From 8393c3382afd0ec723e4810c2a50da1a2614cbc8 Mon Sep 17 00:00:00 2001
From: Cyril Tovena <cyril.tovena@gmail.com>
Date: Tue, 15 Oct 2019 08:28:31 -0400
Subject: [PATCH] rollback fluent-bit push path until we release 0.4

---
 production/helm/fluent-bit/Chart.yaml               | 2 +-
 production/helm/fluent-bit/templates/configmap.yaml | 4 ++--
 production/helm/fluent-bit/values.yaml              | 1 +
 production/helm/loki-stack/Chart.yaml               | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/production/helm/fluent-bit/Chart.yaml b/production/helm/fluent-bit/Chart.yaml
index ae9b2f8d3551..909edfd06dfa 100644
--- a/production/helm/fluent-bit/Chart.yaml
+++ b/production/helm/fluent-bit/Chart.yaml
@@ -1,5 +1,5 @@
 name: fluent-bit
-version: 0.0.1
+version: 0.0.2
 appVersion: v0.0.1
 kubeVersion: "^1.10.0-0"
 description: "Uses fluent-bit Loki go plugin for gathering logs and sending them to Loki"
diff --git a/production/helm/fluent-bit/templates/configmap.yaml b/production/helm/fluent-bit/templates/configmap.yaml
index 57c44dcd1254..551e0d936279 100644
--- a/production/helm/fluent-bit/templates/configmap.yaml
+++ b/production/helm/fluent-bit/templates/configmap.yaml
@@ -31,9 +31,9 @@ data:
         Name loki
         Match *
         {{- if and .Values.loki.user .Values.loki.password }}
-        Url {{ .Values.loki.serviceScheme }}://{{ .Values.loki.user }}:{{ .Values.loki.password }}@{{ include "loki.serviceName" . }}:{{ .Values.loki.servicePort }}/loki/api/v1/push
+        Url {{ .Values.loki.serviceScheme }}://{{ .Values.loki.user }}:{{ .Values.loki.password }}@{{ include "loki.serviceName" . }}:{{ .Values.loki.servicePort }}{{ .Values.loki.servicePath }}
           {{- else }}
-        Url {{ .Values.loki.serviceScheme }}://{{ include "loki.serviceName" . }}:{{ .Values.loki.servicePort }}/loki/api/v1/push
+        Url {{ .Values.loki.serviceScheme }}://{{ include "loki.serviceName" . }}:{{ .Values.loki.servicePort }}{{ .Values.loki.servicePath }}
         {{- end }}
         Labels {{ .Values.config.labels }}
         RemoveKeys {{ include "helm-toolkit.utils.joinListWithComma" .Values.config.removeKeys }}
diff --git a/production/helm/fluent-bit/values.yaml b/production/helm/fluent-bit/values.yaml
index 1fabc811a3a1..7de07d89296d 100644
--- a/production/helm/fluent-bit/values.yaml
+++ b/production/helm/fluent-bit/values.yaml
@@ -3,6 +3,7 @@ loki:
   serviceName: ""  # Defaults to "${RELEASE}-loki" if not set
   servicePort: 3100
   serviceScheme: http
+  servicePath: /api/prom/push
   # user: user
   # password: pass
 config:
diff --git a/production/helm/loki-stack/Chart.yaml b/production/helm/loki-stack/Chart.yaml
index e4737e0190ab..4f006b3cb1fb 100644
--- a/production/helm/loki-stack/Chart.yaml
+++ b/production/helm/loki-stack/Chart.yaml
@@ -1,5 +1,5 @@
 name: loki-stack
-version: 0.17.1
+version: 0.17.2
 appVersion: v0.3.0
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."