[gcp] Add tags.yml file and upgrade to package spec 3.0 (#7957)

* Add missing dashboard filters and fix orphan dashboard references. * Upgrade package spec to 3.0.0. * Add tags.yml file so that integration's dashboards and saved searches are tagged with 'Security Solution' and displayed in the Security Solution UI.
elastic · Oct 2, 2023 · d1f2cd4 · d1f2cd4
1 parent 29cadc0
commit d1f2cd4
Show file tree

Hide file tree

Showing 15 changed files with 188 additions and 71 deletions.
diff --git a/packages/gcp/changelog.yml b/packages/gcp/changelog.yml
@@ -1,4 +1,18 @@
 # newer versions go on top
+- version: "2.30.0"
+  changes:
+    - description: Add tags.yml file so that integration's dashboards and saved searches are tagged with "Security Solution" and displayed in the Security Solution UI.
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/7957
+    - description: Upgrade package spec to 3.0.0.
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/7957
+    - description: Fix orphan dashboard references.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/7957
+    - description: Add missing dashboard filters.
+      type: bugfix
+      link: https://github.com/elastic/integrations/pull/7957
 - version: "2.29.1"
   changes:
     - description: Add null checks and ignore_missing checks to the rename processor

diff --git a/packages/gcp/data_stream/loadbalancing_logs/manifest.yml b/packages/gcp/data_stream/loadbalancing_logs/manifest.yml
@@ -40,7 +40,7 @@ streams:
         description: The maximum number of unprocessed messages (unacknowledged but not yet expired). If the value is negative, then there will be no limit on the number of unprocessed messages. Default is 1000.
         multi: false
         required: false
-        show_user: false  
+        show_user: false
       - name: alternative_host
         type: text
         title: Alternative host

diff --git a/packages/gcp/kibana/dashboard/gcp-1ae960c0-f9f8-11eb-bc38-79936db7c106.json b/packages/gcp/kibana/dashboard/gcp-1ae960c0-f9f8-11eb-bc38-79936db7c106.json
@@ -3060,26 +3060,6 @@
             "id": "metrics-*",
             "name": "controlGroup_70d902f0-3d48-4b91-89ee-2719ab7a1cc5:optionsListDataView",
             "type": "index-pattern"
-        },
-        {
-            "id": "gcp-fleet-managed-default",
-            "name": "tag-ref-gcp-fleet-managed-default",
-            "type": "tag"
-        },
-        {
-            "id": "gcp-fleet-pkg-gcp-default",
-            "name": "tag-ref-gcp-fleet-pkg-gcp-default",
-            "type": "tag"
-        },
-        {
-            "id": "gcp-fleet-managed-default",
-            "name": "tag-ref-fleet-managed-default",
-            "type": "tag"
-        },
-        {
-            "id": "gcp-fleet-pkg-gcp-default",
-            "name": "tag-ref-fleet-pkg-gcp-default",
-            "type": "tag"
         }
     ],
     "type": "dashboard"

diff --git a/packages/gcp/kibana/dashboard/gcp-2b0fd7b0-feac-11ea-b032-d59f894a5072.json b/packages/gcp/kibana/dashboard/gcp-2b0fd7b0-feac-11ea-b032-d59f894a5072.json
@@ -1260,16 +1260,6 @@
             "id": "metrics-*",
             "name": "controlGroup_a75e0bd8-c032-479d-82a6-dc4521340531:optionsListDataView",
             "type": "index-pattern"
-        },
-        {
-            "id": "gcp-fleet-managed-default",
-            "name": "tag-ref-fleet-managed-default",
-            "type": "tag"
-        },
-        {
-            "id": "gcp-fleet-pkg-gcp-default",
-            "name": "tag-ref-fleet-pkg-gcp-default",
-            "type": "tag"
         }
     ],
     "type": "dashboard"

