From 30aab7266b89118596c2d084f71b3cfa77abb334 Mon Sep 17 00:00:00 2001 From: Evan Stork Date: Wed, 1 May 2024 15:57:27 +0200 Subject: [PATCH 1/3] adding otlp ingress for loki distributed chart Signed-off-by: Evan Stork --- charts/loki-distributed/Chart.yaml | 2 +- charts/loki-distributed/README.md | 1 + charts/loki-distributed/values.yaml | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/charts/loki-distributed/Chart.yaml b/charts/loki-distributed/Chart.yaml index f6befe5899..e1f63554c1 100644 --- a/charts/loki-distributed/Chart.yaml +++ b/charts/loki-distributed/Chart.yaml @@ -3,7 +3,7 @@ name: loki-distributed description: Helm chart for Grafana Loki in microservices mode type: application appVersion: 2.9.6 -version: 0.79.0 +version: 0.79.1 home: https://grafana.github.io/helm-charts sources: - https://github.com/grafana/loki diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index d40ea8b510..e12cfc4dd8 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -324,6 +324,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | ingress.hosts[0] | string | `"loki.example.com"` | | | ingress.paths.distributor[0] | string | `"/api/prom/push"` | | | ingress.paths.distributor[1] | string | `"/loki/api/v1/push"` | | +| ingress.paths.distributor[2] | string | `"/otlp/v1/logs"` | | | ingress.paths.querier[0] | string | `"/api/prom/tail"` | | | ingress.paths.querier[1] | string | `"/loki/api/v1/tail"` | | | ingress.paths.query-frontend[0] | string | `"/loki/api"` | | diff --git a/charts/loki-distributed/values.yaml b/charts/loki-distributed/values.yaml index 15e9343e84..9c874e2705 100644 --- a/charts/loki-distributed/values.yaml +++ b/charts/loki-distributed/values.yaml @@ -989,6 +989,7 @@ ingress: distributor: - /api/prom/push - /loki/api/v1/push + - /otlp/v1/logs querier: - /api/prom/tail - /loki/api/v1/tail @@ -1308,6 +1309,12 @@ gateway: proxy_http_version 1.1; } + location = /otlp/v1/logs { + set $loki_api_v1_push_backend http://{{ include "loki.distributorFullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}; + proxy_pass $loki_api_v1_push_backend:3100$request_uri; + proxy_http_version 1.1; + } + location = /loki/api/v1/tail { set $loki_api_v1_tail_backend http://{{ include "loki.querierFullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}; proxy_pass $loki_api_v1_tail_backend:3100$request_uri; From a31ce513638ddbb553ff4fd9bf31261b655d0ef8 Mon Sep 17 00:00:00 2001 From: Evan Stork Date: Wed, 1 May 2024 16:11:11 +0200 Subject: [PATCH 2/3] ran helm-docs Signed-off-by: Evan Stork --- charts/loki-distributed/README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index e12cfc4dd8..e9e532f535 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -1,6 +1,7 @@ # loki-distributed -![Version: 0.79.0](https://img.shields.io/badge/Version-0.79.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.6](https://img.shields.io/badge/AppVersion-2.9.6-informational?style=flat-square) + +![Version: 0.79.1](https://img.shields.io/badge/Version-0.79.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.6](https://img.shields.io/badge/AppVersion-2.9.6-informational?style=flat-square) Helm chart for Grafana Loki in microservices mode @@ -10,6 +11,8 @@ Helm chart for Grafana Loki in microservices mode * * + + ## Chart Repo Add the following repo to use the chart: @@ -47,7 +50,7 @@ loki: chunk_store_config: chunk_cache_config: embedded_cache: - enabled: false + enabled: false ``` `compactor_address` has to be explicitly set in the `common` section of the config. @@ -110,7 +113,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | compactor.livenessProbe | object | `{}` | liveness probe settings for ingester pods. If empty use `loki.livenessProbe` | | compactor.nodeSelector | object | `{}` | Node selector for compactor pods | | compactor.persistence.annotations | object | `{}` | Annotations for compactor PVCs | -| compactor.persistence.claims | list | `[{"name":"data","size":"10Gi","storageClass":null}]` | List of the compactor PVCs @notationType -- list | +| compactor.persistence.claims | list | | List of the compactor PVCs | | compactor.persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature | | compactor.persistence.enabled | bool | `false` | Enable creating PVCs for the compactor | | compactor.persistence.size | string | `"10Gi"` | Size of persistent disk | @@ -303,7 +306,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | ingester.maxSurge | int | `0` | Max Surge for ingester pods | | ingester.maxUnavailable | string | `nil` | Pod Disruption Budget maxUnavailable | | ingester.nodeSelector | object | `{}` | Node selector for ingester pods | -| ingester.persistence.claims | list | `[{"name":"data","size":"10Gi","storageClass":null}]` | List of the ingester PVCs @notationType -- list | +| ingester.persistence.claims | list | | List of the ingester PVCs | | ingester.persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature | | ingester.persistence.enabled | bool | `false` | Enable creating PVCs which is required when using boltdb-shipper | | ingester.persistence.inMemory | bool | `false` | Use emptyDir with ramdisk for storage. **Please note that all data in ingester will be lost on pod restart** | From e6d9adb8e5502bcf85d7e2ced53bcc33a7249ddb Mon Sep 17 00:00:00 2001 From: estork09 Date: Wed, 1 May 2024 10:21:58 -0400 Subject: [PATCH 3/3] ran container based helm-docs Signed-off-by: estork09 --- charts/loki-distributed/README.md | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/charts/loki-distributed/README.md b/charts/loki-distributed/README.md index e9e532f535..bbe62d9426 100644 --- a/charts/loki-distributed/README.md +++ b/charts/loki-distributed/README.md @@ -1,7 +1,6 @@ # loki-distributed - -![Version: 0.79.1](https://img.shields.io/badge/Version-0.79.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.6](https://img.shields.io/badge/AppVersion-2.9.6-informational?style=flat-square) +![Version: 0.79.1](https://img.shields.io/badge/Version-0.79.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.9.6](https://img.shields.io/badge/AppVersion-2.9.6-informational?style=flat-square) Helm chart for Grafana Loki in microservices mode @@ -11,8 +10,6 @@ Helm chart for Grafana Loki in microservices mode * * - - ## Chart Repo Add the following repo to use the chart: @@ -50,7 +47,7 @@ loki: chunk_store_config: chunk_cache_config: embedded_cache: - enabled: false + enabled: false ``` `compactor_address` has to be explicitly set in the `common` section of the config. @@ -113,7 +110,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | compactor.livenessProbe | object | `{}` | liveness probe settings for ingester pods. If empty use `loki.livenessProbe` | | compactor.nodeSelector | object | `{}` | Node selector for compactor pods | | compactor.persistence.annotations | object | `{}` | Annotations for compactor PVCs | -| compactor.persistence.claims | list | | List of the compactor PVCs | +| compactor.persistence.claims | list | `[{"name":"data","size":"10Gi","storageClass":null}]` | List of the compactor PVCs @notationType -- list | | compactor.persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature | | compactor.persistence.enabled | bool | `false` | Enable creating PVCs for the compactor | | compactor.persistence.size | string | `"10Gi"` | Size of persistent disk | @@ -306,7 +303,7 @@ kubectl delete statefulset RELEASE_NAME-loki-distributed-querier -n LOKI_NAMESPA | ingester.maxSurge | int | `0` | Max Surge for ingester pods | | ingester.maxUnavailable | string | `nil` | Pod Disruption Budget maxUnavailable | | ingester.nodeSelector | object | `{}` | Node selector for ingester pods | -| ingester.persistence.claims | list | | List of the ingester PVCs | +| ingester.persistence.claims | list | `[{"name":"data","size":"10Gi","storageClass":null}]` | List of the ingester PVCs @notationType -- list | | ingester.persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature | | ingester.persistence.enabled | bool | `false` | Enable creating PVCs which is required when using boltdb-shipper | | ingester.persistence.inMemory | bool | `false` | Use emptyDir with ramdisk for storage. **Please note that all data in ingester will be lost on pod restart** |