IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Prometheus: Set default value for query expr (#40330)

Browse Source
This commit is contained in:
Ivana Huckova 2021-10-12 15:58:48 +02:00 committed by GitHub
parent 084a9b7d1a
commit fd1b0de34b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/app/plugins/datasource/prometheus/components/PromExploreExtraField.tsx
View File

@ -1,4 +1,4 @@
import React, { memo, useEffect, useCallback } from 'react';
import React, { memo, useCallback } from 'react';
import { usePrevious } from 'react-use';
import { isEqual } from 'lodash';
import { css, cx } from '@emotion/css';
@ -28,17 +28,6 @@ export const PromExploreExtraField: React.FC<PromExploreExtraFieldProps> = memo(
const prevQuery = usePrevious(query);
// Setting default values
useEffect(() => {
if (query.exemplar === undefined) {
onChange({ ...query, exemplar: true });
}
if (!query.instant && !query.range) {
onChange({ ...query, instant: true, range: true });
}
}, [onChange, query]);
const onExemplarChange = useCallback(
(exemplar: boolean) => {
if (!isEqual(query, prevQuery) || exemplar !== query.exemplar) {

16
public/app/plugins/datasource/prometheus/components/PromExploreQueryEditor.tsx
View File

@ -1,4 +1,4 @@
import React, { memo, FC } from 'react';
import React, { memo, FC, useEffect } from 'react';
import { QueryEditorProps } from '@grafana/data';
import { PrometheusDatasource } from '../datasource';
import { PromQuery, PromOptions } from '../types';
@ -10,6 +10,20 @@ export type Props = QueryEditorProps<PrometheusDatasource, PromQuery, PromOption
export const PromExploreQueryEditor: FC<Props> = (props: Props) => {
const { range, query, data, datasource, history, onChange, onRunQuery } = props;
// Setting default values
useEffect(() => {
if (query.expr === undefined) {
onChange({ ...query, expr: '' });
}
if (query.exemplar === undefined) {
onChange({ ...query, exemplar: true });
}
if (!query.instant && !query.range) {
onChange({ ...query, instant: true, range: true });
}
}, [onChange, query]);
return (
<PromQueryField
datasource={datasource}