Merge pull request #102 from evilrussian/master

feature: defining of priorityClassName and add ServiceMonitor in helm chart
vmware · May 13, 2020 · eb86597 · eb86597
2 parents 6ba67ba + 85b7229
commit eb86597
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 0 deletions.
diff --git a/log-router/templates/daemonset.yaml b/log-router/templates/daemonset.yaml
@@ -34,6 +34,9 @@ spec:
       - name: {{ .Values.image.pullSecret }}
       {{- end }}
       serviceAccountName: {{ if .Values.rbac.create }}{{ template "fluentd-router.fullname" . }}{{ else }}"{{ .Values.serviceAccountName }}"{{ end }}
+{{- if .Values.priorityClassName }}
+      priorityClassName: {{ .Values.priorityClassName }}
+{{- end }}
       containers:
         - name: fluentd
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

diff --git a/log-router/templates/servicemonitor.yaml b/log-router/templates/servicemonitor.yaml
@@ -0,0 +1,22 @@
+{{- if .Values.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ template "fluentd-router.fullname" . }}
+  labels:
+    app: {{ template "fluentd-router.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  jobLabel: app
+  selector:
+    matchLabels:
+      app: {{ template "fluentd-router.name" . }}
+      release: {{ .Release.Name }}
+  endpoints:
+  - port: prometheus
+    {{- if .Values.serviceMonitor.interval }}
+    interval: {{ .Values.serviceMonitor.interval }}
+    {{- end }}
+{{- end }}
diff --git a/log-router/values.yaml b/log-router/values.yaml
@@ -75,6 +75,8 @@ tolerations: []
   #  cpu: 100m
   #  memory: 128Mi
 
+priorityClassName: ""
+
 updateStrategy: {}
 #  type: RollingUpdate
 
@@ -84,4 +86,14 @@ updateStrategy: {}
 
 prometheusEnabled: false
 
+serviceMonitor:
+    # enable support for Prometheus Operator
+    enabled: false
+
+    # Job label for scrape target
+    jobLabel: app
+
+    # Scrape interval. If not set, the Prometheus default scrape interval is used.
+    interval: ""
+
 allowTagExpansion: false