diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 7769dd744..4760c2dc4 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -110,9 +110,7 @@ jobs: --set docker.images.backend="/backend:$TAG" \ --set docker.images.guacamole.guacamole="ghcr.io/dsd-dbs/capella-collab-manager/guacamole:$TAG" \ --set docker.images.docs="/docs:$TAG" \ - --set loki.loki.read.persistence.size="500Mi" \ - --set loki.loki.write.persistence.size="500Mi" \ - --set loki.minio.persistence.size="500Mi" \ + --set loki.enabled=False \ --set cluster.pvc.storageClassName="standard" \ --set cluster.imagePullSecret="github" \ --set promtail.storageClassName="standard" \ diff --git a/helm/Chart.lock b/helm/Chart.lock index 62a826b85..af2b469d4 100644 --- a/helm/Chart.lock +++ b/helm/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: loki repository: https://grafana.github.io/helm-charts/ - version: 3.10.0 -digest: sha256:61a7869029f0f6ba5e1c07ff7608ecc96f51f4d6d4329a0007fcbccc2296384d -generated: "2023-01-17T10:43:28.957955005+01:00" + version: 5.30.0 +digest: sha256:afdc744b3c8e3b9f5c6caf9858de7b6c70e5f97c178c9728828d5fcd713dc20d +generated: "2023-10-16T13:58:40.468168+02:00" diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 86b34340d..3247ef803 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -12,5 +12,5 @@ dependencies: - name: loki alias: loki condition: loki.enabled - version: 3.10.0 + version: 5.30.0 repository: https://grafana.github.io/helm-charts/ diff --git a/helm/config/nginx-grafana.conf b/helm/config/nginx-grafana.conf index c165672f9..be19dfccb 100644 --- a/helm/config/nginx-grafana.conf +++ b/helm/config/nginx-grafana.conf @@ -25,6 +25,8 @@ http { location /grafana/ { auth_request /auth; rewrite ^/grafana/(.*) /$1 break; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; proxy_set_header Host $http_host; proxy_set_header X-WEBAUTH-USER "admin"; proxy_pass http://{{ .Release.Name }}-grafana-server:3118; diff --git a/helm/values.yaml b/helm/values.yaml index aaa64ed57..c2033c5c1 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -270,14 +270,21 @@ loki: # Minimum 2 is required replicas: 2 - # We don't want to limit to specific noeds + # We don't want to limit to specific nodes affinity: "" resources: *resourcesLoki write: # Minimum 2 is required replicas: 2 - # We don't want to limit to specific noeds + # We don't want to limit to specific nodes + affinity: "" + resources: *resourcesLoki + backend: + # Minimum 2 is required + replicas: 2 + + # We don't want to limit to specific nodes affinity: "" resources: *resourcesLoki serviceAccount: