added ability to configure kernel setting fs.inotify.max_user_instanc…

…es through init container to resolve issue with too many open files (#1620) Signed-off-by: Roger Steneteg <rsteneteg@ea.com>
grafana · Feb 3, 2020 · 87c2afc · 87c2afc
1 parent a53477f
commit 87c2afc
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/production/helm/loki-stack/Chart.yaml b/production/helm/loki-stack/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: "v1"
 name: loki-stack
-version: 0.29.0
+version: 0.30.0
 appVersion: v1.3.0
 kubeVersion: "^1.10.0-0"
 description: "Loki: like Prometheus, but for logs."

diff --git a/production/helm/promtail/Chart.yaml b/production/helm/promtail/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: "v1"
 name: promtail
-version: 0.17.0
+version: 0.18.0
 appVersion: v1.3.0
 kubeVersion: "^1.10.0-0"
 description: "Responsible for gathering logs and sending them to Loki"

diff --git a/production/helm/promtail/templates/daemonset.yaml b/production/helm/promtail/templates/daemonset.yaml
@@ -37,6 +37,17 @@ spec:
       serviceAccountName: {{ template "promtail.serviceAccountName" . }}
     {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName }}
+    {{- end }}
+    {{- if .Values.initContainer.enabled }}
+      initContainers:
+      - name: init
+        image: busybox
+        command:
+        - sh
+        - -c
+        - sysctl -w fs.inotify.max_user_instances={{ .Values.initContainer.fsInotifyMaxUserInstances }}
+        securityContext:
+          privileged: true
     {{- end }}
       containers:
         - name: promtail

diff --git a/production/helm/promtail/values.yaml b/production/helm/promtail/values.yaml
@@ -6,6 +6,10 @@ annotations: {}
 
 deploymentStrategy: RollingUpdate
 
+initContainer:
+  enabled: false
+  fsInotifyMaxUserInstances: 128
+
 image:
   repository: grafana/promtail
   tag: v1.3.0