From cf49bbe560de5e8e1cf0d5ee379571a7ad92d80b Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Fri, 12 May 2023 15:01:50 +0100 Subject: [PATCH] [v9.5.x] CloudMonitor: Show template variables by default (#68383) CloudMonitor: Show template variables by default (#68331) CloudMonitor: show template variables by default (cherry picked from commit 9503f22f539daacf38dfa55f36d5612adb93e94c) Co-authored-by: Adam Simpson --- .../components/VisualMetricQueryEditor.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx index dd96bc0a0cb..c3f31abbc4f 100644 --- a/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx +++ b/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx @@ -253,7 +253,13 @@ export function Editor({ onChange={onMetricTypeChange} value={[...metrics, ...variableOptionGroup.options].find((s) => s.value === metricType)} loadOptions={debounceFilter} - defaultOptions={metrics.slice(0, 100)} + defaultOptions={[ + { + label: 'Template Variables', + options: variableOptionGroup.options, + }, + ...metrics.slice(0, 100), + ]} placeholder="Select Metric" inputId={`${refId}-select-metric`} disabled={service === ''}