From 264b2e14e9937306ee5fea8b47a3c269e8991671 Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Sat, 13 Jun 2020 11:57:11 +0200
Subject: [PATCH] [Uptime] Fixed metric query broken because of missing mapping
 (#68999) (#69090)

Co-authored-by: Andrew Cholakian <andrew@andrewvc.com>

Co-authored-by: Andrew Cholakian <andrew@andrewvc.com>
---
 .../lib/requests/__tests__/get_latest_monitor.test.ts    | 4 ++--
 .../uptime/server/lib/requests/get_latest_monitor.ts     | 9 ++++++---
 .../server/lib/requests/search/enrich_monitor_groups.ts  | 8 ++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts
index f8a335c387f2e..aa3574874af8e 100644
--- a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts
@@ -37,8 +37,8 @@ describe('getLatestMonitor', () => {
           'monitor',
           'observer',
           '@timestamp',
-          'tls.server.x509.not_after',
-          'tls.server.x509.not_before',
+          'tls.certificate_not_valid_after',
+          'tls.certificate_not_valid_before',
         ],
         sort: {
           '@timestamp': { order: 'desc' },
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts b/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
index db34de5159213..a47e6173d9f00 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
@@ -50,8 +50,8 @@ export const getLatestMonitor: UMElasticsearchQueryFn<GetLatestMonitorParams, Pi
         'monitor',
         'observer',
         '@timestamp',
-        'tls.server.x509.not_after',
-        'tls.server.x509.not_before',
+        'tls.certificate_not_valid_after',
+        'tls.certificate_not_valid_before',
       ],
       sort: {
         '@timestamp': { order: 'desc' },
@@ -68,6 +68,9 @@ export const getLatestMonitor: UMElasticsearchQueryFn<GetLatestMonitorParams, Pi
     ...ping,
     docId,
     timestamp: ping['@timestamp'],
-    tls: { not_after: tls?.server?.x509?.not_after, not_before: tls?.server?.x509?.not_before },
+    tls: {
+      not_after: tls?.certificate_not_valid_after,
+      not_before: tls?.certificate_not_valid_before,
+    },
   };
 };
diff --git a/x-pack/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts b/x-pack/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts
index 53b1fe881cd92..6e52b3a11f25f 100644
--- a/x-pack/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts
@@ -138,11 +138,11 @@ export const enrichMonitorGroups: MonitorEnricher = async (
                         if (curCheck.tls == null) {
                           curCheck.tls = new HashMap();
                         }
-                        if (!doc["tls.server.x509.not_after"].isEmpty()) {
-                          curCheck.tls.not_after = doc["tls.server.x509.not_after"][0];
+                         if (!doc["tls.certificate_not_valid_after"].isEmpty()) {
+                          curCheck.tls.not_after = doc["tls.certificate_not_valid_after"][0];
                         }
-                        if (!doc["tls.server.x509.not_before"].isEmpty()) {
-                          curCheck.tls.not_before = doc["tls.server.x509.not_before"][0];
+                         if (!doc["tls.certificate_not_valid_before"].isEmpty()) {
+                          curCheck.tls.not_before = doc["tls.certificate_not_valid_before"][0];
                         }
 
                         state.checksByAgentIdIP[agentIdIP] = curCheck;