From a44c985d8b99809ae5bf81f5637ca205ce4b39bc Mon Sep 17 00:00:00 2001
From: Ester Marti <ester.martivilaseca@elastic.co>
Date: Fri, 23 Apr 2021 11:36:04 +0200
Subject: [PATCH] Add default value for mode for rate agg

---
 .../MetricAggregationsEditor/SettingsEditor/index.tsx       | 2 +-
 .../QueryEditor/MetricAggregationsEditor/utils.ts           | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/index.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/index.tsx
index 0a8717538f4..1c3b32e5a93 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/index.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/index.tsx
@@ -141,7 +141,7 @@ export const SettingsEditor: FunctionComponent<Props> = ({ metric, previousMetri
               id={`ES-query-${query.refId}_metric-${metric.id}-mode`}
               onChange={(e) => dispatch(changeMetricSetting(metric, 'mode', e.value))}
               options={rateAggModeOptions}
-              value={metric.settings?.unit}
+              value={metric.settings?.unit || metricAggregationConfig['rate'].defaults.settings?.mode}
             />
           </InlineField>
         </>
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/utils.ts b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/utils.ts
index be7847d6034..2964738731e 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/utils.ts
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/utils.ts
@@ -245,7 +245,11 @@ export const metricAggregationConfig: MetricsConfiguration = {
     hasSettings: true,
     supportsInlineScript: false,
     hasMeta: false,
-    defaults: {},
+    defaults: {
+      settings: {
+        mode: 'sum',
+      },
+    },
   },
 };