easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jsonnet: replace all k8s-app labels with app.kubernetes.io/name

Browse Source
This commit is contained in:
paulfantom
2020-12-16 11:07:29 +01:00
parent 3830bc8076
commit ee553a708d
11 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet
View File

@@ -18,24 +18,24 @@ local service(name, namespace, labels, selector, ports) = {
kubeControllerManagerPrometheusDiscoveryService: service( kubeControllerManagerPrometheusDiscoveryService: service(
'kube-controller-manager-prometheus-discovery', 'kube-controller-manager-prometheus-discovery',
'kube-system', 'kube-system',
{ 'k8s-app': 'kube-controller-manager' }, { 'app.kubernetes.io/name': 'kube-controller-manager' },
{ 'k8s-app': 'kube-controller-manager' }, { 'app.kubernetes.io/name': 'kube-controller-manager' },
[{ name: 'https-metrics', port: 10257, targetPort: 10257 }] [{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
), ),
kubeSchedulerPrometheusDiscoveryService: service( kubeSchedulerPrometheusDiscoveryService: service(
'kube-scheduler-prometheus-discovery', 'kube-scheduler-prometheus-discovery',
'kube-system', 'kube-system',
{ 'k8s-app': 'kube-scheduler' }, { 'app.kubernetes.io/name': 'kube-scheduler' },
{ 'k8s-app': 'kube-scheduler' }, { 'app.kubernetes.io/name': 'kube-scheduler' },
[{ name: 'https-metrics', port: 10259, targetPort: 10259 }] [{ name: 'https-metrics', port: 10259, targetPort: 10259 }]
), ),
kubeDnsPrometheusDiscoveryService: service( kubeDnsPrometheusDiscoveryService: service(
'kube-dns-prometheus-discovery', 'kube-dns-prometheus-discovery',
'kube-syste', 'kube-system',
{ 'k8s-app': 'kube-dns' }, { 'app.kubernetes.io/name': 'kube-dns' },
{ 'k8s-app': 'kube-dns' }, { 'app.kubernetes.io/name': 'kube-dns' },
[{ name: 'http-metrics-skydns', port: 10055, targetPort: 10055 }, { name: 'http-metrics-dnsmasq', port: 10054, targetPort: 10054 }] [{ name: 'http-metrics-skydns', port: 10055, targetPort: 10055 }, { name: 'http-metrics-dnsmasq', port: 10054, targetPort: 10054 }]
), ),
}, },

10
jsonnet/kube-prometheus/kube-prometheus-eks.libsonnet
View File

@@ -23,13 +23,13 @@
metadata: { metadata: {
name: 'aws-node', name: 'aws-node',
namespace: 'kube-system', namespace: 'kube-system',
labels: { 'k8s-app': 'aws-node' }, labels: { 'app.kubernetes.io/name': 'aws-node' },
}, },
spec: { spec: {
ports: [ ports: [
{ name: 'cni-metrics-port', port: 61678, targetPort: 61678 }, { name: 'cni-metrics-port', port: 61678, targetPort: 61678 },
], ],
selector: { 'k8s-app': 'aws-node' }, selector: { 'app.kubernetes.io/name': 'aws-node' },
clusterIP: 'None', clusterIP: 'None',
}, },
}, },
@@ -41,14 +41,14 @@
name: 'awsekscni', name: 'awsekscni',
namespace: $._config.namespace, namespace: $._config.namespace,
labels: { labels: {
'k8s-app': 'eks-cni', 'app.kubernetes.io/name': 'eks-cni',
}, },
}, },
spec: { spec: {
jobLabel: 'k8s-app', jobLabel: 'app.kubernetes.io/name',
selector: { selector: {
matchLabels: { matchLabels: {
'k8s-app': 'aws-node', 'app.kubernetes.io/name': 'aws-node',
}, },
}, },
namespaceSelector: { namespaceSelector: {

4
jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet
View File

@@ -6,13 +6,13 @@
metadata: { metadata: {
name: 'kube-dns-prometheus-discovery', name: 'kube-dns-prometheus-discovery',
namespace: 'kube-system', namespace: 'kube-system',
labels: { 'k8s-app': 'kube-dns' }, labels: { 'app.kubernetes.io/name': 'kube-dns' },
}, },
spec: { spec: {
ports: [ ports: [
{ name: 'metrics', port: 9153, targetPort: 9153 }, { name: 'metrics', port: 9153, targetPort: 9153 },
], ],
selector: { 'k8s-app': 'kube-dns' }, selector: { 'app.kubernetes.io/name': 'kube-dns' },
clusterIP: 'None', clusterIP: 'None',
}, },
}, },

12
jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet
View File

@@ -18,22 +18,22 @@ local service(name, namespace, labels, selector, ports) = {
kubeControllerManagerPrometheusDiscoveryService: service( kubeControllerManagerPrometheusDiscoveryService: service(
'kube-controller-manager-prometheus-discovery', 'kube-controller-manager-prometheus-discovery',
'kube-system', 'kube-system',
{ 'k8s-app': 'kube-controller-manager' }, { 'app.kubernetes.io/name': 'kube-controller-manager' },
{ 'k8s-app': 'kube-controller-manager' }, { 'app.kubernetes.io/name': 'kube-controller-manager' },
[{ name: 'https-metrics', port: 10257, targetPort: 10257 }] [{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
), ),
kubeSchedulerPrometheusDiscoveryService: service( kubeSchedulerPrometheusDiscoveryService: service(
'kube-controller-manager-prometheus-discovery', 'kube-controller-manager-prometheus-discovery',
'kube-system', 'kube-system',
{ 'k8s-app': 'kube-scheduler' }, { 'app.kubernetes.io/name': 'kube-scheduler' },
{ 'k8s-app': 'kube-scheduler' }, { 'app.kubernetes.io/name': 'kube-scheduler' },
[{ name: 'https-metrics', port: 10259, targetPort: 10259 }] [{ name: 'https-metrics', port: 10259, targetPort: 10259 }]
), ),
kubeDnsPrometheusDiscoveryService: service( kubeDnsPrometheusDiscoveryService: service(
'kube-controller-manager-prometheus-discovery', 'kube-controller-manager-prometheus-discovery',
'kube-system', 'kube-system',
{ 'k8s-app': 'kube-dns' }, { 'app.kubernetes.io/name': 'kube-dns' },
{ 'k8s-app': 'kube-dns' }, { 'app.kubernetes.io/name': 'kube-dns' },
[{ name: 'metrics', port: 10055, targetPort: 10055 }, { name: 'http-metrics-dnsmasq', port: 10054, targetPort: 10054 }] [{ name: 'metrics', port: 10055, targetPort: 10055 }, { name: 'http-metrics-dnsmasq', port: 10054, targetPort: 10054 }]
), ),
}, },

8
jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet
View File

@@ -18,15 +18,15 @@ local service(name, namespace, labels, selector, ports) = {
kubeControllerManagerPrometheusDiscoveryService: service( kubeControllerManagerPrometheusDiscoveryService: service(
'kube-controller-manager-prometheus-discovery', 'kube-controller-manager-prometheus-discovery',
'kube-system', 'kube-system',
{ 'k8s-app': 'kube-controller-manager' }, { 'app.kubernetes.io/name': 'kube-controller-manager' },
{ 'k8s-app': 'kube-controller-manager' }, { 'app.kubernetes.io/name': 'kube-controller-manager' },
[{ name: 'https-metrics', port: 10257, targetPort: 10257 }], [{ name: 'https-metrics', port: 10257, targetPort: 10257 }],
), ),
kubeSchedulerPrometheusDiscoveryService: service( kubeSchedulerPrometheusDiscoveryService: service(
'kube-scheduler-prometheus-discovery', 'kube-scheduler-prometheus-discovery',
'kube-system', 'kube-system',
{ 'k8s-app': 'kube-scheduler' }, { 'app.kubernetes.io/name': 'kube-scheduler' },
{ 'k8s-app': 'kube-scheduler' }, { 'app.kubernetes.io/name': 'kube-scheduler' },
[{ name: 'https-metrics', port: 10259, targetPort: 10259 }], [{ name: 'https-metrics', port: 10259, targetPort: 10259 }],
), ),
}, },

4
jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet
View File

@@ -18,14 +18,14 @@ local service(name, namespace, labels, selector, ports) = {
kubeControllerManagerPrometheusDiscoveryService: service( kubeControllerManagerPrometheusDiscoveryService: service(
'kube-controller-manager-prometheus-discovery', 'kube-controller-manager-prometheus-discovery',
'kube-system', 'kube-system',
{ 'k8s-app': 'kube-controller-manager' }, { 'app.kubernetes.io/name': 'kube-controller-manager' },
{ component: 'kube-controller-manager' }, { component: 'kube-controller-manager' },
[{ name: 'https-metrics', port: 10257, targetPort: 10257 }] [{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
), ),
kubeSchedulerPrometheusDiscoveryService: service( kubeSchedulerPrometheusDiscoveryService: service(
'kube-scheduler-prometheus-discovery', 'kube-scheduler-prometheus-discovery',
'kube-system', 'kube-system',
{ 'k8s-app': 'kube-scheduler' }, { 'app.kubernetes.io/name': 'kube-scheduler' },
{ component: 'kube-scheduler' }, { component: 'kube-scheduler' },
[{ name: 'https-metrics', port: 10259, targetPort: 10259 }], [{ name: 'https-metrics', port: 10259, targetPort: 10259 }],
), ),

12
jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet
View File

@@ -19,16 +19,16 @@ local service(name, namespace, labels, selector, ports) = {
kubeControllerManagerPrometheusDiscoveryService: service( kubeControllerManagerPrometheusDiscoveryService: service(
'kube-controller-manager-prometheus-discovery', 'kube-controller-manager-prometheus-discovery',
'kube-system', 'kube-system',
{ 'k8s-app': 'kube-controller-manager' }, { 'app.kubernetes.io/name': 'kube-controller-manager' },
{ 'k8s-app': 'kube-controller-manager' }, { 'app.kubernetes.io/name': 'kube-controller-manager' },
[{ name: 'https-metrics', port: 10257, targetPort: 10257 }] [{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
), ),
kubeSchedulerPrometheusDiscoveryService: service( kubeSchedulerPrometheusDiscoveryService: service(
'kube-scheduler-prometheus-discovery', 'kube-scheduler-prometheus-discovery',
'kube-system', 'kube-system',
{ 'k8s-app': 'kube-scheduler' }, { 'app.kubernetes.io/name': 'kube-scheduler' },
{ 'k8s-app': 'kube-scheduler' }, { 'app.kubernetes.io/name': 'kube-scheduler' },
[{ name: 'https-metrics', port: 10259, targetPort: 10259 }], [{ name: 'https-metrics', port: 10259, targetPort: 10259 }],
), ),
@@ -36,7 +36,7 @@ local service(name, namespace, labels, selector, ports) = {
spec+: { spec+: {
selector+: { selector+: {
matchLabels: { matchLabels: {
'k8s-app': 'kube-scheduler', 'app.kubernetes.io/name': 'kube-scheduler',
}, },
}, },
}, },
@@ -46,7 +46,7 @@ local service(name, namespace, labels, selector, ports) = {
spec+: { spec+: {
selector+: { selector+: {
matchLabels: { matchLabels: {
'k8s-app': 'kube-controller-manager', 'app.kubernetes.io/name': 'kube-controller-manager',
}, },
}, },
}, },

10
jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet
View File

@@ -16,7 +16,7 @@
metadata: { metadata: {
name: 'etcd', name: 'etcd',
namespace: 'kube-system', namespace: 'kube-system',
labels: { 'k8s-app': 'etcd' }, labels: { 'app.kubernetes.io/name': 'etcd' },
}, },
spec: { spec: {
ports: [ ports: [
@@ -31,7 +31,7 @@
metadata: { metadata: {
name: 'etcd', name: 'etcd',
namespace: 'kube-system', namespace: 'kube-system',
labels: { 'k8s-app': 'etcd' }, labels: { 'app.kubernetes.io/name': 'etcd' },
}, },
subsets: [{ subsets: [{
addresses: [ addresses: [
@@ -50,11 +50,11 @@
name: 'etcd', name: 'etcd',
namespace: 'kube-system', namespace: 'kube-system',
labels: { labels: {
'k8s-app': 'etcd', 'app.kubernetes.io/name': 'etcd',
}, },
}, },
spec: { spec: {
jobLabel: 'k8s-app', jobLabel: 'app.kubernetes.io/name',
endpoints: [ endpoints: [
{ {
port: 'metrics', port: 'metrics',
@@ -72,7 +72,7 @@
], ],
selector: { selector: {
matchLabels: { matchLabels: {
'k8s-app': 'etcd', 'app.kubernetes.io/name': 'etcd',
}, },
}, },
}, },

2
jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet
View File

@@ -56,7 +56,7 @@
name: 'thanos-sidecar', name: 'thanos-sidecar',
namespace: p.namespace, namespace: p.namespace,
labels: { labels: {
'k8s-app': 'prometheus', 'app.kubernetes.io/name': 'prometheus',
}, },
}, },
spec: { spec: {

8
jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet
View File

@@ -6,7 +6,7 @@
metadata: { metadata: {
name: 'weave-net', name: 'weave-net',
namespace: 'kube-system', namespace: 'kube-system',
labels: { 'k8s-app': 'weave-net' }, labels: { 'app.kubernetes.io/name': 'weave-net' },
}, },
spec: { spec: {
ports: [ ports: [
@@ -22,12 +22,12 @@
metadata: { metadata: {
name: 'weave-net', name: 'weave-net',
labels: { labels: {
'k8s-app': 'weave-net', 'app.kubernetes.io/name': 'weave-net',
}, },
namespace: 'monitoring', namespace: 'monitoring',
}, },
spec: { spec: {
jobLabel: 'k8s-app', jobLabel: 'app.kubernetes.io/name',
endpoints: [ endpoints: [
{ {
port: 'weave-net-metrics', port: 'weave-net-metrics',
@@ -42,7 +42,7 @@
}, },
selector: { selector: {
matchLabels: { matchLabels: {
'k8s-app': 'weave-net', 'app.kubernetes.io/name': 'weave-net',
}, },
}, },
}, },

28
jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
View File

@@ -250,7 +250,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
metadata: { metadata: {
name: 'prometheus', name: 'prometheus',
namespace: p.namespace, namespace: p.namespace,
labels: { 'k8s-app': 'prometheus' } + $._config.prometheus.labels, labels: $._config.prometheus.labels,
}, },
spec: { spec: {
selector: { selector: {
@@ -269,10 +269,10 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
metadata: { metadata: {
name: 'kube-scheduler', name: 'kube-scheduler',
namespace: p.namespace, namespace: p.namespace,
labels: { 'k8s-app': 'kube-scheduler' }, labels: { 'app.kubernetes.io/name': 'kube-scheduler' },
}, },
spec: { spec: {
jobLabel: 'k8s-app', jobLabel: 'app.kubernetes.io/name',
endpoints: [{ endpoints: [{
port: 'https-metrics', port: 'https-metrics',
interval: '30s', interval: '30s',
@@ -281,7 +281,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
tlsConfig: { insecureSkipVerify: true }, tlsConfig: { insecureSkipVerify: true },
}], }],
selector: { selector: {
matchLabels: { 'k8s-app': 'kube-scheduler' }, matchLabels: { 'app.kubernetes.io/name': 'kube-scheduler' },
}, },
namespaceSelector: { namespaceSelector: {
matchNames: ['kube-system'], matchNames: ['kube-system'],
@@ -295,10 +295,10 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
metadata: { metadata: {
name: 'kubelet', name: 'kubelet',
namespace: p.namespace, namespace: p.namespace,
labels: { 'k8s-app': 'kubelet' }, labels: { 'app.kubernetes.io/name': 'kubelet' },
}, },
spec: { spec: {
jobLabel: 'k8s-app', jobLabel: 'app.kubernetes.io/name',
endpoints: [ endpoints: [
{ {
port: 'https-metrics', port: 'https-metrics',
@@ -353,7 +353,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
}, },
], ],
selector: { selector: {
matchLabels: { 'k8s-app': 'kubelet' }, matchLabels: { 'app.kubernetes.io/name': 'kubelet' },
}, },
namespaceSelector: { namespaceSelector: {
matchNames: ['kube-system'], matchNames: ['kube-system'],
@@ -367,10 +367,10 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
metadata: { metadata: {
name: 'kube-controller-manager', name: 'kube-controller-manager',
namespace: p.namespace, namespace: p.namespace,
labels: { 'k8s-app': 'kube-controller-manager' }, labels: { 'app.kubernetes.io/name': 'kube-controller-manager' },
}, },
spec: { spec: {
jobLabel: 'k8s-app', jobLabel: 'app.kubernetes.io/name',
endpoints: [{ endpoints: [{
port: 'https-metrics', port: 'https-metrics',
interval: '30s', interval: '30s',
@@ -388,7 +388,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
], ],
}], }],
selector: { selector: {
matchLabels: { 'k8s-app': 'kube-controller-manager' }, matchLabels: { 'app.kubernetes.io/name': 'kube-controller-manager' },
}, },
namespaceSelector: { namespaceSelector: {
matchNames: ['kube-system'], matchNames: ['kube-system'],
@@ -402,7 +402,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
metadata: { metadata: {
name: 'kube-apiserver', name: 'kube-apiserver',
namespace: p.namespace, namespace: p.namespace,
labels: { 'k8s-app': 'apiserver' }, labels: { 'app.kubernetes.io/name': 'apiserver' },
}, },
spec: { spec: {
jobLabel: 'component', jobLabel: 'component',
@@ -456,12 +456,12 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
metadata: { metadata: {
name: 'coredns', name: 'coredns',
namespace: p.namespace, namespace: p.namespace,
labels: { 'k8s-app': 'coredns' }, labels: { 'app.kubernetes.io/name': 'coredns' },
}, },
spec: { spec: {
jobLabel: 'k8s-app', jobLabel: 'app.kubernetes.io/name',
selector: { selector: {
matchLabels: { 'k8s-app': 'kube-dns' }, matchLabels: { 'app.kubernetes.io/name': 'kube-dns' },
}, },
namespaceSelector: { namespaceSelector: {
matchNames: ['kube-system'], matchNames: ['kube-system'],