fix: sum_over_time

vesoft-inc · Dec 27, 2022 · 8487131 · 8487131
1 parent af68625
commit 8487131
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 83 deletions.
diff --git a/src/components/Service/ServiceCardEdit/index.tsx b/src/components/Service/ServiceCardEdit/index.tsx
@@ -63,15 +63,6 @@ function ServiceCardEdit(props: IProps) {
         initialValues={editItem}
         onFinish={handlePanelConfigUpdate}
       >
-        <Form.Item label={intl.get('service.period')} name="period">
-          <DashboardSelect>
-            {TIME_INTERVAL_OPTIONS.map(value => (
-              <Option key={value} value={value}>
-                {value}
-              </Option>
-            ))}
-          </DashboardSelect>
-        </Form.Item>
         <MetricPopover list={curServiceMetricItems} />
         <Form.Item label={intl.get('service.metric')} name="metric">
           <DashboardSelect onChange={handleUpdateMetricType}>
@@ -108,34 +99,7 @@ function ServiceCardEdit(props: IProps) {
               </Form.Item>
             ) : null;
           }}
-        </Form.Item>
-        <Form.Item
-          noStyle={true}
-          shouldUpdate={(prevValues, currentValues) =>
-            prevValues.metric !== currentValues.metric
-          }
-        >
-          {({ getFieldValue }) => {
-            const metric = getFieldValue('metric');
-            const typeList = curServiceMetricItems.find(
-              item => item.metric === metric,
-            )?.aggregations;
-            return getFieldValue('metric') ? (
-              <Form.Item
-                label={intl.get('service.metricParams')}
-                name="aggregation"
-              >
-                <DashboardSelect>
-                  {typeList?.map((params, index) => (
-                    <Option key={index} value={params}>
-                      {params}
-                    </Option>
-                  ))}
-                </DashboardSelect>
-              </Form.Item>
-            ) : null;
-          }}
-        </Form.Item>
+        </Form.Item> 
         <Form.Item label={intl.get('common.baseLine')} name="baseLine">
           <InputNumber />
         </Form.Item>

diff --git a/src/components/ServiceMetricsFilterPanel/index.tsx b/src/components/ServiceMetricsFilterPanel/index.tsx
@@ -108,33 +108,7 @@ function ServiceMetricsFilterPanel(props: IProps) {
               </DashboardSelect>
             </Form.Item>
           )
-        }
-        <Form.Item
-          className="metric-period"
-          label={intl.get('service.period')}
-          name="period"
-        >
-          <DashboardSelect onChange={handlePeriodChange}>
-            {TIME_INTERVAL_OPTIONS.map(value => (
-              <Option key={value} value={value}>
-                {value}
-              </Option>
-            ))}
-          </DashboardSelect>
-        </Form.Item>
-        <Form.Item
-          className="metric-type"
-          label={intl.get('service.metricParams')}
-          name="metricType"
-        >
-          <DashboardSelect onChange={handleMetricTypeChange}>
-            {AGGREGATION_OPTIONS.map(type => (
-              <Option key={type} value={type}>
-                {type}
-              </Option>
-            ))}
-          </DashboardSelect>
-        </Form.Item>
+        } 
       </MetricsFilterPanel>
     </div>
   )

diff --git a/src/pages/ServiceDashboard/Detail/index.tsx b/src/pages/ServiceDashboard/Detail/index.tsx
@@ -205,6 +205,7 @@ function ServiceDetail(props: IProps) {
           end: endTime,
           space: serviceType === ServiceName.GRAPHD ? space : undefined,
           clusterID: cluster?.id,
+          isRawMetric:item.isRawMetric
         }).then(res => {
           resolve(res);
         }).catch(e => {

diff --git a/src/pages/ServiceDashboard/ServiceOverview/CustomServiceQueryPanel/index.tsx b/src/pages/ServiceDashboard/ServiceOverview/CustomServiceQueryPanel/index.tsx
@@ -93,19 +93,7 @@ function CustomServiceQueryPanel(props: IProps) {
         >
           {config.metric}
         </Popover>
-        <div>
-          {
-            !isHidePeriod && (
-              <>
-                <span>
-                  {intl.get('service.period')}: <span>{config.period}</span>
-                </span>
-                <span>
-                  {intl.get('service.metricParams')}: <span>{config.metricType}</span>
-                </span>
-              </>
-            )
-          }
+        <div> 
           <div
             className={classnames('blue btn-icon-with-desc', {
               'hide-period': isHidePeriod,

diff --git a/src/store/models/service.ts b/src/store/models/service.ts
@@ -54,8 +54,10 @@ export function SereviceModelWrapper(serviceApi) {
       }) {
         const { start, end, space, query: _query, clusterID } = payload;
         const step = getProperStep(start, end);
-        const _start = start / 1000;
-        const _end = end / 1000;
+        let _start = start / 1000;
+        let _end = end / 1000;
+        _start = _start - _start % step;
+        _end = _end + (step - _end % step);
         let query = `sum(${_query}{${getClusterPrefix()}="${clusterID}"})`;
         query = `${_query}{${getClusterPrefix()}="${clusterID}", space="${space || ''}"}`;
         const { code, data } = (await serviceApi.execPromQLByRange({
@@ -86,6 +88,7 @@ export function SereviceModelWrapper(serviceApi) {
         end: number;
         clusterID?: string;
         noSuffix?: boolean;
+        isRawMetric?: boolean;
       }) {
         const {
           start,
@@ -96,12 +99,18 @@ export function SereviceModelWrapper(serviceApi) {
           noSuffix = false,
         } = payload;
         const step = getProperStep(start, end);
-        const _start = start / 1000;
-        const _end = end / 1000;
+        let _start = start / 1000;
+        let _end = end / 1000;
+        _start = _start - _start % step;
+        _end = _end + (step - _end % step);
         let query = _query;
         if (!noSuffix) {
           if (clusterID) {
-            query = `${_query}{${getClusterPrefix()}="${clusterID}", space="${space || ''}"}`;
+            if (!payload.isRawMetric) {
+              query = `sum_over_time(${_query}{${getClusterPrefix()}="${clusterID}", space="${space || ''}"}[${step}s])`;
+            } else {
+              query = `${_query}{${getClusterPrefix()}="${clusterID}", space="${space || ''}"}`;
+            }
           } else {
             query = `${_query}{space="${space || ''}"}`;
           }

diff --git a/src/utils/service.ts b/src/utils/service.ts
@@ -2,7 +2,7 @@ import { AggregationType } from './dashboard';
 import { ServiceName } from './interface';
 
 export const SERVICE_POLLING_INTERVAL = 10 * 1000;
-export const SERVICE_QUERY_PERIOD = 10 * 60;
+export const SERVICE_QUERY_PERIOD = 5;
 export const SERVICE_DEFAULT_RANGE = 6 * 60 * 60 * 1000;
 
 export enum INTERVAL_FREQUENCY_TYPE {