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

ycombinator · ycombinator · commit bf22b87cae52 · 2019-02-12T16:22:43.000-08:00
diff --git a/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_cluster_status.json b/x-pack/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/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/elasticsearch_version_mismatch.json b/x-pack/plugin/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/x-pack/plugin/monitoring/src/main/resources/monitoring/watches/logstash_version_mismatch.json b/x-pack/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"
                           }
                         }
                       ]

Original file line number	Diff line number	Diff line change
`@@ -47,19 +47,8 @@`
`47`	`47`	`}`
`48`	`48`	`},`
`49`	`49`	`{`
`50`		`- "bool": {`
`51`		`- "should": [`
`52`		`- {`
`53`		`- "term": {`
`54`		`- "_type": "cluster_state"`
`55`		`- }`
`56`		`- },`
`57`		`- {`
`58`		`- "term": {`
`59`		`- "type": "cluster_stats"`
`60`		`- }`
`61`		`- }`
`62`		`- ]`
	`50`	`+ "term": {`
	`51`	`+ "type": "cluster_stats"`
`63`	`52`	`}`
`64`	`53`	`},`
`65`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,19 +40,8 @@`
`40`	`40`	`}`
`41`	`41`	`},`
`42`	`42`	`{`
`43`		`- "bool": {`
`44`		`- "should": [`
`45`		`- {`
`46`		`- "term": {`
`47`		`- "_type": "cluster_stats"`
`48`		`- }`
`49`		`- },`
`50`		`- {`
`51`		`- "term": {`
`52`		`- "type": "cluster_stats"`
`53`		`- }`
`54`		`- }`
`55`		`- ]`
	`43`	`+ "term": {`
	`44`	`+ "type": "cluster_stats"`
`56`	`45`	`}`
`57`	`46`	`},`
`58`	`47`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,19 +44,8 @@`
`44`	`44`	`}`
`45`	`45`	`},`
`46`	`46`	`{`
`47`		`- "bool": {`
`48`		`- "should": [`
`49`		`- {`
`50`		`- "term": {`
`51`		`- "_type": "kibana_stats"`
`52`		`- }`
`53`		`- },`
`54`		`- {`
`55`		`- "term": {`
`56`		`- "type": "kibana_stats"`
`57`		`- }`
`58`		`- }`
`59`		`- ]`
	`47`	`+ "term": {`
	`48`	`+ "type": "kibana_stats"`
`60`	`49`	`}`
`61`	`50`	`}`
`62`	`51`	`]`