Skip to content

feat: switch loki deployment to loki3 chart #746

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

Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open

feat: switch loki deployment to loki3 chart #746

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
75f378c
feat: remove loki3 deployment and switch loki deployment to loki3 chart
i0n Jun 13, 2024
7c9d5f3
feat: upgrade
cjorge-graphops Aug 5, 2024
d9b04a8
feat: upgrade
cjorge-graphops Aug 28, 2024
3b7c5a8
feat(kube-state-prom): new v
calinah Sep 10, 2024
dd1a6d7
chore(monitoring): latest v update
calinah Oct 10, 2024
e22d4c4
chore(monitoring): updating loki chart v
calinah Oct 10, 2024
e0bc56e
feat: upgrade
cjorge-graphops Nov 7, 2024
fc582ff
feat: upgrade kube-prometheus-stack chart to 66.5.0
i0n Dec 13, 2024
85551ca
feat: upgrade
cjorge-graphops Dec 22, 2024
0d26430
fix: revert node-problem-detector version to latest available
cjorge-graphops Dec 22, 2024
3c07a5a
feat: upgrade
cjorge-graphops Jan 4, 2025
a36596b
feat: update yarn deps
cjorge-graphops Jan 4, 2025
38e070d
feat: upgrade
cjorge-graphops Jan 10, 2025
1795d30
feat: upgrade
cjorge-graphops Jan 14, 2025
ea72c56
feat: upgrade
cjorge-graphops Feb 5, 2025
a4376aa
feat: upgrade
cjorge-graphops Jun 16, 2025
4a870da
feat: upgrade
cjorge-graphops Aug 18, 2025
579534f
fix: oci chart
cjorge-graphops Aug 18, 2025
5014da1
fix: don't use the oci one
cjorge-graphops Aug 18, 2025
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
3 changes: 0 additions & 3 deletions .husky/commit-msg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn commitlint --edit $1
3 changes: 0 additions & 3 deletions .husky/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#!/usr/bin/env sh
. "$(dirname "$0")/_/husky.sh"

readonly BASEDIR="$(dirname -- "$0")"
readonly REPOROOT="$(realpath "$BASEDIR/../")"
readonly SCRIPTSDIR="$(realpath "$REPOROOT/src/scripts")"
Expand Down
Binary file modified .yarn/install-state.gz
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ This *Namespace* adds software for log and metrics collection and visualization,

