add storage type to metric-labels-allowlist

Signed-off-by: junot <junotxiang@kubesphere.io>
junotx · Jun 27, 2023 · 46f18e5 · 46f18e5
1 parent 8cadce5
commit 46f18e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/roles/ks-monitor/files/prometheus/kube-state-metrics/kube-state-metrics-deployment.yaml b/roles/ks-monitor/files/prometheus/kube-state-metrics/kube-state-metrics-deployment.yaml
@@ -70,7 +70,7 @@ spec:
                       info: {}
         - --resources=certificatesigningrequests,configmaps,cronjobs,daemonsets,deployments,endpoints,horizontalpodautoscalers,ingresses,jobs,leases,limitranges,mutatingwebhookconfigurations,namespaces,networkpolicies,nodes,persistentvolumeclaims,persistentvolumes,poddisruptionbudgets,pods,replicasets,replicationcontrollers,resourcequotas,secrets,services,statefulsets,storageclasses,validatingwebhookconfigurations,volumeattachments,clusterroles,clusterrolebindings,users
         - --metric-annotations-allowlist=clusterroles=[kubesphere.io/creator]
-        - --metric-labels-allowlist=namespaces=[kubesphere.io/workspace]
+        - --metric-labels-allowlist=namespaces=[kubesphere.io/workspace],storageclasses=[storage.kubesphere.io/storagetype]
         image: kubesphere/kube-state-metrics:v2.6.0
         name: kube-state-metrics
         resources:

diff --git a/roles/ks-monitor/templates/kube-state-metrics-deployment.yaml.j2 b/roles/ks-monitor/templates/kube-state-metrics-deployment.yaml.j2
@@ -35,7 +35,7 @@ spec:
         - --telemetry-host=127.0.0.1
         - --telemetry-port=8082
         - --metric-denylist=kube_.+_version,kube_.+_created,kube_deployment_(spec_paused|spec_strategy_rollingupdate_.+),kube_endpoint_(info|address_.+),kube_job_(info|owner|spec_(parallelism|active_deadline_seconds)|status_(active|.+_time)),kube_cronjob_(info|status_.+|spec_.+),kube_namespace_(status_phase),kube_persistentvolume_(info|capacity_.+),kube_persistentvolumeclaim_(resource_.+|access_.+),kube_secret_(type),kube_service_(spec_.+|status_.+),kube_ingress_(info|path|tls),kube_replicaset_(status_.+|spec_.+|owner),kube_poddisruptionbudget_status_.+,kube_replicationcontroller_.+,kube_node_info,kube_(hpa|replicaset|replicationcontroller)_.+_generation
-        - --metric-labels-allowlist=namespaces=[kubesphere.io/workspace]
+        - --metric-labels-allowlist=namespaces=[kubesphere.io/workspace],storageclasses=[storage.kubesphere.io/storagetype]
         image: {{ kube_state_metrics_repo }}:{{ kube_state_metrics_tag }}
         name: kube-state-metrics
         resources: