diff --git a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet index c857344df97dbfb2e43fd076ad74333d4813fec5..af9bf85463d5672b5157feb8a069fc1ed5727c6e 100644 --- a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet +++ b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet @@ -52,9 +52,9 @@ }, replicas: 3, labels: { - 'app.kubernetes.io/name': 'alertmanager-' + $._config.alertmanager.name, + 'app.kubernetes.io/name': 'alertmanager', 'app.kubernetes.io/version': $._config.versions.alertmanager, - 'app.kubernetes.io/component': 'router', + 'app.kubernetes.io/component': 'alert-router', 'app.kubernetes.io/part-of': 'kube-prometheus', }, selectorLabels: { @@ -73,6 +73,7 @@ metadata: { name: 'alertmanager-' + $._config.alertmanager.name, namespace: $._config.namespace, + labels: { alertmanager: $._config.alertmanager.name } + $._config.alertmanager.labels, }, stringData: { 'alertmanager.yaml': if std.type($._config.alertmanager.config) == 'object' @@ -89,6 +90,7 @@ metadata: { name: 'alertmanager-' + $._config.alertmanager.name, namespace: $._config.namespace, + labels: { alertmanager: $._config.alertmanager.name } + $._config.alertmanager.labels, }, }, @@ -106,7 +108,7 @@ ], selector: { app: 'alertmanager', - alertmanager: $._config.alertmanager.name + alertmanager: $._config.alertmanager.name, } + $._config.alertmanager.selectorLabels, sessionAffinity: 'ClientIP', }, diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet index 38bb061ecfdd61240cf660c9f67c0acf3ad559e6..05c7326a4022ab01ea66dd2a4554c26e032f4136 100644 --- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet @@ -87,6 +87,7 @@ local kubeRbacProxyContainer = import './kube-rbac-proxy/container.libsonnet'; grafana+:: { local dashboardDefinitions = super.dashboardDefinitions, + dashboardDefinitions: { apiVersion: 'v1', kind: 'ConfigMapList', @@ -98,6 +99,7 @@ local kubeRbacProxyContainer = import './kube-rbac-proxy/container.libsonnet'; metadata: { name: 'grafana', namespace: $._config.namespace, + labels: $._config.grafana.labels, }, spec: { selector: { @@ -201,6 +203,14 @@ local kubeRbacProxyContainer = import './kube-rbac-proxy/container.libsonnet'; }, }, prometheus+:: { rules: $.prometheusRules + $.prometheusAlerts }, - grafana+:: { dashboards: $.grafanaDashboards }, + grafana+:: { + labels: { + 'app.kubernetes.io/name': 'grafana', + 'app.kubernetes.io/version': $._config.versions.grafana, + 'app.kubernetes.io/component': 'grafana', + 'app.kubernetes.io/part-of': 'kube-prometheus', + }, + dashboards: $.grafanaDashboards, + }, }, } diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet index 44cc2edd11494e17a3b7934daca5b63d0602197f..fd2510f627bea83b710a3b71243026660027bde1 100644 --- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet +++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet @@ -27,6 +27,7 @@ kind: 'ClusterRoleBinding', metadata: { name: 'node-exporter', + labels: $._config.nodeExporter.labels, }, roleRef: { apiGroup: 'rbac.authorization.k8s.io', @@ -45,6 +46,7 @@ kind: 'ClusterRole', metadata: { name: 'node-exporter', + labels: $._config.nodeExporter.labels, }, rules: [ { @@ -157,6 +159,7 @@ metadata: { name: 'node-exporter', namespace: $._config.namespace, + labels: $._config.nodeExporter.labels, }, }, diff --git a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet index e4ba99e388dea6a242308e48e2a5f5a3a1ad1cf8..55950bf0cb8e0abecbb7cf613b0ea07e19bde775 100644 --- a/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet +++ b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet @@ -9,7 +9,7 @@ name: 'prometheus-adapter', namespace: $._config.namespace, labels: { - 'app.kubernetes.io/name': $._config.prometheusAdapter.name, + 'app.kubernetes.io/name': 'prometheus-adapter', 'app.kubernetes.io/version': $._config.versions.prometheusAdapter, 'app.kubernetes.io/component': 'metrics-adapter', 'app.kubernetes.io/part-of': 'kube-prometheus', @@ -58,6 +58,7 @@ kind: 'APIService', metadata: { name: 'v1beta1.metrics.k8s.io', + labels: $._config.prometheusAdapter.labels, }, spec: { service: { @@ -78,6 +79,7 @@ metadata: { name: 'adapter-config', namespace: $._config.prometheusAdapter.namespace, + labels: $._config.prometheusAdapter.labels, }, data: { 'config.yaml': std.manifestYamlDoc($._config.prometheusAdapter.config) }, }, @@ -150,6 +152,7 @@ metadata: { name: $._config.prometheusAdapter.name, namespace: $._config.prometheusAdapter.namespace, + labels: $._config.prometheusAdapter.labels, }, spec: { replicas: 1, @@ -182,6 +185,7 @@ metadata: { name: $._config.prometheusAdapter.name, namespace: $._config.prometheusAdapter.namespace, + labels: $._config.prometheusAdapter.labels, }, }, @@ -190,6 +194,7 @@ kind: 'ClusterRole', metadata: { name: $._config.prometheusAdapter.name, + labels: $._config.prometheusAdapter.labels, }, rules: [{ apiGroups: [''], @@ -203,6 +208,7 @@ kind: 'ClusterRoleBinding', metadata: { name: $._config.prometheusAdapter.name, + labels: $._config.prometheusAdapter.labels, }, roleRef: { apiGroup: 'rbac.authorization.k8s.io', @@ -221,6 +227,7 @@ kind: 'ClusterRoleBinding', metadata: { name: 'resource-metrics:system:auth-delegator', + labels: $._config.prometheusAdapter.labels, }, roleRef: { apiGroup: 'rbac.authorization.k8s.io', @@ -239,6 +246,7 @@ kind: 'ClusterRole', metadata: { name: 'resource-metrics-server-resources', + labels: $._config.prometheusAdapter.labels, }, rules: [{ apiGroups: ['metrics.k8s.io'], @@ -256,7 +264,7 @@ 'rbac.authorization.k8s.io/aggregate-to-admin': 'true', 'rbac.authorization.k8s.io/aggregate-to-edit': 'true', 'rbac.authorization.k8s.io/aggregate-to-view': 'true', - }, + } + $._config.prometheusAdapter.labels, }, rules: [{ apiGroups: ['metrics.k8s.io'], @@ -271,6 +279,7 @@ metadata: { name: 'resource-metrics-auth-reader', namespace: 'kube-system', + labels: $._config.prometheusAdapter.labels, }, roleRef: { apiGroup: 'rbac.authorization.k8s.io', diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index 1a666e1dcd3e90e5871113c82a6c733b0f33de86..7f8a2c3567b870ac4038e5779e8a0accc329b47e 100644 --- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet @@ -14,7 +14,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli rules: {}, namespaces: ['default', 'kube-system', $._config.namespace], labels: { - 'app.kubernetes.io/name': 'prometheus-' + $._config.prometheus.name, + 'app.kubernetes.io/name': 'prometheus', 'app.kubernetes.io/version': $._config.versions.prometheus, 'app.kubernetes.io/component': 'prometheus', 'app.kubernetes.io/part-of': 'kube-prometheus', @@ -43,6 +43,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli metadata: { name: 'prometheus-' + p.name, namespace: p.namespace, + labels: $._config.prometheus.labels, }, }, @@ -70,7 +71,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli labels: { prometheus: p.name, role: 'alert-rules', - }, + } + $._config.prometheus.labels, name: 'prometheus-' + p.name + '-rules', namespace: p.namespace, }, @@ -86,6 +87,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli metadata: { name: 'prometheus-' + p.name, namespace: namespace, + labels: $._config.prometheus.labels, }, roleRef: { apiGroup: 'rbac.authorization.k8s.io', @@ -107,7 +109,10 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli clusterRole: { apiVersion: 'rbac.authorization.k8s.io/v1', kind: 'ClusterRole', - metadata: { name: 'prometheus-' + p.name }, + metadata: { + name: 'prometheus-' + p.name, + labels: $._config.prometheus.labels, + }, rules: [ { apiGroups: [''], @@ -127,6 +132,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli metadata: { name: 'prometheus-' + p.name + '-config', namespace: p.namespace, + labels: $._config.prometheus.labels, }, rules: [{ apiGroups: [''], @@ -141,6 +147,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli metadata: { name: 'prometheus-' + p.name + '-config', namespace: p.namespace, + labels: $._config.prometheus.labels, }, roleRef: { apiGroup: 'rbac.authorization.k8s.io', @@ -157,7 +164,10 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli clusterRoleBinding: { apiVersion: 'rbac.authorization.k8s.io/v1', kind: 'ClusterRoleBinding', - metadata: { name: 'prometheus-' + p.name }, + metadata: { + name: 'prometheus-' + p.name, + labels: $._config.prometheus.labels, + }, roleRef: { apiGroup: 'rbac.authorization.k8s.io', kind: 'ClusterRole', @@ -177,6 +187,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli metadata: { name: 'prometheus-' + p.name, namespace: namespace, + labels: $._config.prometheus.labels, }, rules: [ { @@ -210,7 +221,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli version: $._config.versions.prometheus, image: $._config.imageRepos.prometheus + ':' + $._config.versions.prometheus, podMetadata: { - labels: $._config.prometheus.labels + labels: $._config.prometheus.labels, }, serviceAccountName: 'prometheus-' + p.name, serviceMonitorSelector: {}, diff --git a/manifests/alertmanager-alertmanager.yaml b/manifests/alertmanager-alertmanager.yaml index f873dcc0eb673684fe2b0c450e64ca788afaa278..be59749584e8b2fc35e409e9fd6dba251a71b5e3 100644 --- a/manifests/alertmanager-alertmanager.yaml +++ b/manifests/alertmanager-alertmanager.yaml @@ -3,8 +3,8 @@ kind: Alertmanager metadata: labels: alertmanager: main - app.kubernetes.io/component: router - app.kubernetes.io/name: alertmanager-main + app.kubernetes.io/component: alert-router + app.kubernetes.io/name: alertmanager app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/version: v0.21.0 name: main @@ -15,8 +15,8 @@ spec: kubernetes.io/os: linux podMetadata: labels: - app.kubernetes.io/component: router - app.kubernetes.io/name: alertmanager-main + app.kubernetes.io/component: alert-router + app.kubernetes.io/name: alertmanager app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/version: v0.21.0 replicas: 3 diff --git a/manifests/alertmanager-secret.yaml b/manifests/alertmanager-secret.yaml index 20c205fb1f4f27ec92895fc973baedd8ba3cd115..9868057f9b92ca72463dd55441a7eb92147786c3 100644 --- a/manifests/alertmanager-secret.yaml +++ b/manifests/alertmanager-secret.yaml @@ -1,6 +1,12 @@ apiVersion: v1 kind: Secret metadata: + labels: + alertmanager: main + app.kubernetes.io/component: alert-router + app.kubernetes.io/name: alertmanager + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v0.21.0 name: alertmanager-main namespace: monitoring stringData: diff --git a/manifests/alertmanager-service.yaml b/manifests/alertmanager-service.yaml index 19125e9eea5c3d8600e3fc82939b2d501eb7cbc6..f6cd073a4fd4255ec648b76d2daccc68e8bdf544 100644 --- a/manifests/alertmanager-service.yaml +++ b/manifests/alertmanager-service.yaml @@ -3,8 +3,8 @@ kind: Service metadata: labels: alertmanager: main - app.kubernetes.io/component: router - app.kubernetes.io/name: alertmanager-main + app.kubernetes.io/component: alert-router + app.kubernetes.io/name: alertmanager app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/version: v0.21.0 name: alertmanager-main @@ -17,7 +17,7 @@ spec: selector: alertmanager: main app: alertmanager - app.kubernetes.io/component: router - app.kubernetes.io/name: alertmanager-main + app.kubernetes.io/component: alert-router + app.kubernetes.io/name: alertmanager app.kubernetes.io/part-of: kube-prometheus sessionAffinity: ClientIP diff --git a/manifests/alertmanager-serviceAccount.yaml b/manifests/alertmanager-serviceAccount.yaml index 5c06d5e40cb4b3d99ad5388af1bb401458b63213..4403e398d80188c06dc27d542f6247786c10631c 100644 --- a/manifests/alertmanager-serviceAccount.yaml +++ b/manifests/alertmanager-serviceAccount.yaml @@ -1,5 +1,11 @@ apiVersion: v1 kind: ServiceAccount metadata: + labels: + alertmanager: main + app.kubernetes.io/component: alert-router + app.kubernetes.io/name: alertmanager + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v0.21.0 name: alertmanager-main namespace: monitoring diff --git a/manifests/alertmanager-serviceMonitor.yaml b/manifests/alertmanager-serviceMonitor.yaml index ead162696eaaadd47e8572ad6496dddb4c20e89a..f6f22d86cf3ac64afbed12a5fd0b3b4143056e7a 100644 --- a/manifests/alertmanager-serviceMonitor.yaml +++ b/manifests/alertmanager-serviceMonitor.yaml @@ -2,8 +2,8 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: labels: - app.kubernetes.io/component: router - app.kubernetes.io/name: alertmanager-main + app.kubernetes.io/component: alert-router + app.kubernetes.io/name: alertmanager app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/version: v0.21.0 name: alertmanager @@ -15,6 +15,6 @@ spec: selector: matchLabels: alertmanager: main - app.kubernetes.io/component: router - app.kubernetes.io/name: alertmanager-main + app.kubernetes.io/component: alert-router + app.kubernetes.io/name: alertmanager app.kubernetes.io/part-of: kube-prometheus diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml index 7ede266a5cfcf38e76818aa5571e009870a01e96..9931c1cac24f9b5732fbb329717d3d35b17b80ba 100644 --- a/manifests/grafana-serviceMonitor.yaml +++ b/manifests/grafana-serviceMonitor.yaml @@ -1,6 +1,11 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: + labels: + app.kubernetes.io/component: grafana + app.kubernetes.io/name: grafana + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: 7.3.5 name: grafana namespace: monitoring spec: diff --git a/manifests/node-exporter-clusterRole.yaml b/manifests/node-exporter-clusterRole.yaml index ad783ae9bfdb3eb2c57e8d7bc9be580e75880bbf..7d5bf044bddd20f7148a63e69d2f9e9caf9885a4 100644 --- a/manifests/node-exporter-clusterRole.yaml +++ b/manifests/node-exporter-clusterRole.yaml @@ -1,6 +1,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: + labels: + app.kubernetes.io/component: exporter + app.kubernetes.io/name: node-exporter + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v1.0.1 name: node-exporter rules: - apiGroups: diff --git a/manifests/node-exporter-clusterRoleBinding.yaml b/manifests/node-exporter-clusterRoleBinding.yaml index a5a2050810d0976538a2aa08d4565d4a84bc4a07..3c8d407223169ded23c45192a428828e70d0e20d 100644 --- a/manifests/node-exporter-clusterRoleBinding.yaml +++ b/manifests/node-exporter-clusterRoleBinding.yaml @@ -1,6 +1,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: + labels: + app.kubernetes.io/component: exporter + app.kubernetes.io/name: node-exporter + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v1.0.1 name: node-exporter roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/node-exporter-serviceAccount.yaml b/manifests/node-exporter-serviceAccount.yaml index 8a03ac1641f68cbca54468aae86c79a20156058a..daad7d2fad080e9f97a85b7a7eb2b9e4d82d42d0 100644 --- a/manifests/node-exporter-serviceAccount.yaml +++ b/manifests/node-exporter-serviceAccount.yaml @@ -1,5 +1,10 @@ apiVersion: v1 kind: ServiceAccount metadata: + labels: + app.kubernetes.io/component: exporter + app.kubernetes.io/name: node-exporter + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v1.0.1 name: node-exporter namespace: monitoring diff --git a/manifests/prometheus-adapter-apiService.yaml b/manifests/prometheus-adapter-apiService.yaml index a215efe4554c583ec42ec99df08c4b581972c23b..f38c7c6da59bfc450df6a2a7d5ff4ebf94f49254 100644 --- a/manifests/prometheus-adapter-apiService.yaml +++ b/manifests/prometheus-adapter-apiService.yaml @@ -1,6 +1,11 @@ apiVersion: apiregistration.k8s.io/v1 kind: APIService metadata: + labels: + app.kubernetes.io/component: metrics-adapter + app.kubernetes.io/name: prometheus-adapter + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v0.8.2 name: v1beta1.metrics.k8s.io spec: group: metrics.k8s.io diff --git a/manifests/prometheus-adapter-clusterRole.yaml b/manifests/prometheus-adapter-clusterRole.yaml index a02d2bb050365e23d178dca0bd580ed6f6c94584..6fe766d7c554ea399d4faadde2bb4a484d69d815 100644 --- a/manifests/prometheus-adapter-clusterRole.yaml +++ b/manifests/prometheus-adapter-clusterRole.yaml @@ -1,6 +1,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: + labels: + app.kubernetes.io/component: metrics-adapter + app.kubernetes.io/name: prometheus-adapter + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v0.8.2 name: prometheus-adapter rules: - apiGroups: diff --git a/manifests/prometheus-adapter-clusterRoleAggregatedMetricsReader.yaml b/manifests/prometheus-adapter-clusterRoleAggregatedMetricsReader.yaml index 9f0dbb3495d748de8be167007643c9e8696d4fed..bee640bc2661d78feb9919a33b5c2d1e0a0162a5 100644 --- a/manifests/prometheus-adapter-clusterRoleAggregatedMetricsReader.yaml +++ b/manifests/prometheus-adapter-clusterRoleAggregatedMetricsReader.yaml @@ -2,6 +2,10 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: + app.kubernetes.io/component: metrics-adapter + app.kubernetes.io/name: prometheus-adapter + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v0.8.2 rbac.authorization.k8s.io/aggregate-to-admin: "true" rbac.authorization.k8s.io/aggregate-to-edit: "true" rbac.authorization.k8s.io/aggregate-to-view: "true" diff --git a/manifests/prometheus-adapter-clusterRoleBinding.yaml b/manifests/prometheus-adapter-clusterRoleBinding.yaml index 7e8f3da92b6b7b48ee08481d0a77b850c633c514..b524518c97eb9abdd8346fe8b1071f7cf63de197 100644 --- a/manifests/prometheus-adapter-clusterRoleBinding.yaml +++ b/manifests/prometheus-adapter-clusterRoleBinding.yaml @@ -1,6 +1,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: + labels: + app.kubernetes.io/component: metrics-adapter + app.kubernetes.io/name: prometheus-adapter + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v0.8.2 name: prometheus-adapter roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/prometheus-adapter-clusterRoleBindingDelegator.yaml b/manifests/prometheus-adapter-clusterRoleBindingDelegator.yaml index 4295b50f008f4a7ce5841445ab71f150dc8c4334..5e1c035b1ed31485b11b5022c62e1fb9c0b6c3c7 100644 --- a/manifests/prometheus-adapter-clusterRoleBindingDelegator.yaml +++ b/manifests/prometheus-adapter-clusterRoleBindingDelegator.yaml @@ -1,6 +1,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: + labels: + app.kubernetes.io/component: metrics-adapter + app.kubernetes.io/name: prometheus-adapter + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v0.8.2 name: resource-metrics:system:auth-delegator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/prometheus-adapter-clusterRoleServerResources.yaml b/manifests/prometheus-adapter-clusterRoleServerResources.yaml index fcb914c364dbdef9bf57defdccfe2f0ead709eca..8dea200e8bb44301b7623de78d17ba4e4141605a 100644 --- a/manifests/prometheus-adapter-clusterRoleServerResources.yaml +++ b/manifests/prometheus-adapter-clusterRoleServerResources.yaml @@ -1,6 +1,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: + labels: + app.kubernetes.io/component: metrics-adapter + app.kubernetes.io/name: prometheus-adapter + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v0.8.2 name: resource-metrics-server-resources rules: - apiGroups: diff --git a/manifests/prometheus-adapter-configMap.yaml b/manifests/prometheus-adapter-configMap.yaml index b2bde3cd1fe3d702149c586831c4ce53d1e8a194..f82a202f877a4d6c233768753f798cf2c02e8593 100644 --- a/manifests/prometheus-adapter-configMap.yaml +++ b/manifests/prometheus-adapter-configMap.yaml @@ -29,5 +29,10 @@ data: "window": "5m" kind: ConfigMap metadata: + labels: + app.kubernetes.io/component: metrics-adapter + app.kubernetes.io/name: prometheus-adapter + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v0.8.2 name: adapter-config namespace: monitoring diff --git a/manifests/prometheus-adapter-deployment.yaml b/manifests/prometheus-adapter-deployment.yaml index 53f1ee1de2c681142394fa745efb950729dd71cd..1ed60da558249792218fd6d8fd7a4917f55acce4 100644 --- a/manifests/prometheus-adapter-deployment.yaml +++ b/manifests/prometheus-adapter-deployment.yaml @@ -1,6 +1,11 @@ apiVersion: apps/v1 kind: Deployment metadata: + labels: + app.kubernetes.io/component: metrics-adapter + app.kubernetes.io/name: prometheus-adapter + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v0.8.2 name: prometheus-adapter namespace: monitoring spec: diff --git a/manifests/prometheus-adapter-roleBindingAuthReader.yaml b/manifests/prometheus-adapter-roleBindingAuthReader.yaml index 48c8f3253d484a15d96df4fc1265e03e6c273390..b63c74db482c75f59d20483e7399d22b111be6a3 100644 --- a/manifests/prometheus-adapter-roleBindingAuthReader.yaml +++ b/manifests/prometheus-adapter-roleBindingAuthReader.yaml @@ -1,6 +1,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: + labels: + app.kubernetes.io/component: metrics-adapter + app.kubernetes.io/name: prometheus-adapter + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v0.8.2 name: resource-metrics-auth-reader namespace: kube-system roleRef: diff --git a/manifests/prometheus-adapter-serviceAccount.yaml b/manifests/prometheus-adapter-serviceAccount.yaml index d7e7050391eecfc48a05e98fcd95d5b50f88a18e..bce326b9b07aaf932d732e5dbab0e9b680c9d5be 100644 --- a/manifests/prometheus-adapter-serviceAccount.yaml +++ b/manifests/prometheus-adapter-serviceAccount.yaml @@ -1,5 +1,10 @@ apiVersion: v1 kind: ServiceAccount metadata: + labels: + app.kubernetes.io/component: metrics-adapter + app.kubernetes.io/name: prometheus-adapter + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v0.8.2 name: prometheus-adapter namespace: monitoring diff --git a/manifests/prometheus-clusterRole.yaml b/manifests/prometheus-clusterRole.yaml index d5c4598304eaf7fe0c183e34969ca734f793aa75..b5f080604d703c6cc3129c58cc87c9084c011d81 100644 --- a/manifests/prometheus-clusterRole.yaml +++ b/manifests/prometheus-clusterRole.yaml @@ -1,6 +1,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: + labels: + app.kubernetes.io/component: prometheus + app.kubernetes.io/name: prometheus + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v2.22.1 name: prometheus-k8s rules: - apiGroups: diff --git a/manifests/prometheus-clusterRoleBinding.yaml b/manifests/prometheus-clusterRoleBinding.yaml index 554bb6f8767c0a8a346614c685649321a176b640..a52cf1e899e6fa618a905d50ada2a19f66a19e1a 100644 --- a/manifests/prometheus-clusterRoleBinding.yaml +++ b/manifests/prometheus-clusterRoleBinding.yaml @@ -1,6 +1,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: + labels: + app.kubernetes.io/component: prometheus + app.kubernetes.io/name: prometheus + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v2.22.1 name: prometheus-k8s roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index 0548a955dd9f17fd37cdd15df20df3d44dad15de..2b7dd14086d501cc7d19e65cc03037dd57555e8d 100644 --- a/manifests/prometheus-prometheus.yaml +++ b/manifests/prometheus-prometheus.yaml @@ -3,7 +3,7 @@ kind: Prometheus metadata: labels: app.kubernetes.io/component: prometheus - app.kubernetes.io/name: prometheus-k8s + app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/version: v2.22.1 prometheus: k8s @@ -21,7 +21,7 @@ spec: podMetadata: labels: app.kubernetes.io/component: prometheus - app.kubernetes.io/name: prometheus-k8s + app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/version: v2.22.1 podMonitorNamespaceSelector: {} diff --git a/manifests/prometheus-roleBindingConfig.yaml b/manifests/prometheus-roleBindingConfig.yaml index ec0129db5bf7f474b8aa124b63be72d50e97d667..feaf95e58dc0133dbd45efa0be2cdaf19d35f8e2 100644 --- a/manifests/prometheus-roleBindingConfig.yaml +++ b/manifests/prometheus-roleBindingConfig.yaml @@ -1,6 +1,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: + labels: + app.kubernetes.io/component: prometheus + app.kubernetes.io/name: prometheus + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v2.22.1 name: prometheus-k8s-config namespace: monitoring roleRef: diff --git a/manifests/prometheus-roleBindingSpecificNamespaces.yaml b/manifests/prometheus-roleBindingSpecificNamespaces.yaml index c7527f6aa1330f894adb83136444c8160ea92e90..ed2ac384424c21876dadd16709b26b94f36dd83e 100644 --- a/manifests/prometheus-roleBindingSpecificNamespaces.yaml +++ b/manifests/prometheus-roleBindingSpecificNamespaces.yaml @@ -3,6 +3,11 @@ items: - apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: + labels: + app.kubernetes.io/component: prometheus + app.kubernetes.io/name: prometheus + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v2.22.1 name: prometheus-k8s namespace: default roleRef: @@ -16,6 +21,11 @@ items: - apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: + labels: + app.kubernetes.io/component: prometheus + app.kubernetes.io/name: prometheus + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v2.22.1 name: prometheus-k8s namespace: kube-system roleRef: @@ -29,6 +39,11 @@ items: - apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: + labels: + app.kubernetes.io/component: prometheus + app.kubernetes.io/name: prometheus + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v2.22.1 name: prometheus-k8s namespace: monitoring roleRef: diff --git a/manifests/prometheus-roleConfig.yaml b/manifests/prometheus-roleConfig.yaml index 5f1cd043919a18141c2331c05836d5ef45d099eb..2b94cc720d2a302072d0fffe55ad565cfb74c78d 100644 --- a/manifests/prometheus-roleConfig.yaml +++ b/manifests/prometheus-roleConfig.yaml @@ -1,6 +1,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: + labels: + app.kubernetes.io/component: prometheus + app.kubernetes.io/name: prometheus + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v2.22.1 name: prometheus-k8s-config namespace: monitoring rules: diff --git a/manifests/prometheus-roleSpecificNamespaces.yaml b/manifests/prometheus-roleSpecificNamespaces.yaml index 689baa932f888172044e553da52c2398f1282efa..b7c962c017dfed986fa8274eb503b42c09d0c6b9 100644 --- a/manifests/prometheus-roleSpecificNamespaces.yaml +++ b/manifests/prometheus-roleSpecificNamespaces.yaml @@ -3,6 +3,11 @@ items: - apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: + labels: + app.kubernetes.io/component: prometheus + app.kubernetes.io/name: prometheus + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v2.22.1 name: prometheus-k8s namespace: default rules: @@ -27,6 +32,11 @@ items: - apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: + labels: + app.kubernetes.io/component: prometheus + app.kubernetes.io/name: prometheus + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v2.22.1 name: prometheus-k8s namespace: kube-system rules: @@ -51,6 +61,11 @@ items: - apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: + labels: + app.kubernetes.io/component: prometheus + app.kubernetes.io/name: prometheus + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v2.22.1 name: prometheus-k8s namespace: monitoring rules: diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml index 97409d23c917bcaaee4dedc2294c1a148bb9f30a..cd9c2019e17e4be9455d3596937bd715cd1caaf4 100644 --- a/manifests/prometheus-rules.yaml +++ b/manifests/prometheus-rules.yaml @@ -2,6 +2,10 @@ apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: labels: + app.kubernetes.io/component: prometheus + app.kubernetes.io/name: prometheus + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v2.22.1 prometheus: k8s role: alert-rules name: prometheus-k8s-rules diff --git a/manifests/prometheus-service.yaml b/manifests/prometheus-service.yaml index b2e6dcf440f2eb4b3c6a32b6578551f10b1706fa..ff66c8927636fa1612279cf470a63b66f4954f1c 100644 --- a/manifests/prometheus-service.yaml +++ b/manifests/prometheus-service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: labels: app.kubernetes.io/component: prometheus - app.kubernetes.io/name: prometheus-k8s + app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/version: v2.22.1 prometheus: k8s @@ -17,7 +17,7 @@ spec: selector: app: prometheus app.kubernetes.io/component: prometheus - app.kubernetes.io/name: prometheus-k8s + app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus prometheus: k8s sessionAffinity: ClientIP diff --git a/manifests/prometheus-serviceAccount.yaml b/manifests/prometheus-serviceAccount.yaml index 3e55fad675b8691f3aab29f152fdaa5416605745..a4157e78d8ed714366209137e9c91e4622b5a706 100644 --- a/manifests/prometheus-serviceAccount.yaml +++ b/manifests/prometheus-serviceAccount.yaml @@ -1,5 +1,10 @@ apiVersion: v1 kind: ServiceAccount metadata: + labels: + app.kubernetes.io/component: prometheus + app.kubernetes.io/name: prometheus + app.kubernetes.io/part-of: kube-prometheus + app.kubernetes.io/version: v2.22.1 name: prometheus-k8s namespace: monitoring diff --git a/manifests/prometheus-serviceMonitor.yaml b/manifests/prometheus-serviceMonitor.yaml index c8a74e96e750cfc7d8e66d355a73a43ffb64c49b..38622d374635f1426605283b7c372f44bab3376b 100644 --- a/manifests/prometheus-serviceMonitor.yaml +++ b/manifests/prometheus-serviceMonitor.yaml @@ -3,7 +3,7 @@ kind: ServiceMonitor metadata: labels: app.kubernetes.io/component: prometheus - app.kubernetes.io/name: prometheus-k8s + app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus app.kubernetes.io/version: v2.22.1 name: prometheus @@ -15,6 +15,6 @@ spec: selector: matchLabels: app.kubernetes.io/component: prometheus - app.kubernetes.io/name: prometheus-k8s + app.kubernetes.io/name: prometheus app.kubernetes.io/part-of: kube-prometheus prometheus: k8s