fix: service overview use sum (#183)

vesoft-inc · Dec 29, 2022 · ff125d0 · ff125d0
1 parent 90f403a
commit ff125d0
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 15 deletions.
diff --git a/src/pages/ServiceDashboard/Detail/index.tsx b/src/pages/ServiceDashboard/Detail/index.tsx
@@ -165,14 +165,15 @@ function ServiceDetail(props: IProps) {
     const getPromise = (chart) => {
       return new Promise((resolve, reject) => {
         const item: IServiceMetricItem = chart.metric;
-        const metricType = item.aggregations[0] as AggregationType;
+        const aggregation = item.aggregations[0] as AggregationType;
         asyncFetchMetricsData({
-          query: getQueryByMetricType(item, metricType, period),
+          query: getQueryByMetricType(item, aggregation, period),
           start: startTime,
           end: endTime,
           space: serviceType === ServiceName.GRAPHD ? space : undefined,
           clusterID: cluster?.id,
-          isRawMetric:item.isRawMetric
+          isRawMetric: item.isRawMetric,
+          aggregation
         }).then(res => {
           resolve(res);
         }).catch(e => {

diff --git a/src/pages/ServiceDashboard/ServiceOverview/CustomServiceQueryPanel/index.tsx b/src/pages/ServiceDashboard/ServiceOverview/CustomServiceQueryPanel/index.tsx
@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 import { Popover } from 'antd';
 import Icon from '@/components/Icon';
 import { IServiceMetricItem, IServicePanelConfig, MetricScene, ServiceName } from '@/utils/interface';
-import { calcTimeRange, getDataByType, getMetricsUniqName, TIME_OPTION_TYPE } from '@/utils/dashboard';
+import { AggregationType, calcTimeRange, getDataByType, getMetricsUniqName, TIME_OPTION_TYPE } from '@/utils/dashboard';
 import Card from '@/components/Service/ServiceCard/Card';
 import { IDispatch, IRootState } from '@/store';
 import { shouldCheckCluster } from '@/utils';
@@ -60,16 +60,19 @@ function CustomServiceQueryPanel(props: IProps) {
   }, [metricsFilterValues, metricsFilterValues, cluster, config, serviceMetric])
 
   const getMetricsData = async () => {
-    const { period: metricPeriod, space, metric, aggregation } = config;
+    let { period: metricPeriod = 5, space, metric } = config;
     const [start, end] = calcTimeRange(TIME_OPTION_TYPE.HOUR12);
     const item = (serviceMetric[serviceType] as IServiceMetricItem[]).find((metricItem: IServiceMetricItem) => metricItem.metric === metric);
+    const aggregation = item?.aggregations[0] as AggregationType;
     if (item) {
       const data = await asyncGetMetricsData({
         query: getQueryByMetricType(item, aggregation, metricPeriod?.toString()), // EXPLAIN: query like nebula_graphd_num_queries_rate_600
         start,
         end,
         space,
-        clusterID: cluster?.id
+        clusterID: cluster?.id,
+        isRawMetric: item.isRawMetric,
+        aggregation
       });
       setData(data)
     }

diff --git a/src/store/models/service.ts b/src/store/models/service.ts
@@ -3,7 +3,7 @@ import _ from 'lodash';
 import serviceApi from '@/config/service';
 import { IPanelConfig, ServiceMetricsPanelValue } from '@/utils/interface';
 import { DEFAULT_SERVICE_PANEL_CONFIG } from '@/utils/service';
-import { getProperStep } from '@/utils/dashboard';
+import { AggregationType, getProperStep } from '@/utils/dashboard';
 import { unique } from '@/utils';
 import { getClusterPrefix } from '@/utils/promQL';
 import { InitMetricsFilterValues } from '@/utils/metric';
@@ -89,6 +89,7 @@ export function SereviceModelWrapper(serviceApi) {
         clusterID?: string;
         noSuffix?: boolean;
         isRawMetric?: boolean;
+        aggregation: AggregationType;
       }) {
         const {
           start,
@@ -106,7 +107,7 @@ export function SereviceModelWrapper(serviceApi) {
         let query = _query;
         if (!noSuffix) {
           if (clusterID) {
-            if (!payload.isRawMetric) {
+            if (!payload.isRawMetric && payload.aggregation === AggregationType.Sum) {
               query = `sum_over_time(${_query}{${getClusterPrefix()}="${clusterID}", space="${space || ''}"}[${step}s])`;
             } else {
               query = `${_query}{${getClusterPrefix()}="${clusterID}", space="${space || ''}"}`;

diff --git a/src/utils/metric.ts b/src/utils/metric.ts
@@ -151,6 +151,10 @@ export const filterServiceMetrics = (payload: {
             _item => _item === key,
           );
           if (!metricTypeItem) {
+            if (key === 'sum') {// make sum the first
+              metricItem.aggregations.unshift(key);
+              return;
+            }
             metricItem.aggregations.push(key);
           }
         }
@@ -161,7 +165,7 @@ export const filterServiceMetrics = (payload: {
           isSpaceMetric: !!isSpaceMetric,
           isRawMetric: !key, // if metrics don't have sum / avg / p99 
           prefixMetric: `${metricFieldType}_${componentType.replace('-', '_')}`,
-          aggregations: key ? [key] : METRIC_FUNCTIONS,
+          aggregations: key ? [key] : [],
         });
       }
     }

diff --git a/src/utils/service.ts b/src/utils/service.ts
@@ -82,14 +82,14 @@ export const LINE_COLORS = [
 export const DEFAULT_SERVICE_PANEL_CONFIG = {
   [ServiceName.GRAPHD]: [
     {
-      period: 60,
+      period: 5,
       metric: 'num_queries',
-      aggregation: AggregationType.Rate,
+      aggregation: AggregationType.Sum,
     },
     {
-      period: 60,
+      period: 5,
       metric: 'num_slow_queries',
-      aggregation: AggregationType.Rate,
+      aggregation: AggregationType.Sum,
     },
   ],
   [ServiceName.STORAGED]: [
@@ -111,9 +111,9 @@ export const DEFAULT_SERVICE_PANEL_CONFIG = {
       aggregation: AggregationType.Avg,
     },
     {
-      period: 60,
+      period: 5,
       metric: 'num_heartbeats',
-      aggregation: AggregationType.Rate,
+      aggregation: AggregationType.Sum,
     }
   ],
   [ServiceName.MetadListener]: [],