feat: promql 降采样原始默认改为false

TencentBlueKing · Nov 26, 2024 · f256c28 · f256c28
1 parent 6c3e20e
commit f256c28
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/profiling/src/datasource/datasource.ts b/src/profiling/src/datasource/datasource.ts
@@ -117,8 +117,8 @@ export default class DashboardDatasource extends DataSourceApi<ProfilingQuery, Q
       this.request<BackendDataSourceResponse>(QueryUrl.query_graph_profile, {
         data: {
           bk_biz_id: this.bizId,
-          start: options.range.from.unix(),
-          end: options.range.to.unix(),
+          start: options.range.from.valueOf() * 1000,
+          end: options.range.to.valueOf() * 1000,
           app_name: target.app_name,
           service_name: target.service_name,
           data_type: target.profile_type,

diff --git a/src/timeseries/src/components/editor-form.tsx b/src/timeseries/src/components/editor-form.tsx
@@ -31,7 +31,7 @@ import { LanguageContext } from '../utils/context';
 export interface IEditorFormProps {
   labelStyle?: React.CSSProperties;
   metricList?: MetricDetail[];
-  renderTitle?: () => Element;
+  renderTitle?: () => React.ReactNode;
   style?: React.CSSProperties;
   tips?: string;
   title?: string;

diff --git a/src/timeseries/src/components/query-editor.tsx b/src/timeseries/src/components/query-editor.tsx
@@ -50,7 +50,7 @@ import {
 } from '../typings/metric';
 import { handleTransformOldQuery } from '../utils/common';
 import { LanguageContext } from '../utils/context';
-import { getCookie, t } from 'common/utils/utils';
+import { language, t } from 'common/utils/utils';
 import AddvanceSetting, { type AddvanceSettingKey } from './addvance-setting';
 import AliasInput from './alias-input';
 import ConditionInput from './condition-input';
@@ -118,7 +118,6 @@ export default class MonitorQueryEditor extends React.PureComponent<IQueryEditor
       promqlAlias = '',
       source = '',
       step = '',
-      enableDownSampling = true,
     } = query;
     let expressions: IExpresionItem[] = expressionList;
     // 兼容旧版本
@@ -132,6 +131,11 @@ export default class MonitorQueryEditor extends React.PureComponent<IQueryEditor
         },
       ];
     }
+    const stateMode = only_promql || mode === 'code' ? 'code' : 'ui';
+    let enableDownSampling = query.enableDownSampling;
+    if (enableDownSampling === undefined) {
+      enableDownSampling = stateMode !== 'code';
+    }
     this.state = {
       cluster,
       editorStatus: 'default',
@@ -141,10 +145,10 @@ export default class MonitorQueryEditor extends React.PureComponent<IQueryEditor
       host,
       inited: false,
       isTranform: false,
-      language: getCookie('blueking_language'),
+      language: language,
       loading: true,
       metricList: [{} as any],
-      mode: only_promql || mode === 'code' ? 'code' : 'ui',
+      mode: stateMode,
       module,
       promqlAlias: promqlAlias || alias,
       searchState: SearcState.deafult,