chore(prometheus): add namespace containers base metrics

Author: EamonZhang

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

@@ -20,6 +20,7 @@ spec:
   podSelector:
     matchLabels:
       {{- include "common.labels.matchLabels" . | nindent 6 }}
+  {{- if eq .Values.server.service.type "ClusterIP" }}
   ingress:
     # Allow inbound connections
     - ports:
@@ -44,4 +45,9 @@ spec:
       {{- end }}
       {{- end }}
   {{- end }}
+  {{- end }}
+  {{- if eq .Values.server.service.type "LoadBalancer" }}
+  ingress:
+    - {}
+  {{- end}}
 {{- end }}

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

@@ -22,5 +22,4 @@ data:
   {{- include "common.tplvalues.render" (dict "value" .Values.server.webconfig "context" $) | toYaml | nindent 4 }}
   rules.yaml: 
     {{- include "common.tplvalues.render" (dict "value" .Values.server.rules "context" $) | toYaml | nindent 4 }}
-  
 {{- end }}

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

@@ -149,7 +149,6 @@ spec:
           args:
             - "--config.file=/opt/drycc/prometheus/conf/{{ include "prometheus.server.configmapKey" . }}"
             - "--storage.tsdb.path={{ .Values.server.persistence.mountPath }}"
-            - "--storage.tsdb.retention.time={{ .Values.server.retentionDays }}"
             - "--storage.tsdb.retention.size={{ .Values.server.retentionSize }}"
             - "--log.level={{ .Values.server.logLevel }}"
             - "--log.format={{ .Values.server.logFormat }}"

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

@@ -564,7 +564,10 @@ alertmanager:
     ##     app: my-app
     ##
     selector: {}
-
+drycc:
+  token: xxxxx
+  url: xxxx
+  scheme: https
 ## @section Prometheus server Parameters
 ##
 ## Drycc Prometheus image
@@ -577,8 +580,8 @@ alertmanager:
 ## @param server.image.pullSecrets Prometheus image pull secrets
 ##
 server:
-  username: admin
-  password: Sx3EIELCA
+  username: xxxx
+  password: xxxx
   image:
     registry: registry.drycc.cc
     repository: drycc-addons/prometheus
@@ -658,26 +661,20 @@ server:
   ## @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/>
   ## 
-  rules: |
-    {{`
-    groups:
-    - name: PG数据库-监控告警
-      rules:
-      - alert: PostgresqlDown
-        expr: pg_up == 0
-        for: 0m
-        labels:
-          severity: critical
-        annotations:
-          summary: Postgresql down (instance {{ $labels.instance }})
-          description: "Postgresql instance is down\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}"
-
-     `}}
+  rules: ""
 
   ## @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: [] 
+  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 }}' ]
 
   ## @param server.replicaCount Number of Prometheus replicas to deploy
   ##
@@ -1503,8 +1500,7 @@ networkPolicy:
   ## (with the correct destination port).
   ##
   allowCurrentNamespace: true
-  allowNamespaces: 
-    - traefik
+  allowNamespaces: []
 ## @section Init Container Parameters
 ##
 
@@ -1557,10 +1553,6 @@ volumePermissions:
 scrapeAddons:
   enabled: true
 
-scrapeNamespaces: 
-  - xx1
-  - xx2
-
 configmapReload:
   prometheus:
     ## If false, the configmap-reload container will not be deployed

addons/prometheus/2/meta.yaml

@@ -24,15 +24,22 @@ allow_parameters:
 - name: "alertmanager.enabled"
   required: false
   description: "alertmanager config for values.yaml"
-- name: "server.retentionDays"
+- name: "server.username"
   required: false
-  description: "retentionDays config for values.yaml default 15d"
-- name: "server.retentionSize"
+  description: "prometheus administor username"
+- name: "server.password"
   required: false
-  description: "retentionSize config for values.yaml default 0, unit  MB, GB, TB"
+  description: "prometheus administor password"
+- name: "drycc.token"
+  required: false
+  description: "drycc user token"
+- name: "drycc.url"
+  required: false
+  description: "drycc url"
+- name: "drycc.scheme"
+  required: false
+  description: "drycc scheme"
 - name: "server.rules"
   required: false
   description: "rules config for values.yaml"
-- name: "scrapeNamespaces"
-  required: false
 archive: false