diff --git a/metricbeat/README.md b/metricbeat/README.md index bf804138f..780607284 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -97,6 +97,8 @@ helm install --name metricbeat elastic/metricbeat --set imageTag=7.6.2 | `priorityClassName` | The [name of the PriorityClass](https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/#priorityclass). No default is supplied as the PriorityClass must be created first. | `""` | | `replicas` | The replica count for the metricbeat deployment talking to kube-state-metrics | `1` | | `fullnameOverride` | Overrides the full name of the resources. If not set the name will default to "`.Release.Name`-`.Values.nameOverride or .Chart.Name`" | `""` | +| `kubeStateMetrics` | Control the kube-state-metrics sub-chart | `enabled: true` | +| `exports` | Values for all sub-charts | `kubestateMetrics: {}` | ## Examples @@ -146,3 +148,4 @@ To run the goss tests against the default example: cd examples/default make goss ``` + diff --git a/metricbeat/requirements.lock b/metricbeat/requirements.lock index 9b027f8cc..a7f0f56a9 100644 --- a/metricbeat/requirements.lock +++ b/metricbeat/requirements.lock @@ -2,5 +2,5 @@ dependencies: - name: kube-state-metrics repository: https://kubernetes-charts.storage.googleapis.com version: 2.4.1 -digest: sha256:89fdea6b5f048652fc2d562ff59338a8cbf25f9053dc28976a1271b4387692b1 -generated: "2019-11-01T10:31:40.002896+01:00" +digest: sha256:e1fa927c66914bd01036d6ed762684932688228ef50bdf0a46dd4803f5ab565e +generated: "2020-04-04T11:25:44.500343-07:00" diff --git a/metricbeat/requirements.yaml b/metricbeat/requirements.yaml index 0f8c03d9c..13ef97a80 100644 --- a/metricbeat/requirements.yaml +++ b/metricbeat/requirements.yaml @@ -2,3 +2,7 @@ dependencies: - name: 'kube-state-metrics' version: '2.4.1' repository: '@stable' + condition: kubeStateMetrics.enabled + import-values: + - kubeStateMetrics + diff --git a/metricbeat/values.yaml b/metricbeat/values.yaml index 5e8bdf2d9..a14f2ceb0 100755 --- a/metricbeat/values.yaml +++ b/metricbeat/values.yaml @@ -207,3 +207,11 @@ updateStrategy: RollingUpdate # Only edit these if you know what you're doing nameOverride: "" fullnameOverride: "" + +# Control the behavior of kube-state-metrics +kubeStateMetrics: + enabled: true + +exports: + kubeStateMetrics: {} +