github/skywalking-booster-ui
2
0
Fork 1
mirror of https://github.com/apache/skywalking-booster-ui.git synced 2025-06-17 10:07:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: correct the same labels for metrics (#467)

Browse Source
This commit is contained in:
Fine0830 2025-04-24 11:58:29 +08:00 committed by GitHub
parent a4cd265d45
commit 5e6e5aa737
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hooks/useExpressionsProcessor.ts
View File

@ -109,12 +109,12 @@ export async function useDashboardQueryProcessor(configList: Indexable[]) {
return { source: {}, tips: [], typesOfMQE: [] }; return { source: {}, tips: [], typesOfMQE: [] };
} }
const tips: string[] = []; const tips: string[] = [];
const source: { [key: string]: unknown } = {}; const source: Indexable<unknown> = {};
const keys = Object.keys(resp.data); const keys = Object.keys(resp.data);
const typesOfMQE: string[] = []; const typesOfMQE: string[] = [];
for (let i = 0; i < config.metrics.length; i++) { for (let i = 0; i < config.metrics.length; i++) {
const c: MetricConfigOpt = (config.metricConfig && config.metricConfig[i]) || {}; const metricConfig: MetricConfigOpt = (config.metricConfig && config.metricConfig[i]) || {};
const obj = resp.data[keys[i]] || {}; const obj = resp.data[keys[i]] || {};
const results = obj.results || []; const results = obj.results || [];
const name = config.metrics[i]; const name = config.metrics[i];
@ -125,15 +125,15 @@ export async function useDashboardQueryProcessor(configList: Indexable[]) {
if (!obj.error) { if (!obj.error) {
if ([ExpressionResultType.SINGLE_VALUE, ExpressionResultType.TIME_SERIES_VALUES].includes(type)) { if ([ExpressionResultType.SINGLE_VALUE, ExpressionResultType.TIME_SERIES_VALUES].includes(type)) {
for (const item of results) { for (const item of results) {
const label = let label =
item.metric && item.metric &&
item.metric.labels.map((d: { key: string; value: string }) => `${d.key}=${d.value}`).join(","); item.metric.labels.map((d: { key: string; value: string }) => `${d.key}=${d.value}`).join(",");
const values = item.values.map((d: { value: unknown }) => d.value) || []; const values = item.values.map((d: { value: unknown }) => d.value) || [];
if (results.length === 1) { if (results.length === 1) {
source[label || c.label || name] = values; // If the metrics label does not exist, use the configuration label or expression
} else { label = label ? `${metricConfig.label || name}, ${label}` : metricConfig.label || name;
source[label] = values;
} }
source[label] = values;
} }
} }
if (([ExpressionResultType.RECORD_LIST, ExpressionResultType.SORTED_LIST] as string[]).includes(type)) { if (([ExpressionResultType.RECORD_LIST, ExpressionResultType.SORTED_LIST] as string[]).includes(type)) {
@ -148,7 +148,7 @@ export async function useDashboardQueryProcessor(configList: Indexable[]) {
const appStore = useAppStoreWithOut(); const appStore = useAppStoreWithOut();
const variables: string[] = [`$duration: Duration!`]; const variables: string[] = [`$duration: Duration!`];
let fragments = ""; let fragments = "";
let conditions: Recordable = { let conditions: Recordable<unknown> = {
duration: appStore.durationTime, duration: appStore.durationTime,
}; };
for (let i = 0; i < configArr.length; i++) { for (let i = 0; i < configArr.length; i++) {
@ -465,7 +465,7 @@ export function useQueryTopologyExpressionsProcessor(metrics: string[], instance
return { queryStr, conditions }; return { queryStr, conditions };
} }
function handleExpressionValues(partMetrics: string[], resp: { [key: string]: any }) { function handleExpressionValues(partMetrics: string[], resp: { [key: string]: any }) {
const obj: any = {}; const obj: Indexable = {};
for (let idx = 0; idx < instances.length; idx++) { for (let idx = 0; idx < instances.length; idx++) {
for (let index = 0; index < partMetrics.length; index++) { for (let index = 0; index < partMetrics.length; index++) {
const k = "expression" + idx + index; const k = "expression" + idx + index;