chore(prometheus): add scrape namespace

Author: EamonZhang

addons/prometheus/2/chart/prometheus/templates/_scrape_config.tpl

@@ -92,8 +92,12 @@ kubernetes_sd_configs:
   - role: endpoints
     namespaces:
       own_namespace: true
-      names:
+      names: 
       - {{ include "common.names.namespace" .context }}
+      {{- range .value }}
+      - {{ include "common.tplvalues.render" (dict "value" . "context" $) }}
+      {{- end }}
+
 relabel_configs:
   - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape]
     action: keep

addons/prometheus/2/chart/prometheus/templates/server/deployment.yaml

@@ -95,6 +95,41 @@ spec:
           {{- include "common.tplvalues.render" (dict "value" .Values.server.initContainers "context" $) | nindent 8 }}
         {{- end }}
       containers:
+        {{- if .Values.configmapReload.prometheus.enabled }}
+        - name: prometheus-reload
+          image: "{{ .Values.configmapReload.prometheus.image.repository }}:{{ .Values.configmapReload.prometheus.image.tag }}"
+          imagePullPolicy: "{{ .Values.configmapReload.prometheus.image.pullPolicy }}"
+          {{- with .Values.configmapReload.prometheus.containerSecurityContext }}
+          securityContext:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          args:
+            - --volume-dir=/opt/drycc/prometheus/conf/
+            - --webhook-url=http://{{ .Values.server.username }}:{{ .Values.server.password}}@127.0.0.1:9090{{ .Values.server.prefixURL }}/-/reload
+          {{- range $key, $value := .Values.configmapReload.prometheus.extraArgs }}
+            - --{{ $key }}={{ $value }}
+          {{- end }}
+          {{- range .Values.configmapReload.prometheus.extraVolumeDirs }}
+            - --volume-dir={{ . }}
+          {{- end }}
+          {{- if .Values.configmapReload.prometheus.containerPort }}
+          ports:
+            - containerPort: {{ .Values.configmapReload.prometheus.containerPort }}
+          {{- end }}
+          resources:
+           {{ toYaml .Values.configmapReload.prometheus.resources | indent 12 }}
+          volumeMounts:
+            - name: config
+              mountPath: /opt/drycc/prometheus/conf/
+              readOnly: true
+          {{- range .Values.configmapReload.prometheus.extraConfigmapMounts }}
+            - name: {{ $.Values.configmapReload.prometheus.name }}-{{ .name }}
+              mountPath: {{ .mountPath }}
+              subPath: {{ .subPath }}
+              readOnly: {{ .readOnly }}
+          {{- end }}
+        {{- end }}
+
         - name: prometheus
           image: {{ template "prometheus.server.image" . }}
           imagePullPolicy: {{ .Values.server.image.pullPolicy }}

addons/prometheus/2/chart/prometheus/values.yaml

@@ -578,7 +578,7 @@ alertmanager:
 ##
 server:
   username: admin
-  password: To6EJBHPUo
+  password: Sx3EIELCA
   image:
     registry: registry.drycc.cc
     repository: drycc-addons/prometheus
@@ -636,7 +636,7 @@ server:
     {{- end }}
     {{- if .Values.scrapeAddons.enabled }}
       - job_name: addons
-        {{- include "addons.ds_scrape_config"  (dict "context" $) | nindent 4 }}
+        {{- include "addons.ds_scrape_config"  (dict "value" .Values.scrapeNamespaces "context" $) | nindent 4 }}
     {{- end }}  
     {{- if .Values.server.extraScrapeConfigs}}
     {{- include "common.tplvalues.render" (dict "value" .Values.server.extraScrapeConfigs "context" $) | nindent 2 }}
@@ -1558,3 +1558,51 @@ volumePermissions:
 
 scrapeAddons:
   enabled: true
+
+scrapeNamespaces: 
+  - xx1
+  - xx2
+
+configmapReload:
+  prometheus:
+    ## If false, the configmap-reload container will not be deployed
+    ##
+    enabled: true
+
+    ## configmap-reload container name
+    ##
+    name: configmap-reload
+
+    ## configmap-reload container image
+    ##
+    image:
+      repository: jimmidyson/configmap-reload
+      tag: v0.5.0
+      pullPolicy: IfNotPresent
+
+    # containerPort: 9533
+
+    ## Additional configmap-reload container arguments
+    ##
+    extraArgs: {}
+    ## Additional configmap-reload volume directories
+    ##
+    extraVolumeDirs: []
+
+
+    ## Additional configmap-reload mounts
+    ##
+    extraConfigmapMounts: []
+      # - name: prometheus-alerts
+      #   mountPath: /etc/alerts.d
+      #   subPath: ""
+      #   configMap: prometheus-alerts
+      #   readOnly: true
+
+    ## Security context to be added to configmap-reload container
+    containerSecurityContext: {}
+
+    ## configmap-reload resource requests and limits
+    ## Ref: http://kubernetes.io/docs/user-guide/compute-resources/
+    ##
+    resources: {}

addons/prometheus/2/meta.yaml

@@ -33,4 +33,6 @@ allow_parameters:
 - name: "server.rules"
   required: false
   description: "rules config for values.yaml"
+- name: "scrapeNamespaces"
+  required: false
 archive: false