diff --git a/stable/metricbeat/Chart.yaml b/stable/metricbeat/Chart.yaml index ab91b9b1ca..7558fd768a 100644 --- a/stable/metricbeat/Chart.yaml +++ b/stable/metricbeat/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 description: A Helm chart to collect Kubernetes logs with metricbeat icon: https://www.elastic.co/assets/blt47799dcdcf08438d/logo-elastic-beats-lt.svg name: metricbeat -version: 1.0.0 +version: 1.1.0 appVersion: 6.6.0 home: https://www.elastic.co/products/beats/metricbeat sources: diff --git a/stable/metricbeat/README.md b/stable/metricbeat/README.md index fb42f6e170..6a1076b0f0 100644 --- a/stable/metricbeat/README.md +++ b/stable/metricbeat/README.md @@ -51,11 +51,15 @@ The following table lists the configurable parameters of the metricbeat chart an | `daemonset.podAnnotations` | Pod annotations for daemonset | | | `daemonset.nodeSelector` | Pod node selector for daemonset | `{}` | | `daemonset.tolerations` | Pod taint tolerations for daemonset | `[{"key": "node-role.kubernetes.io/master", "operator": "Exists", "effect": "NoSchedule"}]` | +| `daemonset.resources.requests.cpu` | CPU resource requests for daemonset | | +| `daemonset.resources.limits.cpu` | CPU resource limits for daemonset | | | `deployment.modules..config` | The content of the modules configuration file consumed by metricbeat deployed as deployment, which is assumed to collect cluster-level metrics. See the [metricbeat.reference.yml](https://www.elastic.co/guide/en/beats/metricbeat/current/metricbeat-reference-yml.html) for full details || | `deployment.modules..enabled` | If true, enable configuration || | `deployment.podAnnotations` | Pod annotations for deployment | | | `deployment.nodeSelector` | Pod node selector for deployment | `{}` | -| `deployment.tolerations` | Pod taint tolerations for deployment | `[]` | +| `deployment.tolerations` | Pod taint tolerations for deployment | `[]` | +| `deployment.resources.requests.cpu` | CPU resource requests for daemonset | | +| `deployment.resources.limits.cpu` | CPU resource limits for daemonset | | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, diff --git a/stable/metricbeat/templates/daemonset.yaml b/stable/metricbeat/templates/daemonset.yaml index 4abcdcb69f..4533646c51 100644 --- a/stable/metricbeat/templates/daemonset.yaml +++ b/stable/metricbeat/templates/daemonset.yaml @@ -61,7 +61,11 @@ spec: securityContext: runAsUser: 0 resources: +{{- if .Values.daemonset.resources }} +{{ toYaml .Values.daemonset.resources | indent 10 }} +{{- else if .Values.resources }} {{ toYaml .Values.resources | indent 10 }} +{{- end }} volumeMounts: - name: config mountPath: /usr/share/metricbeat/metricbeat.yml diff --git a/stable/metricbeat/templates/deployment.yaml b/stable/metricbeat/templates/deployment.yaml index 07fecc24ad..4b9d3b3dc6 100644 --- a/stable/metricbeat/templates/deployment.yaml +++ b/stable/metricbeat/templates/deployment.yaml @@ -57,7 +57,11 @@ spec: securityContext: runAsUser: 0 resources: +{{- if .Values.deployment.resources }} +{{ toYaml .Values.deployment.resources | indent 10 }} +{{- else if .Values.resources }} {{ toYaml .Values.resources | indent 10 }} +{{- end }} volumeMounts: - name: metricbeat-config mountPath: /usr/share/metricbeat/metricbeat.yml diff --git a/stable/metricbeat/values.yaml b/stable/metricbeat/values.yaml index 8e73d3191c..4e4d92fa75 100644 --- a/stable/metricbeat/values.yaml +++ b/stable/metricbeat/values.yaml @@ -11,6 +11,7 @@ daemonset: operator: Exists effect: NoSchedule nodeSelector: {} + resources: {} config: metricbeat.config: modules: @@ -75,6 +76,7 @@ deployment: podAnnotations: [] tolerations: [] nodeSelector: {} + resources: {} config: metricbeat.config: modules: