From 4a9f97b41fd1f2e06499751a556ffad723e6b1fc Mon Sep 17 00:00:00 2001
From: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com>
Date: Mon, 7 Mar 2022 07:41:44 +0000
Subject: [PATCH] [bot] [main] Automated version update
---
jsonnet/kube-prometheus/versions.json | 4 +-
jsonnetfile.lock.json | 22 ++++-----
manifests/grafana-config.yaml | 2 +-
manifests/grafana-dashboardDatasources.yaml | 2 +-
manifests/grafana-dashboardDefinitions.yaml | 48 +++++++++----------
manifests/grafana-dashboardSources.yaml | 2 +-
manifests/grafana-deployment.yaml | 12 ++---
manifests/grafana-prometheusRule.yaml | 2 +-
manifests/grafana-service.yaml | 2 +-
manifests/grafana-serviceAccount.yaml | 2 +-
manifests/grafana-serviceMonitor.yaml | 2 +-
manifests/kubeStateMetrics-clusterRole.yaml | 2 +-
.../kubeStateMetrics-clusterRoleBinding.yaml | 2 +-
manifests/kubeStateMetrics-deployment.yaml | 6 +--
.../kubeStateMetrics-prometheusRule.yaml | 2 +-
manifests/kubeStateMetrics-service.yaml | 2 +-
.../kubeStateMetrics-serviceAccount.yaml | 2 +-
.../kubeStateMetrics-serviceMonitor.yaml | 2 +-
...0alertmanagerCustomResourceDefinition.yaml | 14 ++++++
.../0podmonitorCustomResourceDefinition.yaml | 7 +--
.../setup/0probeCustomResourceDefinition.yaml | 35 ++++++++------
.../0prometheusCustomResourceDefinition.yaml | 26 +++++-----
...ervicemonitorCustomResourceDefinition.yaml | 7 +--
23 files changed, 116 insertions(+), 91 deletions(-)
diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index 6dbf22d7..106ccccd 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,8 +1,8 @@
{
"alertmanager": "0.23.0",
"blackboxExporter": "0.19.0",
- "grafana": "8.4.2",
- "kubeStateMetrics": "2.3.0",
+ "grafana": "8.4.3",
+ "kubeStateMetrics": "2.4.1",
"nodeExporter": "1.3.1",
"prometheus": "2.33.4",
"prometheusAdapter": "0.9.1",
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 0ea9aaa2..2fc4a5ad 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "af7154c1f432d2ec896e281b36a127cfc09faff7",
+ "version": "8ac44ffa5fcccc7928876be4682c07f50b5e3b7e",
"sum": "zhLYhUNcXNkMRfJhMUX0UiOpi8TOuLmUqJfO9NFKFkg="
},
{
@@ -28,7 +28,7 @@
"subdir": "grafana-mixin"
}
},
- "version": "1b2c4dca61648fb65345df329d51b1deaac7a41d",
+ "version": "288e8eeb1563f8eb35430f7fdcd4ba4e9ed648cb",
"sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
},
{
@@ -48,7 +48,7 @@
"subdir": "grafana-builder"
}
},
- "version": "857530e2e73565c40a3d06aaf8e2195a77cda55b",
+ "version": "c805327ecfd7cd9709c0dc338ef6b34696021d42",
"sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc="
},
{
@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "5db4c85d4e1b4655da68a3f3f882a6a0bcabde63",
+ "version": "abe6c4cb0a1385e017cd202f32b460f935357aeb",
"sum": "P0dCnbzyPScQGNXwXRcwiPkMLeTq0IPNbSTysDbySnM="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "5db4c85d4e1b4655da68a3f3f882a6a0bcabde63",
+ "version": "abe6c4cb0a1385e017cd202f32b460f935357aeb",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -98,7 +98,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "f156f4ff3bd2e600cbd7758e48fadfa0590c850e",
+ "version": "1e4acb010642067bb918eebb75410191640a95c6",
"sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=",
"name": "prometheus-operator-mixin"
},
@@ -109,8 +109,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "f156f4ff3bd2e600cbd7758e48fadfa0590c850e",
- "sum": "/HVgGcQcgj+pAzRFrXlYFE9algvDEXmxcoh4tj3Le3U="
+ "version": "1e4acb010642067bb918eebb75410191640a95c6",
+ "sum": "3rS4oZTMEr/S+kS8qlwEjANvf0Kwmo9e2qhv2lH3Z74="
},
{
"source": {
@@ -119,7 +119,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "1138a088f60aa8cf4c6ef9c3c3ca23aabfbdd6e0",
+ "version": "d155153305afc25471b9879928d8d93df77b12a8",
"sum": "iqF63VWQovIGBb7JI5oVVgMShz0dKptSzEVQQjsy+Jo=",
"name": "alertmanager"
},
@@ -140,7 +140,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "4cc25c0cb0b96042a7d36a0dd53dc6970ad607fd",
+ "version": "9dbd1cc1b9d2e045222d07085556d77d69fbc2b5",
"sum": "ZjQoYhvgKwJNkg+h+m9lW3SYjnjv5Yx5btEipLhru88=",
"name": "prometheus"
},
@@ -151,7 +151,7 @@
"subdir": "mixin"
}
},
- "version": "7528375b8f7181c15f8df64e1fcb8acb182c454c",
+ "version": "e60ca7ea0a73dad9f283f641216b05e78a99116b",
"sum": "dBm9ML50quhu6dwTIgfNmVruMqfaUeQVCO/6EKtQLxE=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml
index 76d4650c..2ee54382 100644
--- a/manifests/grafana-config.yaml
+++ b/manifests/grafana-config.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-config
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index 9a6c083b..772f100e 100644
--- a/manifests/grafana-dashboardDatasources.yaml
+++ b/manifests/grafana-dashboardDatasources.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-datasources
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 04022c32..1e5b0ac2 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -596,7 +596,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-alertmanager-overview
namespace: monitoring
- apiVersion: v1
@@ -2357,7 +2357,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-apiserver
namespace: monitoring
- apiVersion: v1
@@ -4228,7 +4228,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-cluster-total
namespace: monitoring
- apiVersion: v1
@@ -5407,7 +5407,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-controller-manager
namespace: monitoring
- apiVersion: v1
@@ -6032,7 +6032,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-grafana-overview
namespace: monitoring
- apiVersion: v1
@@ -9109,7 +9109,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-k8s-resources-cluster
namespace: monitoring
- apiVersion: v1
@@ -11895,7 +11895,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-k8s-resources-namespace
namespace: monitoring
- apiVersion: v1
@@ -12910,7 +12910,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-k8s-resources-node
namespace: monitoring
- apiVersion: v1
@@ -15368,7 +15368,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-k8s-resources-pod
namespace: monitoring
- apiVersion: v1
@@ -17381,7 +17381,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-k8s-resources-workload
namespace: monitoring
- apiVersion: v1
@@ -19559,7 +19559,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-k8s-resources-workloads-namespace
namespace: monitoring
- apiVersion: v1
@@ -21802,7 +21802,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-kubelet
namespace: monitoring
- apiVersion: v1
@@ -23255,7 +23255,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-namespace-by-pod
namespace: monitoring
- apiVersion: v1
@@ -24980,7 +24980,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-namespace-by-workload
namespace: monitoring
- apiVersion: v1
@@ -26032,7 +26032,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-node-cluster-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -27110,7 +27110,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -28090,7 +28090,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-nodes
namespace: monitoring
- apiVersion: v1
@@ -28666,7 +28666,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-persistentvolumesusage
namespace: monitoring
- apiVersion: v1
@@ -29883,7 +29883,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-pod-total
namespace: monitoring
- apiVersion: v1
@@ -31542,7 +31542,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-prometheus-remote-write
namespace: monitoring
- apiVersion: v1
@@ -32766,7 +32766,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-prometheus
namespace: monitoring
- apiVersion: v1
@@ -34026,7 +34026,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-proxy
namespace: monitoring
- apiVersion: v1
@@ -35127,7 +35127,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-scheduler
namespace: monitoring
- apiVersion: v1
@@ -36554,7 +36554,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index b5e453d8..1ad8f710 100644
--- a/manifests/grafana-dashboardSources.yaml
+++ b/manifests/grafana-dashboardSources.yaml
@@ -22,6 +22,6 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 963b24e7..d488787a 100644
--- a/manifests/grafana-deployment.yaml
+++ b/manifests/grafana-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana
namespace: monitoring
spec:
@@ -18,19 +18,19 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-config: 1ff75fd8225fb74f8949e00830249f0b
- checksum/grafana-dashboardproviders: 627757dd1e5b9d642d9bd8c6831c1a62
- checksum/grafana-datasources: 95aedebefdc4506190a8582126c27944
+ checksum/grafana-config: 48f2be17990d4c910541b431b30693fd
+ checksum/grafana-dashboardproviders: 496935a6a7e29994a955dcb602747db1
+ checksum/grafana-datasources: 79dcc4e84676397665293f9560bb1d75
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
spec:
automountServiceAccountToken: false
containers:
- env: []
- image: grafana/grafana:8.4.2
+ image: grafana/grafana:8.4.3
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml
index d7187a38..8d6ad414 100644
--- a/manifests/grafana-prometheusRule.yaml
+++ b/manifests/grafana-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
prometheus: k8s
role: alert-rules
name: grafana-rules
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index f2f9d92a..31699ae9 100644
--- a/manifests/grafana-service.yaml
+++ b/manifests/grafana-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml
index 2260c777..0c3f62f3 100644
--- a/manifests/grafana-serviceAccount.yaml
+++ b/manifests/grafana-serviceAccount.yaml
@@ -6,6 +6,6 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana
namespace: monitoring
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index e8569d55..5e93739c 100644
--- a/manifests/grafana-serviceMonitor.yaml
+++ b/manifests/grafana-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.4.2
+ app.kubernetes.io/version: 8.4.3
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/kubeStateMetrics-clusterRole.yaml b/manifests/kubeStateMetrics-clusterRole.yaml
index dd499ec3..dbf1d0b2 100644
--- a/manifests/kubeStateMetrics-clusterRole.yaml
+++ b/manifests/kubeStateMetrics-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.3.0
+ app.kubernetes.io/version: 2.4.1
name: kube-state-metrics
rules:
- apiGroups:
diff --git a/manifests/kubeStateMetrics-clusterRoleBinding.yaml b/manifests/kubeStateMetrics-clusterRoleBinding.yaml
index 9117e1d3..57c83ee1 100644
--- a/manifests/kubeStateMetrics-clusterRoleBinding.yaml
+++ b/manifests/kubeStateMetrics-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.3.0
+ app.kubernetes.io/version: 2.4.1
name: kube-state-metrics
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/kubeStateMetrics-deployment.yaml b/manifests/kubeStateMetrics-deployment.yaml
index 86ab4faa..1ee2e938 100644
--- a/manifests/kubeStateMetrics-deployment.yaml
+++ b/manifests/kubeStateMetrics-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.3.0
+ app.kubernetes.io/version: 2.4.1
name: kube-state-metrics
namespace: monitoring
spec:
@@ -23,7 +23,7 @@ spec:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.3.0
+ app.kubernetes.io/version: 2.4.1
spec:
automountServiceAccountToken: true
containers:
@@ -32,7 +32,7 @@ spec:
- --port=8081
- --telemetry-host=127.0.0.1
- --telemetry-port=8082
- image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.3.0
+ image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.4.1
name: kube-state-metrics
resources:
limits:
diff --git a/manifests/kubeStateMetrics-prometheusRule.yaml b/manifests/kubeStateMetrics-prometheusRule.yaml
index 629dd236..fc12beae 100644
--- a/manifests/kubeStateMetrics-prometheusRule.yaml
+++ b/manifests/kubeStateMetrics-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.3.0
+ app.kubernetes.io/version: 2.4.1
prometheus: k8s
role: alert-rules
name: kube-state-metrics-rules
diff --git a/manifests/kubeStateMetrics-service.yaml b/manifests/kubeStateMetrics-service.yaml
index 87159f91..dd5a1f7e 100644
--- a/manifests/kubeStateMetrics-service.yaml
+++ b/manifests/kubeStateMetrics-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.3.0
+ app.kubernetes.io/version: 2.4.1
name: kube-state-metrics
namespace: monitoring
spec:
diff --git a/manifests/kubeStateMetrics-serviceAccount.yaml b/manifests/kubeStateMetrics-serviceAccount.yaml
index 6866f8b1..6ac4122a 100644
--- a/manifests/kubeStateMetrics-serviceAccount.yaml
+++ b/manifests/kubeStateMetrics-serviceAccount.yaml
@@ -6,6 +6,6 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.3.0
+ app.kubernetes.io/version: 2.4.1
name: kube-state-metrics
namespace: monitoring
diff --git a/manifests/kubeStateMetrics-serviceMonitor.yaml b/manifests/kubeStateMetrics-serviceMonitor.yaml
index ca8faf62..6981b884 100644
--- a/manifests/kubeStateMetrics-serviceMonitor.yaml
+++ b/manifests/kubeStateMetrics-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.3.0
+ app.kubernetes.io/version: 2.4.1
name: kube-state-metrics
namespace: monitoring
spec:
diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
index f48b94bc..c2e6772b 100644
--- a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
@@ -970,6 +970,20 @@ spec:
are ANDed.
type: object
type: object
+ alertmanagerConfiguration:
+ description: 'EXPERIMENTAL: alertmanagerConfiguration specifies the
+ global Alertmanager configuration. If defined, it takes precedence
+ over the `configSecret` field. This field may change in future releases.
+ The specified global alertmanager config will not force add a namespace
+ label in routes and inhibitRules.'
+ properties:
+ name:
+ description: The name of the AlertmanagerConfig resource which
+ holds the global configuration. It must be in the same namespace
+ as the Alertmanager.
+ minLength: 1
+ type: string
+ type: object
baseImage:
description: 'Base image that is used to deploy pods, without tag.
Deprecated: use ''image'' instead'
diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
index 0c09236f..9e448d3a 100644
--- a/manifests/setup/0podmonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
@@ -66,7 +66,7 @@ spec:
in contrast to a list restricting them.
type: boolean
matchNames:
- description: List of namespace names.
+ description: List of namespace names to select from.
items:
type: string
type: array
@@ -346,8 +346,9 @@ spec:
relabelings:
description: 'RelabelConfigs to apply to samples before scraping.
Prometheus Operator automatically adds relabelings for a few
- standard Kubernetes fields and replaces original scrape job
- name with __tmp_prometheus_job_name. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config'
+ standard Kubernetes fields. The original scrape job''s name
+ is available via the `__tmp_prometheus_job_name` label. More
+ info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config'
items:
description: 'RelabelConfig allows dynamic rewriting of the
label set, being applied to samples before ingestion. It
diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml
index 502b94aa..34385440 100644
--- a/manifests/setup/0probeCustomResourceDefinition.yaml
+++ b/manifests/setup/0probeCustomResourceDefinition.yaml
@@ -326,29 +326,34 @@ spec:
format: int64
type: integer
targets:
- description: Targets defines a set of static and/or dynamically discovered
- targets to be probed using the prober.
+ description: Targets defines a set of static or dynamically discovered
+ targets to probe.
properties:
ingress:
- description: Ingress defines the set of dynamically discovered
- ingress objects which hosts are considered for probing.
+ description: ingress defines the Ingress objects to probe and
+ the relabeling configuration. If `staticConfig` is also defined,
+ `staticConfig` takes precedence.
properties:
namespaceSelector:
- description: Select Ingress objects by namespace.
+ description: From which namespaces to select Ingress objects.
properties:
any:
description: Boolean describing whether all namespaces
are selected in contrast to a list restricting them.
type: boolean
matchNames:
- description: List of namespace names.
+ description: List of namespace names to select from.
items:
type: string
type: array
type: object
relabelingConfigs:
- description: 'RelabelConfigs to apply to samples before ingestion.
- More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config'
+ description: 'RelabelConfigs to apply to the label set of
+ the target before it gets scraped. The original ingress
+ address is available via the `__tmp_prometheus_ingress_address`
+ label. It can be used to customize the probed URL. The original
+ scrape job''s name is available via the `__tmp_prometheus_job_name`
+ label. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config'
items:
description: 'RelabelConfig allows dynamic rewriting of
the label set, being applied to samples before ingestion.
@@ -406,7 +411,7 @@ spec:
type: object
type: array
selector:
- description: Select Ingress objects by labels.
+ description: Selector to select the Ingress objects.
properties:
matchExpressions:
description: matchExpressions is a list of label selector
@@ -452,8 +457,9 @@ spec:
type: object
type: object
staticConfig:
- description: 'StaticConfig defines static targets which are considers
- for probing. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#static_config.'
+ description: 'staticConfig defines the static list of targets
+ to probe and the relabeling configuration. If `ingress` is also
+ defined, `staticConfig` takes precedence. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#static_config.'
properties:
labels:
additionalProperties:
@@ -462,8 +468,8 @@ spec:
targets.
type: object
relabelingConfigs:
- description: 'RelabelConfigs to apply to samples before ingestion.
- More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config'
+ description: 'RelabelConfigs to apply to the label set of
+ the targets before it gets scraped. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config'
items:
description: 'RelabelConfig allows dynamic rewriting of
the label set, being applied to samples before ingestion.
@@ -521,8 +527,7 @@ spec:
type: object
type: array
static:
- description: Targets is a list of URLs to probe using the
- configured prober.
+ description: The list of hosts to probe.
items:
type: string
type: array
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index 1b50f6dc..61579aa0 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -2693,11 +2693,11 @@ spec:
enforcedNamespaceLabel:
description: "EnforcedNamespaceLabel If set, a label will be added
to \n 1. all user-metrics (created by `ServiceMonitor`, `PodMonitor`
- and `ProbeConfig` object) and 2. in all `PrometheusRule` objects
- (except the ones excluded in `prometheusRulesExcludedFromEnforce`)
- to * alerting & recording rules and * the metrics used in
- their expressions (`expr`). \n Label name is this field's value.
- Label value is the namespace of the created object (mentioned above)."
+ and `Probe` objects) and 2. in all `PrometheusRule` objects (except
+ the ones excluded in `prometheusRulesExcludedFromEnforce`) to *
+ alerting & recording rules and * the metrics used in their expressions
+ (`expr`). \n Label name is this field's value. Label value is the
+ namespace of the created object (mentioned above)."
type: string
enforcedSampleLimit:
description: EnforcedSampleLimit defines global limit on number of
@@ -2735,9 +2735,9 @@ spec:
type: string
ignoreNamespaceSelectors:
description: IgnoreNamespaceSelectors if set to true will ignore NamespaceSelector
- settings from the podmonitor and servicemonitor configs, and they
- will only discover endpoints within their current namespace. Defaults
- to false.
+ settings from all PodMonitor, ServiceMonitor and Probe objects.
+ They will only discover endpoints within their current namespace.
+ Defaults to false.
type: boolean
image:
description: Image if specified has precedence over baseImage, tag
@@ -4290,9 +4290,13 @@ spec:
type: object
queryLogFile:
description: QueryLogFile specifies the file to which PromQL queries
- are logged. Note that this location must be writable, and can be
- persisted using an attached volume. Alternatively, the location
- can be set to a stdout location such as `/dev/stdout` to log querie
+ are logged. If the filename has an empty path, e.g. 'query.log',
+ prometheus-operator will mount the file into an emptyDir volume
+ at `/var/log/prometheus`. If a full path is provided, e.g. /var/log/prometheus/query.log,
+ you must mount a volume in the specified directory and it must be
+ writable. This is because the prometheus container runs with a read-only
+ root filesystem for security reasons. Alternatively, the location
+ can be set to a stdout location such as `/dev/stdout` to log query
information to the default Prometheus log stream. This is only available
in versions of Prometheus >= 2.16.0. For more details, see the Prometheus
docs (https://prometheus.io/docs/guides/query-log/)
diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
index 8d568024..90fe8340 100644
--- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
@@ -315,8 +315,9 @@ spec:
relabelings:
description: 'RelabelConfigs to apply to samples before scraping.
Prometheus Operator automatically adds relabelings for a few
- standard Kubernetes fields and replaces original scrape job
- name with __tmp_prometheus_job_name. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config'
+ standard Kubernetes fields. The original scrape job''s name
+ is available via the `__tmp_prometheus_job_name` label. More
+ info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config'
items:
description: 'RelabelConfig allows dynamic rewriting of the
label set, being applied to samples before ingestion. It
@@ -548,7 +549,7 @@ spec:
in contrast to a list restricting them.
type: boolean
matchNames:
- description: List of namespace names.
+ description: List of namespace names to select from.
items:
type: string
type: array
--
GitLab