From b997590fa94c74c20f7859cefc3b25dad2440965 Mon Sep 17 00:00:00 2001 From: Justin Kambic Date: Wed, 5 Jun 2019 08:40:24 -0400 Subject: [PATCH] Remove deprecated feature from elasticsearch queries. (#37995) --- .../__snapshots__/elasticsearch_monitors_adapter.test.ts.snap | 4 ++-- .../lib/adapters/monitors/elasticsearch_monitors_adapter.ts | 4 ++-- .../server/lib/adapters/pings/elasticsearch_pings_adapter.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/x-pack/plugins/uptime/server/lib/adapters/monitors/__tests__/__snapshots__/elasticsearch_monitors_adapter.test.ts.snap b/x-pack/plugins/uptime/server/lib/adapters/monitors/__tests__/__snapshots__/elasticsearch_monitors_adapter.test.ts.snap index a9877a4d1f8d7..100fe0b9a66bf 100644 --- a/x-pack/plugins/uptime/server/lib/adapters/monitors/__tests__/__snapshots__/elasticsearch_monitors_adapter.test.ts.snap +++ b/x-pack/plugins/uptime/server/lib/adapters/monitors/__tests__/__snapshots__/elasticsearch_monitors_adapter.test.ts.snap @@ -23,7 +23,7 @@ Array [ }, "date_histogram": Object { "field": "@timestamp", - "interval": "36000ms", + "fixed_interval": "36000ms", }, }, }, @@ -81,7 +81,7 @@ Array [ }, "date_histogram": Object { "field": "@timestamp", - "interval": "36000ms", + "fixed_interval": "36000ms", }, }, }, diff --git a/x-pack/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts b/x-pack/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts index 9dc153e2e54ae..7b4af0ae89620 100644 --- a/x-pack/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts +++ b/x-pack/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts @@ -82,7 +82,7 @@ export class ElasticsearchMonitorsAdapter implements UMMonitorsAdapter { timeseries: { date_histogram: { field: '@timestamp', - interval: getHistogramInterval(dateRangeStart, dateRangeEnd), + fixed_interval: getHistogramInterval(dateRangeStart, dateRangeEnd), }, aggs: { status: { terms: { field: 'monitor.status', size: 2, shard_size: 2 } }, @@ -297,7 +297,7 @@ export class ElasticsearchMonitorsAdapter implements UMMonitorsAdapter { histogram: { date_histogram: { field: '@timestamp', - interval: getHistogramInterval(dateRangeStart, dateRangeEnd), + fixed_interval: getHistogramInterval(dateRangeStart, dateRangeEnd), missing: 0, }, aggs: { diff --git a/x-pack/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts b/x-pack/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts index 4e69e4a4291ae..511bb791654db 100644 --- a/x-pack/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts +++ b/x-pack/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts @@ -179,7 +179,7 @@ export class ElasticsearchPingsAdapter implements UMPingsAdapter { timeseries: { date_histogram: { field: '@timestamp', - interval: getHistogramInterval(dateRangeStart, dateRangeEnd), + fixed_interval: getHistogramInterval(dateRangeStart, dateRangeEnd), }, aggs: { down: {