Fix more sorts by adding unmapped_type (#85837) (#86666)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
elastic · Dec 21, 2020 · 7c7dc5f · 7c7dc5f
1 parent aa28c41
commit 7c7dc5f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 2 deletions.
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_es_usage.ts
@@ -58,6 +58,7 @@ export async function fetchESUsage(
         {
           timestamp: {
             order: 'desc',
+            unmapped_type: 'long',
           },
         },
       ],

diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.ts b/x-pack/plugins/monitoring/server/kibana_monitoring/collectors/lib/fetch_license_type.ts
@@ -27,6 +27,7 @@ export async function fetchLicenseType(
         {
           timestamp: {
             order: 'desc',
+            unmapped_type: 'long',
           },
         },
       ],

diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_legacy_alerts.test.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_legacy_alerts.test.ts
@@ -70,7 +70,7 @@ describe('fetchLegacyAlerts', () => {
       ],
       body: {
         size,
-        sort: [{ timestamp: { order: 'desc' } }],
+        sort: [{ timestamp: { order: 'desc', unmapped_type: 'long' } }],
         query: {
           bool: {
             minimum_should_match: 1,

diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_legacy_alerts.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_legacy_alerts.ts
@@ -28,6 +28,7 @@ export async function fetchLegacyAlerts(
         {
           timestamp: {
             order: 'desc',
+            unmapped_type: 'long',
           },
         },
       ],

diff --git a/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.ts b/x-pack/plugins/monitoring/server/lib/alerts/fetch_missing_monitoring_data.ts
@@ -97,6 +97,7 @@ export async function fetchMissingMonitoringData(
                       {
                         timestamp: {
                           order: 'desc',
+                          unmapped_type: 'long',
                         },
                       },
                     ],

diff --git a/x-pack/plugins/monitoring/server/lib/beats/get_beats.ts b/x-pack/plugins/monitoring/server/lib/beats/get_beats.ts
@@ -151,7 +151,7 @@ export async function getBeats(req: LegacyRequest, beatsIndexPattern: string, cl
         inner_hits: {
           name: 'earliest',
           size: 1,
-          sort: [{ 'beats_stats.timestamp': 'asc' }],
+          sort: [{ 'beats_stats.timestamp': { order: 'asc', unmapped_type: 'long' } }],
         },
       },
       sort: [