Skip to content

fix(helm): Avoid scraping metrics from gateway pod #13350

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.

Sign up for GitHub

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

Closed
wants to merge 10 commits into from
Closed

fix(helm): Avoid scraping metrics from gateway pod #13350

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
80c75a9
Avoid scraping metrics from gateway pod
Skaronator Jun 28, 2024
dc02e25
Bump Version and add changelog
Skaronator Jun 28, 2024
7465a61
Merge remote-tracking branch 'upstream/main' into fix-nginx-metrics-s…
Skaronator Jul 5, 2024
61e8503
Adjust changelog
Skaronator Jul 5, 2024
6e8c709
Update production/helm/loki/CHANGELOG.md
Skaronator Jul 22, 2024
86c547e
Merge remote-tracking branch 'upstream/main' into fix-nginx-metrics-s…
Skaronator Jul 22, 2024
3def812
Fix changelog
Skaronator Jul 22, 2024
6793811
Merge branch 'main' into fix-nginx-metrics-scrape
Skaronator Jul 22, 2024
9a0de3a
Merge branch 'fix-nginx-metrics-scrape' of github.com:Skaronator/loki…
Skaronator Jul 22, 2024
36a6570
Merge remote-tracking branch 'upstream/main' into fix-nginx-metrics-s…
Skaronator Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions production/helm/loki/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ Entries should include a reference to the pull request that introduced the chang

[//]: # (<AUTOMATED_UPDATES_LOCATOR> : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.)

## 6.7.0

- [CHANGE] Changed `gateway.readinessProbe.httpGet.port` from `http-metrics` to `metrics` to avoid beeing scraped by the ServiceMonitor #13350

## 6.6.5

- [BUGFIX] Fix querier address in SingleBinary mode
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: loki
description: Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
type: application
appVersion: 3.0.0
version: 6.6.5
version: 6.7.0
home: https://grafana.github.io/helm-charts
sources:
- https://github.com/grafana/loki
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# loki

![Version: 6.6.5](https://img.shields.io/badge/Version-6.6.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
![Version: 6.7.0](https://img.shields.io/badge/Version-6.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)

Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.

Expand Down
4 changes: 2 additions & 2 deletions production/helm/loki/templates/gateway/deployment-gateway-enterprise.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ spec:
{{ toYaml .Values.enterpriseGateway.extraVolumeMounts | nindent 12 }}
{{- end }}
ports:
- name: http-metrics
- name: http
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when the loki/gel image is run in mode gateway(-target=gateway), it exposes the metrics under /metrics url ....

containerPort: 3100
protocol: TCP
readinessProbe:
Expand Down Expand Up @@ -141,4 +141,4 @@ spec:
{{- if .Values.enterpriseGateway.extraVolumes }}
{{ toYaml .Values.enterpriseGateway.extraVolumes | nindent 8 }}
{{- end }}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion production/helm/loki/templates/gateway/deployment-gateway-nginx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ spec:
image: {{ include "loki.gatewayImage" . }}
imagePullPolicy: {{ .Values.gateway.image.pullPolicy }}
ports:
- name: http-metrics
- name: http
containerPort: {{ .Values.gateway.containerPort }}
protocol: TCP
{{- with .Values.gateway.extraEnv }}
Expand Down
4 changes: 2 additions & 2 deletions production/helm/loki/templates/gateway/service-gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ spec:
loadBalancerIP: {{ .Values.gateway.service.loadBalancerIP }}
{{- end }}
ports:
- name: http-metrics
- name: http
port: {{ .Values.gateway.service.port }}
targetPort: http-metrics
targetPort: http
{{- if and (eq "NodePort" .Values.gateway.service.type) .Values.gateway.service.nodePort }}
nodePort: {{ .Values.gateway.service.nodePort }}
{{- end }}
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,7 @@ gateway:
readinessProbe:
httpGet:
path: /
port: http-metrics
port: http
initialDelaySeconds: 15
timeoutSeconds: 1
nginxConfig:
Expand Down
Loading