update monitoring template alias path (elastic#82029)

* update monitoring template alias path * fix elasticsearch.cluster.id path
probakowski · Dec 31, 2021 · f05d4be · f05d4be
1 parent 2445752
commit f05d4be
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git a/x-pack/plugin/core/src/main/resources/monitoring-beats-mb.json b/x-pack/plugin/core/src/main/resources/monitoring-beats-mb.json
@@ -10,6 +10,18 @@
               "type": "keyword",
               "ignore_above": 1024
             },
+            "elasticsearch": {
+              "properties": {
+                "cluster": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
             "state": {
               "properties": {
                 "beat": {
@@ -1808,7 +1820,7 @@
                           "type": "alias",
                           "path": "beat.stats.libbeat.pipeline.clients"
                         },
-                        "event": {
+                        "events": {
                           "properties": {
                             "active": {
                               "type": "alias",
@@ -2175,21 +2187,9 @@
             }
           }
         },
-        "elasticsearch": {
-          "properties": {
-            "cluster": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
         "cluster_uuid": {
           "type": "alias",
-          "path": "elasticsearch.cluster.id"
+          "path": "beat.elasticsearch.cluster.id"
         }
       }
     }

diff --git a/x-pack/plugin/core/src/main/resources/monitoring-kibana-mb.json b/x-pack/plugin/core/src/main/resources/monitoring-kibana-mb.json
@@ -22,18 +22,6 @@
             }
           }
         },
-        "elasticsearch": {
-          "properties": {
-            "cluster": {
-              "properties": {
-                "id": {
-                  "ignore_above": 1024,
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
         "service": {
           "properties": {
             "address": {
@@ -172,6 +160,18 @@
         },
         "kibana": {
           "properties": {
+            "elasticsearch": {
+              "properties": {
+                "cluster": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
             "stats": {
               "properties": {
                 "request": {
@@ -639,7 +639,7 @@
         },
         "cluster_uuid": {
           "type": "alias",
-          "path": "elasticsearch.cluster.id"
+          "path": "kibana.elasticsearch.cluster.id"
         }
       }
     },