From 28d58a9dbc0140ea6d5cc2b1d655912071e1051f Mon Sep 17 00:00:00 2001
From: Kristijan Sedlak <xpepermint@gmail.com>
Date: Wed, 14 Apr 2021 20:19:00 +0200
Subject: [PATCH] Update versions
---
examples/thanos-sidecar.jsonnet | 4 +-
jsonnet/kube-prometheus/jsonnetfile.json | 6 +-
jsonnet/kube-prometheus/versions.json | 12 +-
jsonnetfile.lock.json | 34 ++---
manifests/grafana-dashboardDatasources.yaml | 2 +-
manifests/grafana-dashboardDefinitions.yaml | 90 +++++------
manifests/grafana-dashboardSources.yaml | 2 +-
manifests/grafana-deployment.yaml | 8 +-
manifests/grafana-service.yaml | 2 +-
manifests/grafana-serviceMonitor.yaml | 2 +-
manifests/kube-state-metrics-clusterRole.yaml | 2 +-
...kube-state-metrics-clusterRoleBinding.yaml | 2 +-
manifests/kube-state-metrics-deployment.yaml | 6 +-
.../kube-state-metrics-prometheusRule.yaml | 2 +-
manifests/kube-state-metrics-service.yaml | 2 +-
.../kube-state-metrics-serviceAccount.yaml | 2 +-
.../kube-state-metrics-serviceMonitor.yaml | 2 +-
manifests/kubernetes-prometheusRule.yaml | 10 +-
manifests/node-exporter-clusterRole.yaml | 2 +-
.../node-exporter-clusterRoleBinding.yaml | 2 +-
manifests/node-exporter-daemonset.yaml | 6 +-
manifests/node-exporter-prometheusRule.yaml | 34 ++---
manifests/node-exporter-service.yaml | 2 +-
manifests/node-exporter-serviceAccount.yaml | 2 +-
manifests/node-exporter-serviceMonitor.yaml | 2 +-
manifests/prometheus-adapter-apiService.yaml | 2 +-
manifests/prometheus-adapter-clusterRole.yaml | 2 +-
...er-clusterRoleAggregatedMetricsReader.yaml | 2 +-
...prometheus-adapter-clusterRoleBinding.yaml | 2 +-
...s-adapter-clusterRoleBindingDelegator.yaml | 2 +-
...us-adapter-clusterRoleServerResources.yaml | 2 +-
manifests/prometheus-adapter-configMap.yaml | 2 +-
manifests/prometheus-adapter-deployment.yaml | 6 +-
...metheus-adapter-roleBindingAuthReader.yaml | 2 +-
manifests/prometheus-adapter-service.yaml | 2 +-
.../prometheus-adapter-serviceAccount.yaml | 2 +-
.../prometheus-adapter-serviceMonitor.yaml | 2 +-
manifests/prometheus-clusterRole.yaml | 2 +-
manifests/prometheus-clusterRoleBinding.yaml | 2 +-
.../prometheus-operator-prometheusRule.yaml | 2 +-
.../prometheus-operator-serviceMonitor.yaml | 4 +-
manifests/prometheus-podDisruptionBudget.yaml | 2 +-
manifests/prometheus-prometheus.yaml | 8 +-
manifests/prometheus-prometheusRule.yaml | 2 +-
manifests/prometheus-roleBindingConfig.yaml | 2 +-
...metheus-roleBindingSpecificNamespaces.yaml | 6 +-
manifests/prometheus-roleConfig.yaml | 2 +-
.../prometheus-roleSpecificNamespaces.yaml | 6 +-
manifests/prometheus-service.yaml | 2 +-
manifests/prometheus-serviceAccount.yaml | 2 +-
manifests/prometheus-serviceMonitor.yaml | 2 +-
...r-0podmonitorCustomResourceDefinition.yaml | 2 +-
...erator-0probeCustomResourceDefinition.yaml | 142 ++++++++++++++++++
...r-0prometheusCustomResourceDefinition.yaml | 19 ++-
...ervicemonitorCustomResourceDefinition.yaml | 2 +-
.../prometheus-operator-clusterRole.yaml | 2 +-
...rometheus-operator-clusterRoleBinding.yaml | 2 +-
.../setup/prometheus-operator-deployment.yaml | 8 +-
.../setup/prometheus-operator-service.yaml | 2 +-
.../prometheus-operator-serviceAccount.yaml | 2 +-
60 files changed, 327 insertions(+), 166 deletions(-)
diff --git a/examples/thanos-sidecar.jsonnet b/examples/thanos-sidecar.jsonnet
index 8949a1b1..7ed55036 100644
--- a/examples/thanos-sidecar.jsonnet
+++ b/examples/thanos-sidecar.jsonnet
@@ -7,8 +7,8 @@ local kp =
},
prometheus+: {
thanos: {
- version: '0.17.2',
- image: 'quay.io/thanos/thanos:v0.17.2',
+ version: '0.19.0',
+ image: 'quay.io/thanos/thanos:v0.19.0',
objectStorageConfig: {
key: 'thanos.yaml', // How the file inside the secret is called
name: 'thanos-objectstorage', // This is the name of your Kubernetes secret with the config
diff --git a/jsonnet/kube-prometheus/jsonnetfile.json b/jsonnet/kube-prometheus/jsonnetfile.json
index e05b298e..a0b6eddb 100644
--- a/jsonnet/kube-prometheus/jsonnetfile.json
+++ b/jsonnet/kube-prometheus/jsonnetfile.json
@@ -26,7 +26,7 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "release-0.46"
+ "version": "release-0.47"
},
{
"source": {
@@ -80,7 +80,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "release-2.25",
+ "version": "release-2.26",
"name": "prometheus"
},
{
@@ -100,7 +100,7 @@
"subdir": "mixin"
}
},
- "version": "release-0.17"
+ "version": "release-0.19"
}
],
"legacyImports": true
diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index 7cd8c6cf..387e111c 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,10 +1,10 @@
{
"alertmanager": "0.21.0",
"blackboxExporter": "0.18.0",
- "grafana": "7.4.3",
- "kubeStateMetrics": "2.0.0-rc.1",
- "nodeExporter": "1.1.1",
- "prometheus": "2.25.0",
- "prometheusAdapter": "0.8.3",
- "prometheusOperator": "0.46.0"
+ "grafana": "7.5.3",
+ "kubeStateMetrics": "2.0.0",
+ "nodeExporter": "1.1.2",
+ "prometheus": "2.26.0",
+ "prometheusAdapter": "0.8.4",
+ "prometheusOperator": "0.47.0"
}
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 1213cbe4..253fd89e 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,8 +18,8 @@
"subdir": "contrib/mixin"
}
},
- "version": "8ee1dd9e23bce4d9770816edf5816b13767ac51d",
- "sum": "EgKKzxcW3ttt7gjPMX//DNTqNcn/0o2VAIaWJ/HSLEc="
+ "version": "57a092b45d0eae6c9e600e62513ffcd2f1f25a92",
+ "sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc="
},
{
"source": {
@@ -38,7 +38,7 @@
"subdir": "grafana-builder"
}
},
- "version": "5d376192970fc4eab52005ac08168e7109c87075",
+ "version": "89299b1c5e93952622801795353d496fb337f44e",
"sum": "GRf2GvwEU4jhXV+JOonXSZ4wdDv8mnHBPCQ6TUVd+g8="
},
{
@@ -59,8 +59,8 @@
"subdir": ""
}
},
- "version": "778b1cc035a6785e05ead0a022cd7e6cea4c2059",
- "sum": "oY2XqGB26n/qX+T5L7NvfJLwBnAN2C11OTGvmqQBFRA="
+ "version": "faa0561a823cbd3b726aaefffcf6ee317547041a",
+ "sum": "CaoF5iyX+bntNZgcHeKcwVO1wc7X9W6u/JOuhqSW9/Q="
},
{
"source": {
@@ -69,7 +69,7 @@
"subdir": "lib/promgrafonnet"
}
},
- "version": "0e9fc466b492e45cfd1a59a09ab10162bf8b1baa",
+ "version": "faa0561a823cbd3b726aaefffcf6ee317547041a",
"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
},
{
@@ -79,7 +79,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "aafecf305bbb5c13fcec0ba3e749d1ffcb0d93e1",
+ "version": "93255df07113f87dcdec0726b4f4db4e6344df26",
"sum": "S5qI+PJUdNeYOv76jH5nxwYS9N6U7CRxvyuB1wI4cTE="
},
{
@@ -89,7 +89,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "aafecf305bbb5c13fcec0ba3e749d1ffcb0d93e1",
+ "version": "93255df07113f87dcdec0726b4f4db4e6344df26",
"sum": "Yf8mNAHrV1YWzrdV8Ry5dJ8YblepTGw3C0Zp10XIYLo="
},
{
@@ -99,7 +99,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "bbb2431b998d18a1b4c61ef1cd933ffa13af1a4c",
+ "version": "a4f5928b074e75addb76a27c5ebfe78314fcd6d1",
"sum": "6reUygVmQrLEWQzTKcH8ceDbvM+2ztK3z2VBR2K2l+U="
},
{
@@ -109,8 +109,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "7f94a06b86d41c20176f0d5b53aa0100fdc361e6",
- "sum": "2CCa4pHH08Pnyf+0c+ZhVjM5h6TfoCbhHypPigpB9AM="
+ "version": "64d466d7730165c0d260f187e2e9742bc0295bf2",
+ "sum": "MRwyChXdKG3anL2OWpbUu3qWc97w9J6YsjUWjLFQyB0="
},
{
"source": {
@@ -119,7 +119,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "10757eb5fb78c5c58586812721e9833b0d8500ee",
+ "version": "22ac6dff21901bfce14545da59b37a1aaca0db3a",
"sum": "VP1vn/WTGLZaBgGhGMUO81qNTc/fnp5KtzVjcaxad6Q=",
"name": "alertmanager"
},
@@ -130,8 +130,8 @@
"subdir": "docs/node-mixin"
}
},
- "version": "1dfd858e4aaa35e2595348dd13540700cd9df89b",
- "sum": "cZTNXQMUCLB5FGYpMn845dcqGdkcYt58qCqOFIV/BoQ="
+ "version": "46cdf618c9419ea62dd1a87331def97a0f18c837",
+ "sum": "sxI7cBEy34JSbB0gHy9xC/ErtFsRzl9eJPsWVqd+XSY="
},
{
"source": {
@@ -140,7 +140,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "bda05a23ada314a0b9806a362da39b7a1a4e04c3",
+ "version": "3cafc58827d1ebd1a67749f88be4218f0bab3d8d",
"sum": "VK0c3sQ3ksiM6JQsAVfWmL5NbzGv9llMfXFNXfFdJ+A=",
"name": "prometheus"
},
@@ -151,8 +151,8 @@
"subdir": "mixin"
}
},
- "version": "37e6ef61566c7c70793ba6d128f00c4c66cb2402",
- "sum": "OptiWUMOHFrRGTZhSfxV1RCeXZ90qsefGNTD4lDYVG0="
+ "version": "ba6c5c4726ff52807c7383c68f2159b1af7980bb",
+ "sum": "XP3uq7xcfKHsnWsz1v992csZhhZR3jQma6hFOfSViTs="
},
{
"source": {
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index 9cc89841..076cf1ba 100644
--- a/manifests/grafana-dashboardDatasources.yaml
+++ b/manifests/grafana-dashboardDatasources.yaml
@@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-datasources
namespace: monitoring
type: Opaque
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index e6d5d9c0..6b9ab53d 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -1733,7 +1733,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-apiserver
namespace: monitoring
- apiVersion: v1
@@ -3604,7 +3604,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-cluster-total
namespace: monitoring
- apiVersion: v1
@@ -4770,7 +4770,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-controller-manager
namespace: monitoring
- apiVersion: v1
@@ -7293,7 +7293,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-k8s-resources-cluster
namespace: monitoring
- apiVersion: v1
@@ -9536,7 +9536,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-k8s-resources-namespace
namespace: monitoring
- apiVersion: v1
@@ -10503,7 +10503,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-k8s-resources-node
namespace: monitoring
- apiVersion: v1
@@ -12228,7 +12228,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-k8s-resources-pod
namespace: monitoring
- apiVersion: v1
@@ -14203,7 +14203,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-k8s-resources-workload
namespace: monitoring
- apiVersion: v1
@@ -16343,7 +16343,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-k8s-resources-workloads-namespace
namespace: monitoring
- apiVersion: v1
@@ -18865,7 +18865,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-kubelet
namespace: monitoring
- apiVersion: v1
@@ -20318,7 +20318,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-namespace-by-pod
namespace: monitoring
- apiVersion: v1
@@ -22043,7 +22043,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-namespace-by-workload
namespace: monitoring
- apiVersion: v1
@@ -22106,7 +22106,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "(\n instance:node_cpu_utilisation:rate1m{job=\"node-exporter\"}\n*\n instance:node_num_cpu:sum{job=\"node-exporter\"}\n)\n/ scalar(sum(instance:node_num_cpu:sum{job=\"node-exporter\"}))\n",
+ "expr": "(\n instance:node_cpu_utilisation:rate5m{job=\"node-exporter\"}\n*\n instance:node_num_cpu:sum{job=\"node-exporter\"}\n)\n/ scalar(sum(instance:node_num_cpu:sum{job=\"node-exporter\"}))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}}",
@@ -22376,7 +22376,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "instance:node_vmstat_pgmajfault:rate1m{job=\"node-exporter\"}",
+ "expr": "instance:node_vmstat_pgmajfault:rate5m{job=\"node-exporter\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}}",
@@ -22482,7 +22482,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "instance:node_network_receive_bytes_excluding_lo:rate1m{job=\"node-exporter\"}",
+ "expr": "instance:node_network_receive_bytes_excluding_lo:rate5m{job=\"node-exporter\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}} Receive",
@@ -22490,7 +22490,7 @@ items:
"step": 10
},
{
- "expr": "instance:node_network_transmit_bytes_excluding_lo:rate1m{job=\"node-exporter\"}",
+ "expr": "instance:node_network_transmit_bytes_excluding_lo:rate5m{job=\"node-exporter\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}} Transmit",
@@ -22584,7 +22584,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "instance:node_network_receive_drop_excluding_lo:rate1m{job=\"node-exporter\"}",
+ "expr": "instance:node_network_receive_drop_excluding_lo:rate5m{job=\"node-exporter\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}} Receive",
@@ -22592,7 +22592,7 @@ items:
"step": 10
},
{
- "expr": "instance:node_network_transmit_drop_excluding_lo:rate1m{job=\"node-exporter\"}",
+ "expr": "instance:node_network_transmit_drop_excluding_lo:rate5m{job=\"node-exporter\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}} Transmit",
@@ -22690,7 +22690,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "instance_device:node_disk_io_time_seconds:rate1m{job=\"node-exporter\"}\n/ scalar(count(instance_device:node_disk_io_time_seconds:rate1m{job=\"node-exporter\"}))\n",
+ "expr": "instance_device:node_disk_io_time_seconds:rate5m{job=\"node-exporter\"}\n/ scalar(count(instance_device:node_disk_io_time_seconds:rate5m{job=\"node-exporter\"}))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}} {{device}}",
@@ -22776,7 +22776,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "instance_device:node_disk_io_time_weighted_seconds:rate1m{job=\"node-exporter\"}\n/ scalar(count(instance_device:node_disk_io_time_weighted_seconds:rate1m{job=\"node-exporter\"}))\n",
+ "expr": "instance_device:node_disk_io_time_weighted_seconds:rate5m{job=\"node-exporter\"}\n/ scalar(count(instance_device:node_disk_io_time_weighted_seconds:rate5m{job=\"node-exporter\"}))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}} {{device}}",
@@ -22996,7 +22996,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-node-cluster-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -23059,7 +23059,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "instance:node_cpu_utilisation:rate1m{job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "instance:node_cpu_utilisation:rate5m{job=\"node-exporter\", instance=\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Utilisation",
@@ -23329,7 +23329,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "instance:node_vmstat_pgmajfault:rate1m{job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "instance:node_vmstat_pgmajfault:rate5m{job=\"node-exporter\", instance=\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Major page faults",
@@ -23435,7 +23435,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "instance:node_network_receive_bytes_excluding_lo:rate1m{job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "instance:node_network_receive_bytes_excluding_lo:rate5m{job=\"node-exporter\", instance=\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Receive",
@@ -23443,7 +23443,7 @@ items:
"step": 10
},
{
- "expr": "instance:node_network_transmit_bytes_excluding_lo:rate1m{job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "instance:node_network_transmit_bytes_excluding_lo:rate5m{job=\"node-exporter\", instance=\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Transmit",
@@ -23537,7 +23537,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "instance:node_network_receive_drop_excluding_lo:rate1m{job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "instance:node_network_receive_drop_excluding_lo:rate5m{job=\"node-exporter\", instance=\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Receive drops",
@@ -23545,7 +23545,7 @@ items:
"step": 10
},
{
- "expr": "instance:node_network_transmit_drop_excluding_lo:rate1m{job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "instance:node_network_transmit_drop_excluding_lo:rate5m{job=\"node-exporter\", instance=\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "Transmit drops",
@@ -23643,7 +23643,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "instance_device:node_disk_io_time_seconds:rate1m{job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "instance_device:node_disk_io_time_seconds:rate5m{job=\"node-exporter\", instance=\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{device}}",
@@ -23729,7 +23729,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "instance_device:node_disk_io_time_weighted_seconds:rate1m{job=\"node-exporter\", instance=\"$instance\"}",
+ "expr": "instance_device:node_disk_io_time_weighted_seconds:rate5m{job=\"node-exporter\", instance=\"$instance\"}",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{device}}",
@@ -23976,7 +23976,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -24056,7 +24056,7 @@ items:
{
"expr": "(\n (1 - rate(node_cpu_seconds_total{job=\"node-exporter\", mode=\"idle\", instance=\"$instance\"}[$__interval]))\n/ ignoring(cpu) group_left\n count without (cpu)( node_cpu_seconds_total{job=\"node-exporter\", mode=\"idle\", instance=\"$instance\"})\n)\n",
"format": "time_series",
- "interval": "1m",
+ "interval": "$__rate_interval",
"intervalFactor": 5,
"legendFormat": "{{cpu}}",
"refId": "A"
@@ -24492,7 +24492,7 @@ items:
{
"expr": "rate(node_disk_read_bytes_total{job=\"node-exporter\", instance=\"$instance\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\"}[$__interval])",
"format": "time_series",
- "interval": "1m",
+ "interval": "$__rate_interval",
"intervalFactor": 2,
"legendFormat": "{{device}} read",
"refId": "A"
@@ -24500,7 +24500,7 @@ items:
{
"expr": "rate(node_disk_written_bytes_total{job=\"node-exporter\", instance=\"$instance\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\"}[$__interval])",
"format": "time_series",
- "interval": "1m",
+ "interval": "$__rate_interval",
"intervalFactor": 2,
"legendFormat": "{{device}} written",
"refId": "B"
@@ -24508,7 +24508,7 @@ items:
{
"expr": "rate(node_disk_io_time_seconds_total{job=\"node-exporter\", instance=\"$instance\", device=~\"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\"}[$__interval])",
"format": "time_series",
- "interval": "1m",
+ "interval": "$__rate_interval",
"intervalFactor": 2,
"legendFormat": "{{device}} io time",
"refId": "C"
@@ -24722,7 +24722,7 @@ items:
{
"expr": "rate(node_network_receive_bytes_total{job=\"node-exporter\", instance=\"$instance\", device!=\"lo\"}[$__interval])",
"format": "time_series",
- "interval": "1m",
+ "interval": "$__rate_interval",
"intervalFactor": 2,
"legendFormat": "{{device}}",
"refId": "A"
@@ -24816,7 +24816,7 @@ items:
{
"expr": "rate(node_network_transmit_bytes_total{job=\"node-exporter\", instance=\"$instance\", device!=\"lo\"}[$__interval])",
"format": "time_series",
- "interval": "1m",
+ "interval": "$__rate_interval",
"intervalFactor": 2,
"legendFormat": "{{device}}",
"refId": "A"
@@ -24962,7 +24962,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-nodes
namespace: monitoring
- apiVersion: v1
@@ -25528,7 +25528,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-persistentvolumesusage
namespace: monitoring
- apiVersion: v1
@@ -26745,7 +26745,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-pod-total
namespace: monitoring
- apiVersion: v1
@@ -28404,7 +28404,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-prometheus-remote-write
namespace: monitoring
- apiVersion: v1
@@ -29620,7 +29620,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-prometheus
namespace: monitoring
- apiVersion: v1
@@ -30866,7 +30866,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-proxy
namespace: monitoring
- apiVersion: v1
@@ -31955,7 +31955,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-scheduler
namespace: monitoring
- apiVersion: v1
@@ -32872,7 +32872,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-statefulset
namespace: monitoring
- apiVersion: v1
@@ -34299,7 +34299,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index 9c5ce06b..d631765b 100644
--- a/manifests/grafana-dashboardSources.yaml
+++ b/manifests/grafana-dashboardSources.yaml
@@ -21,6 +21,6 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 7443ed5e..cb466e6e 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: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana
namespace: monitoring
spec:
@@ -18,16 +18,16 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-datasources: 42a69d2dee9d1a6d6331226efedb56a6
+ checksum/grafana-datasources: d118a0f812be10bddbea6fdd25543bb1
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 7.4.3
+ app.kubernetes.io/version: 7.5.3
spec:
containers:
- env: []
- image: grafana/grafana:7.4.3
+ image: grafana/grafana:7.5.3
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index a74ab4ac..46148403 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: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index 090ff4f8..e10b1fa7 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: 7.4.3
+ app.kubernetes.io/version: 7.5.3
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/kube-state-metrics-clusterRole.yaml b/manifests/kube-state-metrics-clusterRole.yaml
index d18a23bf..c7f14e29 100644
--- a/manifests/kube-state-metrics-clusterRole.yaml
+++ b/manifests/kube-state-metrics-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.0.0-rc.1
+ app.kubernetes.io/version: 2.0.0
name: kube-state-metrics
rules:
- apiGroups:
diff --git a/manifests/kube-state-metrics-clusterRoleBinding.yaml b/manifests/kube-state-metrics-clusterRoleBinding.yaml
index a635e6f0..4030e967 100644
--- a/manifests/kube-state-metrics-clusterRoleBinding.yaml
+++ b/manifests/kube-state-metrics-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.0.0-rc.1
+ app.kubernetes.io/version: 2.0.0
name: kube-state-metrics
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/kube-state-metrics-deployment.yaml b/manifests/kube-state-metrics-deployment.yaml
index 9f534b16..b5776083 100644
--- a/manifests/kube-state-metrics-deployment.yaml
+++ b/manifests/kube-state-metrics-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.0.0-rc.1
+ app.kubernetes.io/version: 2.0.0
name: kube-state-metrics
namespace: monitoring
spec:
@@ -21,7 +21,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.0.0-rc.1
+ app.kubernetes.io/version: 2.0.0
spec:
containers:
- args:
@@ -29,7 +29,7 @@ spec:
- --port=8081
- --telemetry-host=127.0.0.1
- --telemetry-port=8082
- image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.0.0-rc.1
+ image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.0.0
name: kube-state-metrics
resources:
limits:
diff --git a/manifests/kube-state-metrics-prometheusRule.yaml b/manifests/kube-state-metrics-prometheusRule.yaml
index b2b6f00e..9b4541f6 100644
--- a/manifests/kube-state-metrics-prometheusRule.yaml
+++ b/manifests/kube-state-metrics-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.0.0-rc.1
+ app.kubernetes.io/version: 2.0.0
prometheus: k8s
role: alert-rules
name: kube-state-metrics-rules
diff --git a/manifests/kube-state-metrics-service.yaml b/manifests/kube-state-metrics-service.yaml
index bcbff985..2f8117a8 100644
--- a/manifests/kube-state-metrics-service.yaml
+++ b/manifests/kube-state-metrics-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.0.0-rc.1
+ app.kubernetes.io/version: 2.0.0
name: kube-state-metrics
namespace: monitoring
spec:
diff --git a/manifests/kube-state-metrics-serviceAccount.yaml b/manifests/kube-state-metrics-serviceAccount.yaml
index 413df7e0..f98d4fea 100644
--- a/manifests/kube-state-metrics-serviceAccount.yaml
+++ b/manifests/kube-state-metrics-serviceAccount.yaml
@@ -5,6 +5,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.0.0-rc.1
+ app.kubernetes.io/version: 2.0.0
name: kube-state-metrics
namespace: monitoring
diff --git a/manifests/kube-state-metrics-serviceMonitor.yaml b/manifests/kube-state-metrics-serviceMonitor.yaml
index df301e31..c27306d7 100644
--- a/manifests/kube-state-metrics-serviceMonitor.yaml
+++ b/manifests/kube-state-metrics-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.0.0-rc.1
+ app.kubernetes.io/version: 2.0.0
name: kube-state-metrics
namespace: monitoring
spec:
diff --git a/manifests/kubernetes-prometheusRule.yaml b/manifests/kubernetes-prometheusRule.yaml
index e83cd084..fda06912 100644
--- a/manifests/kubernetes-prometheusRule.yaml
+++ b/manifests/kubernetes-prometheusRule.yaml
@@ -254,7 +254,7 @@ spec:
/
sum(kube_node_status_allocatable{resource="cpu"})
>
- (count(kube_node_status_allocatable{resource="cpu"}) -1) / count(kube_node_status_allocatable{resource="cpu"})
+ ((count(kube_node_status_allocatable{resource="cpu"}) > 1) - 1) / count(kube_node_status_allocatable{resource="cpu"})
for: 5m
labels:
severity: warning
@@ -268,7 +268,7 @@ spec:
/
sum(kube_node_status_allocatable{resource="memory"})
>
- (count(kube_node_status_allocatable{resource="memory"})-1)
+ ((count(kube_node_status_allocatable{resource="memory"}) > 1) - 1)
/
count(kube_node_status_allocatable{resource="memory"})
for: 5m
@@ -279,7 +279,11 @@ spec:
description: Cluster has overcommitted CPU resource requests for Namespaces.
runbook_url: https://github.com/prometheus-operator/kube-prometheus/wiki/kubecpuquotaovercommit
summary: Cluster has overcommitted CPU resource requests.
- expr: "sum(kube_resourcequota{job=\"kube-state-metrics\", type=\"hard\", resource=\"cpu\"})\n /\nsum(kube_node_status_allocatable{resource=\"cpu\"}) \n > 1.5\n"
+ expr: |
+ sum(kube_resourcequota{job="kube-state-metrics", type="hard", resource="cpu"})
+ /
+ sum(kube_node_status_allocatable{resource="cpu"})
+ > 1.5
for: 5m
labels:
severity: warning
diff --git a/manifests/node-exporter-clusterRole.yaml b/manifests/node-exporter-clusterRole.yaml
index 38fa0770..18ac8610 100644
--- a/manifests/node-exporter-clusterRole.yaml
+++ b/manifests/node-exporter-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 1.1.1
+ app.kubernetes.io/version: 1.1.2
name: node-exporter
rules:
- apiGroups:
diff --git a/manifests/node-exporter-clusterRoleBinding.yaml b/manifests/node-exporter-clusterRoleBinding.yaml
index 26754d62..3d552151 100644
--- a/manifests/node-exporter-clusterRoleBinding.yaml
+++ b/manifests/node-exporter-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 1.1.1
+ app.kubernetes.io/version: 1.1.2
name: node-exporter
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/node-exporter-daemonset.yaml b/manifests/node-exporter-daemonset.yaml
index 146cb487..f63d1019 100644
--- a/manifests/node-exporter-daemonset.yaml
+++ b/manifests/node-exporter-daemonset.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 1.1.1
+ app.kubernetes.io/version: 1.1.2
name: node-exporter
namespace: monitoring
spec:
@@ -20,7 +20,7 @@ spec:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 1.1.1
+ app.kubernetes.io/version: 1.1.2
spec:
containers:
- args:
@@ -32,7 +32,7 @@ spec:
- --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+|var/lib/kubelet/pods/.+)($|/)
- --collector.netclass.ignored-devices=^(veth.*)$
- --collector.netdev.device-exclude=^(veth.*)$
- image: quay.io/prometheus/node-exporter:v1.1.1
+ image: quay.io/prometheus/node-exporter:v1.1.2
name: node-exporter
resources:
limits:
diff --git a/manifests/node-exporter-prometheusRule.yaml b/manifests/node-exporter-prometheusRule.yaml
index 616f2b37..1300f5b6 100644
--- a/manifests/node-exporter-prometheusRule.yaml
+++ b/manifests/node-exporter-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 1.1.1
+ app.kubernetes.io/version: 1.1.2
prometheus: k8s
role: alert-rules
name: node-exporter-rules
@@ -234,9 +234,9 @@ spec:
record: instance:node_num_cpu:sum
- expr: |
1 - avg without (cpu, mode) (
- rate(node_cpu_seconds_total{job="node-exporter", mode="idle"}[1m])
+ rate(node_cpu_seconds_total{job="node-exporter", mode="idle"}[5m])
)
- record: instance:node_cpu_utilisation:rate1m
+ record: instance:node_cpu_utilisation:rate5m
- expr: |
(
node_load1{job="node-exporter"}
@@ -252,31 +252,31 @@ spec:
)
record: instance:node_memory_utilisation:ratio
- expr: |
- rate(node_vmstat_pgmajfault{job="node-exporter"}[1m])
- record: instance:node_vmstat_pgmajfault:rate1m
+ rate(node_vmstat_pgmajfault{job="node-exporter"}[5m])
+ record: instance:node_vmstat_pgmajfault:rate5m
- expr: |
- rate(node_disk_io_time_seconds_total{job="node-exporter", device=~"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"}[1m])
- record: instance_device:node_disk_io_time_seconds:rate1m
+ rate(node_disk_io_time_seconds_total{job="node-exporter", device=~"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"}[5m])
+ record: instance_device:node_disk_io_time_seconds:rate5m
- expr: |
- rate(node_disk_io_time_weighted_seconds_total{job="node-exporter", device=~"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"}[1m])
- record: instance_device:node_disk_io_time_weighted_seconds:rate1m
+ rate(node_disk_io_time_weighted_seconds_total{job="node-exporter", device=~"mmcblk.p.+|nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"}[5m])
+ record: instance_device:node_disk_io_time_weighted_seconds:rate5m
- expr: |
sum without (device) (
- rate(node_network_receive_bytes_total{job="node-exporter", device!="lo"}[1m])
+ rate(node_network_receive_bytes_total{job="node-exporter", device!="lo"}[5m])
)
- record: instance:node_network_receive_bytes_excluding_lo:rate1m
+ record: instance:node_network_receive_bytes_excluding_lo:rate5m
- expr: |
sum without (device) (
- rate(node_network_transmit_bytes_total{job="node-exporter", device!="lo"}[1m])
+ rate(node_network_transmit_bytes_total{job="node-exporter", device!="lo"}[5m])
)
- record: instance:node_network_transmit_bytes_excluding_lo:rate1m
+ record: instance:node_network_transmit_bytes_excluding_lo:rate5m
- expr: |
sum without (device) (
- rate(node_network_receive_drop_total{job="node-exporter", device!="lo"}[1m])
+ rate(node_network_receive_drop_total{job="node-exporter", device!="lo"}[5m])
)
- record: instance:node_network_receive_drop_excluding_lo:rate1m
+ record: instance:node_network_receive_drop_excluding_lo:rate5m
- expr: |
sum without (device) (
- rate(node_network_transmit_drop_total{job="node-exporter", device!="lo"}[1m])
+ rate(node_network_transmit_drop_total{job="node-exporter", device!="lo"}[5m])
)
- record: instance:node_network_transmit_drop_excluding_lo:rate1m
+ record: instance:node_network_transmit_drop_excluding_lo:rate5m
diff --git a/manifests/node-exporter-service.yaml b/manifests/node-exporter-service.yaml
index 15634261..2c89de8b 100644
--- a/manifests/node-exporter-service.yaml
+++ b/manifests/node-exporter-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 1.1.1
+ app.kubernetes.io/version: 1.1.2
name: node-exporter
namespace: monitoring
spec:
diff --git a/manifests/node-exporter-serviceAccount.yaml b/manifests/node-exporter-serviceAccount.yaml
index 446bf8b5..1b665a47 100644
--- a/manifests/node-exporter-serviceAccount.yaml
+++ b/manifests/node-exporter-serviceAccount.yaml
@@ -5,6 +5,6 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 1.1.1
+ app.kubernetes.io/version: 1.1.2
name: node-exporter
namespace: monitoring
diff --git a/manifests/node-exporter-serviceMonitor.yaml b/manifests/node-exporter-serviceMonitor.yaml
index c5096105..c63ef32c 100644
--- a/manifests/node-exporter-serviceMonitor.yaml
+++ b/manifests/node-exporter-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: node-exporter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 1.1.1
+ app.kubernetes.io/version: 1.1.2
name: node-exporter
namespace: monitoring
spec:
diff --git a/manifests/prometheus-adapter-apiService.yaml b/manifests/prometheus-adapter-apiService.yaml
index aced8989..ab5af8fb 100644
--- a/manifests/prometheus-adapter-apiService.yaml
+++ b/manifests/prometheus-adapter-apiService.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.8.3
+ app.kubernetes.io/version: 0.8.4
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 1884b593..d011b3c6 100644
--- a/manifests/prometheus-adapter-clusterRole.yaml
+++ b/manifests/prometheus-adapter-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.8.3
+ app.kubernetes.io/version: 0.8.4
name: prometheus-adapter
rules:
- apiGroups:
diff --git a/manifests/prometheus-adapter-clusterRoleAggregatedMetricsReader.yaml b/manifests/prometheus-adapter-clusterRoleAggregatedMetricsReader.yaml
index f0e7d560..03e76925 100644
--- a/manifests/prometheus-adapter-clusterRoleAggregatedMetricsReader.yaml
+++ b/manifests/prometheus-adapter-clusterRoleAggregatedMetricsReader.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.8.3
+ app.kubernetes.io/version: 0.8.4
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 eb4cf6bd..52c8df93 100644
--- a/manifests/prometheus-adapter-clusterRoleBinding.yaml
+++ b/manifests/prometheus-adapter-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.8.3
+ app.kubernetes.io/version: 0.8.4
name: prometheus-adapter
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheus-adapter-clusterRoleBindingDelegator.yaml b/manifests/prometheus-adapter-clusterRoleBindingDelegator.yaml
index 2787eefa..d77d743e 100644
--- a/manifests/prometheus-adapter-clusterRoleBindingDelegator.yaml
+++ b/manifests/prometheus-adapter-clusterRoleBindingDelegator.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.8.3
+ app.kubernetes.io/version: 0.8.4
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 43e2b1e8..f4fb9c38 100644
--- a/manifests/prometheus-adapter-clusterRoleServerResources.yaml
+++ b/manifests/prometheus-adapter-clusterRoleServerResources.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.8.3
+ app.kubernetes.io/version: 0.8.4
name: resource-metrics-server-resources
rules:
- apiGroups:
diff --git a/manifests/prometheus-adapter-configMap.yaml b/manifests/prometheus-adapter-configMap.yaml
index e933b692..64ee1079 100644
--- a/manifests/prometheus-adapter-configMap.yaml
+++ b/manifests/prometheus-adapter-configMap.yaml
@@ -33,6 +33,6 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.8.3
+ app.kubernetes.io/version: 0.8.4
name: adapter-config
namespace: monitoring
diff --git a/manifests/prometheus-adapter-deployment.yaml b/manifests/prometheus-adapter-deployment.yaml
index b04e2fd7..92740436 100644
--- a/manifests/prometheus-adapter-deployment.yaml
+++ b/manifests/prometheus-adapter-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.8.3
+ app.kubernetes.io/version: 0.8.4
name: prometheus-adapter
namespace: monitoring
spec:
@@ -25,7 +25,7 @@ spec:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.8.3
+ app.kubernetes.io/version: 0.8.4
spec:
containers:
- args:
@@ -35,7 +35,7 @@ spec:
- --metrics-relist-interval=1m
- --prometheus-url=http://prometheus-k8s.monitoring.svc.cluster.local:9090/
- --secure-port=6443
- image: directxman12/k8s-prometheus-adapter:v0.8.3
+ image: directxman12/k8s-prometheus-adapter:v0.8.4
name: prometheus-adapter
ports:
- containerPort: 6443
diff --git a/manifests/prometheus-adapter-roleBindingAuthReader.yaml b/manifests/prometheus-adapter-roleBindingAuthReader.yaml
index 96a5643b..ddc119ef 100644
--- a/manifests/prometheus-adapter-roleBindingAuthReader.yaml
+++ b/manifests/prometheus-adapter-roleBindingAuthReader.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.8.3
+ app.kubernetes.io/version: 0.8.4
name: resource-metrics-auth-reader
namespace: kube-system
roleRef:
diff --git a/manifests/prometheus-adapter-service.yaml b/manifests/prometheus-adapter-service.yaml
index bbcd1ccd..7e711d5e 100644
--- a/manifests/prometheus-adapter-service.yaml
+++ b/manifests/prometheus-adapter-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.8.3
+ app.kubernetes.io/version: 0.8.4
name: prometheus-adapter
namespace: monitoring
spec:
diff --git a/manifests/prometheus-adapter-serviceAccount.yaml b/manifests/prometheus-adapter-serviceAccount.yaml
index a1da8795..74404d5d 100644
--- a/manifests/prometheus-adapter-serviceAccount.yaml
+++ b/manifests/prometheus-adapter-serviceAccount.yaml
@@ -5,6 +5,6 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.8.3
+ app.kubernetes.io/version: 0.8.4
name: prometheus-adapter
namespace: monitoring
diff --git a/manifests/prometheus-adapter-serviceMonitor.yaml b/manifests/prometheus-adapter-serviceMonitor.yaml
index 2de7a36c..5d8bd2c3 100644
--- a/manifests/prometheus-adapter-serviceMonitor.yaml
+++ b/manifests/prometheus-adapter-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: metrics-adapter
app.kubernetes.io/name: prometheus-adapter
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.8.3
+ app.kubernetes.io/version: 0.8.4
name: prometheus-adapter
namespace: monitoring
spec:
diff --git a/manifests/prometheus-clusterRole.yaml b/manifests/prometheus-clusterRole.yaml
index d11d4344..8baca486 100644
--- a/manifests/prometheus-clusterRole.yaml
+++ b/manifests/prometheus-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.25.0
+ app.kubernetes.io/version: 2.26.0
name: prometheus-k8s
rules:
- apiGroups:
diff --git a/manifests/prometheus-clusterRoleBinding.yaml b/manifests/prometheus-clusterRoleBinding.yaml
index 92b449a5..97814375 100644
--- a/manifests/prometheus-clusterRoleBinding.yaml
+++ b/manifests/prometheus-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.25.0
+ app.kubernetes.io/version: 2.26.0
name: prometheus-k8s
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheus-operator-prometheusRule.yaml b/manifests/prometheus-operator-prometheusRule.yaml
index 1db20307..33bfffca 100644
--- a/manifests/prometheus-operator-prometheusRule.yaml
+++ b/manifests/prometheus-operator-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.46.0
+ app.kubernetes.io/version: 0.47.0
prometheus: k8s
role: alert-rules
name: prometheus-operator-rules
diff --git a/manifests/prometheus-operator-serviceMonitor.yaml b/manifests/prometheus-operator-serviceMonitor.yaml
index 3ad1e304..7884328e 100644
--- a/manifests/prometheus-operator-serviceMonitor.yaml
+++ b/manifests/prometheus-operator-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.46.0
+ app.kubernetes.io/version: 0.47.0
name: prometheus-operator
namespace: monitoring
spec:
@@ -21,4 +21,4 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.46.0
+ app.kubernetes.io/version: 0.47.0
diff --git a/manifests/prometheus-podDisruptionBudget.yaml b/manifests/prometheus-podDisruptionBudget.yaml
index 4bc1a8d0..457fe436 100644
--- a/manifests/prometheus-podDisruptionBudget.yaml
+++ b/manifests/prometheus-podDisruptionBudget.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.25.0
+ app.kubernetes.io/version: 2.26.0
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml
index 3febbfee..e45a86f8 100644
--- a/manifests/prometheus-prometheus.yaml
+++ b/manifests/prometheus-prometheus.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.25.0
+ app.kubernetes.io/version: 2.26.0
prometheus: k8s
name: k8s
namespace: monitoring
@@ -17,7 +17,7 @@ spec:
namespace: monitoring
port: web
externalLabels: {}
- image: quay.io/prometheus/prometheus:v2.25.0
+ image: quay.io/prometheus/prometheus:v2.26.0
nodeSelector:
kubernetes.io/os: linux
podMetadata:
@@ -25,7 +25,7 @@ spec:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.25.0
+ app.kubernetes.io/version: 2.26.0
podMonitorNamespaceSelector: {}
podMonitorSelector: {}
probeNamespaceSelector: {}
@@ -45,4 +45,4 @@ spec:
serviceAccountName: prometheus-k8s
serviceMonitorNamespaceSelector: {}
serviceMonitorSelector: {}
- version: 2.25.0
+ version: 2.26.0
diff --git a/manifests/prometheus-prometheusRule.yaml b/manifests/prometheus-prometheusRule.yaml
index 86a853d7..681219fb 100644
--- a/manifests/prometheus-prometheusRule.yaml
+++ b/manifests/prometheus-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.25.0
+ app.kubernetes.io/version: 2.26.0
prometheus: k8s
role: alert-rules
name: prometheus-k8s-prometheus-rules
diff --git a/manifests/prometheus-roleBindingConfig.yaml b/manifests/prometheus-roleBindingConfig.yaml
index 719538b9..d02fcc6a 100644
--- a/manifests/prometheus-roleBindingConfig.yaml
+++ b/manifests/prometheus-roleBindingConfig.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.25.0
+ app.kubernetes.io/version: 2.26.0
name: prometheus-k8s-config
namespace: monitoring
roleRef:
diff --git a/manifests/prometheus-roleBindingSpecificNamespaces.yaml b/manifests/prometheus-roleBindingSpecificNamespaces.yaml
index 78b387f5..e9efd6bd 100644
--- a/manifests/prometheus-roleBindingSpecificNamespaces.yaml
+++ b/manifests/prometheus-roleBindingSpecificNamespaces.yaml
@@ -7,7 +7,7 @@ items:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.25.0
+ app.kubernetes.io/version: 2.26.0
name: prometheus-k8s
namespace: default
roleRef:
@@ -25,7 +25,7 @@ items:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.25.0
+ app.kubernetes.io/version: 2.26.0
name: prometheus-k8s
namespace: kube-system
roleRef:
@@ -43,7 +43,7 @@ items:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.25.0
+ app.kubernetes.io/version: 2.26.0
name: prometheus-k8s
namespace: monitoring
roleRef:
diff --git a/manifests/prometheus-roleConfig.yaml b/manifests/prometheus-roleConfig.yaml
index e1bd1715..d83277b4 100644
--- a/manifests/prometheus-roleConfig.yaml
+++ b/manifests/prometheus-roleConfig.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.25.0
+ app.kubernetes.io/version: 2.26.0
name: prometheus-k8s-config
namespace: monitoring
rules:
diff --git a/manifests/prometheus-roleSpecificNamespaces.yaml b/manifests/prometheus-roleSpecificNamespaces.yaml
index de5bca6e..a55e8610 100644
--- a/manifests/prometheus-roleSpecificNamespaces.yaml
+++ b/manifests/prometheus-roleSpecificNamespaces.yaml
@@ -7,7 +7,7 @@ items:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.25.0
+ app.kubernetes.io/version: 2.26.0
name: prometheus-k8s
namespace: default
rules:
@@ -44,7 +44,7 @@ items:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.25.0
+ app.kubernetes.io/version: 2.26.0
name: prometheus-k8s
namespace: kube-system
rules:
@@ -81,7 +81,7 @@ items:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.25.0
+ app.kubernetes.io/version: 2.26.0
name: prometheus-k8s
namespace: monitoring
rules:
diff --git a/manifests/prometheus-service.yaml b/manifests/prometheus-service.yaml
index 799ac53f..3c512b9f 100644
--- a/manifests/prometheus-service.yaml
+++ b/manifests/prometheus-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.25.0
+ app.kubernetes.io/version: 2.26.0
prometheus: k8s
name: prometheus-k8s
namespace: monitoring
diff --git a/manifests/prometheus-serviceAccount.yaml b/manifests/prometheus-serviceAccount.yaml
index d82e617f..5496825f 100644
--- a/manifests/prometheus-serviceAccount.yaml
+++ b/manifests/prometheus-serviceAccount.yaml
@@ -5,6 +5,6 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.25.0
+ app.kubernetes.io/version: 2.26.0
name: prometheus-k8s
namespace: monitoring
diff --git a/manifests/prometheus-serviceMonitor.yaml b/manifests/prometheus-serviceMonitor.yaml
index 3440a5c9..edeacbc6 100644
--- a/manifests/prometheus-serviceMonitor.yaml
+++ b/manifests/prometheus-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: prometheus
app.kubernetes.io/name: prometheus
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.25.0
+ app.kubernetes.io/version: 2.26.0
name: prometheus-k8s
namespace: monitoring
spec:
diff --git a/manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml
index 5cb8d021..5897c240 100644
--- a/manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0podmonitorCustomResourceDefinition.yaml
@@ -158,7 +158,7 @@ spec:
description: ProxyURL eg http://proxyserver:2195 Directs scrapes to proxy through this endpoint.
type: string
relabelings:
- 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 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'
items:
description: 'RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines `<metric_relabel_configs>`-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
properties:
diff --git a/manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml
index 273616af..d6a8acd9 100644
--- a/manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0probeCustomResourceDefinition.yaml
@@ -32,6 +32,55 @@ spec:
spec:
description: Specification of desired Ingress selection for target discovery by Prometheus.
properties:
+ basicAuth:
+ description: 'BasicAuth allow an endpoint to authenticate over basic authentication. More info: https://prometheus.io/docs/operating/configuration/#endpoint'
+ properties:
+ password:
+ description: The secret in the service monitor namespace that contains the password for authentication.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ username:
+ description: The secret in the service monitor namespace that contains the username for authentication.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ type: object
+ bearerTokenSecret:
+ description: Secret to mount to read bearer token for scraping targets. The secret needs to be in the same namespace as the probe and accessible by the Prometheus Operator.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
interval:
description: Interval at which targets are probed using the configured prober. If not specified Prometheus' global scrape interval is used.
type: string
@@ -185,6 +234,99 @@ spec:
type: array
type: object
type: object
+ tlsConfig:
+ description: TLS configuration to use when scraping the endpoint.
+ properties:
+ ca:
+ description: Struct containing the CA cert to use for the targets.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ type: object
+ cert:
+ description: Struct containing the client cert file for the targets.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ type: object
+ insecureSkipVerify:
+ description: Disable target certificate validation.
+ type: boolean
+ keySecret:
+ description: Secret containing the client key file for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ serverName:
+ description: Used to verify the hostname for the targets.
+ type: string
+ type: object
type: object
required:
- spec
diff --git a/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
index 3f0eb867..23816577 100644
--- a/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
@@ -1464,6 +1464,11 @@ spec:
enableAdminAPI:
description: 'Enable access to prometheus web admin API. Defaults to the value of `false`. WARNING: Enabling the admin APIs enables mutating endpoints, to delete data, shutdown Prometheus, and more. Enabling this should be done with care and the user is advised to add additional authentication authorization via a proxy to ensure only clients authorized to perform these actions can do so. For more information see https://prometheus.io/docs/prometheus/latest/querying/api/#tsdb-admin-apis'
type: boolean
+ enableFeatures:
+ description: Enable access to Prometheus disabled features. By default, no features are enabled. Enabling disabled features is entirely outside the scope of what the maintainers will support and by doing so, you accept that this behaviour may break at any time without notice. For more information see https://prometheus.io/docs/prometheus/latest/disabled_features/
+ items:
+ type: string
+ type: array
enforcedNamespaceLabel:
description: EnforcedNamespaceLabel enforces adding a namespace label of origin for each alert and metric that is user created. The label value will always be the namespace of the object that is being created.
type: string
@@ -2462,7 +2467,7 @@ spec:
type: object
type: object
bearerToken:
- description: bearer token for remote read.
+ description: Bearer token for remote read.
type: string
bearerTokenFile:
description: File to read bearer token for remote read.
@@ -2633,7 +2638,7 @@ spec:
type: object
type: object
bearerToken:
- description: File to read bearer token for remote write.
+ description: Bearer token for remote write.
type: string
bearerTokenFile:
description: File to read bearer token for remote write.
@@ -2643,6 +2648,16 @@ spec:
type: string
description: Custom HTTP headers to be sent along with each remote write request. Be aware that headers that are set by Prometheus itself can't be overwritten. Only valid in Prometheus versions 2.25.0 and newer.
type: object
+ metadataConfig:
+ description: MetadataConfig configures the sending of series metadata to remote storage.
+ properties:
+ send:
+ description: Whether metric metadata is sent to remote storage or not.
+ type: boolean
+ sendInterval:
+ description: How frequently metric metadata is sent to remote storage.
+ type: string
+ type: object
name:
description: The name of the remote write queue, must be unique if specified. The name is used in metrics and logging in order to differentiate queues. Only valid in Prometheus versions 2.15.0 and newer.
type: string
diff --git a/manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
index 82d6ba34..4ae0a59d 100644
--- a/manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0servicemonitorCustomResourceDefinition.yaml
@@ -146,7 +146,7 @@ spec:
description: ProxyURL eg http://proxyserver:2195 Directs scrapes to proxy through this endpoint.
type: string
relabelings:
- description: 'RelabelConfigs to apply to samples before scraping. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config'
+ 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'
items:
description: 'RelabelConfig allows dynamic rewriting of the label set, being applied to samples before ingestion. It defines `<metric_relabel_configs>`-section of Prometheus configuration. More info: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs'
properties:
diff --git a/manifests/setup/prometheus-operator-clusterRole.yaml b/manifests/setup/prometheus-operator-clusterRole.yaml
index ef18e645..6ff220b4 100644
--- a/manifests/setup/prometheus-operator-clusterRole.yaml
+++ b/manifests/setup/prometheus-operator-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.46.0
+ app.kubernetes.io/version: 0.47.0
name: prometheus-operator
rules:
- apiGroups:
diff --git a/manifests/setup/prometheus-operator-clusterRoleBinding.yaml b/manifests/setup/prometheus-operator-clusterRoleBinding.yaml
index 821e55b1..99c9ae30 100644
--- a/manifests/setup/prometheus-operator-clusterRoleBinding.yaml
+++ b/manifests/setup/prometheus-operator-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.46.0
+ app.kubernetes.io/version: 0.47.0
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/setup/prometheus-operator-deployment.yaml b/manifests/setup/prometheus-operator-deployment.yaml
index 41c02268..23992a03 100644
--- a/manifests/setup/prometheus-operator-deployment.yaml
+++ b/manifests/setup/prometheus-operator-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.46.0
+ app.kubernetes.io/version: 0.47.0
name: prometheus-operator
namespace: monitoring
spec:
@@ -21,13 +21,13 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.46.0
+ app.kubernetes.io/version: 0.47.0
spec:
containers:
- args:
- --kubelet-service=kube-system/kubelet
- - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.46.0
- image: quay.io/prometheus-operator/prometheus-operator:v0.46.0
+ - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.47.0
+ image: quay.io/prometheus-operator/prometheus-operator:v0.47.0
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/manifests/setup/prometheus-operator-service.yaml b/manifests/setup/prometheus-operator-service.yaml
index 792cc6e5..ac4e89a7 100644
--- a/manifests/setup/prometheus-operator-service.yaml
+++ b/manifests/setup/prometheus-operator-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.46.0
+ app.kubernetes.io/version: 0.47.0
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/setup/prometheus-operator-serviceAccount.yaml b/manifests/setup/prometheus-operator-serviceAccount.yaml
index ecb7cce9..20f98fd2 100644
--- a/manifests/setup/prometheus-operator-serviceAccount.yaml
+++ b/manifests/setup/prometheus-operator-serviceAccount.yaml
@@ -5,6 +5,6 @@ metadata:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.46.0
+ app.kubernetes.io/version: 0.47.0
name: prometheus-operator
namespace: monitoring
--
GitLab