From f32a1e74b0cce3e5acfb7d59dd50b9ceb046b1a8 Mon Sep 17 00:00:00 2001 From: Yousaf Syed Date: Tue, 2 Feb 2021 12:48:52 +0100 Subject: [PATCH 1/5] Fixing the respository of kube-state-metrics for metricbeats --- metricbeat/requirements.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metricbeat/requirements.yaml b/metricbeat/requirements.yaml index 2d78b382a..fc60ecc06 100644 --- a/metricbeat/requirements.yaml +++ b/metricbeat/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: 'kube-state-metrics' - version: '2.4.1' - repository: '@stable' + version: '1.2.0' + repository: '@bitnami' condition: kube_state_metrics.enabled From 5a87481cf3b5442f8cab2a1b61e38931e6dd9f14 Mon Sep 17 00:00:00 2001 From: Yousaf Syed Date: Tue, 2 Feb 2021 13:11:05 +0100 Subject: [PATCH 2/5] Updating the readme.md --- metricbeat/README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/metricbeat/README.md b/metricbeat/README.md index cd834659c..5706f763b 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -51,6 +51,12 @@ See [supported configurations][] for more details. - with Helm 3: `helm install metricbeat elastic/metricbeat` - with Helm 2 (deprecated): `helm install --name metricbeat elastic/metricbeat` +Note: If you choose to enable `kube-state-metrics` than you should also add the bitnami repostory to your helm3 installation as follows + +``` +helm repo add bitnami https://charts.bitnami.com/bitnami +``` +For more on @bitnami/kube-state-metrics please goto the charts [readme](https://github.com/bitnami/charts/tree/master/bitnami/kube-state-metrics/) ### Install development version using master branch From 7db7088e47dcd632f02c3a56912351228c270d5d Mon Sep 17 00:00:00 2001 From: Yousaf Syed Date: Wed, 3 Feb 2021 09:39:43 +0100 Subject: [PATCH 3/5] Adding instructions for kube-state-metrics requirements --- metricbeat/README.md | 3 +-- metricbeat/requirements.yaml | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/metricbeat/README.md b/metricbeat/README.md index 5706f763b..cb8a8acd3 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -50,8 +50,7 @@ See [supported configurations][] for more details. * Install it: - with Helm 3: `helm install metricbeat elastic/metricbeat` - with Helm 2 (deprecated): `helm install --name metricbeat elastic/metricbeat` - -Note: If you choose to enable `kube-state-metrics` than you should also add the bitnami repostory to your helm3 installation as follows + - Add the Elastic Helm charts repo (required for kube-state-metrics chart dependency): `helm repo add stable https://charts.helm.sh/stable` ``` helm repo add bitnami https://charts.bitnami.com/bitnami diff --git a/metricbeat/requirements.yaml b/metricbeat/requirements.yaml index fc60ecc06..2d78b382a 100644 --- a/metricbeat/requirements.yaml +++ b/metricbeat/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: 'kube-state-metrics' - version: '1.2.0' - repository: '@bitnami' + version: '2.4.1' + repository: '@stable' condition: kube_state_metrics.enabled From 5b7d497a45ddb7e6a853da88594d383781c776b9 Mon Sep 17 00:00:00 2001 From: Yousaf Syed Date: Wed, 3 Feb 2021 09:42:16 +0100 Subject: [PATCH 4/5] Removing unneeded documentation --- metricbeat/README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/metricbeat/README.md b/metricbeat/README.md index cb8a8acd3..9fae2ad55 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -52,11 +52,6 @@ See [supported configurations][] for more details. - with Helm 2 (deprecated): `helm install --name metricbeat elastic/metricbeat` - Add the Elastic Helm charts repo (required for kube-state-metrics chart dependency): `helm repo add stable https://charts.helm.sh/stable` -``` -helm repo add bitnami https://charts.bitnami.com/bitnami -``` -For more on @bitnami/kube-state-metrics please goto the charts [readme](https://github.com/bitnami/charts/tree/master/bitnami/kube-state-metrics/) - ### Install development version using master branch * Clone the git repo: `git clone git@github.com:elastic/helm-charts.git` From 99f3384b465a82ebc9970d54390beb32a877b290 Mon Sep 17 00:00:00 2001 From: Yousaf Syed Date: Wed, 3 Feb 2021 10:06:12 +0100 Subject: [PATCH 5/5] Changing install docs for metricbeat charts --- metricbeat/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/README.md b/metricbeat/README.md index 9fae2ad55..e84143a9d 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -48,9 +48,9 @@ See [supported configurations][] for more details. `helm repo add elastic https://helm.elastic.co` * Install it: + - Add the Elastic Helm charts repo (required for kube-state-metrics chart dependency): `helm repo add stable https://charts.helm.sh/stable` - with Helm 3: `helm install metricbeat elastic/metricbeat` - with Helm 2 (deprecated): `helm install --name metricbeat elastic/metricbeat` - - Add the Elastic Helm charts repo (required for kube-state-metrics chart dependency): `helm repo add stable https://charts.helm.sh/stable` ### Install development version using master branch