diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml index 4d43ebde13..cbd1d34936 100644 --- a/charts/loki-distributed/Chart.yaml +++ b/charts/loki-distributed/Chart.yaml @@ -3,7 +3,7 @@ name: loki-distributed description: Helm chart for Grafana Loki in microservices mode type: application appVersion: 2.1.0 -version: 0.21.1 +version: 0.21.2 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index 0fc4c9347b..129127e5c4 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -1,6 +1,6 @@ # loki-distributed -![Version: 0.21.1](https://img.shields.io/badge/Version-0.21.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.0](https://img.shields.io/badge/AppVersion-2.1.0-informational?style=flat-square) +![Version: 0.21.2](https://img.shields.io/badge/Version-0.21.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.0](https://img.shields.io/badge/AppVersion-2.1.0-informational?style=flat-square) Helm chart for Grafana Loki in microservices mode @@ -137,6 +137,7 @@ helm repo add grafana https://grafana.github.io/helm-charts | memcachedExporter.image.registry | string | `"docker.io"` | The Docker registry for the Memcached Exporter | | memcachedExporter.image.repository | string | `"prom/memcached-exporter"` | Memcached Exporter Docker image repository | | memcachedExporter.image.tag | string | `"v0.6.0"` | Memcached Exporter Docker image tag | +| memcachedExporter.resources | object | `{}` | Memcached Exporter resource requests and limits | | memcachedFrontend.affinity | string | Hard node and soft zone anti-affinity | Affinity for memcached-frontend pods. Passed through `tpl` and, thus, to be configured as string | | memcachedFrontend.enabled | bool | `false` | Specifies whether the Memcached frontend cache should be enabled | | memcachedFrontend.extraArgs | list | `[]` | Additional CLI args for memcached-frontend | diff --git a/charts/loki-distributed/templates/memcached-chunks/statefulset-memcached-chunks.yaml b/charts/loki-distributed/templates/memcached-chunks/statefulset-memcached-chunks.yaml index 3caac40e9f..7d8e30aafc 100644 --- a/charts/loki-distributed/templates/memcached-chunks/statefulset-memcached-chunks.yaml +++ b/charts/loki-distributed/templates/memcached-chunks/statefulset-memcached-chunks.yaml @@ -78,6 +78,8 @@ spec: - name: http-metrics containerPort: 9150 protocol: TCP + resources: + {{- toYaml .Values.memcachedExporter.resources | nindent 12 }} {{- end }} {{- with .Values.memcachedChunks.affinity }} affinity: diff --git a/charts/loki-distributed/templates/memcached-frontend/statefulset-memcached-frontend.yaml b/charts/loki-distributed/templates/memcached-frontend/statefulset-memcached-frontend.yaml index f93d699af1..a3a172d9f6 100644 --- a/charts/loki-distributed/templates/memcached-frontend/statefulset-memcached-frontend.yaml +++ b/charts/loki-distributed/templates/memcached-frontend/statefulset-memcached-frontend.yaml @@ -78,6 +78,8 @@ spec: - name: http-metrics containerPort: 9150 protocol: TCP + resources: + {{- toYaml .Values.memcachedExporter.resources | nindent 12 }} {{- end }} {{- with .Values.memcachedFrontend.affinity }} affinity: diff --git a/charts/loki-distributed/templates/memcached-index-queries/statefulset-memcached-index-queries.yaml b/charts/loki-distributed/templates/memcached-index-queries/statefulset-memcached-index-queries.yaml index 68973d6d32..1802c81095 100644 --- a/charts/loki-distributed/templates/memcached-index-queries/statefulset-memcached-index-queries.yaml +++ b/charts/loki-distributed/templates/memcached-index-queries/statefulset-memcached-index-queries.yaml @@ -78,6 +78,8 @@ spec: - name: http-metrics containerPort: 9150 protocol: TCP + resources: + {{- toYaml .Values.memcachedExporter.resources | nindent 12 }} {{- end }} {{- with .Values.memcachedIndexQueries.affinity }} affinity: diff --git a/charts/loki-distributed/templates/memcached-index-writes/statefulset-memcached-index-writes.yaml b/charts/loki-distributed/templates/memcached-index-writes/statefulset-memcached-index-writes.yaml index 4a8834ff7a..c93befa764 100644 --- a/charts/loki-distributed/templates/memcached-index-writes/statefulset-memcached-index-writes.yaml +++ b/charts/loki-distributed/templates/memcached-index-writes/statefulset-memcached-index-writes.yaml @@ -78,6 +78,8 @@ spec: - name: http-metrics containerPort: 9150 protocol: TCP + resources: + {{- toYaml .Values.memcachedExporter.resources | nindent 12 }} {{- end }} {{- with .Values.memcachedIndexWrites.affinity }} affinity: diff --git a/charts/loki-distributed/values.yaml b/charts/loki-distributed/values.yaml index 8e86b712db..38cd83e9b3 100644 --- a/charts/loki-distributed/values.yaml +++ b/charts/loki-distributed/values.yaml @@ -814,6 +814,8 @@ memcachedExporter: tag: v0.6.0 # -- Memcached Exporter Docker image pull policy pullPolicy: IfNotPresent + # -- Memcached Exporter resource requests and limits + resources: {} memcachedChunks: # -- Specifies whether the Memcached chunks cache should be enabled