style(monitor): format charts and dashboard

Author: duanhongyi

charts/monitor/charts/telegraf/templates/monitor-telegraf-clusterrole.yaml

@@ -0,0 +1,19 @@
+{{- if (.Values.global.use_rbac) -}}
+{{- if (.Capabilities.APIVersions.Has (include "rbacAPIVersion" .)) -}}
+kind: ClusterRole
+apiVersion: {{ template "rbacAPIVersion" . }}
+metadata:
+  name: drycc:drycc-monitor-telegraf
+  labels:
+    rbac.authorization.k8s.io/aggregate-view-telegraf-stats: "true"
+    app: drycc-monitor-telegraf
+    heritage: drycc
+rules:
+  - apiGroups: ["metrics.k8s.io"]
+    resources: ["pods"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: [""]
+    resources: ["pods", "nodes/proxy", "nodes/stats"]
+    verbs: ["get", "list", "watch"]
+{{- end -}}
+{{- end -}}

…plates/monitor-telegraf-rolebinding.yaml …monitor-telegraf-clusterrolebinding.yamlcharts/monitor/charts/telegraf/templates/monitor-telegraf-rolebinding.yaml renamed to charts/monitor/charts/telegraf/templates/monitor-telegraf-clusterrolebinding.yaml charts/monitor/charts/telegraf/templates/monitor-telegraf-rolebinding.yaml renamed to charts/monitor/charts/telegraf/templates/monitor-telegraf-clusterrolebinding.yaml

@@ -3,18 +3,18 @@
 kind: ClusterRoleBinding 
 apiVersion: {{ template "rbacAPIVersion" . }}
 metadata:
-  name: drycc:influx:telegraf:viewer
+  name: drycc:drycc-monitor-telegraf
   labels:
     app: drycc-monitor-telegraf
     heritage: drycc
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: drycc:influx:telegraf
+  name: drycc:drycc-monitor-telegraf
 subjects:
 - kind: ServiceAccount
   name: drycc-monitor-telegraf
-  namespace: drycc
+  namespace: {{ .Release.Namespace }}
 {{- end -}}
 {{- end -}}
 

…raf/templates/monitor-telegraf-role.yaml …nitor/templates/monitor-clusterrole.yamlcharts/monitor/charts/telegraf/templates/monitor-telegraf-role.yaml renamed to charts/monitor/templates/monitor-clusterrole.yaml charts/monitor/charts/telegraf/templates/monitor-telegraf-role.yaml renamed to charts/monitor/templates/monitor-clusterrole.yaml

@@ -1,26 +1,10 @@
 {{- if (.Values.global.use_rbac) -}}
 {{- if (.Capabilities.APIVersions.Has (include "rbacAPIVersion" .)) -}}
-kind: ClusterRole
-apiVersion: {{ template "rbacAPIVersion" . }}
-metadata:
-  name: drycc:influx:stats:viewer
-  labels:
-    rbac.authorization.k8s.io/aggregate-view-telegraf-stats: "true"
-    app: drycc-monitor-telegraf
-    heritage: drycc
-rules:
-  - apiGroups: ["metrics.k8s.io"]
-    resources: ["pods"]
-    verbs: ["get", "list", "watch"]
-  - apiGroups: [""]
-    resources: ["nodes/proxy", "nodes/stats"]
-    verbs: ["get", "list", "watch"]
----
 # Define global role with the default system:aggregate-to-view cluster role and the two rules we just created
 kind: ClusterRole
 apiVersion: {{ template "rbacAPIVersion" . }}
 metadata:
-  name: drycc:influx:telegraf
+  name: drycc:drycc-monitor
 aggregationRule:
   clusterRoleSelectors:
     - matchLabels:

grafana/rootfs/usr/share/grafana/api/dashboards/kube_health.json

@@ -1099,7 +1099,7 @@
               "selected": false
             }
           ],
-          "query": "show tag values from kubernetes_pod_container with key in (\"container_name\")", 
+          "query": "show tag values from kubernetes_pod_container with key in (\"container_name\") where namespace =~ /kube-*/ or container_name =~ /kube.*/", 
           "refresh": 1,
           "regex": "",
           "type": "query"