diff --git a/packages/gcp/kibana/dashboard/gcp-48e12760-cbe4-11ec-b519-85ccf621cbbf.json b/packages/gcp/kibana/dashboard/gcp-48e12760-cbe4-11ec-b519-85ccf621cbbf.json
@@ -3,7 +3,29 @@
         "description": "Overview of the audit log data from Google Cloud.",
         "kibanaSavedObjectMeta": {
             "searchSourceJSON": {
-                "filter": [],
+                "filter": [
+                    {
+                        "$state": {
+                            "store": "appState"
+                        },
+                        "meta": {
+                            "alias": "Only data from gcp.audit dataset",
+                            "disabled": false,
+                            "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
+                            "key": "data_stream.dataset",
+                            "negate": false,
+                            "params": {
+                                "query": "gcp.audit"
+                            },
+                            "type": "phrase"
+                        },
+                        "query": {
+                            "match_phrase": {
+                                "data_stream.dataset": "gcp.audit"
+                            }
+                        }
+                    }
+                ],
                 "query": {
                     "language": "kuery",
                     "query": ""

diff --git a/packages/gcp/kibana/dashboard/gcp-6041d970-a6ae-11ea-950e-d57608e3aa51.json b/packages/gcp/kibana/dashboard/gcp-6041d970-a6ae-11ea-950e-d57608e3aa51.json
@@ -9,7 +9,29 @@
         "description": "Overview of Google Cloud Load Balancing TCP SSL Proxy Metrics\n\n",
         "kibanaSavedObjectMeta": {
             "searchSourceJSON": {
-                "filter": [],
+                "filter": [
+                    {
+                        "$state": {
+                            "store": "appState"
+                        },
+                        "meta": {
+                            "alias": "Only data from gcp.loadbalancing_metrics dataset",
+                            "disabled": false,
+                            "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
+                            "key": "data_stream.dataset",
+                            "negate": false,
+                            "params": {
+                                "query": "gcp.loadbalancing_metrics"
+                            },
+                            "type": "phrase"
+                        },
+                        "query": {
+                            "match_phrase": {
+                                "data_stream.dataset": "gcp.loadbalancing_metrics"
+                            }
+                        }
+                    }
+                ],
                 "query": {
                     "language": "kuery",
                     "query": ""

diff --git a/packages/gcp/kibana/dashboard/gcp-76c9e920-e890-11ea-bf8c-d13ebf358a78.json b/packages/gcp/kibana/dashboard/gcp-76c9e920-e890-11ea-bf8c-d13ebf358a78.json
@@ -9,7 +9,29 @@
         "description": "Overview of Google Cloud Billing Metrics",
         "kibanaSavedObjectMeta": {
             "searchSourceJSON": {
-                "filter": [],
+                "filter": [
+                    {
+                        "$state": {
+                            "store": "appState"
+                        },
+                        "meta": {
+                            "alias": "Only data from gcp.billing dataset",
+                            "disabled": false,
+                            "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
+                            "key": "data_stream.dataset",
+                            "negate": false,
+                            "params": {
+                                "query": "gcp.billing"
+                            },
+                            "type": "phrase"
+                        },
+                        "query": {
+                            "match_phrase": {
+                                "data_stream.dataset": "gcp.billing"
+                            }
+                        }
+                    }
+                ],
                 "query": {
                     "language": "kuery",
                     "query": ""

diff --git a/packages/gcp/kibana/dashboard/gcp-8a1fb690-cbeb-11ec-b519-85ccf621cbbf.json b/packages/gcp/kibana/dashboard/gcp-8a1fb690-cbeb-11ec-b519-85ccf621cbbf.json
@@ -3,7 +3,29 @@
         "description": "Overview of the firewall log data from Google Cloud.",
         "kibanaSavedObjectMeta": {
             "searchSourceJSON": {
-                "filter": [],
+                "filter": [
+                    {
+                        "$state": {
+                            "store": "appState"
+                        },
+                        "meta": {
+                            "alias": "Only data from gcp.firewall dataset",
+                            "disabled": false,
+                            "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
+                            "key": "data_stream.dataset",
+                            "negate": false,
+                            "params": {
+                                "query": "gcp.firewall"
+                            },
+                            "type": "phrase"
+                        },
+                        "query": {
+                            "match_phrase": {
+                                "data_stream.dataset": "gcp.firewall"
+                            }
+                        }
+                    }
+                ],
                 "query": {
                     "language": "kuery",
                     "query": ""

diff --git a/packages/gcp/kibana/dashboard/gcp-8f9c6cc0-909d-11ea-8180-7b0dacd9df87.json b/packages/gcp/kibana/dashboard/gcp-8f9c6cc0-909d-11ea-8180-7b0dacd9df87.json
@@ -9,7 +9,29 @@
         "description": "Overview of GCP Load Balancing L3 Metrics",
         "kibanaSavedObjectMeta": {
             "searchSourceJSON": {
-                "filter": [],
+                "filter": [
+                    {
+                        "$state": {
+                            "store": "appState"
+                        },
+                        "meta": {
+                            "alias": "Only data from gcp.loadbalancing_metrics dataset",
+                            "disabled": false,
+                            "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
+                            "key": "data_stream.dataset",
+                            "negate": false,
+                            "params": {
+                                "query": "gcp.loadbalancing_metrics"
+                            },
+                            "type": "phrase"
+                        },
+                        "query": {
+                            "match_phrase": {
+                                "data_stream.dataset": "gcp.loadbalancing_metrics"
+                            }
+                        }
+                    }
+                ],
                 "query": {
                     "language": "kuery",
                     "query": ""

diff --git a/packages/gcp/kibana/dashboard/gcp-9484a4cd-685f-450e-aeaa-728fbdbea20f.json b/packages/gcp/kibana/dashboard/gcp-9484a4cd-685f-450e-aeaa-728fbdbea20f.json
@@ -3,7 +3,29 @@
         "description": "Overview of the VPC flow log data from Google Cloud.",
         "kibanaSavedObjectMeta": {
             "searchSourceJSON": {
-                "filter": [],
+                "filter": [
+                    {
+                        "$state": {
+                            "store": "appState"
+                        },
+                        "meta": {
+                            "alias": "Only data from gcp.vpcflow dataset",
+                            "disabled": false,
+                            "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
+                            "key": "data_stream.dataset",
+                            "negate": false,
+                            "params": {
+                                "query": "gcp.vpcflow"
+                            },
+                            "type": "phrase"
+                        },
+                        "query": {
+                            "match_phrase": {
+                                "data_stream.dataset": "gcp.vpcflow"
+                            }
+                        }
+                    }
+                ],
                 "query": {
                     "language": "kuery",
                     "query": ""

diff --git a/packages/gcp/kibana/dashboard/gcp-aa5b8bd0-9157-11ea-8180-7b0dacd9df87.json b/packages/gcp/kibana/dashboard/gcp-aa5b8bd0-9157-11ea-8180-7b0dacd9df87.json
@@ -9,7 +9,29 @@
         "description": "Overview of GCP Load Balancing HTTPS Metrics",
         "kibanaSavedObjectMeta": {
             "searchSourceJSON": {
-                "filter": [],
+                "filter": [
+                    {
+                        "$state": {
+                            "store": "appState"
+                        },
+                        "meta": {
+                            "alias": "Only data from gcp.loadbalancing_metrics dataset",
+                            "disabled": false,
+                            "indexRefName": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
+                            "key": "data_stream.dataset",
+                            "negate": false,
+                            "params": {
+                                "query": "gcp.loadbalancing_metrics"
+                            },
+                            "type": "phrase"
+                        },
+                        "query": {
+                            "match_phrase": {
+                                "data_stream.dataset": "gcp.loadbalancing_metrics"
+                            }
+                        }
+                    }
+                ],
                 "query": {
                     "language": "kuery",
                     "query": ""

diff --git a/packages/gcp/kibana/dashboard/gcp-ca401040-8e52-11ea-9fa6-4d675d5290dc.json b/packages/gcp/kibana/dashboard/gcp-ca401040-8e52-11ea-9fa6-4d675d5290dc.json
@@ -1185,16 +1185,6 @@
             "id": "metrics-*",
             "name": "controlGroup_cd71c585-a028-4993-872a-f73f5fde6d40:optionsListDataView",
             "type": "index-pattern"
-        },
-        {
-            "id": "gcp-fleet-managed-default",
-            "name": "tag-ref-fleet-managed-default",
-            "type": "tag"
-        },
-        {
-            "id": "gcp-fleet-pkg-gcp-default",
-            "name": "tag-ref-fleet-pkg-gcp-default",
-            "type": "tag"
         }
     ],
     "type": "dashboard"

diff --git a/packages/gcp/kibana/dashboard/gcp-f40ee870-5e4a-11ea-a4f6-717338406083.json b/packages/gcp/kibana/dashboard/gcp-f40ee870-5e4a-11ea-a4f6-717338406083.json
@@ -1244,26 +1244,6 @@
             "id": "metrics-*",
             "name": "controlGroup_e3ec704a-158f-40bf-aefa-bab59331183f:optionsListDataView",
             "type": "index-pattern"
-        },
-        {
-            "id": "gcp-fleet-managed-default",
-            "name": "tag-gcp-fleet-managed-default",
-            "type": "tag"
-        },
-        {
-            "id": "gcp-fleet-pkg-gcp-default",
-            "name": "tag-gcp-fleet-pkg-gcp-default",
-            "type": "tag"
-        },
-        {
-            "id": "gcp-fleet-managed-default",
-            "name": "tag-fleet-managed-default",
-            "type": "tag"
-        },
-        {
-            "id": "gcp-fleet-pkg-gcp-default",
-            "name": "tag-fleet-pkg-gcp-default",
-            "type": "tag"
         }
     ],
     "type": "dashboard"

diff --git a/packages/gcp/kibana/tags.yml b/packages/gcp/kibana/tags.yml
@@ -0,0 +1,7 @@
+- text: Security Solution
+  asset_ids:
+    - gcp-2b0fd7b0-feac-11ea-b032-d59f894a5072
+    - gcp-8a1fb690-cbeb-11ec-b519-85ccf621cbbf
+    - gcp-48e12760-cbe4-11ec-b519-85ccf621cbbf
+    - gcp-9484a4cd-685f-450e-aeaa-728fbdbea20f
+    - gcp-d88364c0-73a1-11ea-a345-f985c61fe654
diff --git a/packages/gcp/manifest.yml b/packages/gcp/manifest.yml
@@ -1,18 +1,19 @@
 name: gcp
 title: Google Cloud Platform
-version: "2.29.1"
+version: "2.30.0"
 description: Collect logs and metrics from Google Cloud Platform with Elastic Agent.
 type: integration
 icons:
   - src: /img/logo_gcp.svg
     title: logo gcp
     size: 32x32
     type: image/svg+xml
-format_version: 2.7.0
+format_version: 3.0.0
 categories:
   - google_cloud
 conditions:
-  kibana.version: ^8.7.1
+  kibana:
+    version: ^8.7.1
 screenshots:
   - src: /img/filebeat-gcp-audit.png
     title: filebeat gcp audit
@@ -251,3 +252,4 @@ policy_templates:
         input_group: metrics
 owner:
   github: elastic/obs-cloud-monitoring
+  type: elastic