From 9503f22f539daacf38dfa55f36d5612adb93e94c Mon Sep 17 00:00:00 2001
From: Adam Simpson <adam@adamsimpson.net>
Date: Fri, 12 May 2023 09:49:12 -0400
Subject: [PATCH] CloudMonitor: Show template variables by default (#68331)

CloudMonitor: show template variables by default
---
 .../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 10b6990ba42..5bef59b1802 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/VisualMetricQueryEditor.tsx
@@ -257,7 +257,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 === ''}