index_pattern under visState.params cannot be empty "" (elastic#18865…

…) (elastic#18943) * `index_pattern` under visState.params cannot be empty "" (cherry picked from commit f6710e3)
adriansr · Jun 5, 2020 · 21a8d93 · 21a8d93
1 parent 77a665b
commit 21a8d93
Show file tree

Hide file tree

Showing 27 changed files with 171 additions and 167 deletions.
diff --git a/dev-tools/mage/check.go b/dev-tools/mage/check.go
@@ -270,13 +270,14 @@ type dashboardObject struct {
 		Title                 string `json:"title"`
 		KibanaSavedObjectMeta *struct {
 			SearchSourceJSON struct {
-				Index string `json:"index"`
+				Index *string `json:"index"`
 			} `json:"searchSourceJSON,omitempty"`
 		} `json:"kibanaSavedObjectMeta"`
 		VisState *struct {
-			Params struct {
-				Controls []struct {
-					IndexPattern string
+			Params *struct {
+				IndexPattern *string `json:"index_pattern"`
+				Controls     []struct {
+					IndexPattern *string
 				} `json:"controls"`
 			} `json:"params"`
 		} `json:"visState,omitempty"`
@@ -346,20 +347,23 @@ func checkTitle(re *regexp.Regexp, title string, module string) error {
 
 func checkDashboardIndexPattern(expectedIndex string, o *dashboardObject) error {
 	if objectMeta := o.Attributes.KibanaSavedObjectMeta; objectMeta != nil {
-		if index := objectMeta.SearchSourceJSON.Index; index != "" && index != expectedIndex {
-			return errors.Errorf("unexpected index pattern reference found in object meta: %s", index)
+		if index := objectMeta.SearchSourceJSON.Index; index != nil && *index != expectedIndex {
+			return errors.Errorf("unexpected index pattern reference found in object meta: `%s` in visualization `%s`", *index, o.Attributes.Title)
 		}
 	}
 	if visState := o.Attributes.VisState; visState != nil {
 		for _, control := range visState.Params.Controls {
-			if index := control.IndexPattern; index != "" && index != expectedIndex {
-				return errors.Errorf("unexpected index pattern reference found in visualization state: %s", index)
+			if index := control.IndexPattern; index != nil && *index != expectedIndex {
+				return errors.Errorf("unexpected index pattern reference found in visualization state: `%s` in visualization `%s`", *index, o.Attributes.Title)
 			}
 		}
+		if index := visState.Params.IndexPattern; index != nil && *index != expectedIndex {
+			return errors.Errorf("unexpected index pattern reference found in visualization state params: `%s` in visualization `%s`", *index, o.Attributes.Title)
+		}
 	}
 	for _, reference := range o.References {
 		if reference.Type == "index-pattern" && reference.ID != expectedIndex {
-			return errors.Errorf("unexpected reference to index pattern %s", reference.ID)
+			return errors.Errorf("unexpected reference to index pattern `%s`", reference.ID)
 		}
 	}
 	return nil

diff --git a/.../module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-controller-manager.json b/.../module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-controller-manager.json
@@ -329,7 +329,7 @@
             "default_timefield": "@timestamp",
             "drop_last_bucket": 1,
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "30s",
             "markdown": "|  |   |\n|---|---|\n|**Days running**|{{ math.started.last.raw }}|\n|**File descriptors open**|{{ average_of_kubernetes_controllermanager_process_fds_open_count.fds.last.raw }}|\n|**Resident Memory**|{{ average_of_kubernetes_controllermanager_process_memory_resident_bytes.resident_memory.last.formatted }}|\n|**Virtual Memory**|{{ average_of_kubernetes_controllermanager_process_memory_virtual_bytes.virtual_memory.last.formatted }}|\n",
             "markdown_css": "#markdown-61ca57f0-469d-11e7-af02-69e470af7417 table,#markdown-61ca57f0-469d-11e7-af02-69e470af7417 tr,#markdown-61ca57f0-469d-11e7-af02-69e470af7417 td,#markdown-61ca57f0-469d-11e7-af02-69e470af7417 th{border:none}",
@@ -475,7 +475,7 @@
             "axis_scale": "normal",
             "default_index_pattern": "metricbeat-*",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "auto",
             "series": [
               {
@@ -585,7 +585,7 @@
             "default_index_pattern": "metricbeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "auto",
             "series": [
               {
@@ -658,7 +658,7 @@
             "default_index_pattern": "metricbeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "auto",
             "series": [
               {
@@ -728,7 +728,7 @@
             "default_index_pattern": "metricbeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "auto",
             "series": [
               {
@@ -816,7 +816,7 @@
             "default_index_pattern": "metricbeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "auto",
             "series": [
               {
@@ -893,7 +893,7 @@
             "default_index_pattern": "metricbeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "auto",
             "series": [
               {
@@ -972,7 +972,7 @@
             "default_index_pattern": "metricbeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "",
             "series": [
               {

diff --git a/metricbeat/module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-proxy.json b/metricbeat/module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-proxy.json
@@ -215,7 +215,7 @@
             "default_index_pattern": "metricbeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "auto",
             "series": [
               {
@@ -288,7 +288,7 @@
             "axis_scale": "normal",
             "default_index_pattern": "metricbeat-*",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "auto",
             "series": [
               {
@@ -376,7 +376,7 @@
             "default_index_pattern": "metricbeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "30s",
             "markdown": "\n|  |   |\n|---|---|\n|**Days running**|{{ math.started.last.raw }}|\n|**File descriptors open**|{{ average_of_kubernetes_proxy_process_fds_open_count.fds.last.raw }}|\n|**Resident Memory**|{{ average_of_kubernetes_proxy_process_memory_resident_bytes.resident_memory.last.formatted }}|\n|**Virtual Memory**|{{ average_of_kubernetes_proxy_process_memory_virtual_bytes.virtual_memory.last.formatted }}|\n\n",
             "markdown_css": "#markdown-61ca57f0-469d-11e7-af02-69e470af7417 table,#markdown-61ca57f0-469d-11e7-af02-69e470af7417 tr,#markdown-61ca57f0-469d-11e7-af02-69e470af7417 td,#markdown-61ca57f0-469d-11e7-af02-69e470af7417 th{border:none}",
@@ -532,7 +532,7 @@
             "axis_scale": "normal",
             "default_index_pattern": "metricbeat-*",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "auto",
             "series": [
               {
@@ -659,7 +659,7 @@
             "gauge_style": "half",
             "gauge_width": 10,
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "auto",
             "series": [
               {
@@ -897,7 +897,7 @@
             "axis_scale": "normal",
             "default_index_pattern": "metricbeat-*",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "auto",
             "series": [
               {

diff --git a/metricbeat/module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-scheduler.json b/metricbeat/module/kubernetes/_meta/kibana/7/dashboard/Metricbeat-kubernetes-scheduler.json
@@ -294,7 +294,7 @@
             "drop_last_bucket": 1,
             "filter": "_exists_:\"kubernetes.scheduler.process.started.sec\"",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "30s",
             "markdown": "|  |   |\n|---|---|\n|**Days running**|{{ math.started.last.raw }}|\n|**File descriptors open**|{{ max_of_kubernetes_scheduler_process_fds_open_count.fds.last.raw }}|\n|**Resident Memory**|{{ max_of_kubernetes_scheduler_process_memory_resident_bytes.resident_memory.last.formatted }}|\n|**Virtual Memory**|{{ max_of_kubernetes_scheduler_process_memory_virtual_bytes.virtual_memory.last.formatted }}|\n",
             "markdown_css": "#markdown-61ca57f0-469d-11e7-af02-69e470af7417 table,#markdown-61ca57f0-469d-11e7-af02-69e470af7417 tr,#markdown-61ca57f0-469d-11e7-af02-69e470af7417 td,#markdown-61ca57f0-469d-11e7-af02-69e470af7417 th{border:none}",
@@ -443,7 +443,7 @@
             "default_index_pattern": "metricbeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "",
             "series": [
               {
@@ -553,7 +553,7 @@
             "default_index_pattern": "metricbeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "",
             "series": [
               {
@@ -796,7 +796,7 @@
             "default_index_pattern": "metricbeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "",
             "series": [
               {
@@ -873,7 +873,7 @@
             "default_index_pattern": "metricbeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "",
             "series": [
               {
@@ -947,7 +947,7 @@
             "default_index_pattern": "metricbeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "",
             "series": [
               {

diff --git a/metricbeat/module/system/_meta/kibana/7/dashboard/Metricbeat-Host-Services-overview.json b/metricbeat/module/system/_meta/kibana/7/dashboard/Metricbeat-Host-Services-overview.json
@@ -632,7 +632,7 @@
             "default_index_pattern": "metricbeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "",
             "isModelInvalid": false,
             "series": [
@@ -777,7 +777,7 @@
             "default_index_pattern": "metricbeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "metricbeat-*",
             "interval": "",
             "isModelInvalid": false,
             "series": [

diff --git a/metricbeat/module/system/_meta/kibana/7/dashboard/Metricbeat-host-overview.json b/metricbeat/module/system/_meta/kibana/7/dashboard/Metricbeat-host-overview.json
@@ -480,7 +480,7 @@
                             "query": "-system.network.name:l*"
                         },
                         "id": "da1046f0-faa0-11e6-86b1-cd7735ff7e23",
-                        "index_pattern": "*",
+                        "index_pattern": "metricbeat-*",
                         "interval": "auto",
                         "series": [
                             {
@@ -719,7 +719,7 @@
                             "query": "-system.network.name:l*"
                         },
                         "id": "da1046f0-faa0-11e6-86b1-cd7735ff7e23",
-                        "index_pattern": "*",
+                        "index_pattern": "metricbeat-*",
                         "interval": "auto",
                         "series": [
                             {

diff --git a/x-pack/filebeat/module/aws/_meta/kibana/7/dashboard/Filebeat-aws-elb-overview.json b/x-pack/filebeat/module/aws/_meta/kibana/7/dashboard/Filebeat-aws-elb-overview.json
@@ -307,7 +307,7 @@
             "default_index_pattern": "filebeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "filebeat-*",
             "interval": "",
             "isModelInvalid": false,
             "legend_position": "bottom",
@@ -401,7 +401,7 @@
             "gauge_style": "half",
             "gauge_width": 10,
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "filebeat-*",
             "interval": "",
             "isModelInvalid": false,
             "legend_position": "bottom",
@@ -488,7 +488,7 @@
             "default_index_pattern": "filebeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "filebeat-*",
             "interval": "",
             "isModelInvalid": false,
             "legend_position": "bottom",
@@ -581,7 +581,7 @@
             "gauge_style": "half",
             "gauge_width": 10,
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "filebeat-*",
             "interval": "",
             "isModelInvalid": false,
             "legend_position": "bottom",
@@ -668,7 +668,7 @@
             "default_index_pattern": "filebeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "filebeat-*",
             "interval": "",
             "isModelInvalid": false,
             "legend_position": "bottom",
@@ -744,7 +744,7 @@
             "default_index_pattern": "filebeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "filebeat-*",
             "interval": "",
             "isModelInvalid": false,
             "legend_position": "bottom",
@@ -819,7 +819,7 @@
             "default_index_pattern": "filebeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "filebeat-*",
             "interval": "",
             "isModelInvalid": false,
             "legend_position": "bottom",
@@ -894,7 +894,7 @@
             "default_index_pattern": "filebeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "filebeat-*",
             "interval": "",
             "isModelInvalid": false,
             "legend_position": "bottom",

diff --git a/x-pack/filebeat/module/aws/_meta/kibana/7/dashboard/Filebeat-aws-vpcflow-overview.json b/x-pack/filebeat/module/aws/_meta/kibana/7/dashboard/Filebeat-aws-vpcflow-overview.json
@@ -304,7 +304,7 @@
             "gauge_style": "half",
             "gauge_width": 10,
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "filebeat-*",
             "interval": "",
             "isModelInvalid": false,
             "legend_position": "bottom",
@@ -396,7 +396,7 @@
             "default_index_pattern": "metricbeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "filebeat-*",
             "interval": "",
             "isModelInvalid": false,
             "legend_position": "right",

diff --git a/x-pack/filebeat/module/coredns/_meta/kibana/7/dashboard/Coredns-Overview-Dashboard.json b/x-pack/filebeat/module/coredns/_meta/kibana/7/dashboard/Coredns-Overview-Dashboard.json
@@ -394,7 +394,7 @@
             "gauge_style": "half",
             "gauge_width": 10,
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "filebeat-*",
             "interval": "auto",
             "series": [
               {

diff --git a/...k/filebeat/module/okta/_meta/kibana/7/dashboard/749203a0-67b1-11ea-a76f-bf44814e437d.json b/...k/filebeat/module/okta/_meta/kibana/7/dashboard/749203a0-67b1-11ea-a76f-bf44814e437d.json
@@ -425,7 +425,7 @@
             "default_index_pattern": "filebeat-*",
             "default_timefield": "@timestamp",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "filebeat-*",
             "interval": "",
             "isModelInvalid": false,
             "series": [

diff --git a/x-pack/filebeat/module/zeek/_meta/kibana/7/dashboard/Filebeat-Zeek-Overview.json b/x-pack/filebeat/module/zeek/_meta/kibana/7/dashboard/Filebeat-Zeek-Overview.json
@@ -813,7 +813,7 @@
             "axis_position": "left",
             "axis_scale": "normal",
             "id": "61ca57f0-469d-11e7-af02-69e470af7417",
-            "index_pattern": "",
+            "index_pattern": "filebeat-*",
             "interval": "auto",
             "series": [
               {