Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions class/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ parameters:
gateway:
enabled: true
# Optional
alertmanager:
enabled: true
overridesExporter:
enabled: true
patternIngester:
enabled: false
ruler:
enabled: true
enabled: false

caches:
chunks:
Expand Down
6 changes: 3 additions & 3 deletions component/helm_values.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ local components = com.makeMergeable({
nodeSelector: std.get(params.components.gateway, 'nodeSelector', globalConfig.nodeSelector),
} + com.makeMergeable(params.components.gateway),
// "Optional" components
alertmanager: {
nodeSelector: std.get(params.components.alertmanager, 'nodeSelector', globalConfig.nodeSelector),
} + com.makeMergeable(params.components.alertmanager),
overridesExporter: {
nodeSelector: std.get(params.components.overridesExporter, 'nodeSelector', globalConfig.nodeSelector),
} + com.makeMergeable(params.components.overridesExporter),
patternIngester: {
nodeSelector: std.get(params.components.patternIngester, 'nodeSelector', globalConfig.nodeSelector),
} + com.makeMergeable(params.components.patternIngester),
ruler: {
nodeSelector: std.get(params.components.ruler, 'nodeSelector', globalConfig.nodeSelector),
} + com.makeMergeable(params.components.ruler),
Expand Down
15 changes: 0 additions & 15 deletions docs/modules/ROOT/pages/references/parameters.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -249,21 +249,6 @@ components:
The Loki gateway is a critical component for query, write, and alert paths.
It improves performance and simplifies deployments by acting as a single entry point for all Loki requests.

=== `components.alertmanager`

[horizontal]
type:: dict
default::
+
[source,yaml]
----
components:
alertmanager:
enabled: true
----

The Loki Alertmanager is an optional component that accepts alert notifications from the Loki ruler.

=== `components.overridesExporter`

[horizontal]
Expand Down
2 changes: 2 additions & 0 deletions tests/extra-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ parameters:
tag: latest

components:
patternIngester:
enabled: true
ruler:
enabled: true

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
template:
metadata:
annotations:
checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749
checksum/config: 50a4a55c03f81d16280ddcf8f281e7e5493c15736deca0161784fb3f782d8204
kubectl.kubernetes.io/default-container: compactor
labels:
app.kubernetes.io/component: compactor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,6 @@ data:
consistent_hash: true
timeout: 500ms
update_interval: 1m
ruler:
storage:
s3:
access_key_id: ${S3_ACCESS_KEY_ID}
bucketnames: defaults-ruler
insecure: false
s3forcepathstyle: true
secret_access_key: ${S3_SECRET_ACCESS_KEY}
type: s3
wal:
dir: /var/loki/ruler-wal
runtime_config:
file: /etc/loki/runtime-config/runtime-config.yaml
schema_config:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
metadata:
annotations:
checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749
checksum/config: 50a4a55c03f81d16280ddcf8f281e7e5493c15736deca0161784fb3f782d8204
kubectl.kubernetes.io/default-container: distributor
labels:
app.kubernetes.io/component: distributor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
template:
metadata:
annotations:
checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749
checksum/config: 50a4a55c03f81d16280ddcf8f281e7e5493c15736deca0161784fb3f782d8204
kubectl.kubernetes.io/default-container: index-gateway
labels:
app.kubernetes.io/component: index-gateway
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
template:
metadata:
annotations:
checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749
checksum/config: 50a4a55c03f81d16280ddcf8f281e7e5493c15736deca0161784fb3f782d8204
kubectl.kubernetes.io/default-container: ingester
labels:
app.kubernetes.io/component: ingester
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
template:
metadata:
annotations:
checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749
checksum/config: 50a4a55c03f81d16280ddcf8f281e7e5493c15736deca0161784fb3f782d8204
kubectl.kubernetes.io/default-container: overrides-exporter
labels:
app.kubernetes.io/component: overrides-exporter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749
checksum/config: 50a4a55c03f81d16280ddcf8f281e7e5493c15736deca0161784fb3f782d8204
kubectl.kubernetes.io/default-container: querier
labels:
app.kubernetes.io/component: querier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749
checksum/config: 50a4a55c03f81d16280ddcf8f281e7e5493c15736deca0161784fb3f782d8204
kubectl.kubernetes.io/default-container: query-frontend
labels:
app.kubernetes.io/component: query-frontend
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749
checksum/config: 50a4a55c03f81d16280ddcf8f281e7e5493c15736deca0161784fb3f782d8204
kubectl.kubernetes.io/default-container: query-scheduler
labels:
app.kubernetes.io/component: query-scheduler
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,30 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
labels:
app.kubernetes.io/component: ruler
app.kubernetes.io/instance: defaults
app.kubernetes.io/component: pattern-ingester
app.kubernetes.io/instance: extra-config
app.kubernetes.io/name: loki
app.kubernetes.io/version: 3.7.3
helm.sh/chart: loki-18.1.1
name: defaults-loki-ruler
namespace: defaults
name: extra-config-loki-pattern-ingester
namespace: extra-config
spec:
replicas: 2
replicas: 0
revisionHistoryLimit: 10
selector:
matchLabels:
app.kubernetes.io/component: ruler
app.kubernetes.io/instance: defaults
app.kubernetes.io/component: pattern-ingester
app.kubernetes.io/instance: extra-config
app.kubernetes.io/name: loki
serviceName: defaults-loki-ruler-headless
serviceName: extra-config-loki-pattern-ingester-headless
template:
metadata:
annotations:
checksum/config: deaa6a87d1aab9442e32ccf19a6b570a0e780f737f386704bbf5fd577a324749
kubectl.kubernetes.io/default-container: ruler
checksum/config: 3c1d2e71f51f12dc19ff070c24fcddc6753f403e393fcd255f274d5c757fb513
kubectl.kubernetes.io/default-container: pattern-ingester
labels:
app.kubernetes.io/component: ruler
app.kubernetes.io/instance: defaults
app.kubernetes.io/component: pattern-ingester
app.kubernetes.io/instance: extra-config
app.kubernetes.io/name: loki
app.kubernetes.io/part-of: memberlist
app.kubernetes.io/version: 3.7.3
Expand All @@ -36,8 +36,8 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector:
matchLabels:
app.kubernetes.io/component: ruler
app.kubernetes.io/instance: defaults
app.kubernetes.io/component: pattern-ingester
app.kubernetes.io/instance: extra-config
app.kubernetes.io/name: loki
topologyKey: kubernetes.io/hostname
automountServiceAccountToken: true
Expand All @@ -46,10 +46,8 @@ spec:
- -config.file=/etc/loki/config/config.yaml
- -config.expand-env=true
- -memberlist.advertise-addr=$(POD_IP)
- -target=ruler
- -target=pattern-ingester
env:
- name: GOMEMLIMIT
value: 652MiB
- name: GOGC
value: '80'
- name: POD_IP
Expand All @@ -58,8 +56,8 @@ spec:
fieldPath: status.podIP
envFrom:
- secretRef:
name: defaults-bucket-secret
image: docker.io/docker.io/grafana/loki:3.7.3
name: extra-config-bucket-secret
image: docker.io/dockerhub.vshn.net/grafana/loki:3.7.3
imagePullPolicy: IfNotPresent
livenessProbe:
failureThreshold: 10
Expand All @@ -69,7 +67,7 @@ spec:
periodSeconds: 30
successThreshold: 1
timeoutSeconds: 1
name: ruler
name: pattern-ingester
ports:
- containerPort: 3100
name: http-metrics
Expand All @@ -89,12 +87,6 @@ spec:
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 1
resources:
limits:
memory: 768Mi
requests:
cpu: 250m
memory: 512Mi
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand All @@ -121,8 +113,8 @@ spec:
runAsUser: 10001
seccompProfile:
type: RuntimeDefault
serviceAccountName: defaults-loki
terminationGracePeriodSeconds: 300
serviceAccountName: extra-config-loki
terminationGracePeriodSeconds: 30
volumes:
- emptyDir: {}
name: temp
Expand All @@ -137,3 +129,6 @@ spec:
name: runtime-config
- emptyDir: {}
name: data
updateStrategy:
rollingUpdate:
partition: 0
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: b44dc2a41f07cbdbc2f2bfc21c14563d4677b2ba7189014f4c36cce5ed7065ae
checksum/config: ce50afec5572924f052536fad720dedf7e6b89ee8485007d1c915216b0feeeae
kubectl.kubernetes.io/default-container: backend
labels:
app.kubernetes.io/component: backend
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,6 @@ data:
consistent_hash: true
timeout: 500ms
update_interval: 1m
ruler:
storage:
s3:
access_key_id: ${S3_ACCESS_KEY_ID}
bucketnames: legacy-ruler
insecure: false
s3forcepathstyle: true
secret_access_key: ${S3_SECRET_ACCESS_KEY}
type: s3
wal:
dir: /var/loki/ruler-wal
runtime_config:
file: /etc/loki/runtime-config/runtime-config.yaml
schema_config:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
template:
metadata:
annotations:
checksum/config: b44dc2a41f07cbdbc2f2bfc21c14563d4677b2ba7189014f4c36cce5ed7065ae
checksum/config: ce50afec5572924f052536fad720dedf7e6b89ee8485007d1c915216b0feeeae
kubectl.kubernetes.io/default-container: read
labels:
app.kubernetes.io/component: read
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
template:
metadata:
annotations:
checksum/config: b44dc2a41f07cbdbc2f2bfc21c14563d4677b2ba7189014f4c36cce5ed7065ae
checksum/config: ce50afec5572924f052536fad720dedf7e6b89ee8485007d1c915216b0feeeae
kubectl.kubernetes.io/default-container: write
labels:
app.kubernetes.io/component: write
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 5d8408062873bbd397f104a8639e965387027554a23e8ab4cc739894fc75ceb8
checksum/config: 69b70ba23cd5b0710aa0e679bdb6985ad18edbe1bf8fec8fb58d1c80ca7cb0be
kubectl.kubernetes.io/default-container: compactor
labels:
app.kubernetes.io/component: compactor
Expand Down
Loading
Loading