From 6c8ae439d852c7d9fc64e2bef34df4cb62edf502 Mon Sep 17 00:00:00 2001 From: Fine Date: Thu, 23 Nov 2023 15:58:59 +0800 Subject: [PATCH] fix: call metrics --- src/views/dashboard/data.ts | 4 ++++ src/views/dashboard/related/topology/components/Graph.vue | 6 +++--- .../dashboard/related/topology/components/PodTopology.vue | 6 +++--- .../dashboard/related/topology/components/Settings.vue | 5 +++-- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/views/dashboard/data.ts b/src/views/dashboard/data.ts index 3b503638..16f84074 100644 --- a/src/views/dashboard/data.ts +++ b/src/views/dashboard/data.ts @@ -345,3 +345,7 @@ export enum MetricModes { Expression = "Expression", General = "General", } +export enum CallTypes { + Server = "SERVER", + Client = "CLIENT", +} diff --git a/src/views/dashboard/related/topology/components/Graph.vue b/src/views/dashboard/related/topology/components/Graph.vue index d38e2c36..29aa7322 100644 --- a/src/views/dashboard/related/topology/components/Graph.vue +++ b/src/views/dashboard/related/topology/components/Graph.vue @@ -140,7 +140,7 @@ limitations under the License. --> import { useSelectorStore } from "@/store/modules/selectors"; import { useTopologyStore } from "@/store/modules/topology"; import { useDashboardStore } from "@/store/modules/dashboard"; - import { EntityType, DepthList, MetricModes } from "../../../data"; + import { EntityType, DepthList, MetricModes, CallTypes } from "../../../data"; import router from "@/router"; import { ElMessage } from "element-plus"; import Settings from "./Settings.vue"; @@ -224,8 +224,8 @@ limitations under the License. --> async function update() { if (settings.value.metricMode === MetricModes.Expression) { topologyStore.queryNodeExpressions(settings.value.nodeExpressions || []); - topologyStore.getLinkExpressions(settings.value.linkClientExpressions || []); - topologyStore.getLinkExpressions(settings.value.linkServerExpressions || []); + topologyStore.getLinkExpressions(settings.value.linkClientExpressions || [], CallTypes.Client); + topologyStore.getLinkExpressions(settings.value.linkServerExpressions || [], CallTypes.Server); } else { topologyStore.queryNodeMetrics(settings.value.nodeMetrics || []); topologyStore.getLinkClientMetrics(settings.value.linkClientMetrics || []); diff --git a/src/views/dashboard/related/topology/components/PodTopology.vue b/src/views/dashboard/related/topology/components/PodTopology.vue index 40812b14..3d445895 100644 --- a/src/views/dashboard/related/topology/components/PodTopology.vue +++ b/src/views/dashboard/related/topology/components/PodTopology.vue @@ -69,7 +69,7 @@ limitations under the License. --> import { useDashboardStore } from "@/store/modules/dashboard"; import { useSelectorStore } from "@/store/modules/selectors"; import { useAppStoreWithOut } from "@/store/modules/app"; - import { EntityType, DepthList, MetricModes } from "../../../data"; + import { EntityType, DepthList, MetricModes, CallTypes } from "../../../data"; import { ElMessage } from "element-plus"; import Sankey from "./Sankey.vue"; import Settings from "./Settings.vue"; @@ -121,8 +121,8 @@ limitations under the License. --> width.value = dom.width - 5; if (settings.value.metricMode === MetricModes.Expression) { topologyStore.queryNodeExpressions(settings.value.nodeExpressions || []); - topologyStore.getLinkExpressions(settings.value.linkClientExpressions || []); - topologyStore.getLinkExpressions(settings.value.linkServerExpressions || []); + topologyStore.getLinkExpressions(settings.value.linkClientExpressions || [], CallTypes.Client); + topologyStore.getLinkExpressions(settings.value.linkServerExpressions || [], CallTypes.Server); } else { topologyStore.getLinkClientMetrics(settings.value.linkClientMetrics || []); topologyStore.getLinkServerMetrics(settings.value.linkServerMetrics || []); diff --git a/src/views/dashboard/related/topology/components/Settings.vue b/src/views/dashboard/related/topology/components/Settings.vue index 5fbea92b..be20080a 100644 --- a/src/views/dashboard/related/topology/components/Settings.vue +++ b/src/views/dashboard/related/topology/components/Settings.vue @@ -277,6 +277,7 @@ limitations under the License. --> LegendOpt, MetricsType, MetricModes, + CallTypes, } from "../../../data"; import type { Option } from "@/types/app"; import { useQueryTopologyMetrics } from "@/hooks/useMetricsProcessor"; @@ -515,7 +516,7 @@ limitations under the License. --> topologyStore.setLinkServerMetrics({}); return; } - topologyStore.getLinkExpressions(states.linkServerExpressions, "SERVER"); + topologyStore.getLinkExpressions(states.linkServerExpressions, CallTypes.Server); } function changeLinkClientExpressions(param: string[]) { if (!isExpression.value) { @@ -527,7 +528,7 @@ limitations under the License. --> topologyStore.changeLinkClientMetrics({}); return; } - topologyStore.getLinkExpressions(states.linkClientExpressions, "CLIENT"); + topologyStore.getLinkExpressions(states.linkClientExpressions, CallTypes.Client); } function updateLinkClientMetrics(options: Option[] | any) { const opt = options.map((d: Option) => d.value);