update

elastic · Jun 12, 2020 · ce34d8b · ce34d8b
1 parent e6941b4
commit ce34d8b
Showing 1 changed file with 4 additions and 9 deletions.
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,16 +138,11 @@ export const enrichMonitorGroups: MonitorEnricher = async (
                         if (curCheck.tls == null) {
                           curCheck.tls = new HashMap();
                         }
-                       if (doc.containsKey("tls.server.x509.not_after") && !doc["tls.server.x509.not_after"].isEmpty()) {
-                          curCheck.tls.not_after = doc["tls.server.x509.not_after"][0];
-                        } else if (doc.containsKey("tls.certificate_not_valid_after") && !doc["tls.certificate_not_valid_after"].isEmpty()) {
-                          curCheck.tls.certificate_not_valid_after = doc["tls.certificate_not_valid_after"][0];
+                         if (!doc["tls.certificate_not_valid_after"].isEmpty()) {
+                          curCheck.tls.not_after = doc["tls.certificate_not_valid_after"][0];
                         }
-
-                        if (doc.containsKey("tls.server.x509.not_after") && !doc["tls.server.x509.not_before"].isEmpty()) {
-                          curCheck.tls.not_before = doc["tls.server.x509.not_before"][0];
-                        } else if (doc.containsKey("tls.certificate_not_valid_before") && !doc["tls.certificate_not_valid_before"].isEmpty()) {
-                          curCheck.tls.certificate_not_valid_before = doc["tls.certificate_not_valid_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;