chore(prometheus): add plans

Author: EamonZhang

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

@@ -60,6 +60,7 @@ relabel_configs:
       - __meta_kubernetes_service_name
     target_label: service
   - source_labels:
+  
       - __meta_kubernetes_pod_name
     target_label: pod
   - source_labels:

addons/prometheus/2/chart/prometheus/templates/networkpolicy.yaml

@@ -44,7 +44,7 @@ spec:
               kubernetes.io/metadata.name: {{ $namespace }}
       {{- end }}
       {{- end }}
-  {{- end }}
+  {{- end }}  
   {{- end }}
   {{- if eq .Values.server.service.type "LoadBalancer" }}
   ingress:

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

@@ -564,10 +564,12 @@ alertmanager:
     ##     app: my-app
     ##
     selector: {}
-drycc:
+
+containerScrape:
   token: xxxxx
   url: xxxx
   scheme: https
+  namespaces: []
 ## @section Prometheus server Parameters
 ##
 ## Drycc Prometheus image
@@ -641,6 +643,24 @@ server:
       - job_name: addons
         {{- include "addons.ds_scrape_config"  (dict "context" $) | nindent 4 }}
     {{- end }}  
+    
+    {{ $scheme := .Values.containerScrape.scheme }}
+    {{ $token := .Values.containerScrape.token }}
+    {{ $url := .Values.containerScrape.url }}
+    {{- range $namespace := .Values.containerScrape.namespaces }}
+    
+    {{- if $namespace }}
+      - job_name: 'jobns-%s {{ $namespace }}'
+        scheme: {{ $scheme }}
+        metrics_path: /v2/apps/{{ $namespace }}/metrics
+        authorization:
+          type: Token
+          credentials: {{ $token  }}
+        static_configs:
+          - targets: [ {{ $url }} ]
+    {{- end }}
+    {{- end }}
+
     {{- if .Values.server.extraScrapeConfigs}}
     {{- include "common.tplvalues.render" (dict "value" .Values.server.extraScrapeConfigs "context" $) | nindent 2 }}
     {{- end }}
@@ -657,7 +677,7 @@ server:
           static_configs:
             - targets: [ "{{ printf "%s.%s.svc.%s:%d" (include "prometheus.alertmanager.fullname" .) (include "common.names.namespace" .) .Values.clusterDomain (int .Values.alertmanager.service.ports.http) }}" ]
     {{- end }}
-    
+
   ## @param server.alertingRules Prometheus alerting rules. This content will be stored in the the rules.yaml file and the content can be a template.
   ## ref: <https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/>
   ## 
@@ -666,16 +686,9 @@ server:
   ## @param server.extraScrapeConfigs Promethus configuration, useful to declare new scrape_configs. This content will be merged with the 'server.configuration' value and stored in the the prometheus.yaml file.
   ## ref: <https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config>
   ##
-  extraScrapeConfigs: 
-    - job_name: 'containers'
-      scheme: '{{ .Values.drycc.scheme }}'
-      metrics_path: /v2/apps/{{ include "common.names.namespace" .  }}/metrics
-      authorization:
-        type: Token
-        credentials: '{{ .Values.drycc.token }}'
-      static_configs:
-        - targets: [ '{{ .Values.drycc.url }}' ]
- 
+
+  extraScrapeConfigs: []
+   
   ## @param server.replicaCount Number of Prometheus replicas to deploy
   ##
   replicaCount: 1

addons/prometheus/2/meta.yaml

@@ -30,15 +30,12 @@ allow_parameters:
 - name: "server.password"
   required: false
   description: "prometheus administor password"
-- name: "drycc.token"
+- name: "containerScrape"
   required: false
-  description: "drycc user token"
-- name: "drycc.url"
+  description: "container scrape"
+- name: "extraScrapeConfigs"
   required: false
-  description: "drycc url"
-- name: "drycc.scheme"
-  required: false
-  description: "drycc scheme"
+  description: "extra scrape configs"
 - name: "server.rules"
   required: false
   description: "rules config for values.yaml"