Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[loki-distributed] Adding resources for Memcached Exporter container #156

Merged
merged 8 commits into from
Jan 7, 2021
2 changes: 1 addition & 1 deletion charts/loki-distributed/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion charts/loki-distributed/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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 |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions charts/loki-distributed/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down