diff --git a/src/hooks/useListConfig.ts b/src/hooks/useListConfig.ts index f000bf43..c87fd39e 100644 --- a/src/hooks/useListConfig.ts +++ b/src/hooks/useListConfig.ts @@ -26,16 +26,18 @@ export function useListConfig(config: any, index: string) { config.metricConfig && config.metricConfig[i] && config.metricConfig[i].calculation; - const line = - config.metricTypes[i] === MetricQueryTypes.ReadMetricsValues && - !types.includes(calculation); + const isLinear = + [ + MetricQueryTypes.ReadMetricsValues, + MetricQueryTypes.ReadLabeledMetricsValues, + ].includes(config.metricTypes[i]) && !types.includes(calculation); const isAvg = [ MetricQueryTypes.ReadMetricsValues, MetricQueryTypes.ReadLabeledMetricsValues, ].includes(config.metricTypes[i]) && types.includes(calculation); return { - isLinear: line, + isLinear, isAvg, }; } diff --git a/src/views/dashboard/graphs/ServiceList.vue b/src/views/dashboard/graphs/ServiceList.vue index a271017f..e66e3705 100644 --- a/src/views/dashboard/graphs/ServiceList.vue +++ b/src/views/dashboard/graphs/ServiceList.vue @@ -221,15 +221,12 @@ async function queryServiceMetrics(currentServices: Service[]) { return; } - if (!metricConfig.value.length) { - return; - } const { data, names, metricConfigArr, metricTypesArr } = usePodsSource( currentServices, json, { ...props.config, - metricConfig: metricConfig.value, + metricConfig: metricConfig.value || [], } ); services.value = data;