diff --git a/monitor/kube-state-metrics/apps_v1_Deployment_prometheus-community-kube-state-metrics.yaml b/monitor/kube-state-metrics/apps_v1_Deployment_kube-state-metrics.yaml similarity index 87% rename from monitor/kube-state-metrics/apps_v1_Deployment_prometheus-community-kube-state-metrics.yaml rename to monitor/kube-state-metrics/apps_v1_Deployment_kube-state-metrics.yaml index 885fe95..2c580f9 100644 --- a/monitor/kube-state-metrics/apps_v1_Deployment_prometheus-community-kube-state-metrics.yaml +++ b/monitor/kube-state-metrics/apps_v1_Deployment_kube-state-metrics.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: prometheus-community-kube-state-metrics + name: kube-state-metrics namespace: vynil-monitor labels: helm.sh/chart: kube-state-metrics-5.16.0 @@ -10,14 +10,14 @@ metadata: app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/instance: prometheus-community + app.kubernetes.io/instance: kube-state-metrics app.kubernetes.io/version: "2.10.1" - release: prometheus-community + release: kube-state-metrics spec: selector: matchLabels: app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/instance: prometheus-community + app.kubernetes.io/instance: kube-state-metrics replicas: 1 strategy: type: RollingUpdate @@ -30,12 +30,12 @@ spec: app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/instance: prometheus-community + app.kubernetes.io/instance: kube-state-metrics app.kubernetes.io/version: "2.10.1" - release: prometheus-community + release: kube-state-metrics spec: hostNetwork: false - serviceAccountName: prometheus-community-kube-state-metrics + serviceAccountName: kube-state-metrics securityContext: fsGroup: 65534 runAsGroup: 65534 diff --git a/monitor/kube-state-metrics/datas.tf b/monitor/kube-state-metrics/datas.tf index e8616b6..571e464 100644 --- a/monitor/kube-state-metrics/datas.tf +++ b/monitor/kube-state-metrics/datas.tf @@ -31,7 +31,7 @@ data "kustomization_overlay" "data_no_ns" { patches { target { kind = "ClusterRoleBinding" - name = "prometheus-community-kube-state-metrics" + name = "kube-state-metrics" } patch = local.rb-patch } diff --git a/monitor/kube-state-metrics/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-kube-state-metrics.yaml b/monitor/kube-state-metrics/monitoring.coreos.com_v1_PrometheusRule_kube-state-metrics-kube-pr-kube-state-metrics.yaml similarity index 93% rename from monitor/kube-state-metrics/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-kube-state-metrics.yaml rename to monitor/kube-state-metrics/monitoring.coreos.com_v1_PrometheusRule_kube-state-metrics-kube-pr-kube-state-metrics.yaml index 11b23d4..ffbcf50 100644 --- a/monitor/kube-state-metrics/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-kube-state-metrics.yaml +++ b/monitor/kube-state-metrics/monitoring.coreos.com_v1_PrometheusRule_kube-state-metrics-kube-pr-kube-state-metrics.yaml @@ -2,17 +2,17 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: prometheus-community-kube-kube-state-metrics + name: kube-state-metrics-kube-pr-kube-state-metrics namespace: vynil-monitor labels: app: kube-prometheus-stack app.kubernetes.io/managed-by: Helm - app.kubernetes.io/instance: prometheus-community - app.kubernetes.io/version: "56.0.2" + app.kubernetes.io/instance: kube-state-metrics + app.kubernetes.io/version: "56.0.3" app.kubernetes.io/part-of: kube-prometheus-stack - chart: kube-prometheus-stack-56.0.2 - release: "prometheus-community" + chart: kube-prometheus-stack-56.0.3 + release: "kube-state-metrics" heritage: "Helm" spec: groups: diff --git a/monitor/kube-state-metrics/monitoring.coreos.com_v1_ServiceMonitor_prometheus-community-kube-state-metrics.yaml b/monitor/kube-state-metrics/monitoring.coreos.com_v1_ServiceMonitor_kube-state-metrics.yaml similarity index 77% rename from monitor/kube-state-metrics/monitoring.coreos.com_v1_ServiceMonitor_prometheus-community-kube-state-metrics.yaml rename to monitor/kube-state-metrics/monitoring.coreos.com_v1_ServiceMonitor_kube-state-metrics.yaml index 8b0d36c..5034788 100644 --- a/monitor/kube-state-metrics/monitoring.coreos.com_v1_ServiceMonitor_prometheus-community-kube-state-metrics.yaml +++ b/monitor/kube-state-metrics/monitoring.coreos.com_v1_ServiceMonitor_kube-state-metrics.yaml @@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: prometheus-community-kube-state-metrics + name: kube-state-metrics namespace: vynil-monitor labels: helm.sh/chart: kube-state-metrics-5.16.0 @@ -10,15 +10,15 @@ metadata: app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/instance: prometheus-community + app.kubernetes.io/instance: kube-state-metrics app.kubernetes.io/version: "2.10.1" - release: prometheus-community + release: kube-state-metrics spec: jobLabel: app.kubernetes.io/name selector: matchLabels: app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/instance: prometheus-community + app.kubernetes.io/instance: kube-state-metrics endpoints: - port: http honorLabels: true \ No newline at end of file diff --git a/monitor/kube-state-metrics/rbac.authorization.k8s.io_v1_ClusterRoleBinding_prometheus-community-kube-state-metrics.yaml b/monitor/kube-state-metrics/rbac.authorization.k8s.io_v1_ClusterRoleBinding_kube-state-metrics.yaml similarity index 71% rename from monitor/kube-state-metrics/rbac.authorization.k8s.io_v1_ClusterRoleBinding_prometheus-community-kube-state-metrics.yaml rename to monitor/kube-state-metrics/rbac.authorization.k8s.io_v1_ClusterRoleBinding_kube-state-metrics.yaml index 5c64332..1b5d050 100644 --- a/monitor/kube-state-metrics/rbac.authorization.k8s.io_v1_ClusterRoleBinding_prometheus-community-kube-state-metrics.yaml +++ b/monitor/kube-state-metrics/rbac.authorization.k8s.io_v1_ClusterRoleBinding_kube-state-metrics.yaml @@ -8,15 +8,15 @@ metadata: app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/instance: prometheus-community + app.kubernetes.io/instance: kube-state-metrics app.kubernetes.io/version: "2.10.1" - release: prometheus-community - name: prometheus-community-kube-state-metrics + release: kube-state-metrics + name: kube-state-metrics roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: prometheus-community-kube-state-metrics + name: kube-state-metrics subjects: - kind: ServiceAccount - name: prometheus-community-kube-state-metrics + name: kube-state-metrics namespace: vynil-monitor \ No newline at end of file diff --git a/monitor/kube-state-metrics/rbac.authorization.k8s.io_v1_ClusterRole_prometheus-community-kube-state-metrics.yaml b/monitor/kube-state-metrics/rbac.authorization.k8s.io_v1_ClusterRole_kube-state-metrics.yaml similarity index 95% rename from monitor/kube-state-metrics/rbac.authorization.k8s.io_v1_ClusterRole_prometheus-community-kube-state-metrics.yaml rename to monitor/kube-state-metrics/rbac.authorization.k8s.io_v1_ClusterRole_kube-state-metrics.yaml index a68c2a7..f335187 100644 --- a/monitor/kube-state-metrics/rbac.authorization.k8s.io_v1_ClusterRole_prometheus-community-kube-state-metrics.yaml +++ b/monitor/kube-state-metrics/rbac.authorization.k8s.io_v1_ClusterRole_kube-state-metrics.yaml @@ -8,10 +8,10 @@ metadata: app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/instance: prometheus-community + app.kubernetes.io/instance: kube-state-metrics app.kubernetes.io/version: "2.10.1" - release: prometheus-community - name: prometheus-community-kube-state-metrics + release: kube-state-metrics + name: kube-state-metrics rules: - apiGroups: ["certificates.k8s.io"] diff --git a/monitor/kube-state-metrics/v1_ServiceAccount_prometheus-community-kube-state-metrics.yaml b/monitor/kube-state-metrics/v1_ServiceAccount_kube-state-metrics.yaml similarity index 76% rename from monitor/kube-state-metrics/v1_ServiceAccount_prometheus-community-kube-state-metrics.yaml rename to monitor/kube-state-metrics/v1_ServiceAccount_kube-state-metrics.yaml index 5178819..d275f41 100644 --- a/monitor/kube-state-metrics/v1_ServiceAccount_prometheus-community-kube-state-metrics.yaml +++ b/monitor/kube-state-metrics/v1_ServiceAccount_kube-state-metrics.yaml @@ -9,8 +9,8 @@ metadata: app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/instance: prometheus-community + app.kubernetes.io/instance: kube-state-metrics app.kubernetes.io/version: "2.10.1" - release: prometheus-community - name: prometheus-community-kube-state-metrics + release: kube-state-metrics + name: kube-state-metrics namespace: vynil-monitor \ No newline at end of file diff --git a/monitor/kube-state-metrics/v1_Service_prometheus-community-kube-state-metrics.yaml b/monitor/kube-state-metrics/v1_Service_kube-state-metrics.yaml similarity index 77% rename from monitor/kube-state-metrics/v1_Service_prometheus-community-kube-state-metrics.yaml rename to monitor/kube-state-metrics/v1_Service_kube-state-metrics.yaml index 7ae0e79..56e2a69 100644 --- a/monitor/kube-state-metrics/v1_Service_prometheus-community-kube-state-metrics.yaml +++ b/monitor/kube-state-metrics/v1_Service_kube-state-metrics.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: - name: prometheus-community-kube-state-metrics + name: kube-state-metrics namespace: vynil-monitor labels: helm.sh/chart: kube-state-metrics-5.16.0 @@ -10,9 +10,9 @@ metadata: app.kubernetes.io/component: metrics app.kubernetes.io/part-of: kube-state-metrics app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/instance: prometheus-community + app.kubernetes.io/instance: kube-state-metrics app.kubernetes.io/version: "2.10.1" - release: prometheus-community + release: kube-state-metrics annotations: prometheus.io/scrape: 'true' spec: @@ -25,4 +25,4 @@ spec: selector: app.kubernetes.io/name: kube-state-metrics - app.kubernetes.io/instance: prometheus-community \ No newline at end of file + app.kubernetes.io/instance: kube-state-metrics \ No newline at end of file