Remove _type term filters from cluster alert watches (elastic#38819)

ycombinator · Feb 13, 2019 · 61649a8 · 61649a8
1 parent 9171ce9
commit 61649a8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 52 deletions.
diff --git a/...plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_cluster_status.json b/...plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_cluster_status.json
@@ -47,19 +47,8 @@
                           }
                         },
                         {
-                          "bool": {
-                            "should": [
-                              {
-                                "term": {
-                                  "_type": "cluster_state"
-                                }
-                              },
-                              {
-                                "term": {
-                                  "type": "cluster_stats"
-                                }
-                              }
-                            ]
+                          "term": {
+                            "type": "cluster_stats"
                           }
                         },
                         {

diff --git a/...ugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_version_mismatch.json b/...ugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_version_mismatch.json
@@ -40,19 +40,8 @@
                           }
                         },
                         {
-                          "bool": {
-                            "should": [
-                              {
-                                "term": {
-                                  "_type": "cluster_stats"
-                                }
-                              },
-                              {
-                                "term": {
-                                  "type": "cluster_stats"
-                                }
-                              }
-                            ]
+                          "term": {
+                            "type": "cluster_stats"
                           }
                         },
                         {

diff --git a/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/kibana_version_mismatch.json b/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/kibana_version_mismatch.json
@@ -44,19 +44,8 @@
                           }
                         },
                         {
-                          "bool": {
-                            "should": [
-                              {
-                                "term": {
-                                  "_type": "kibana_stats"
-                                }
-                              },
-                              {
-                                "term": {
-                                  "type": "kibana_stats"
-                                }
-                              }
-                            ]
+                          "term": {
+                            "type": "kibana_stats"
                           }
                         }
                       ]

diff --git a/...ck/plugin/monitoring/src/main/resources/monitoring/watches/logstash_version_mismatch.json b/...ck/plugin/monitoring/src/main/resources/monitoring/watches/logstash_version_mismatch.json
@@ -44,19 +44,8 @@
                           }
                         },
                         {
-                          "bool": {
-                            "should": [
-                              {
-                                "term": {
-                                  "_type": "logstash_stats"
-                                }
-                              },
-                              {
-                                "term": {
-                                  "type": "logstash_stats"
-                                }
-                              }
-                            ]
+                          "term": {
+                            "type": "logstash_stats"
                           }
                         }
                       ]