rollback fluent-bit push path until we release 0.4

grafana · Oct 15, 2019 · 8393c33 · 8393c33
1 parent 1f6f433
commit 8393c33
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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."