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

Alerting: Fix Graphite subqueries (#80744)

Browse Source
This commit is contained in:
Gilles De Mey 2024-01-18 15:15:21 +01:00 committed by GitHub
parent bb2e0dad22
commit 8a4bd85efd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/features/alerting/unified/components/rule-editor/QueryWrapper.tsx
View File

@ -136,6 +136,9 @@ export const QueryWrapper = ({
} }
const showVizualisation = data.state !== LoadingState.NotStarted; const showVizualisation = data.state !== LoadingState.NotStarted;
// ⚠️ the query editors want the entire array of queries passed as "DataQuery" NOT "AlertQuery"
// TypeScript isn't complaining here because the interfaces just happen to be compatible
const editorQueries = cloneDeep(queries.map((query) => query.model));
return ( return (
<Stack direction="column" gap={0.5}> <Stack direction="column" gap={0.5}>
@ -155,7 +158,7 @@ export const QueryWrapper = ({
onRemoveQuery={onRemoveQuery} onRemoveQuery={onRemoveQuery}
onAddQuery={() => onDuplicateQuery(cloneDeep(query))} onAddQuery={() => onDuplicateQuery(cloneDeep(query))}
onRunQuery={onRunQueries} onRunQuery={onRunQueries}
queries={queries} queries={editorQueries}
renderHeaderExtras={() => <HeaderExtras query={query} index={index} error={error} />} renderHeaderExtras={() => <HeaderExtras query={query} index={index} error={error} />}
app={CoreApp.UnifiedAlerting} app={CoreApp.UnifiedAlerting}
hideDisableQuery={true} hideDisableQuery={true}

6
public/app/plugins/datasource/graphite/state/context.tsx
View File

@ -76,7 +76,7 @@ export const GraphiteQueryEditorContext = ({
() => { () => {
if (needsRefresh && state) { if (needsRefresh && state) {
setNeedsRefresh(false); setNeedsRefresh(false);
onChange({ ...query, target: state.target.target }); onChange({ ...query, target: state.target.target, targetFull: state.target.targetFull });
onRunQuery(); onRunQuery();
} }
}, },
@ -92,8 +92,8 @@ export const GraphiteQueryEditorContext = ({
datasource: datasource, datasource: datasource,
range: range, range: range,
templateSrv: getTemplateSrv(), templateSrv: getTemplateSrv(),
// list of queries is passed only when the editor is in Dashboards. This is to allow interpolation // list of queries is passed only when the editor is in Dashboards or Alerting. This is to allow interpolation
// of sub-queries which are stored in "targetFull" property used by alerting in the backend. // of sub-queries which are stored in "targetFull" property. This is used by alerting in the backend.
queries: queries || [], queries: queries || [],
refresh: () => { refresh: () => {
// do not run onChange/onRunQuery straight away to ensure the internal state gets updated first // do not run onChange/onRunQuery straight away to ensure the internal state gets updated first

1
public/app/plugins/datasource/graphite/types.ts
View File

@ -14,6 +14,7 @@ export interface GraphiteQuery extends DataQuery {
queryType?: string; queryType?: string;
textEditor?: boolean; textEditor?: boolean;
target?: string; target?: string;
targetFull?: string;
tags?: string[]; tags?: string[];
fromAnnotations?: boolean; fromAnnotations?: boolean;
} }