- [kube-prometheus-stack](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack)<br>
Installs the kube-prometheus stack, a collection of Kubernetes manifests, Grafana dashboards, and Prometheus rules
- [loki](https://github.com/grafana/helm-charts/tree/main/charts/loki-distributed)<br>
- [loki](https://github.com/grafana/loki/tree/main/production/helm/loki)<br>
Helm chart for Grafana Loki in microservices mode
- [node-problem-detector](https://github.com/deliveryhero/helm-charts/tree/master/stable/node-problem-detector)<br>
This chart installs a node-problem-detector daemonset. This tool aims to make various node problems visible to the upstream layers in cluster management stack.
Expand Down
2 changes: 1 addition & 1 deletion monitoring/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This *Namespace* adds software for log and metrics collection and visualization,
## Releases
- [kube-prometheus-stack](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack)<br>
Installs the kube-prometheus stack, a collection of Kubernetes manifests, Grafana dashboards, and Prometheus rules
- [loki](https://github.com/grafana/helm-charts/tree/main/charts/loki-distributed)<br>
- [loki](https://github.com/grafana/loki/tree/main/production/helm/loki)<br>
Helm chart for Grafana Loki in microservices mode
- [node-problem-detector](https://github.com/deliveryhero/helm-charts/tree/master/stable/node-problem-detector)<br>
This chart installs a node-problem-detector daemonset. This tool aims to make various node problems visible to the upstream layers in cluster management stack.
Expand Down
10 changes: 5 additions & 5 deletions monitoring/helmfile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ templates:
version: {{ .Values | get "kube-prometheus-stack" | get "chartVersion" }}
{{- end }}
{{- if (not (or ( .Values | get "kube-prometheus-stack" dict | get "chartVersion" false ) ( .Values | get "kube-prometheus-stack" dict | get "chartUrl" false ) )) }}
version: "60.3.0"
version: "66.5.0"
{{- end }}
disableValidationOnInstall: true

Expand All @@ -174,22 +174,22 @@ templates:
version: {{ .Values | get "node-problem-detector" | get "chartVersion" }}
{{- end }}
{{- if (not (or ( .Values | get "node-problem-detector" dict | get "chartVersion" false ) ( .Values | get "node-problem-detector" dict | get "chartUrl" false ) )) }}
version: "2.3.13"
version: "2.3.14"
{{- end }}

loki:
{{- if ( .Values | get "loki" dict | get "chartUrl" false ) }}
chart: {{ .Values | get "loki" | get "chartUrl" }}
{{- else }}
chart: "grafana/loki-distributed"
chart: "grafana/loki"
{{- end }}
Comment on lines +184 to 185
Copy link

@coderabbitai coderabbitai bot Aug 18, 2025

Choose a reason for hiding this comment

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

💡 Verification agent

🧩 Analysis chain

Loki: chart switch to grafana/loki 6.36.1 — verify values migration

The rename/version bump is correct for Loki 3.x, but the values schema differs from loki-distributed. Ensure your values no longer rely on legacy component blocks (distributor/ingester/querier/query-frontend/index-gateway/read/write/gateway) and are aligned with the new top-level keys (deploymentMode, storageConfig, schemaConfig, ruler, compactor, gateway, etc.).

Run this repo-local scan to catch lingering legacy keys:

Also applies to: 192-193

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo "Searching for old chart references..."
rg -nP -C2 '\bloki-distributed\b|grafana/loki-distributed' || true

echo
echo "Scanning loki values files for legacy component keys:"
fd -t f -a '.*loki.*\.(ya?ml|gotmpl)$' | while read -r f; do
  hits=$(rg -nP '\b(distributor|ingester|querier|query-frontend|index-?gateway|write|read|gateway)\b\s*:' "$f" || true)
  if [ -n "$hits" ]; then
    echo "---- $f"
    echo "$hits" | sed -n '1,40p'
  fi
done

Length of output: 1078

Loki values migration required: remove legacy component blocks

Our scan shows that your monitoring/values/loki.yaml still includes legacy component keys that aren’t supported by the new grafana/loki 6.36.1 chart. You’ll need to replace them with the new top-level schema (e.g. deploymentMode, storageConfig, schemaConfig, compactor, gateway, ruler, etc.).

Affected file and lines:

  • monitoring/values/loki.yaml
    • Line 17: ingester:
    • Line 21: querier:
    • Line 25: #gateway:
    • Line 36: ingester:
    • Line 38: querier:
    • Line 46: distributor:
    • Line 67: read:
    • Line 69: write:

Action items:

  • Remove or migrate all legacy blocks (distributor, ingester, querier, query-frontend, index-gateway, read, write, gateway) from your values.
  • Define equivalent settings under the new top-level keys as per the Loki 6.x values schema.
  • Verify no other values files (including those loaded via helmfile.yaml at lines 184–185 and 192–193) reference these legacy sections.

Please update the values files accordingly to avoid runtime errors after the chart bump.

🤖 Prompt for AI Agents 
In monitoring/helmfile.yaml around lines 184-185 and in
monitoring/values/loki.yaml (notably lines 17,21,25,36,38,46,67,69), the values
file still contains legacy component blocks (distributor, ingester, querier,
query-frontend, index-gateway, read, write, gateway) that are unsupported by
grafana/loki 6.36.1; remove those legacy blocks and migrate their settings into
the new top-level schema (e.g., map relevant settings into deploymentMode,
storageConfig, schemaConfig, compactor, gateway, ruler, etc.), update any
references in other values files loaded by helmfile (check the includes at
helmfile lines 184–185 and 192–193), and validate the final values against the
Loki 6.x values schema to ensure no legacy keys remain.

inherit:
- template: "defaults"
{{- if ( .Values | get "loki" dict | get "chartVersion" false ) }}
version: {{ .Values | get "loki" | get "chartVersion" }}
{{- end }}
{{- if (not (or ( .Values | get "loki" dict | get "chartVersion" false ) ( .Values | get "loki" dict | get "chartUrl" false ) )) }}
version: "0.79.0"
version: "6.18.0"
{{- end }}

promtail:
Expand All @@ -204,7 +204,7 @@ templates:
version: {{ .Values | get "promtail" | get "chartVersion" }}
{{- end }}
{{- if (not (or ( .Values | get "promtail" dict | get "chartVersion" false ) ( .Values | get "promtail" dict | get "chartUrl" false ) )) }}
version: "6.16.0"
version: "6.16.6"
{{- end }}

releases:
Expand Down
2 changes: 1 addition & 1 deletion monitoring/values/kube-prometheus-stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ grafana:
- name: Loki
access: proxy
type: loki
url: http://loki-loki-distributed-gateway
url: http://loki-gateway
version: 1
sidecar:
logLevel: DEBUG
Expand Down
78 changes: 61 additions & 17 deletions monitoring/values/loki.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,73 @@
ingester:
persistence:
enabled: true # change to true to enable
claims:
- name: data
size: 20Gi
storageClass: openebs-rawfile-localpv # change if not using openebs-rawfile-localpv

loki:
auth_enabled: false
extraArgs:
- -config.expand-env=true
schemaConfig:
configs:
- from: 2022-01-01
store: boltdb-shipper
object_store: filesystem
schema: v11
- from: 2024-04-01
store: tsdb
object_store: s3
schema: v13
index:
prefix: loki_index_
period: 24h
storageConfig:
boltdb_shipper:
shared_store: filesystem
active_index_directory: /var/loki/index
cache_location: /var/loki/cache
cache_ttl: 168h
filesystem:
directory: /var/loki/chunks
ingester:
chunk_encoding: snappy
tracing:
enabled: true
querier:
# Default is 4, if you have enough memory and CPU you can increase, reduce if OOMing
max_concurrent: 4

#gateway:
# ingress:
# enabled: true
# hosts:
# - host: FIXME
# paths:
# - path: /
# pathType: Prefix

deploymentMode: Distributed

ingester:
replicas: 3
querier:
replicas: 3
maxUnavailable: 2
queryFrontend:
replicas: 2
maxUnavailable: 1
queryScheduler:
replicas: 2
distributor:
replicas: 3
maxUnavailable: 2
compactor:
replicas: 1
indexGateway:
replicas: 2
maxUnavailable: 1

bloomCompactor:
replicas: 0
bloomGateway:
replicas: 0

# Enable minio for storage
minio:
enabled: true

# Zero out replica counts of other deployment modes
backend:
replicas: 0
read:
replicas: 0
write:
replicas: 0

singleBinary:
replicas: 0
4 changes: 2 additions & 2 deletions monitoring/values/promtail.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
config:
lokiAddress: http://loki-loki-distributed-gateway/loki/api/v1/push
lokiAddress: http://loki-gateway/loki/api/v1/push
clients:
- url: http://loki-loki-distributed-gateway/loki/api/v1/push
- url: http://loki-gateway/loki/api/v1/push
containerSecurityContext:
privileged: true
allowPrivilegeEscalation: true
10 changes: 5 additions & 5 deletions schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4393,7 +4393,7 @@
"url": {
"type": "string",
"enum": [
"https://github.com/grafana/helm-charts/tree/main/charts/loki-distributed"
"https://github.com/grafana/loki/tree/main/production/helm/loki"
]
},
"repository": {
Expand All @@ -4411,7 +4411,7 @@
"name": {
"type": "string",
"enum": [
"loki-distributed"
"loki"
]
}
}
Expand Down Expand Up @@ -6832,7 +6832,7 @@
"type": "object",
"required": [
"promtail",
"loki-distributed"
"loki"
],
"properties": {
"promtail": {
Expand All @@ -6856,7 +6856,7 @@
}
}
},
"loki-distributed": {
"loki": {
"type": "object",
"required": [
"url",
Expand All @@ -6866,7 +6866,7 @@
"url": {
"type": "string",
"enum": [
"https://github.com/grafana/helm-charts/tree/main/charts/loki-distributed"
"https://github.com/grafana/loki/tree/main/production/helm/loki"
]
},
"description": {
Expand Down
4 changes: 2 additions & 2 deletions src/charts.cue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ package LaunchpadNamespaces
url: "https://github.com/grafana/helm-charts/tree/main/charts/promtail"
description: "Promtail is an agent which ships the contents of local logs to a Loki instance"
}
"loki-distributed": {
url: "https://github.com/grafana/helm-charts/tree/main/charts/loki-distributed"
"loki": {
url: "https://github.com/grafana/loki/tree/main/production/helm/loki"
description: "Helm chart for Grafana Loki in microservices mode"
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/schemas/monitoring.cue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,24 +51,24 @@ package LaunchpadNamespaces
chart: {_repositories["prometheus-community"].charts["kube-prometheus-stack"]}
feature: #features.#metrics
_template: {
version: "60.3.0"
version: "66.5.0"
disableValidationOnInstall: true
}
}
"node-problem-detector": {
chart: {_repositories.deliveryhero.charts["node-problem-detector"]}
feature: #features.#metrics
_template: {version: "2.3.13"}
_template: {version: "2.3.14"}
}
loki: {
chart: {_repositories.grafana.charts["loki-distributed"]}
chart: {_repositories.grafana.charts["loki"]}
feature: #features.#logs
_template: {version: "0.79.0"}
_template: {version: "6.18.0"}
}
promtail: {
chart: {_repositories.grafana.charts.promtail}
feature: #features.#logs
_template: {version: "6.16.0"}
_template: {version: "6.16.6"}
}
}

Expand Down