[Uptime] Fixed metric query broken because of missing mapping (elasti…

…c#68999) Co-authored-by: Andrew Cholakian <andrew@andrewvc.com>
shahzad31 · Jun 12, 2020 · bf19cd2 · bf19cd2
1 parent 82a700e
commit bf19cd2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 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
@@ -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
@@ -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
@@ -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;