From 03347b9916dccbdac73bc0df31edf3baff974103 Mon Sep 17 00:00:00 2001 From: ChrsMark Date: Tue, 9 Feb 2021 14:22:41 +0200 Subject: [PATCH] Enable only default datastreams Signed-off-by: ChrsMark --- packages/kubernetes/_dev/build/docs/README.md | 3 +++ .../kubernetes/data_stream/controllermanager/manifest.yml | 1 + packages/kubernetes/data_stream/scheduler/manifest.yml | 1 + packages/kubernetes/data_stream/state_container/manifest.yml | 1 + packages/kubernetes/data_stream/state_cronjob/manifest.yml | 1 + packages/kubernetes/data_stream/state_daemonset/manifest.yml | 1 + packages/kubernetes/data_stream/state_deployment/manifest.yml | 1 + packages/kubernetes/data_stream/state_node/manifest.yml | 1 + .../data_stream/state_persistentvolume/manifest.yml | 1 + .../data_stream/state_persistentvolumeclaim/manifest.yml | 1 + packages/kubernetes/data_stream/state_pod/manifest.yml | 1 + packages/kubernetes/data_stream/state_replicaset/manifest.yml | 1 + .../kubernetes/data_stream/state_resourcequota/manifest.yml | 1 + packages/kubernetes/data_stream/state_service/manifest.yml | 1 + .../kubernetes/data_stream/state_statefulset/manifest.yml | 1 + .../kubernetes/data_stream/state_storageclass/manifest.yml | 1 + packages/kubernetes/docs/README.md | 3 +++ packages/kubernetes/manifest.yml | 4 ++-- 18 files changed, 23 insertions(+), 2 deletions(-) diff --git a/packages/kubernetes/_dev/build/docs/README.md b/packages/kubernetes/_dev/build/docs/README.md index 3f6433f9197..236e3381d9a 100644 --- a/packages/kubernetes/_dev/build/docs/README.md +++ b/packages/kubernetes/_dev/build/docs/README.md @@ -50,6 +50,8 @@ deployment are available [here](https://github.com/kubernetes/kube-state-metrics Generally `kube-state-metrics` runs a `Deployment` and is accessible via a service called `kube-state-metrics` on `kube-system` namespace, which will be the service to use in our configuration. +state_* datasets are not enabled by default. + #### apiserver The apiserver dataset requires access to the Kubernetes API, which should be easily available in all Kubernetes @@ -71,6 +73,7 @@ available for its configuration: the datasets to point to these services as part of an `Agent Deployment`. - Run these datasets as part an `Agent Daemonset` (with HostNetwork setting) with a `nodeSelector` to only run on Master nodes. +These datasets are not enabled by default. Note: In some "As a Service" Kubernetes implementations, like `GKE`, the master nodes or even the pods running on the masters won't be visible. In these cases it won't be possible to use `scheduler` and `controllermanager` metricsets. diff --git a/packages/kubernetes/data_stream/controllermanager/manifest.yml b/packages/kubernetes/data_stream/controllermanager/manifest.yml index 8b1830cb5d2..93c2c40f2e1 100644 --- a/packages/kubernetes/data_stream/controllermanager/manifest.yml +++ b/packages/kubernetes/data_stream/controllermanager/manifest.yml @@ -3,6 +3,7 @@ release: experimental type: metrics streams: - input: kubernetes/metrics + enabled: false vars: - name: hosts type: text diff --git a/packages/kubernetes/data_stream/scheduler/manifest.yml b/packages/kubernetes/data_stream/scheduler/manifest.yml index 362a48512c4..447a97ac071 100644 --- a/packages/kubernetes/data_stream/scheduler/manifest.yml +++ b/packages/kubernetes/data_stream/scheduler/manifest.yml @@ -3,6 +3,7 @@ release: experimental type: metrics streams: - input: kubernetes/metrics + enabled: false vars: - name: hosts type: text diff --git a/packages/kubernetes/data_stream/state_container/manifest.yml b/packages/kubernetes/data_stream/state_container/manifest.yml index 3a363928ae1..f5f6dab2da9 100644 --- a/packages/kubernetes/data_stream/state_container/manifest.yml +++ b/packages/kubernetes/data_stream/state_container/manifest.yml @@ -3,6 +3,7 @@ release: experimental type: metrics streams: - input: kubernetes/metrics + enabled: false vars: - name: add_metadata type: bool diff --git a/packages/kubernetes/data_stream/state_cronjob/manifest.yml b/packages/kubernetes/data_stream/state_cronjob/manifest.yml index 983d1b73627..598b5aa1f66 100644 --- a/packages/kubernetes/data_stream/state_cronjob/manifest.yml +++ b/packages/kubernetes/data_stream/state_cronjob/manifest.yml @@ -3,6 +3,7 @@ release: experimental type: metrics streams: - input: kubernetes/metrics + enabled: false vars: - name: add_metadata type: bool diff --git a/packages/kubernetes/data_stream/state_daemonset/manifest.yml b/packages/kubernetes/data_stream/state_daemonset/manifest.yml index 72089c9609a..57f2a4c29cf 100644 --- a/packages/kubernetes/data_stream/state_daemonset/manifest.yml +++ b/packages/kubernetes/data_stream/state_daemonset/manifest.yml @@ -3,6 +3,7 @@ release: experimental type: metrics streams: - input: kubernetes/metrics + enabled: false vars: - name: add_metadata type: bool diff --git a/packages/kubernetes/data_stream/state_deployment/manifest.yml b/packages/kubernetes/data_stream/state_deployment/manifest.yml index 89fd0426bdb..44fba0f837e 100644 --- a/packages/kubernetes/data_stream/state_deployment/manifest.yml +++ b/packages/kubernetes/data_stream/state_deployment/manifest.yml @@ -3,6 +3,7 @@ release: experimental type: metrics streams: - input: kubernetes/metrics + enabled: false vars: - name: add_metadata type: bool diff --git a/packages/kubernetes/data_stream/state_node/manifest.yml b/packages/kubernetes/data_stream/state_node/manifest.yml index 12d01bcef1d..0236608c5fb 100644 --- a/packages/kubernetes/data_stream/state_node/manifest.yml +++ b/packages/kubernetes/data_stream/state_node/manifest.yml @@ -3,6 +3,7 @@ release: experimental type: metrics streams: - input: kubernetes/metrics + enabled: false vars: - name: add_metadata type: bool diff --git a/packages/kubernetes/data_stream/state_persistentvolume/manifest.yml b/packages/kubernetes/data_stream/state_persistentvolume/manifest.yml index 81ab3a23580..6ddb583588e 100644 --- a/packages/kubernetes/data_stream/state_persistentvolume/manifest.yml +++ b/packages/kubernetes/data_stream/state_persistentvolume/manifest.yml @@ -3,6 +3,7 @@ release: experimental type: metrics streams: - input: kubernetes/metrics + enabled: false vars: - name: add_metadata type: bool diff --git a/packages/kubernetes/data_stream/state_persistentvolumeclaim/manifest.yml b/packages/kubernetes/data_stream/state_persistentvolumeclaim/manifest.yml index 44234b6a713..8dede141310 100644 --- a/packages/kubernetes/data_stream/state_persistentvolumeclaim/manifest.yml +++ b/packages/kubernetes/data_stream/state_persistentvolumeclaim/manifest.yml @@ -3,6 +3,7 @@ release: experimental type: metrics streams: - input: kubernetes/metrics + enabled: false vars: - name: add_metadata type: bool diff --git a/packages/kubernetes/data_stream/state_pod/manifest.yml b/packages/kubernetes/data_stream/state_pod/manifest.yml index 546018c5aa0..8ff8695373f 100644 --- a/packages/kubernetes/data_stream/state_pod/manifest.yml +++ b/packages/kubernetes/data_stream/state_pod/manifest.yml @@ -3,6 +3,7 @@ release: experimental type: metrics streams: - input: kubernetes/metrics + enabled: false vars: - name: add_metadata type: bool diff --git a/packages/kubernetes/data_stream/state_replicaset/manifest.yml b/packages/kubernetes/data_stream/state_replicaset/manifest.yml index 00fa6a16e17..890b569795b 100644 --- a/packages/kubernetes/data_stream/state_replicaset/manifest.yml +++ b/packages/kubernetes/data_stream/state_replicaset/manifest.yml @@ -3,6 +3,7 @@ release: experimental type: metrics streams: - input: kubernetes/metrics + enabled: false vars: - name: add_metadata type: bool diff --git a/packages/kubernetes/data_stream/state_resourcequota/manifest.yml b/packages/kubernetes/data_stream/state_resourcequota/manifest.yml index 5f464448c39..ffc29da59f5 100644 --- a/packages/kubernetes/data_stream/state_resourcequota/manifest.yml +++ b/packages/kubernetes/data_stream/state_resourcequota/manifest.yml @@ -3,6 +3,7 @@ release: experimental type: metrics streams: - input: kubernetes/metrics + enabled: false vars: - name: add_metadata type: bool diff --git a/packages/kubernetes/data_stream/state_service/manifest.yml b/packages/kubernetes/data_stream/state_service/manifest.yml index ac0d0842b3c..163f0a7e63d 100644 --- a/packages/kubernetes/data_stream/state_service/manifest.yml +++ b/packages/kubernetes/data_stream/state_service/manifest.yml @@ -3,6 +3,7 @@ release: experimental type: metrics streams: - input: kubernetes/metrics + enabled: false vars: - name: add_metadata type: bool diff --git a/packages/kubernetes/data_stream/state_statefulset/manifest.yml b/packages/kubernetes/data_stream/state_statefulset/manifest.yml index 764d8c7eda1..7323802c7d4 100644 --- a/packages/kubernetes/data_stream/state_statefulset/manifest.yml +++ b/packages/kubernetes/data_stream/state_statefulset/manifest.yml @@ -3,6 +3,7 @@ release: experimental type: metrics streams: - input: kubernetes/metrics + enabled: false vars: - name: add_metadata type: bool diff --git a/packages/kubernetes/data_stream/state_storageclass/manifest.yml b/packages/kubernetes/data_stream/state_storageclass/manifest.yml index ca4942b5fae..3b6a5c6421d 100644 --- a/packages/kubernetes/data_stream/state_storageclass/manifest.yml +++ b/packages/kubernetes/data_stream/state_storageclass/manifest.yml @@ -3,6 +3,7 @@ release: experimental type: metrics streams: - input: kubernetes/metrics + enabled: false vars: - name: add_metadata type: bool diff --git a/packages/kubernetes/docs/README.md b/packages/kubernetes/docs/README.md index 97f464e0e8d..5ea4ad343b2 100644 --- a/packages/kubernetes/docs/README.md +++ b/packages/kubernetes/docs/README.md @@ -50,6 +50,8 @@ deployment are available [here](https://github.com/kubernetes/kube-state-metrics Generally `kube-state-metrics` runs a `Deployment` and is accessible via a service called `kube-state-metrics` on `kube-system` namespace, which will be the service to use in our configuration. +state_* datasets are not enabled by default. + #### apiserver The apiserver dataset requires access to the Kubernetes API, which should be easily available in all Kubernetes @@ -71,6 +73,7 @@ available for its configuration: the datasets to point to these services as part of an `Agent Deployment`. - Run these datasets as part an `Agent Daemonset` (with HostNetwork setting) with a `nodeSelector` to only run on Master nodes. +These datasets are not enabled by default. Note: In some "As a Service" Kubernetes implementations, like `GKE`, the master nodes or even the pods running on the masters won't be visible. In these cases it won't be possible to use `scheduler` and `controllermanager` metricsets. diff --git a/packages/kubernetes/manifest.yml b/packages/kubernetes/manifest.yml index c58a21dc39e..840c84d4379 100644 --- a/packages/kubernetes/manifest.yml +++ b/packages/kubernetes/manifest.yml @@ -1,7 +1,7 @@ format_version: 1.0.0 name: kubernetes title: Kubernetes -version: 0.3.0 +version: 0.4.0 license: basic description: Kubernetes Integration type: integration @@ -10,7 +10,7 @@ categories: - kubernetes release: experimental conditions: - kibana.version: '^7.9.0' + kibana.version: ">=7.11.0" screenshots: - src: /img/metricbeat_kubernetes_overview.png title: Metricbeat Kubernetes Overview