From 403983dedc0d1dadc6c41a184970edfd167bf3e3 Mon Sep 17 00:00:00 2001
From: Jaime Soriano Pastor <jaime.soriano@elastic.co>
Date: Wed, 30 Sep 2020 16:09:27 +0200
Subject: [PATCH] Move Kubernetes events metricset to its own block in
 reference config (#21407) (#21415)

In the reference configuration the event metricset was in the block of
configurations for kube-state-metrics.

(cherry picked from commit c4b1f040aa955e9119cbb056d58a7aeec3d4b444)
---
 deploy/kubernetes/metricbeat-kubernetes.yaml                | 6 ++++--
 .../metricbeat/metricbeat-deployment-configmap.yaml         | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/deploy/kubernetes/metricbeat-kubernetes.yaml b/deploy/kubernetes/metricbeat-kubernetes.yaml
index 652ed5579dc9..73ef02409a3a 100644
--- a/deploy/kubernetes/metricbeat-kubernetes.yaml
+++ b/deploy/kubernetes/metricbeat-kubernetes.yaml
@@ -234,8 +234,6 @@ data:
         - state_container
         - state_cronjob
         - state_resourcequota
-        # Uncomment this to get k8s events:
-        #- event
       period: 10s
       host: ${NODE_NAME}
       hosts: ["kube-state-metrics:8080"]
@@ -247,6 +245,10 @@ data:
     #  ssl.certificate_authorities:
     #    - /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
     #  period: 30s
+    # Uncomment this to get k8s events:
+    #- module: kubernetes
+    #  metricsets:
+    #    - event
 ---
 # Deploy singleton instance in the whole cluster for some unique data sources, like kube-state-metrics
 apiVersion: apps/v1
diff --git a/deploy/kubernetes/metricbeat/metricbeat-deployment-configmap.yaml b/deploy/kubernetes/metricbeat/metricbeat-deployment-configmap.yaml
index b7760db71699..22db9e3dac50 100644
--- a/deploy/kubernetes/metricbeat/metricbeat-deployment-configmap.yaml
+++ b/deploy/kubernetes/metricbeat/metricbeat-deployment-configmap.yaml
@@ -43,8 +43,6 @@ data:
         - state_container
         - state_cronjob
         - state_resourcequota
-        # Uncomment this to get k8s events:
-        #- event
       period: 10s
       host: ${NODE_NAME}
       hosts: ["kube-state-metrics:8080"]
@@ -56,3 +54,7 @@ data:
     #  ssl.certificate_authorities:
     #    - /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
     #  period: 30s
+    # Uncomment this to get k8s events:
+    #- module: kubernetes
+    #  metricsets:
+    #    - event