Merge pull request #476 from steven-sheehy/loki-config

Helm: Allow custom loki config

production/helm/loki-stack/Chart.yaml

 name: loki-stack
-version: 0.6.2
+version: 0.7.0
 appVersion: 0.0.1
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."

production/helm/loki/Chart.yaml

 name: loki
-version: 0.6.0
+version: 0.7.0
 appVersion: 0.0.1
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."

production/helm/loki/templates/_helpers.tpl

@@ -42,38 +42,3 @@ Create the name of the service account
 {{- end -}}
 {{- end -}}
 
-{{- define "configSecret" }}
-auth_enabled: {{ .Values.config.auth_enabled }}
-
-server:
-  http_listen_port: {{ .Values.port }}
-
-limits_config:
-  enforce_metric_name: false
-
-ingester:
-  lifecycler:
-    ring:
-{{ toYaml .Values.config.ingester.lifecycler.ring | indent 6 }}    
-  chunk_idle_period: 15m
-
-{{- if .Values.config.schema_configs }}
-schema_config:
-  configs:
-{{- range .Values.config.schema_configs }}
-  - from: {{ .from }}
-    store: {{ .store }}
-    object_store: {{ .object_store }}
-    schema: {{ .schema }}
-    index:
-      prefix: {{ .index.prefix }}
-      period: {{ .index.period }}
-{{- end -}}
-{{- end -}}
-
-{{- with .Values.config.storage_config }}
-storage_config:
-{{ toYaml . | indent 2 }}
-{{- end }}
-
-{{- end}}

production/helm/loki/templates/deployment.yaml

@@ -53,7 +53,7 @@ spec:
               subPath: {{ .Values.persistence.subPath }}
           ports:
             - name: http-metrics
-              containerPort: {{ .Values.port }}
+              containerPort: {{ .Values.config.server.http_listen_port }}
               protocol: TCP
           livenessProbe:
             {{- toYaml .Values.livenessProbe | nindent 12 }}

production/helm/loki/templates/secret.yaml

@@ -8,4 +8,4 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-  loki.yaml: {{ include "configSecret" . | b64enc}}
\ No newline at end of file
+  loki.yaml: {{ tpl (toYaml .Values.config) . | b64enc}}

production/helm/loki/values.yaml

@@ -17,6 +17,7 @@ annotations: {}
 config:
   auth_enabled: false
   ingester:
+    chunk_idle_period: 15m
     lifecycler:
       ring:
         store: inmemory
@@ -31,14 +32,19 @@ config:
       #     prefix: ""
       #     httpclienttimeout: "20s"
       #     consistentreads: true
-  schema_configs:
-  - from: 0
-    store: boltdb
-    object_store: filesystem
-    schema: v9
-    index:
-      prefix: index_
-      period: 168h
+  limits_config:
+    enforce_metric_name: false
+  schema_config:
+    configs:
+    - from: 0
+      store: boltdb
+      object_store: filesystem
+      schema: v9
+      index:
+        prefix: index_
+        period: 168h
+  server:
+    http_listen_port: 3100
   storage_config:
     boltdb:
       directory: /data/loki/index
@@ -86,8 +92,6 @@ podAnnotations: {}
 #  prometheus.io/scrape: "true"
 #  prometheus.io/port: "http-metrics"
 
-port: 3100
-
 ## Assign a PriorityClassName to pods if set
 # priorityClassName: