From c36271d0f8b47f4e525f1910c7ae14b64982d0b8 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Thu, 11 Jan 2024 03:04:44 +0530 Subject: [PATCH 01/12] Modified helm template to use variables http_listen_port and grpc_listen_port Signed-off-by: Sheikh-Abubaker --- production/helm/loki/CHANGELOG.md | 4 ++++ production/helm/loki/Chart.yaml | 2 +- production/helm/loki/README.md | 2 +- .../loki/templates/backend/query-scheduler-discovery.yaml | 4 ++-- .../helm/loki/templates/backend/service-backend-headless.yaml | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index ca04f5d18ce5d..24b484feea62e 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,6 +13,10 @@ Entries should include a reference to the pull request that introduced the chang [//]: # ( : 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.) +## 5.41.6 + +- [ENHANCEMENT] Modified helm template to use variables http_listen_port and grpc_listen_port instead of hardcoded value of 3100 and 9095. + ## 5.41.5 - [BUGFIX] Added "swift" type object storage to resolve Loki HELM Chart error. diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 1e08c0c8f0d1e..cb43a70c965b7 100644 --- a/production/helm/loki/Chart.yaml +++ b/production/helm/loki/Chart.yaml @@ -3,7 +3,7 @@ name: loki description: Helm chart for Grafana Loki in simple, scalable mode type: application appVersion: 2.9.3 -version: 5.41.5 +version: 5.41.6 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md index ec3360d378d76..6b4ec081e9bba 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 5.41.5](https://img.shields.io/badge/Version-5.41.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square) +![Version: 5.41.6](https://img.shields.io/badge/Version-5.41.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square) Helm chart for Grafana Loki in simple, scalable mode diff --git a/production/helm/loki/templates/backend/query-scheduler-discovery.yaml b/production/helm/loki/templates/backend/query-scheduler-discovery.yaml index 01865863e57ef..3bc932e82c621 100644 --- a/production/helm/loki/templates/backend/query-scheduler-discovery.yaml +++ b/production/helm/loki/templates/backend/query-scheduler-discovery.yaml @@ -14,11 +14,11 @@ spec: publishNotReadyAddresses: true ports: - name: http-metrics - port: 3100 + port: {{ .Values.loki.server.http_listen_port | default 3100 }} targetPort: http-metrics protocol: TCP - name: grpc - port: 9095 + port: {{ .Values.loki.server.grpc_listen_port | default 9095 }} targetPort: grpc protocol: TCP selector: diff --git a/production/helm/loki/templates/backend/service-backend-headless.yaml b/production/helm/loki/templates/backend/service-backend-headless.yaml index 2ed4a9ae18c6a..4043cbbc5335e 100644 --- a/production/helm/loki/templates/backend/service-backend-headless.yaml +++ b/production/helm/loki/templates/backend/service-backend-headless.yaml @@ -28,11 +28,11 @@ spec: clusterIP: None ports: - name: http-metrics - port: 3100 + port: {{ .Values.loki.server.http_listen_port | default 3100 }} targetPort: http-metrics protocol: TCP - name: grpc - port: 9095 + port: {{ .Values.loki.server.grpc_listen_port | default 9095 }} targetPort: grpc protocol: TCP selector: From 37f1d91ff21367711dbc878a7408d066a3030f07 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Thu, 11 Jan 2024 03:14:31 +0530 Subject: [PATCH 02/12] Updated CHANGELOG.md Signed-off-by: Sheikh-Abubaker --- production/helm/loki/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 24b484feea62e..4555dfb70bddd 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -15,7 +15,7 @@ Entries should include a reference to the pull request that introduced the chang ## 5.41.6 -- [ENHANCEMENT] Modified helm template to use variables http_listen_port and grpc_listen_port instead of hardcoded value of 3100 and 9095. +- [ENHANCEMENT] Modified helm template to use parameters http_listen_port and grpc_listen_port instead of hardcoded value of 3100 and 9095. ## 5.41.5 From c5989436e8d9ed20320801194417f4db5f5dec51 Mon Sep 17 00:00:00 2001 From: Alberto Chiusole Date: Thu, 11 Jan 2024 13:01:08 +0100 Subject: [PATCH 03/12] Remove defaults from service objects, already in values.yaml --- .../loki/templates/backend/query-scheduler-discovery.yaml | 4 ++-- .../helm/loki/templates/backend/service-backend-headless.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/production/helm/loki/templates/backend/query-scheduler-discovery.yaml b/production/helm/loki/templates/backend/query-scheduler-discovery.yaml index 3bc932e82c621..fc254db8bc93b 100644 --- a/production/helm/loki/templates/backend/query-scheduler-discovery.yaml +++ b/production/helm/loki/templates/backend/query-scheduler-discovery.yaml @@ -14,11 +14,11 @@ spec: publishNotReadyAddresses: true ports: - name: http-metrics - port: {{ .Values.loki.server.http_listen_port | default 3100 }} + port: {{ .Values.loki.server.http_listen_port }} targetPort: http-metrics protocol: TCP - name: grpc - port: {{ .Values.loki.server.grpc_listen_port | default 9095 }} + port: {{ .Values.loki.server.grpc_listen_port }} targetPort: grpc protocol: TCP selector: diff --git a/production/helm/loki/templates/backend/service-backend-headless.yaml b/production/helm/loki/templates/backend/service-backend-headless.yaml index 4043cbbc5335e..0755be66d5fee 100644 --- a/production/helm/loki/templates/backend/service-backend-headless.yaml +++ b/production/helm/loki/templates/backend/service-backend-headless.yaml @@ -28,11 +28,11 @@ spec: clusterIP: None ports: - name: http-metrics - port: {{ .Values.loki.server.http_listen_port | default 3100 }} + port: {{ .Values.loki.server.http_listen_port }} targetPort: http-metrics protocol: TCP - name: grpc - port: {{ .Values.loki.server.grpc_listen_port | default 9095 }} + port: {{ .Values.loki.server.grpc_listen_port }} targetPort: grpc protocol: TCP selector: From 65531b2b084d28c2e377fae8c309b58893a435dc Mon Sep 17 00:00:00 2001 From: Alberto Chiusole Date: Thu, 11 Jan 2024 13:03:03 +0100 Subject: [PATCH 04/12] Replace all occurrences of port 9095 with value from values.yaml --- production/helm/loki/templates/_helpers.tpl | 2 +- production/helm/loki/templates/backend/service-backend.yaml | 2 +- .../helm/loki/templates/backend/statefulset-backend.yaml | 2 +- production/helm/loki/templates/read/deployment-read.yaml | 4 ++-- .../helm/loki/templates/read/service-read-headless.yaml | 2 +- production/helm/loki/templates/read/service-read.yaml | 2 +- production/helm/loki/templates/read/statefulset-read.yaml | 2 +- production/helm/loki/templates/single-binary/service.yaml | 2 +- production/helm/loki/templates/single-binary/statefulset.yaml | 2 +- .../templates/table-manager/deployment-table-manager.yaml | 2 +- .../loki/templates/table-manager/service-table-manager.yaml | 2 +- .../helm/loki/templates/write/service-write-headless.yaml | 2 +- production/helm/loki/templates/write/service-write.yaml | 2 +- production/helm/loki/templates/write/statefulset-write.yaml | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/production/helm/loki/templates/_helpers.tpl b/production/helm/loki/templates/_helpers.tpl index 9ebcc63519573..575788ab33bd2 100644 --- a/production/helm/loki/templates/_helpers.tpl +++ b/production/helm/loki/templates/_helpers.tpl @@ -891,7 +891,7 @@ enableServiceLinks: false {{- $isSimpleScalable := eq (include "loki.deployment.isScalable" .) "true" -}} {{- $schedulerAddress := ""}} {{- if and $isSimpleScalable (not .Values.read.legacyReadTarget ) -}} -{{- $schedulerAddress = printf "query-scheduler-discovery.%s.svc.%s.:9095" .Release.Namespace .Values.global.clusterDomain -}} +{{- $schedulerAddress = printf "query-scheduler-discovery.%s.svc.%s.:%s" .Release.Namespace .Values.global.clusterDomain .Values.loki.server.grpc_listen_port -}} {{- end -}} {{- printf "%s" $schedulerAddress }} {{- end }} diff --git a/production/helm/loki/templates/backend/service-backend.yaml b/production/helm/loki/templates/backend/service-backend.yaml index 47af89e148cc1..31156de7044a3 100644 --- a/production/helm/loki/templates/backend/service-backend.yaml +++ b/production/helm/loki/templates/backend/service-backend.yaml @@ -29,7 +29,7 @@ spec: targetPort: http-metrics protocol: TCP - name: grpc - port: 9095 + port: {{ .Values.loki.server.grpc_listen_port }} targetPort: grpc protocol: TCP selector: diff --git a/production/helm/loki/templates/backend/statefulset-backend.yaml b/production/helm/loki/templates/backend/statefulset-backend.yaml index 0bdef7e8e7774..477da100e30f2 100644 --- a/production/helm/loki/templates/backend/statefulset-backend.yaml +++ b/production/helm/loki/templates/backend/statefulset-backend.yaml @@ -164,7 +164,7 @@ spec: containerPort: 3100 protocol: TCP - name: grpc - containerPort: 9095 + containerPort: {{ .Values.loki.server.grpc_listen_port }} protocol: TCP - name: http-memberlist containerPort: 7946 diff --git a/production/helm/loki/templates/read/deployment-read.yaml b/production/helm/loki/templates/read/deployment-read.yaml index a5e7524f2a05f..d5fdc0536c0aa 100644 --- a/production/helm/loki/templates/read/deployment-read.yaml +++ b/production/helm/loki/templates/read/deployment-read.yaml @@ -71,7 +71,7 @@ spec: - -config.file=/etc/loki/config/config.yaml - -target={{ .Values.read.targetModule }} - -legacy-read-mode=false - - -common.compactor-grpc-address={{ include "loki.backendFullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:9095 + - -common.compactor-grpc-address={{ include "loki.backendFullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:{{ .Values.loki.server.grpc_listen_port }} {{- with .Values.read.extraArgs }} {{- toYaml . | nindent 12 }} {{- end }} @@ -80,7 +80,7 @@ spec: containerPort: 3100 protocol: TCP - name: grpc - containerPort: 9095 + containerPort: {{ .Values.loki.server.grpc_listen_port }} protocol: TCP - name: http-memberlist containerPort: 7946 diff --git a/production/helm/loki/templates/read/service-read-headless.yaml b/production/helm/loki/templates/read/service-read-headless.yaml index e3c440082b4f3..527b5f4516ed4 100644 --- a/production/helm/loki/templates/read/service-read-headless.yaml +++ b/production/helm/loki/templates/read/service-read-headless.yaml @@ -32,7 +32,7 @@ spec: targetPort: http-metrics protocol: TCP - name: grpc - port: 9095 + port: {{ .Values.loki.server.grpc_listen_port }} targetPort: grpc protocol: TCP appProtocol: tcp diff --git a/production/helm/loki/templates/read/service-read.yaml b/production/helm/loki/templates/read/service-read.yaml index b7306edc058d6..b912b6fba1d2b 100644 --- a/production/helm/loki/templates/read/service-read.yaml +++ b/production/helm/loki/templates/read/service-read.yaml @@ -29,7 +29,7 @@ spec: targetPort: http-metrics protocol: TCP - name: grpc - port: 9095 + port: {{ .Values.loki.server.grpc_listen_port }} targetPort: grpc protocol: TCP selector: diff --git a/production/helm/loki/templates/read/statefulset-read.yaml b/production/helm/loki/templates/read/statefulset-read.yaml index 3b0d91d926a3c..d31e992210fba 100644 --- a/production/helm/loki/templates/read/statefulset-read.yaml +++ b/production/helm/loki/templates/read/statefulset-read.yaml @@ -80,7 +80,7 @@ spec: containerPort: 3100 protocol: TCP - name: grpc - containerPort: 9095 + containerPort: {{ .Values.loki.server.grpc_listen_port }} protocol: TCP - name: http-memberlist containerPort: 7946 diff --git a/production/helm/loki/templates/single-binary/service.yaml b/production/helm/loki/templates/single-binary/service.yaml index 1dee4eba8a6f8..d0ffe0971cba3 100644 --- a/production/helm/loki/templates/single-binary/service.yaml +++ b/production/helm/loki/templates/single-binary/service.yaml @@ -29,7 +29,7 @@ spec: targetPort: http-metrics protocol: TCP - name: grpc - port: 9095 + port: {{ .Values.loki.server.grpc_listen_port }} targetPort: grpc protocol: TCP selector: diff --git a/production/helm/loki/templates/single-binary/statefulset.yaml b/production/helm/loki/templates/single-binary/statefulset.yaml index b74cc60500d6a..cca3ce0d83b2b 100644 --- a/production/helm/loki/templates/single-binary/statefulset.yaml +++ b/production/helm/loki/templates/single-binary/statefulset.yaml @@ -93,7 +93,7 @@ spec: containerPort: 3100 protocol: TCP - name: grpc - containerPort: 9095 + containerPort: {{ .Values.loki.server.grpc_listen_port }} protocol: TCP - name: http-memberlist containerPort: 7946 diff --git a/production/helm/loki/templates/table-manager/deployment-table-manager.yaml b/production/helm/loki/templates/table-manager/deployment-table-manager.yaml index bc14d1f6df491..edc52c1760f6b 100644 --- a/production/helm/loki/templates/table-manager/deployment-table-manager.yaml +++ b/production/helm/loki/templates/table-manager/deployment-table-manager.yaml @@ -61,7 +61,7 @@ spec: containerPort: 3100 protocol: TCP - name: grpc - containerPort: 9095 + containerPort: {{ .Values.loki.server.grpc_listen_port }} protocol: TCP {{- with .Values.tableManager.extraEnv }} env: diff --git a/production/helm/loki/templates/table-manager/service-table-manager.yaml b/production/helm/loki/templates/table-manager/service-table-manager.yaml index 43443fb57550d..e00711e21acbd 100644 --- a/production/helm/loki/templates/table-manager/service-table-manager.yaml +++ b/production/helm/loki/templates/table-manager/service-table-manager.yaml @@ -27,7 +27,7 @@ spec: targetPort: http-metrics protocol: TCP - name: grpc - port: 9095 + port: {{ .Values.loki.server.grpc_listen_port }} targetPort: grpc protocol: TCP selector: diff --git a/production/helm/loki/templates/write/service-write-headless.yaml b/production/helm/loki/templates/write/service-write-headless.yaml index 71cdcb7b2db8c..46e3f879489a5 100644 --- a/production/helm/loki/templates/write/service-write-headless.yaml +++ b/production/helm/loki/templates/write/service-write-headless.yaml @@ -32,7 +32,7 @@ spec: targetPort: http-metrics protocol: TCP - name: grpc - port: 9095 + port: {{ .Values.loki.server.grpc_listen_port }} targetPort: grpc protocol: TCP appProtocol: tcp diff --git a/production/helm/loki/templates/write/service-write.yaml b/production/helm/loki/templates/write/service-write.yaml index 35a548c0330c3..ec29f78836400 100644 --- a/production/helm/loki/templates/write/service-write.yaml +++ b/production/helm/loki/templates/write/service-write.yaml @@ -29,7 +29,7 @@ spec: targetPort: http-metrics protocol: TCP - name: grpc - port: 9095 + port: {{ .Values.loki.server.grpc_listen_port }} targetPort: grpc protocol: TCP selector: diff --git a/production/helm/loki/templates/write/statefulset-write.yaml b/production/helm/loki/templates/write/statefulset-write.yaml index ca67038a16192..19aee27a006a0 100644 --- a/production/helm/loki/templates/write/statefulset-write.yaml +++ b/production/helm/loki/templates/write/statefulset-write.yaml @@ -95,7 +95,7 @@ spec: containerPort: 3100 protocol: TCP - name: grpc - containerPort: 9095 + containerPort: {{ .Values.loki.server.grpc_listen_port }} protocol: TCP - name: http-memberlist containerPort: 7946 From c5402018d54478d1d966d16c35383d69c2a566a1 Mon Sep 17 00:00:00 2001 From: Alberto Chiusole Date: Thu, 11 Jan 2024 13:14:43 +0100 Subject: [PATCH 05/12] Replace all occurrences of port 3100 with value from values.yaml --- production/helm/loki/templates/_helpers.tpl | 12 ++++++------ .../helm/loki/templates/backend/service-backend.yaml | 2 +- .../loki/templates/backend/statefulset-backend.yaml | 2 +- .../templates/monitoring/_helpers-monitoring.tpl | 4 ++-- .../helm/loki/templates/read/deployment-read.yaml | 2 +- .../loki/templates/read/service-read-headless.yaml | 2 +- .../helm/loki/templates/read/service-read.yaml | 2 +- .../helm/loki/templates/read/statefulset-read.yaml | 2 +- .../templates/single-binary/service-headless.yaml | 2 +- .../helm/loki/templates/single-binary/service.yaml | 2 +- .../loki/templates/single-binary/statefulset.yaml | 2 +- .../table-manager/deployment-table-manager.yaml | 2 +- .../table-manager/service-table-manager.yaml | 2 +- .../loki/templates/write/service-write-headless.yaml | 2 +- .../helm/loki/templates/write/service-write.yaml | 2 +- .../helm/loki/templates/write/statefulset-write.yaml | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) diff --git a/production/helm/loki/templates/_helpers.tpl b/production/helm/loki/templates/_helpers.tpl index 575788ab33bd2..1e351ff193c82 100644 --- a/production/helm/loki/templates/_helpers.tpl +++ b/production/helm/loki/templates/_helpers.tpl @@ -564,10 +564,10 @@ Params: service: name: {{ $serviceName }} port: - number: 3100 + number: {{ .Values.loki.server.http_listen_port }} {{- else }} serviceName: {{ $serviceName }} - servicePort: 3100 + servicePort: {{ .Values.loki.server.http_listen_port }} {{- end -}} {{- end -}} {{- end -}} @@ -610,7 +610,7 @@ Create the service endpoint including port for MinIO. {{- $isSingleBinary := eq (include "loki.deployment.isSingleBinary" .) "true" -}} {{- $url := printf "%s.%s.svc.%s.:%s" (include "loki.gatewayFullname" .) .Release.Namespace .Values.global.clusterDomain (.Values.gateway.service.port | toString) }} {{- if and $isSingleBinary (not .Values.gateway.enabled) }} - {{- $url = printf "%s.%s.svc.%s.:3100" (include "loki.singleBinaryFullname" .) .Release.Namespace .Values.global.clusterDomain }} + {{- $url = printf "%s.%s.svc.%s.:%s" (include "loki.singleBinaryFullname" .) .Release.Namespace .Values.global.clusterDomain .Values.loki.server.http_listen_port }} {{- end }} {{- printf "%s" $url -}} {{- end -}} @@ -721,9 +721,9 @@ http { {{- $writeHost = include "loki.singleBinaryFullname" .}} {{- end }} - {{- $writeUrl := printf "http://%s.%s.svc.%s:3100" $writeHost .Release.Namespace .Values.global.clusterDomain }} - {{- $readUrl := printf "http://%s.%s.svc.%s:3100" $readHost .Release.Namespace .Values.global.clusterDomain }} - {{- $backendUrl := printf "http://%s.%s.svc.%s:3100" $backendHost .Release.Namespace .Values.global.clusterDomain }} + {{- $writeUrl := printf "http://%s.%s.svc.%s:%s" $writeHost .Release.Namespace .Values.global.clusterDomain .Values.loki.server.http_listen_port }} + {{- $readUrl := printf "http://%s.%s.svc.%s:%s" $readHost .Release.Namespace .Values.global.clusterDomain .Values.loki.server.http_listen_port }} + {{- $backendUrl := printf "http://%s.%s.svc.%s:%s" $backendHost .Release.Namespace .Values.global.clusterDomain .Values.loki.server.http_listen_port }} {{- if .Values.gateway.nginxConfig.customWriteUrl }} {{- $writeUrl = .Values.gateway.nginxConfig.customWriteUrl }} diff --git a/production/helm/loki/templates/backend/service-backend.yaml b/production/helm/loki/templates/backend/service-backend.yaml index 31156de7044a3..cd1bd3b9b69dc 100644 --- a/production/helm/loki/templates/backend/service-backend.yaml +++ b/production/helm/loki/templates/backend/service-backend.yaml @@ -25,7 +25,7 @@ spec: type: ClusterIP ports: - name: http-metrics - port: 3100 + port: {{ .Values.loki.server.http_listen_port }} targetPort: http-metrics protocol: TCP - name: grpc diff --git a/production/helm/loki/templates/backend/statefulset-backend.yaml b/production/helm/loki/templates/backend/statefulset-backend.yaml index 477da100e30f2..e9c1eaeb246b5 100644 --- a/production/helm/loki/templates/backend/statefulset-backend.yaml +++ b/production/helm/loki/templates/backend/statefulset-backend.yaml @@ -161,7 +161,7 @@ spec: {{- end }} ports: - name: http-metrics - containerPort: 3100 + containerPort: {{ .Values.loki.server.http_listen_port }} protocol: TCP - name: grpc containerPort: {{ .Values.loki.server.grpc_listen_port }} diff --git a/production/helm/loki/templates/monitoring/_helpers-monitoring.tpl b/production/helm/loki/templates/monitoring/_helpers-monitoring.tpl index e54f13004d341..5a8e8b2ce4176 100644 --- a/production/helm/loki/templates/monitoring/_helpers-monitoring.tpl +++ b/production/helm/loki/templates/monitoring/_helpers-monitoring.tpl @@ -3,9 +3,9 @@ Client definition for LogsInstance */}} {{- define "loki.logsInstanceClient" -}} {{- $isSingleBinary := eq (include "loki.deployment.isSingleBinary" .) "true" -}} -{{- $url := printf "http://%s.%s.svc.%s:3100/loki/api/v1/push" (include "loki.writeFullname" .) .Release.Namespace .Values.global.clusterDomain }} +{{- $url := printf "http://%s.%s.svc.%s:%s/loki/api/v1/push" (include "loki.writeFullname" .) .Release.Namespace .Values.global.clusterDomain .Values.loki.server.http_listen_port }} {{- if $isSingleBinary }} - {{- $url = printf "http://%s.%s.svc.%s:3100/loki/api/v1/push" (include "loki.singleBinaryFullname" .) .Release.Namespace .Values.global.clusterDomain }} + {{- $url = printf "http://%s.%s.svc.%s:%s/loki/api/v1/push" (include "loki.singleBinaryFullname" .) .Release.Namespace .Values.global.clusterDomain .Values.loki.server.http_listen_port }} {{- else if .Values.gateway.enabled -}} {{- $url = printf "http://%s.%s.svc.%s/loki/api/v1/push" (include "loki.gatewayFullname" .) .Release.Namespace .Values.global.clusterDomain }} {{- end -}} diff --git a/production/helm/loki/templates/read/deployment-read.yaml b/production/helm/loki/templates/read/deployment-read.yaml index d5fdc0536c0aa..dbe8f531ed188 100644 --- a/production/helm/loki/templates/read/deployment-read.yaml +++ b/production/helm/loki/templates/read/deployment-read.yaml @@ -77,7 +77,7 @@ spec: {{- end }} ports: - name: http-metrics - containerPort: 3100 + containerPort: {{ .Values.loki.server.http_listen_port }} protocol: TCP - name: grpc containerPort: {{ .Values.loki.server.grpc_listen_port }} diff --git a/production/helm/loki/templates/read/service-read-headless.yaml b/production/helm/loki/templates/read/service-read-headless.yaml index 527b5f4516ed4..14ba0f62f9f8a 100644 --- a/production/helm/loki/templates/read/service-read-headless.yaml +++ b/production/helm/loki/templates/read/service-read-headless.yaml @@ -28,7 +28,7 @@ spec: clusterIP: None ports: - name: http-metrics - port: 3100 + port: {{ .Values.loki.server.http_listen_port }} targetPort: http-metrics protocol: TCP - name: grpc diff --git a/production/helm/loki/templates/read/service-read.yaml b/production/helm/loki/templates/read/service-read.yaml index b912b6fba1d2b..f4000fda5720e 100644 --- a/production/helm/loki/templates/read/service-read.yaml +++ b/production/helm/loki/templates/read/service-read.yaml @@ -25,7 +25,7 @@ spec: type: ClusterIP ports: - name: http-metrics - port: 3100 + port: {{ .Values.loki.server.http_listen_port }} targetPort: http-metrics protocol: TCP - name: grpc diff --git a/production/helm/loki/templates/read/statefulset-read.yaml b/production/helm/loki/templates/read/statefulset-read.yaml index d31e992210fba..359fe9079b750 100644 --- a/production/helm/loki/templates/read/statefulset-read.yaml +++ b/production/helm/loki/templates/read/statefulset-read.yaml @@ -77,7 +77,7 @@ spec: {{- end }} ports: - name: http-metrics - containerPort: 3100 + containerPort: {{ .Values.loki.server.http_listen_port }} protocol: TCP - name: grpc containerPort: {{ .Values.loki.server.grpc_listen_port }} diff --git a/production/helm/loki/templates/single-binary/service-headless.yaml b/production/helm/loki/templates/single-binary/service-headless.yaml index 51e111982b95a..7522240afc72a 100644 --- a/production/helm/loki/templates/single-binary/service-headless.yaml +++ b/production/helm/loki/templates/single-binary/service-headless.yaml @@ -27,7 +27,7 @@ spec: clusterIP: None ports: - name: http-metrics - port: 3100 + port: {{ .Values.loki.server.http_listen_port }} targetPort: http-metrics protocol: TCP selector: diff --git a/production/helm/loki/templates/single-binary/service.yaml b/production/helm/loki/templates/single-binary/service.yaml index d0ffe0971cba3..352fcadf96ccd 100644 --- a/production/helm/loki/templates/single-binary/service.yaml +++ b/production/helm/loki/templates/single-binary/service.yaml @@ -25,7 +25,7 @@ spec: type: ClusterIP ports: - name: http-metrics - port: 3100 + port: {{ .Values.loki.server.http_listen_port }} targetPort: http-metrics protocol: TCP - name: grpc diff --git a/production/helm/loki/templates/single-binary/statefulset.yaml b/production/helm/loki/templates/single-binary/statefulset.yaml index cca3ce0d83b2b..cdc0f46a99892 100644 --- a/production/helm/loki/templates/single-binary/statefulset.yaml +++ b/production/helm/loki/templates/single-binary/statefulset.yaml @@ -90,7 +90,7 @@ spec: {{- end }} ports: - name: http-metrics - containerPort: 3100 + containerPort: {{ .Values.loki.server.http_listen_port }} protocol: TCP - name: grpc containerPort: {{ .Values.loki.server.grpc_listen_port }} diff --git a/production/helm/loki/templates/table-manager/deployment-table-manager.yaml b/production/helm/loki/templates/table-manager/deployment-table-manager.yaml index edc52c1760f6b..aeb5b1affea57 100644 --- a/production/helm/loki/templates/table-manager/deployment-table-manager.yaml +++ b/production/helm/loki/templates/table-manager/deployment-table-manager.yaml @@ -58,7 +58,7 @@ spec: {{- end }} ports: - name: http-metrics - containerPort: 3100 + containerPort: {{ .Values.loki.server.http_listen_port }} protocol: TCP - name: grpc containerPort: {{ .Values.loki.server.grpc_listen_port }} diff --git a/production/helm/loki/templates/table-manager/service-table-manager.yaml b/production/helm/loki/templates/table-manager/service-table-manager.yaml index e00711e21acbd..214cd3663e02e 100644 --- a/production/helm/loki/templates/table-manager/service-table-manager.yaml +++ b/production/helm/loki/templates/table-manager/service-table-manager.yaml @@ -23,7 +23,7 @@ spec: type: ClusterIP ports: - name: http-metrics - port: 3100 + port: {{ .Values.loki.server.http_listen_port }} targetPort: http-metrics protocol: TCP - name: grpc diff --git a/production/helm/loki/templates/write/service-write-headless.yaml b/production/helm/loki/templates/write/service-write-headless.yaml index 46e3f879489a5..84cf5d7b178f3 100644 --- a/production/helm/loki/templates/write/service-write-headless.yaml +++ b/production/helm/loki/templates/write/service-write-headless.yaml @@ -28,7 +28,7 @@ spec: clusterIP: None ports: - name: http-metrics - port: 3100 + port: {{ .Values.loki.server.http_listen_port }} targetPort: http-metrics protocol: TCP - name: grpc diff --git a/production/helm/loki/templates/write/service-write.yaml b/production/helm/loki/templates/write/service-write.yaml index ec29f78836400..9603706e6f1eb 100644 --- a/production/helm/loki/templates/write/service-write.yaml +++ b/production/helm/loki/templates/write/service-write.yaml @@ -25,7 +25,7 @@ spec: type: ClusterIP ports: - name: http-metrics - port: 3100 + port: {{ .Values.loki.server.http_listen_port }} targetPort: http-metrics protocol: TCP - name: grpc diff --git a/production/helm/loki/templates/write/statefulset-write.yaml b/production/helm/loki/templates/write/statefulset-write.yaml index 19aee27a006a0..5aa1e78eaf58c 100644 --- a/production/helm/loki/templates/write/statefulset-write.yaml +++ b/production/helm/loki/templates/write/statefulset-write.yaml @@ -92,7 +92,7 @@ spec: {{- end }} ports: - name: http-metrics - containerPort: 3100 + containerPort: {{ .Values.loki.server.http_listen_port }} protocol: TCP - name: grpc containerPort: {{ .Values.loki.server.grpc_listen_port }} From 3a89bf70aa2c2c4ac6108c8daa761ca25b003670 Mon Sep 17 00:00:00 2001 From: Alberto Chiusole Date: Thu, 11 Jan 2024 15:14:23 +0100 Subject: [PATCH 06/12] Format port numbers to string --- production/helm/loki/templates/_helpers.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/production/helm/loki/templates/_helpers.tpl b/production/helm/loki/templates/_helpers.tpl index 1e351ff193c82..1908c3f76b009 100644 --- a/production/helm/loki/templates/_helpers.tpl +++ b/production/helm/loki/templates/_helpers.tpl @@ -610,7 +610,7 @@ Create the service endpoint including port for MinIO. {{- $isSingleBinary := eq (include "loki.deployment.isSingleBinary" .) "true" -}} {{- $url := printf "%s.%s.svc.%s.:%s" (include "loki.gatewayFullname" .) .Release.Namespace .Values.global.clusterDomain (.Values.gateway.service.port | toString) }} {{- if and $isSingleBinary (not .Values.gateway.enabled) }} - {{- $url = printf "%s.%s.svc.%s.:%s" (include "loki.singleBinaryFullname" .) .Release.Namespace .Values.global.clusterDomain .Values.loki.server.http_listen_port }} + {{- $url = printf "%s.%s.svc.%s.:%s" (include "loki.singleBinaryFullname" .) .Release.Namespace .Values.global.clusterDomain (.Values.loki.server.http_listen_port | toString) }} {{- end }} {{- printf "%s" $url -}} {{- end -}} @@ -721,9 +721,9 @@ http { {{- $writeHost = include "loki.singleBinaryFullname" .}} {{- end }} - {{- $writeUrl := printf "http://%s.%s.svc.%s:%s" $writeHost .Release.Namespace .Values.global.clusterDomain .Values.loki.server.http_listen_port }} - {{- $readUrl := printf "http://%s.%s.svc.%s:%s" $readHost .Release.Namespace .Values.global.clusterDomain .Values.loki.server.http_listen_port }} - {{- $backendUrl := printf "http://%s.%s.svc.%s:%s" $backendHost .Release.Namespace .Values.global.clusterDomain .Values.loki.server.http_listen_port }} + {{- $writeUrl := printf "http://%s.%s.svc.%s:%s" $writeHost .Release.Namespace .Values.global.clusterDomain (.Values.loki.server.http_listen_port | toString) }} + {{- $readUrl := printf "http://%s.%s.svc.%s:%s" $readHost .Release.Namespace .Values.global.clusterDomain (.Values.loki.server.http_listen_port | toString) }} + {{- $backendUrl := printf "http://%s.%s.svc.%s:%s" $backendHost .Release.Namespace .Values.global.clusterDomain (.Values.loki.server.http_listen_port | toString) }} {{- if .Values.gateway.nginxConfig.customWriteUrl }} {{- $writeUrl = .Values.gateway.nginxConfig.customWriteUrl }} @@ -891,7 +891,7 @@ enableServiceLinks: false {{- $isSimpleScalable := eq (include "loki.deployment.isScalable" .) "true" -}} {{- $schedulerAddress := ""}} {{- if and $isSimpleScalable (not .Values.read.legacyReadTarget ) -}} -{{- $schedulerAddress = printf "query-scheduler-discovery.%s.svc.%s.:%s" .Release.Namespace .Values.global.clusterDomain .Values.loki.server.grpc_listen_port -}} +{{- $schedulerAddress = printf "query-scheduler-discovery.%s.svc.%s.:%s" .Release.Namespace .Values.global.clusterDomain (.Values.loki.server.grpc_listen_port | toString) -}} {{- end -}} {{- printf "%s" $schedulerAddress }} {{- end }} From a38105402600076c0c1a0aab6bab51a91c567e6e Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Thu, 11 Jan 2024 21:03:44 +0530 Subject: [PATCH 07/12] Updated branch and Modified CHANGELOG.md Signed-off-by: Sheikh-Abubaker --- production/helm/loki/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 4555dfb70bddd..01a4cc6c8a901 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -15,7 +15,7 @@ Entries should include a reference to the pull request that introduced the chang ## 5.41.6 -- [ENHANCEMENT] Modified helm template to use parameters http_listen_port and grpc_listen_port instead of hardcoded value of 3100 and 9095. +- [ENHANCEMENT] Modified helm template to use parameters http_listen_port and grpc_listen_port instead of hardcoded values. ## 5.41.5 From 7d5fafcca2e64ee9c65bc6e490e90aee093a31ac Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Fri, 12 Jan 2024 00:47:21 +0530 Subject: [PATCH 08/12] Fixed Linting error Signed-off-by: Sheikh-Abubaker --- production/helm/loki/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 01a4cc6c8a901..4655c526b601c 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -15,7 +15,7 @@ Entries should include a reference to the pull request that introduced the chang ## 5.41.6 -- [ENHANCEMENT] Modified helm template to use parameters http_listen_port and grpc_listen_port instead of hardcoded values. +- [ENHANCEMENT] Modified helm template to use parameters http_listen_port and grpc_listen_port instead of hardcoded values. ## 5.41.5 From cf12e4cebe0a98d1f2c5469a734791f90fb4b1da Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Sat, 13 Jan 2024 23:37:48 +0530 Subject: [PATCH 09/12] Resolved merge conflicts Signed-off-by: Sheikh-Abubaker --- production/helm/loki/CHANGELOG.md | 5 ++++- production/helm/loki/Chart.yaml | 2 +- production/helm/loki/README.md | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index c1d6284408bce..1415b381409c1 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,9 +13,12 @@ Entries should include a reference to the pull request that introduced the chang [//]: # ( : 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.) -## 5.41.6 +## 5.41.7 - [ENHANCEMENT] Modified helm template to use parameters http_listen_port and grpc_listen_port instead of hardcoded values. + +## 5.41.6 + - [BUGFIX] Added missing namespace to query-scheduler-discovery service when deploying loki in a specific namespace. ## 5.41.5 diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index cb43a70c965b7..d8f4486b7de61 100644 --- a/production/helm/loki/Chart.yaml +++ b/production/helm/loki/Chart.yaml @@ -3,7 +3,7 @@ name: loki description: Helm chart for Grafana Loki in simple, scalable mode type: application appVersion: 2.9.3 -version: 5.41.6 +version: 5.41.7 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md index 6b4ec081e9bba..dc016ef13c253 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 5.41.6](https://img.shields.io/badge/Version-5.41.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square) +![Version: 5.41.7](https://img.shields.io/badge/Version-5.41.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square) Helm chart for Grafana Loki in simple, scalable mode From 4bbb6bb44476d707b3f154df7ca21697f2380946 Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Thu, 18 Jan 2024 01:03:50 +0530 Subject: [PATCH 10/12] Resolved conflicts Signed-off-by: Sheikh-Abubaker --- production/helm/loki/CHANGELOG.md | 2 +- production/helm/loki/Chart.yaml | 2 +- production/helm/loki/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 03cfb44fab981..251207ec210bf 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,7 +13,7 @@ Entries should include a reference to the pull request that introduced the chang [//]: # ( : 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.) -## 5.41.7 +## 5.41.8 - [ENHANCEMENT] Modified helm template to use parameters http_listen_port and grpc_listen_port instead of hardcoded values. diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index d8f4486b7de61..8b5402bc9dbd8 100644 --- a/production/helm/loki/Chart.yaml +++ b/production/helm/loki/Chart.yaml @@ -3,7 +3,7 @@ name: loki description: Helm chart for Grafana Loki in simple, scalable mode type: application appVersion: 2.9.3 -version: 5.41.7 +version: 5.41.8 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md index dc016ef13c253..33730c361d31e 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 5.41.7](https://img.shields.io/badge/Version-5.41.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square) +![Version: 5.41.8](https://img.shields.io/badge/Version-5.41.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square) Helm chart for Grafana Loki in simple, scalable mode From af929f16e8175d53c0a729770404d818579e1d9e Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Wed, 24 Jan 2024 16:48:12 +0530 Subject: [PATCH 11/12] Resolved Conflicts Signed-off-by: Sheikh-Abubaker --- production/helm/loki/CHANGELOG.md | 2 +- production/helm/loki/Chart.yaml | 2 +- production/helm/loki/README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index d5cfa8fb64cfb..5568e2ed482ec 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -13,7 +13,7 @@ Entries should include a reference to the pull request that introduced the chang [//]: # ( : 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.) -## 5.41.8 +## 5.41.9 - [ENHANCEMENT] Modified helm template to use parameters http_listen_port and grpc_listen_port instead of hardcoded values. diff --git a/production/helm/loki/Chart.yaml b/production/helm/loki/Chart.yaml index 8b5402bc9dbd8..7fe326a2ce18a 100644 --- a/production/helm/loki/Chart.yaml +++ b/production/helm/loki/Chart.yaml @@ -3,7 +3,7 @@ name: loki description: Helm chart for Grafana Loki in simple, scalable mode type: application appVersion: 2.9.3 -version: 5.41.8 +version: 5.41.9 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/production/helm/loki/README.md b/production/helm/loki/README.md index 33730c361d31e..08f896a97efef 100644 --- a/production/helm/loki/README.md +++ b/production/helm/loki/README.md @@ -1,6 +1,6 @@ # loki -![Version: 5.41.8](https://img.shields.io/badge/Version-5.41.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square) +![Version: 5.41.9](https://img.shields.io/badge/Version-5.41.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.3](https://img.shields.io/badge/AppVersion-2.9.3-informational?style=flat-square) Helm chart for Grafana Loki in simple, scalable mode From 73b64f1f1970b35a0b775592190ea98eb80710df Mon Sep 17 00:00:00 2001 From: Sheikh-Abubaker Date: Thu, 22 Feb 2024 15:18:31 +0530 Subject: [PATCH 12/12] Updated CHANGELOG.md Signed-off-by: Sheikh-Abubaker --- production/helm/loki/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md index 463d7b3384d11..180ed0d1427aa 100644 --- a/production/helm/loki/CHANGELOG.md +++ b/production/helm/loki/CHANGELOG.md @@ -15,7 +15,7 @@ Entries should include a reference to the pull request that introduced the chang ## 5.44.0 -- [ENHANCEMENT] Modified helm template to use parameters http_listen_port and grpc_listen_port instead of hardcoded values. +- [FEATURE] Modified helm template to use parameters http_listen_port and grpc_listen_port instead of hardcoded values. ## 5.43.3