diff --git a/production/helm/templates/promtail/daemonset.yaml b/production/helm/templates/promtail/daemonset.yaml index b3cbd6ce004e213f15c8d953ca31739a5e7eea3c..906310201918aa8bc607d7de97f82883461fb3ce 100644 --- a/production/helm/templates/promtail/daemonset.yaml +++ b/production/helm/templates/promtail/daemonset.yaml @@ -45,11 +45,13 @@ spec: volumeMounts: - name: config mountPath: /etc/promtail - - name: varlog - mountPath: /var/log - - name: varlibdockercontainers - mountPath: {{ .Values.promtail.containerRootPath }}/containers - readOnly: true + {{- range .Values.promtail.volumeMounts }} + - name: {{ .name }} + mountPath: {{ .mountPath }} + {{- if .readOnly }} + readOnly: {{ .readOnly}} + {{- end }} + {{- end }} env: - name: HOSTNAME valueFrom: @@ -89,9 +91,8 @@ spec: - name: config configMap: name: {{ template "promtail.fullname" . }} - - name: varlog + {{- range .Values.promtail.volumes }} + - name: {{ .name }} hostPath: - path: /var/log - - name: varlibdockercontainers - hostPath: - path: {{ .Values.promtail.containerRootPath }}/containers + path: {{ .path }} + {{- end }} diff --git a/production/helm/values.yaml b/production/helm/values.yaml index c1364a9b8a05e6c6d3212f1358fa996c12a1374a..cb067d597a68c0730fc595d5193965ccc57bbfca 100644 --- a/production/helm/values.yaml +++ b/production/helm/values.yaml @@ -98,13 +98,25 @@ promtail: deploymentStrategy: RollingUpdate entryParser: docker - containerRootPath: /var/lib/docker image: repository: grafana/promtail tag: master pullPolicy: Always # Always pull while in BETA + volumes: + - name: varlog + path: /var/log + - name: varlibdockercontainers + path: /var/lib/docker/containers + + volumeMounts: + - name: varlog + mountPath: /var/log + - name: varlibdockercontainers + mountPath: /var/lib/docker/containers + readOnly: true + service: port: 3100 annotations: {}