diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index 54d637a4f28..aa2b9f0d655 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -332,9 +332,11 @@ export class ElasticDatasource extends DataSourceApi<ElasticsearchQuery, Elastic
       }
 
       let queryObj;
-      if (target.isLogsQuery) {
+      if (target.isLogsQuery || queryDef.hasMetricOfType(target, 'logs')) {
         target.bucketAggs = [queryDef.defaultBucketAgg()];
         target.metrics = [queryDef.defaultMetricAgg()];
+        // Setting this for metrics queries that are typed as logs
+        target.isLogsQuery = true;
         queryObj = this.queryBuilder.getLogsQuery(target, queryString);
       } else {
         if (target.alias) {
diff --git a/public/app/plugins/datasource/elasticsearch/query_def.ts b/public/app/plugins/datasource/elasticsearch/query_def.ts
index 4f898e8155b..9771000e9e1 100644
--- a/public/app/plugins/datasource/elasticsearch/query_def.ts
+++ b/public/app/plugins/datasource/elasticsearch/query_def.ts
@@ -73,6 +73,7 @@ export const metricAggTypes = [
     minVersion: 2,
   },
   { text: 'Raw Document', value: 'raw_document', requiresField: false },
+  { text: 'Logs', value: 'logs', requiresField: false },
 ];
 
 export const bucketAggTypes = [
@@ -260,3 +261,7 @@ export function defaultBucketAgg() {
 export const findMetricById = (metrics: any[], id: any) => {
   return _.find(metrics, { id: id });
 };
+
+export function hasMetricOfType(target: any, type: string): boolean {
+  return target && target.metrics && target.metrics.some((m: any) => m.type === type);
+}
diff --git a/public/app/plugins/datasource/elasticsearch/specs/query_def.test.ts b/public/app/plugins/datasource/elasticsearch/specs/query_def.test.ts
index f3d1874338f..d581ad0fc0d 100644
--- a/public/app/plugins/datasource/elasticsearch/specs/query_def.test.ts
+++ b/public/app/plugins/datasource/elasticsearch/specs/query_def.test.ts
@@ -86,25 +86,25 @@ describe('ElasticQueryDef', () => {
   describe('pipeline aggs depending on esverison', () => {
     describe('using esversion undefined', () => {
       test('should not get pipeline aggs', () => {
-        expect(queryDef.getMetricAggTypes(undefined).length).toBe(9);
+        expect(queryDef.getMetricAggTypes(undefined).length).toBe(10);
       });
     });
 
     describe('using esversion 1', () => {
       test('should not get pipeline aggs', () => {
-        expect(queryDef.getMetricAggTypes(1).length).toBe(9);
+        expect(queryDef.getMetricAggTypes(1).length).toBe(10);
       });
     });
 
     describe('using esversion 2', () => {
       test('should get pipeline aggs', () => {
-        expect(queryDef.getMetricAggTypes(2).length).toBe(12);
+        expect(queryDef.getMetricAggTypes(2).length).toBe(13);
       });
     });
 
     describe('using esversion 5', () => {
       test('should get pipeline aggs', () => {
-        expect(queryDef.getMetricAggTypes(5).length).toBe(12);
+        expect(queryDef.getMetricAggTypes(5).length).toBe(13);
       });
     });
   });