diff --git a/.husky/commit-msg b/.husky/commit-msg
index 4c49ae6a..2785bc1d 100755
--- a/.husky/commit-msg
+++ b/.husky/commit-msg
@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
yarn commitlint --edit $1
diff --git a/.husky/pre-commit b/.husky/pre-commit
index 36f9c351..0b058777 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -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")"
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
index b1c7c63c..aa4a4e15 100644
Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ
diff --git a/README.md b/README.md
index 19b98a48..5e423ac7 100644
--- a/README.md
+++ b/README.md
@@ -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)
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)
+- [loki](https://github.com/grafana/loki/tree/main/production/helm/loki)
Helm chart for Grafana Loki in microservices mode
- [node-problem-detector](https://github.com/deliveryhero/helm-charts/tree/master/stable/node-problem-detector)
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.
diff --git a/monitoring/README.md b/monitoring/README.md
index cb78a391..122ba6b5 100644
--- a/monitoring/README.md
+++ b/monitoring/README.md
@@ -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)
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)
+- [loki](https://github.com/grafana/loki/tree/main/production/helm/loki)
Helm chart for Grafana Loki in microservices mode
- [node-problem-detector](https://github.com/deliveryhero/helm-charts/tree/master/stable/node-problem-detector)
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.
diff --git a/monitoring/helmfile.yaml b/monitoring/helmfile.yaml
index db4f00a8..721f542e 100644
--- a/monitoring/helmfile.yaml
+++ b/monitoring/helmfile.yaml
@@ -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: "68.4.5"
{{- end }}
disableValidationOnInstall: true
@@ -174,14 +174,14 @@ 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 }}
inherit:
- template: "defaults"
@@ -189,7 +189,7 @@ templates:
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.24.0"
{{- end }}
promtail:
@@ -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:
diff --git a/monitoring/values/kube-prometheus-stack.yaml b/monitoring/values/kube-prometheus-stack.yaml
index 59fe4b50..415b521f 100644
--- a/monitoring/values/kube-prometheus-stack.yaml
+++ b/monitoring/values/kube-prometheus-stack.yaml
@@ -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
diff --git a/monitoring/values/loki.yaml b/monitoring/values/loki.yaml
index 70bd9b93..501dfdf2 100644
--- a/monitoring/values/loki.yaml
+++ b/monitoring/values/loki.yaml
@@ -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
diff --git a/monitoring/values/promtail.yaml b/monitoring/values/promtail.yaml
index 23b2a8a5..f902a29b 100644
--- a/monitoring/values/promtail.yaml
+++ b/monitoring/values/promtail.yaml
@@ -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
diff --git a/schema.json b/schema.json
index 2d5c002e..5f2d127e 100644
--- a/schema.json
+++ b/schema.json
@@ -849,14 +849,6 @@
"$ref": "#/components/schemas/namespaces.arbitrum.features.arbitrum_nitro"
}
],
- "enum": [
- [
- "proxyd-classic",
- "proxyd-nitro",
- "arbitrum-classic",
- "arbitrum-nitro"
- ]
- ],
"default": [
"proxyd-classic",
"proxyd-nitro",
@@ -896,12 +888,6 @@
"$ref": "#/components/schemas/namespaces.arbitrum.features.arbitrum_nitro"
}
],
- "enum": [
- [
- "proxyd-nitro",
- "arbitrum-nitro"
- ]
- ],
"default": [
"proxyd-nitro",
"arbitrum-nitro"
@@ -1848,11 +1834,6 @@
"$ref": "#/components/schemas/namespaces.celo.features.proxyd"
}
],
- "enum": [
- [
- "proxyd"
- ]
- ],
"default": [
"proxyd"
]
@@ -2478,12 +2459,6 @@
"$ref": "#/components/schemas/namespaces.ethereum.features.proxyd"
}
],
- "enum": [
- [
- "nimbus",
- "proxyd"
- ]
- ],
"default": [
"nimbus",
"proxyd"
@@ -3106,13 +3081,6 @@
"$ref": "#/components/schemas/namespaces.gnosis.features.proxyd"
}
],
- "enum": [
- [
- "erigon",
- "lighthouse",
- "proxyd"
- ]
- ],
"default": [
"erigon",
"lighthouse",
@@ -3743,11 +3711,6 @@
"$ref": "#/components/schemas/namespaces.graph.features.subgraph_radio"
}
],
- "enum": [
- [
- "subgraph-radio"
- ]
- ],
"default": [
"subgraph-radio"
]
@@ -4127,12 +4090,6 @@
"$ref": "#/components/schemas/namespaces.ingress.features.certManager"
}
],
- "enum": [
- [
- "ingress",
- "cert-manager"
- ]
- ],
"default": [
"ingress",
"cert-manager"
@@ -4393,7 +4350,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": {
@@ -4411,7 +4368,7 @@
"name": {
"type": "string",
"enum": [
- "loki-distributed"
+ "loki"
]
}
}
@@ -4526,12 +4483,6 @@
"$ref": "#/components/schemas/namespaces.monitoring.features.logs"
}
],
- "enum": [
- [
- "metrics",
- "logs"
- ]
- ],
"default": [
"metrics",
"logs"
@@ -5129,14 +5080,6 @@
"$ref": "#/components/schemas/namespaces.polygon.features.heimdall_ha_svc"
}
],
- "enum": [
- [
- "proxyd",
- "erigon",
- "heimdall",
- "heimdall-ha-svc"
- ]
- ],
"default": [
"proxyd",
"erigon",
@@ -6120,11 +6063,6 @@
"$ref": "#/components/schemas/namespaces.storage.features.rawfile"
}
],
- "enum": [
- [
- "rawfile"
- ]
- ],
"default": [
"rawfile"
]
@@ -6832,7 +6770,7 @@
"type": "object",
"required": [
"promtail",
- "loki-distributed"
+ "loki"
],
"properties": {
"promtail": {
@@ -6856,7 +6794,7 @@
}
}
},
- "loki-distributed": {
+ "loki": {
"type": "object",
"required": [
"url",
@@ -6866,7 +6804,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": {
diff --git a/src/charts.cue b/src/charts.cue
index ea067ae6..b4779ae9 100644
--- a/src/charts.cue
+++ b/src/charts.cue
@@ -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"
}
}
diff --git a/src/schemas/monitoring.cue b/src/schemas/monitoring.cue
index c5e436d9..752f126c 100644
--- a/src/schemas/monitoring.cue
+++ b/src/schemas/monitoring.cue
@@ -51,24 +51,24 @@ package LaunchpadNamespaces
chart: {_repositories["prometheus-community"].charts["kube-prometheus-stack"]}
feature: #features.#metrics
_template: {
- version: "60.3.0"
+ version: "68.4.5"
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.24.0"}
}
promtail: {
chart: {_repositories.grafana.charts.promtail}
feature: #features.#logs
- _template: {version: "6.16.0"}
+ _template: {version: "6.16.6"}
}
}