diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md
index d4d5f65ffe..ef62de9022 100644
--- a/docs/sources/setup/install/helm/reference.md
+++ b/docs/sources/setup/install/helm/reference.md
@@ -1610,6 +1610,7 @@ null
},
"serviceAnnotations": {},
"serviceLabels": {},
+ "startupProbe": {},
"terminationGracePeriodSeconds": 30,
"tolerations": []
}
@@ -1922,6 +1923,15 @@ null
{}
+ |
+
+
+ | bloomPlanner.startupProbe |
+ object |
+ startup probe settings for ingester pods. If empty use `loki.startupProbe` |
+
+{}
+
|
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
index e79d5b0c23..05978e4e89 100644
--- a/production/helm/loki/CHANGELOG.md
+++ b/production/helm/loki/CHANGELOG.md
@@ -12,6 +12,7 @@ Entries should be ordered as follows:
Entries should include a reference to the pull request that introduced the change.
[//]: # ( : 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.)
+- [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` to bloom-planner. [#18552](https://github.com/grafana/loki/pull/18552)
## 6.36.1
- [BUGFIX] Fix missing s3 field in lokiStorageConfig templated value.[#18791](https://github.com/grafana/loki/pull/18791)
diff --git a/production/helm/loki/templates/bloom-planner/_helpers-bloom-planner.tpl b/production/helm/loki/templates/bloom-planner/_helpers-bloom-planner.tpl
index 1e3ccc8e31..e35ded1564 100644
--- a/production/helm/loki/templates/bloom-planner/_helpers-bloom-planner.tpl
+++ b/production/helm/loki/templates/bloom-planner/_helpers-bloom-planner.tpl
@@ -21,6 +21,16 @@ bloom planner selector labels
app.kubernetes.io/component: bloom-planner
{{- end }}
+{{/*
+bloom planner livenessProbe
+*/}}
+{{- define "loki.bloomPlanner.livenessProbe" }}
+{{- with .Values.bloomPlanner.livenessProbe | default .Values.loki.livenessProbe }}
+livenessProbe:
+ {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end }}
+
{{/*
bloom planner readinessProbe
*/}}
@@ -31,6 +41,16 @@ readinessProbe:
{{- end }}
{{- end }}
+{{/*
+bloom planner startupProbe
+*/}}
+{{- define "loki.bloomPlanner.startupProbe" }}
+{{- with .Values.bloomPlanner.startupProbe | default .Values.loki.startupProbe }}
+startupProbe:
+ {{- toYaml . | nindent 2 }}
+{{- end }}
+{{- end }}
+
{{/*
bloom planner priority class name
*/}}
diff --git a/production/helm/loki/templates/bloom-planner/statefulset-bloom-planner.yaml b/production/helm/loki/templates/bloom-planner/statefulset-bloom-planner.yaml
index 815d68f404..54437bc2ba 100644
--- a/production/helm/loki/templates/bloom-planner/statefulset-bloom-planner.yaml
+++ b/production/helm/loki/templates/bloom-planner/statefulset-bloom-planner.yaml
@@ -95,7 +95,9 @@ spec:
{{- end }}
securityContext:
{{- toYaml .Values.loki.containerSecurityContext | nindent 12 }}
+ {{- include "loki.bloomPlanner.livenessProbe" . | nindent 10 }}
{{- include "loki.bloomPlanner.readinessProbe" . | nindent 10 }}
+ {{- include "loki.bloomPlanner.startupProbe" . | nindent 10 }}
volumeMounts:
- name: temp
mountPath: /tmp
diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
index 98d3459774..3da44d5ab0 100644
--- a/production/helm/loki/values.yaml
+++ b/production/helm/loki/values.yaml
@@ -71,6 +71,8 @@ loki:
port: http-metrics
initialDelaySeconds: 30
timeoutSeconds: 1
+ # Configures the startup probe for all of the Loki pods
+ startupProbe: {}
image:
# -- The Docker registry
registry: docker.io
@@ -2697,6 +2699,7 @@ bloomGateway:
annotations: {}
# -- Set this toggle to false to opt out of automounting API credentials for the service account
automountServiceAccountToken: true
+
# -- Configuration for the bloom-planner
bloomPlanner:
# -- Number of replicas for the bloom-planner
@@ -2748,6 +2751,8 @@ bloomPlanner:
readinessProbe: {}
# -- liveness probe settings for ingester pods. If empty use `loki.livenessProbe`
livenessProbe: {}
+ # -- startup probe settings for ingester pods. If empty use `loki.startupProbe`
+ startupProbe: {}
# -- Resource requests and limits for the bloom-planner
resources: {}
# -- Containers to add to the bloom-planner pods
@@ -2798,6 +2803,7 @@ bloomPlanner:
annotations: {}
# -- Set this toggle to false to opt out of automounting API credentials for the service account
automountServiceAccountToken: true
+
# -- Configuration for the bloom-builder
bloomBuilder:
# -- Number of replicas for the bloom-builder
@@ -2888,6 +2894,7 @@ bloomBuilder:
appProtocol:
# -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https"
grpc: ""
+
# -- Configuration for the pattern ingester
patternIngester:
# -- Number of replicas for the pattern ingester