diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index e7a9cd808945f899300548893582d379ea442b1d..a3f923d5cb819ab0a9a1d0d6ac04f61b02fa8ee0 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,12 +1,12 @@
{
"alertmanager": "0.24.0",
"blackboxExporter": "0.22.0",
- "grafana": "9.1.7",
+ "grafana": "9.2.3",
"kubeStateMetrics": "2.6.0",
"nodeExporter": "1.4.0",
"prometheus": "2.39.1",
"prometheusAdapter": "0.10.0",
- "prometheusOperator": "0.60.0",
+ "prometheusOperator": "0.60.1",
"kubeRbacProxy": "0.13.1",
"configmapReload": "0.5.0",
"pyrra": "0.4.4"
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index f9738dc2d8c78beb5b796937c750038aec8af5f4..98b3b8af581905490982967c7b398c0eadf13b83 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "d19116e6ee66e52a5fd8cce2e10f9422fb80e42f",
+ "version": "0dd88467fa0714c39666e631f26a3fd4aefdd817",
"sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds="
},
{
@@ -58,7 +58,7 @@
"subdir": "grafana-builder"
}
},
- "version": "d73aff453c9784cd6922119f3ce33d8d355a79e1",
+ "version": "24a52fc8622a540962362f667344f68864d15792",
"sum": "tDR6yT2GVfw0wTU12iZH+m01HrbIr6g/xN+/8nzNkU0="
},
{
@@ -68,8 +68,8 @@
"subdir": ""
}
},
- "version": "7b559e800a32a2a80caf4c968f37c4999ec44689",
- "sum": "OqX/DHB6fuywNgqHAZTGRnfkYTQqoYmGePsrZ6nQELw="
+ "version": "05a58f765eda05902d4f7dd22098a2b870f7ca1e",
+ "sum": "ohFopg3a6U8N73iy97/iRIuO3UN5WJaCGoxh5TqYUWw="
},
{
"source": {
@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "12402a564cbf4557763079ab8e6e995d9afb4db9",
+ "version": "0f483430c406847ebafff91733e18fbb64f87f8e",
"sum": "evJ+PXRzuM1tezCG5WzpAn4Lk3YJfMvDFcs+45fsscU="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "12402a564cbf4557763079ab8e6e995d9afb4db9",
+ "version": "0f483430c406847ebafff91733e18fbb64f87f8e",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -98,7 +98,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "3335fd098b6bcd4702a411256a54b515726935af",
+ "version": "2ce4214759c73d8a148945b074d16cf86b52b1cd",
"sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
"name": "prometheus-operator-mixin"
},
@@ -109,8 +109,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "3335fd098b6bcd4702a411256a54b515726935af",
- "sum": "O/e9OtVscqHAiAvvWGR372ci6xadmQ09WWGjT7vDlbg="
+ "version": "2ce4214759c73d8a148945b074d16cf86b52b1cd",
+ "sum": "Gn4tIYk+uSNU39G9Pn1/flzknbbN/RHeGEu3dZj1H0s="
},
{
"source": {
@@ -119,7 +119,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "78b5a27d40c099fee039fbf1a613ebfa3d01e345",
+ "version": "33bba9509939dae568c6b6e49b9871974cdcf98d",
"sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=",
"name": "alertmanager"
},
@@ -130,8 +130,8 @@
"subdir": "docs/node-mixin"
}
},
- "version": "b7dd00ff8b079474b080a068ce0064d66878a348",
- "sum": "tappaHscNBSJCA6ypSWt7DDhohIOkxNjcLFRb3WKpu4="
+ "version": "fd14fb04c7208b440319ab3e048985f870994dc3",
+ "sum": "5H6gKQvR23QHpvNvLkNn9DL3Vx37g015eHG2iqrlCzE="
},
{
"source": {
@@ -140,7 +140,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "bfd320e1866bd8d9e58654d2e6ff87e79b01621f",
+ "version": "6dd4e907a31a58d1b738aa5debbfc9c5e1ed32ac",
"sum": "Dq+wurABxuqRAHj4DGp2sCmjJWzNjrhP2XEScsS0kmY=",
"name": "prometheus"
},
@@ -151,7 +151,7 @@
"subdir": "config/crd/bases"
}
},
- "version": "65c07fda62ecbc4e5970580d924a37ca633abe3c",
+ "version": "ca8f1bb63e1dd40a89d3dc70d98d4ae04bb51db1",
"sum": "d1550yhsX4VxdVN7b0gWT0cido/W90P6OGLzLqPwZcs="
},
{
@@ -161,8 +161,8 @@
"subdir": "mixin"
}
},
- "version": "a4e334152549c3eeef5bc55566537b1927bca087",
- "sum": "095uB0qB1Ek+aNYf+CgydVZk5aFETsfD8GYf6gDwSJs=",
+ "version": "ef3a3310bf34c179ffaf73d94d0a4f60f0d07a99",
+ "sum": "FE6a1GxXu7kzo+zD8XeyVV296Rz/OCvBUNJXJqua6D4=",
"name": "thanos-mixin"
},
{
diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml
index b3e1b9806eb26969399afec02bf2ef87ea879f0c..d8d933cfef04545ed288c74efef58034e14af669 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: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-config
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index 6e49e971f5a8c134ec8266b85477c6d520da782e..7c3a037974dc3a677cc5549fcd665f648b67a8e5 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: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-datasources
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 1856f9f4bb88a39c96a5c4ae52e86ff91a50118c..0f3dafb084d1631e3221c13cf7d3a5be3007d03d 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -600,7 +600,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-alertmanager-overview
namespace: monitoring
- apiVersion: v1
@@ -2361,7 +2361,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-apiserver
namespace: monitoring
- apiVersion: v1
@@ -4232,7 +4232,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-cluster-total
namespace: monitoring
- apiVersion: v1
@@ -5411,7 +5411,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-controller-manager
namespace: monitoring
- apiVersion: v1
@@ -6036,7 +6036,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-grafana-overview
namespace: monitoring
- apiVersion: v1
@@ -9113,7 +9113,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-k8s-resources-cluster
namespace: monitoring
- apiVersion: v1
@@ -11899,7 +11899,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-k8s-resources-namespace
namespace: monitoring
- apiVersion: v1
@@ -12914,7 +12914,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-k8s-resources-node
namespace: monitoring
- apiVersion: v1
@@ -15372,7 +15372,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-k8s-resources-pod
namespace: monitoring
- apiVersion: v1
@@ -17385,7 +17385,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-k8s-resources-workload
namespace: monitoring
- apiVersion: v1
@@ -19563,7 +19563,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-k8s-resources-workloads-namespace
namespace: monitoring
- apiVersion: v1
@@ -21806,7 +21806,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-kubelet
namespace: monitoring
- apiVersion: v1
@@ -23259,7 +23259,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-namespace-by-pod
namespace: monitoring
- apiVersion: v1
@@ -24984,7 +24984,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-namespace-by-workload
namespace: monitoring
- apiVersion: v1
@@ -25888,7 +25888,7 @@ items:
"steppedLine": false,
"targets": [
{
- "expr": "sum without (device) (\n max without (fstype, mountpoint) ((\n node_filesystem_size_bytes{job=\"node-exporter\", fstype!=\"\", cluster=\"$cluster\"}\n -\n node_filesystem_avail_bytes{job=\"node-exporter\", fstype!=\"\", cluster=\"$cluster\"}\n ) != 0)\n)\n/ scalar(sum(max without (fstype, mountpoint) (node_filesystem_size_bytes{job=\"node-exporter\", fstype!=\"\", cluster=\"$cluster\"})))\n",
+ "expr": "sum without (device) (\n max without (fstype, mountpoint) ((\n node_filesystem_size_bytes{job=\"node-exporter\", fstype!=\"\", mountpoint!=\"\", cluster=\"$cluster\"}\n -\n node_filesystem_avail_bytes{job=\"node-exporter\", fstype!=\"\", mountpoint!=\"\", cluster=\"$cluster\"}\n ) != 0)\n)\n/ scalar(sum(max without (fstype, mountpoint) (node_filesystem_size_bytes{job=\"node-exporter\", fstype!=\"\", mountpoint!=\"\", cluster=\"$cluster\"})))\n",
"format": "time_series",
"intervalFactor": 2,
"legendFormat": "{{instance}}",
@@ -26036,7 +26036,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-node-cluster-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -27114,7 +27114,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -27763,14 +27763,14 @@ items:
"span": 6,
"targets": [
{
- "expr": "max by (mountpoint) (node_filesystem_size_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\"})\n",
+ "expr": "max by (mountpoint) (node_filesystem_size_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\", mountpoint!=\"\"})\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
"legendFormat": ""
},
{
- "expr": "max by (mountpoint) (node_filesystem_avail_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\"})\n",
+ "expr": "max by (mountpoint) (node_filesystem_avail_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\", mountpoint!=\"\"})\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -28176,7 +28176,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-nodes-darwin
namespace: monitoring
- apiVersion: v1
@@ -28818,14 +28818,14 @@ items:
"span": 6,
"targets": [
{
- "expr": "max by (mountpoint) (node_filesystem_size_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\"})\n",
+ "expr": "max by (mountpoint) (node_filesystem_size_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\", mountpoint!=\"\"})\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
"legendFormat": ""
},
{
- "expr": "max by (mountpoint) (node_filesystem_avail_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\"})\n",
+ "expr": "max by (mountpoint) (node_filesystem_avail_bytes{job=\"node-exporter\", instance=\"$instance\", fstype!=\"\", mountpoint!=\"\"})\n",
"format": "table",
"instant": true,
"intervalFactor": 2,
@@ -29231,7 +29231,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-nodes
namespace: monitoring
- apiVersion: v1
@@ -29807,7 +29807,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-persistentvolumesusage
namespace: monitoring
- apiVersion: v1
@@ -31024,7 +31024,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-pod-total
namespace: monitoring
- apiVersion: v1
@@ -32683,7 +32683,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-prometheus-remote-write
namespace: monitoring
- apiVersion: v1
@@ -33907,7 +33907,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-prometheus
namespace: monitoring
- apiVersion: v1
@@ -35167,7 +35167,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-proxy
namespace: monitoring
- apiVersion: v1
@@ -36268,7 +36268,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-scheduler
namespace: monitoring
- apiVersion: v1
@@ -37695,7 +37695,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index cf86b952c313b844813c5a2921f67b643cb81dcd..ef08503ba2bb641a64dc8990cacc585cecf738b7 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: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 04e082de690729989b741f3dd11ca69788b23037..7e937baf228ff2c87baceb89ce3b0b3410f3f7a7 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: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana
namespace: monitoring
spec:
@@ -18,19 +18,19 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-config: 0ef4c7db13c72102f31c8ad529156e4e
- checksum/grafana-dashboardproviders: 2d7e919d4989f84795096640ec87a55e
- checksum/grafana-datasources: ba03a8ff7e8324228e2472e2ebde4080
+ checksum/grafana-config: fdf6f4168cf0c2006f9f9ee38740384d
+ checksum/grafana-dashboardproviders: bd2505a955b6b74b07c7d294b2ecc138
+ checksum/grafana-datasources: ffb85116948c65ff51e950d00c67b139
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.1.7
+ app.kubernetes.io/version: 9.2.3
spec:
automountServiceAccountToken: false
containers:
- env: []
- image: grafana/grafana:9.1.7
+ image: grafana/grafana:9.2.3
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml
index 697833b2b0af610251ea275e6c3fbf8e6291782c..8ea406743d05c7c51c07e5574962d21d39e7f7d4 100644
--- a/manifests/grafana-networkPolicy.yaml
+++ b/manifests/grafana-networkPolicy.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: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml
index e8e680f3b9636e1a0d0c292d4a41c2eace3b55f6..4eba8060de5acd812a4ec717b85a960ec0179270 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: 9.1.7
+ app.kubernetes.io/version: 9.2.3
prometheus: k8s
role: alert-rules
name: grafana-rules
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index 5a39b830f915ed82321202ed0e0f9693ba4dcdd3..560ce8fb36aae1749e9d2021a0b5caec523bb3ee 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: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml
index d92e4927260a6f739cf45d363a201482016ed715..afed5d58cf2ac2f9dd31aa552ef432f38bc0633f 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: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana
namespace: monitoring
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index 804de546f3b7f241678ebf8c034867b96068b977..f957efea47a17375c707266a8944fb68433c7317 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: 9.1.7
+ app.kubernetes.io/version: 9.2.3
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/nodeExporter-prometheusRule.yaml b/manifests/nodeExporter-prometheusRule.yaml
index 56a5180783f41bef15b8474d74963d4d5135dff9..f725bc740c579afd75797d700c781ce11984009b 100644
--- a/manifests/nodeExporter-prometheusRule.yaml
+++ b/manifests/nodeExporter-prometheusRule.yaml
@@ -23,11 +23,11 @@ spec:
summary: Filesystem is predicted to run out of space within the next 24 hours.
expr: |
(
- node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 15
+ node_filesystem_avail_bytes{job="node-exporter",fstype!="",mountpoint!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!="",mountpoint!=""} * 100 < 15
and
- predict_linear(node_filesystem_avail_bytes{job="node-exporter",fstype!=""}[6h], 24*60*60) < 0
+ predict_linear(node_filesystem_avail_bytes{job="node-exporter",fstype!="",mountpoint!=""}[6h], 24*60*60) < 0
and
- node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
+ node_filesystem_readonly{job="node-exporter",fstype!="",mountpoint!=""} == 0
)
for: 1h
labels:
@@ -41,11 +41,11 @@ spec:
summary: Filesystem is predicted to run out of space within the next 4 hours.
expr: |
(
- node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 10
+ node_filesystem_avail_bytes{job="node-exporter",fstype!="",mountpoint!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!="",mountpoint!=""} * 100 < 10
and
- predict_linear(node_filesystem_avail_bytes{job="node-exporter",fstype!=""}[6h], 4*60*60) < 0
+ predict_linear(node_filesystem_avail_bytes{job="node-exporter",fstype!="",mountpoint!=""}[6h], 4*60*60) < 0
and
- node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
+ node_filesystem_readonly{job="node-exporter",fstype!="",mountpoint!=""} == 0
)
for: 1h
labels:
@@ -58,9 +58,9 @@ spec:
summary: Filesystem has less than 5% space left.
expr: |
(
- node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 5
+ node_filesystem_avail_bytes{job="node-exporter",fstype!="",mountpoint!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!="",mountpoint!=""} * 100 < 5
and
- node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
+ node_filesystem_readonly{job="node-exporter",fstype!="",mountpoint!=""} == 0
)
for: 30m
labels:
@@ -73,9 +73,9 @@ spec:
summary: Filesystem has less than 3% space left.
expr: |
(
- node_filesystem_avail_bytes{job="node-exporter",fstype!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!=""} * 100 < 3
+ node_filesystem_avail_bytes{job="node-exporter",fstype!="",mountpoint!=""} / node_filesystem_size_bytes{job="node-exporter",fstype!="",mountpoint!=""} * 100 < 3
and
- node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
+ node_filesystem_readonly{job="node-exporter",fstype!="",mountpoint!=""} == 0
)
for: 30m
labels:
@@ -89,11 +89,11 @@ spec:
summary: Filesystem is predicted to run out of inodes within the next 24 hours.
expr: |
(
- node_filesystem_files_free{job="node-exporter",fstype!=""} / node_filesystem_files{job="node-exporter",fstype!=""} * 100 < 40
+ node_filesystem_files_free{job="node-exporter",fstype!="",mountpoint!=""} / node_filesystem_files{job="node-exporter",fstype!="",mountpoint!=""} * 100 < 40
and
- predict_linear(node_filesystem_files_free{job="node-exporter",fstype!=""}[6h], 24*60*60) < 0
+ predict_linear(node_filesystem_files_free{job="node-exporter",fstype!="",mountpoint!=""}[6h], 24*60*60) < 0
and
- node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
+ node_filesystem_readonly{job="node-exporter",fstype!="",mountpoint!=""} == 0
)
for: 1h
labels:
@@ -107,11 +107,11 @@ spec:
summary: Filesystem is predicted to run out of inodes within the next 4 hours.
expr: |
(
- node_filesystem_files_free{job="node-exporter",fstype!=""} / node_filesystem_files{job="node-exporter",fstype!=""} * 100 < 20
+ node_filesystem_files_free{job="node-exporter",fstype!="",mountpoint!=""} / node_filesystem_files{job="node-exporter",fstype!="",mountpoint!=""} * 100 < 20
and
- predict_linear(node_filesystem_files_free{job="node-exporter",fstype!=""}[6h], 4*60*60) < 0
+ predict_linear(node_filesystem_files_free{job="node-exporter",fstype!="",mountpoint!=""}[6h], 4*60*60) < 0
and
- node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
+ node_filesystem_readonly{job="node-exporter",fstype!="",mountpoint!=""} == 0
)
for: 1h
labels:
@@ -124,9 +124,9 @@ spec:
summary: Filesystem has less than 5% inodes left.
expr: |
(
- node_filesystem_files_free{job="node-exporter",fstype!=""} / node_filesystem_files{job="node-exporter",fstype!=""} * 100 < 5
+ node_filesystem_files_free{job="node-exporter",fstype!="",mountpoint!=""} / node_filesystem_files{job="node-exporter",fstype!="",mountpoint!=""} * 100 < 5
and
- node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
+ node_filesystem_readonly{job="node-exporter",fstype!="",mountpoint!=""} == 0
)
for: 1h
labels:
@@ -139,9 +139,9 @@ spec:
summary: Filesystem has less than 3% inodes left.
expr: |
(
- node_filesystem_files_free{job="node-exporter",fstype!=""} / node_filesystem_files{job="node-exporter",fstype!=""} * 100 < 3
+ node_filesystem_files_free{job="node-exporter",fstype!="",mountpoint!=""} / node_filesystem_files{job="node-exporter",fstype!="",mountpoint!=""} * 100 < 3
and
- node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
+ node_filesystem_readonly{job="node-exporter",fstype!="",mountpoint!=""} == 0
)
for: 1h
labels:
diff --git a/manifests/prometheusOperator-clusterRole.yaml b/manifests/prometheusOperator-clusterRole.yaml
index 51db7c79b823aa1bb1ed806f532c83eff3a0fdef..7b4812560edae0cd2e58e6da341e1ebb1a5d85b7 100644
--- a/manifests/prometheusOperator-clusterRole.yaml
+++ b/manifests/prometheusOperator-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.60.0
+ app.kubernetes.io/version: 0.60.1
name: prometheus-operator
rules:
- apiGroups:
diff --git a/manifests/prometheusOperator-clusterRoleBinding.yaml b/manifests/prometheusOperator-clusterRoleBinding.yaml
index 30df7504af6dd9f7fb957c152305cce13afffbc7..83ee98c233a3e13d003a005c0ee4933add34761f 100644
--- a/manifests/prometheusOperator-clusterRoleBinding.yaml
+++ b/manifests/prometheusOperator-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.60.0
+ app.kubernetes.io/version: 0.60.1
name: prometheus-operator
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/prometheusOperator-deployment.yaml b/manifests/prometheusOperator-deployment.yaml
index fc1149a9d54544abb97134732ce8fb1e74ff7498..78a1e1c0c3db65b9c468acc2a61670ca727f3a19 100644
--- a/manifests/prometheusOperator-deployment.yaml
+++ b/manifests/prometheusOperator-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.60.0
+ app.kubernetes.io/version: 0.60.1
name: prometheus-operator
namespace: monitoring
spec:
@@ -23,14 +23,14 @@ spec:
app.kubernetes.io/component: controller
app.kubernetes.io/name: prometheus-operator
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 0.60.0
+ app.kubernetes.io/version: 0.60.1
spec:
automountServiceAccountToken: true
containers:
- args:
- --kubelet-service=kube-system/kubelet
- - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.60.0
- image: quay.io/prometheus-operator/prometheus-operator:v0.60.0
+ - --prometheus-config-reloader=quay.io/prometheus-operator/prometheus-config-reloader:v0.60.1
+ image: quay.io/prometheus-operator/prometheus-operator:v0.60.1
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/manifests/prometheusOperator-networkPolicy.yaml b/manifests/prometheusOperator-networkPolicy.yaml
index 1b56ef5837f35a81cb9927fb0efdea4f019c46be..fca47db4713d4a2ace65477181b587477b1c3ef2 100644
--- a/manifests/prometheusOperator-networkPolicy.yaml
+++ b/manifests/prometheusOperator-networkPolicy.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.60.0
+ app.kubernetes.io/version: 0.60.1
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-prometheusRule.yaml b/manifests/prometheusOperator-prometheusRule.yaml
index a6da4b907b1ca67c8ae11478deab3180ca8616c9..3d992773dd863e8a0676a727ab9dbcb14f59053a 100644
--- a/manifests/prometheusOperator-prometheusRule.yaml
+++ b/manifests/prometheusOperator-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.60.0
+ app.kubernetes.io/version: 0.60.1
prometheus: k8s
role: alert-rules
name: prometheus-operator-rules
diff --git a/manifests/prometheusOperator-service.yaml b/manifests/prometheusOperator-service.yaml
index 74da95df710aeb9e3233925c190a543624a452c2..ebf991b7f57a52ae0b9151d233b847d204b18fb2 100644
--- a/manifests/prometheusOperator-service.yaml
+++ b/manifests/prometheusOperator-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.60.0
+ app.kubernetes.io/version: 0.60.1
name: prometheus-operator
namespace: monitoring
spec:
diff --git a/manifests/prometheusOperator-serviceAccount.yaml b/manifests/prometheusOperator-serviceAccount.yaml
index fee31bb726a3c787a283564081e7730f601312ab..94217bc3c290d4a4f4021641dddd2a37b92dde28 100644
--- a/manifests/prometheusOperator-serviceAccount.yaml
+++ b/manifests/prometheusOperator-serviceAccount.yaml
@@ -6,6 +6,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.60.0
+ app.kubernetes.io/version: 0.60.1
name: prometheus-operator
namespace: monitoring
diff --git a/manifests/prometheusOperator-serviceMonitor.yaml b/manifests/prometheusOperator-serviceMonitor.yaml
index bc48d91267cfc62275b84c5243ef5f79f669320e..ee52c42fd4b61a1b5ac45e0c2ce8d4b73e9f0c3a 100644
--- a/manifests/prometheusOperator-serviceMonitor.yaml
+++ b/manifests/prometheusOperator-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.60.0
+ app.kubernetes.io/version: 0.60.1
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.60.0
+ app.kubernetes.io/version: 0.60.1
diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
index 73b238f0810cb620bbe474311bf814107133863e..d6d3a371dd54eacea0cbd4d17e2d9bead345378a 100644
--- a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
@@ -311,8 +311,8 @@ spec:
description: TLS configuration
properties:
ca:
- description: Struct containing the CA cert to use
- for the targets.
+ description: Certificate authority used when verifying
+ server certificates.
properties:
configMap:
description: ConfigMap containing data to use
@@ -359,8 +359,8 @@ spec:
x-kubernetes-map-type: atomic
type: object
cert:
- description: Struct containing the client cert file
- for the targets.
+ description: Client certificate to present when doing
+ client-authentication.
properties:
configMap:
description: ConfigMap containing data to use
@@ -722,8 +722,8 @@ spec:
description: TLS configuration for the client.
properties:
ca:
- description: Struct containing the CA cert to
- use for the targets.
+ description: Certificate authority used when verifying
+ server certificates.
properties:
configMap:
description: ConfigMap containing data to
@@ -771,8 +771,8 @@ spec:
x-kubernetes-map-type: atomic
type: object
cert:
- description: Struct containing the client cert
- file for the targets.
+ description: Client certificate to present when
+ doing client-authentication.
properties:
configMap:
description: ConfigMap containing data to
@@ -1168,8 +1168,8 @@ spec:
description: TLS configuration for the client.
properties:
ca:
- description: Struct containing the CA cert to
- use for the targets.
+ description: Certificate authority used when verifying
+ server certificates.
properties:
configMap:
description: ConfigMap containing data to
@@ -1217,8 +1217,8 @@ spec:
x-kubernetes-map-type: atomic
type: object
cert:
- description: Struct containing the client cert
- file for the targets.
+ description: Client certificate to present when
+ doing client-authentication.
properties:
configMap:
description: ConfigMap containing data to
@@ -1624,8 +1624,8 @@ spec:
description: TLS configuration for the client.
properties:
ca:
- description: Struct containing the CA cert to
- use for the targets.
+ description: Certificate authority used when verifying
+ server certificates.
properties:
configMap:
description: ConfigMap containing data to
@@ -1673,8 +1673,8 @@ spec:
x-kubernetes-map-type: atomic
type: object
cert:
- description: Struct containing the client cert
- file for the targets.
+ description: Client certificate to present when
+ doing client-authentication.
properties:
configMap:
description: ConfigMap containing data to
@@ -2158,8 +2158,8 @@ spec:
description: TLS configuration for the client.
properties:
ca:
- description: Struct containing the CA cert to
- use for the targets.
+ description: Certificate authority used when verifying
+ server certificates.
properties:
configMap:
description: ConfigMap containing data to
@@ -2207,8 +2207,8 @@ spec:
x-kubernetes-map-type: atomic
type: object
cert:
- description: Struct containing the client cert
- file for the targets.
+ description: Client certificate to present when
+ doing client-authentication.
properties:
configMap:
description: ConfigMap containing data to
@@ -2550,8 +2550,8 @@ spec:
description: TLS configuration for the client.
properties:
ca:
- description: Struct containing the CA cert to
- use for the targets.
+ description: Certificate authority used when verifying
+ server certificates.
properties:
configMap:
description: ConfigMap containing data to
@@ -2599,8 +2599,8 @@ spec:
x-kubernetes-map-type: atomic
type: object
cert:
- description: Struct containing the client cert
- file for the targets.
+ description: Client certificate to present when
+ doing client-authentication.
properties:
configMap:
description: ConfigMap containing data to
@@ -3024,8 +3024,8 @@ spec:
description: TLS configuration for the client.
properties:
ca:
- description: Struct containing the CA cert to
- use for the targets.
+ description: Certificate authority used when verifying
+ server certificates.
properties:
configMap:
description: ConfigMap containing data to
@@ -3073,8 +3073,8 @@ spec:
x-kubernetes-map-type: atomic
type: object
cert:
- description: Struct containing the client cert
- file for the targets.
+ description: Client certificate to present when
+ doing client-authentication.
properties:
configMap:
description: ConfigMap containing data to
@@ -3435,8 +3435,8 @@ spec:
description: TLS configuration for the client.
properties:
ca:
- description: Struct containing the CA cert to
- use for the targets.
+ description: Certificate authority used when verifying
+ server certificates.
properties:
configMap:
description: ConfigMap containing data to
@@ -3484,8 +3484,8 @@ spec:
x-kubernetes-map-type: atomic
type: object
cert:
- description: Struct containing the client cert
- file for the targets.
+ description: Client certificate to present when
+ doing client-authentication.
properties:
configMap:
description: ConfigMap containing data to
@@ -3806,8 +3806,8 @@ spec:
description: TLS configuration for the client.
properties:
ca:
- description: Struct containing the CA cert to
- use for the targets.
+ description: Certificate authority used when verifying
+ server certificates.
properties:
configMap:
description: ConfigMap containing data to
@@ -3855,8 +3855,8 @@ spec:
x-kubernetes-map-type: atomic
type: object
cert:
- description: Struct containing the client cert
- file for the targets.
+ description: Client certificate to present when
+ doing client-authentication.
properties:
configMap:
description: ConfigMap containing data to
@@ -4227,8 +4227,8 @@ spec:
description: TLS configuration for the client.
properties:
ca:
- description: Struct containing the CA cert to
- use for the targets.
+ description: Certificate authority used when verifying
+ server certificates.
properties:
configMap:
description: ConfigMap containing data to
@@ -4276,8 +4276,8 @@ spec:
x-kubernetes-map-type: atomic
type: object
cert:
- description: Struct containing the client cert
- file for the targets.
+ description: Client certificate to present when
+ doing client-authentication.
properties:
configMap:
description: ConfigMap containing data to
diff --git a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
index 9ddcadb64e087b27f61f04c7f13ff5014882f16e..0d8c5c00afb44ccd5e921f2decbbe142a217ba1b 100644
--- a/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerCustomResourceDefinition.yaml
@@ -1203,8 +1203,8 @@ spec:
description: TLS configuration for the client.
properties:
ca:
- description: Struct containing the CA cert to use
- for the targets.
+ description: Certificate authority used when verifying
+ server certificates.
properties:
configMap:
description: ConfigMap containing data to use
@@ -1251,8 +1251,8 @@ spec:
x-kubernetes-map-type: atomic
type: object
cert:
- description: Struct containing the client cert file
- for the targets.
+ description: Client certificate to present when doing
+ client-authentication.
properties:
configMap:
description: ConfigMap containing data to use
@@ -1428,10 +1428,11 @@ spec:
for this Alertmanager instance. If empty, it defaults to `alertmanager-<alertmanager-name>`.
\n The Alertmanager configuration should be available under the
`alertmanager.yaml` key. Additional keys from the original secret
- are copied to the generated secret. \n If either the secret or the
- `alertmanager.yaml` key is missing, the operator provisions an Alertmanager
- configuration with one empty receiver (effectively dropping alert
- notifications)."
+ are copied to the generated secret and mounted into the `/etc/alertmanager/config`
+ directory in the `alertmanager` container. \n If either the secret
+ or the `alertmanager.yaml` key is missing, the operator provisions
+ a minimal Alertmanager configuration with one empty receiver (effectively
+ dropping alert notifications)."
type: string
containers:
description: 'Containers allows injecting additional containers. This
diff --git a/manifests/setup/0podmonitorCustomResourceDefinition.yaml b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
index 5fa52499dd479afd415eccb8e1abf4cecf514ab0..91436d0a0f06d4c2b2dd4f575b2d1e1253423189 100644
--- a/manifests/setup/0podmonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0podmonitorCustomResourceDefinition.yaml
@@ -475,8 +475,8 @@ spec:
description: TLS configuration to use when scraping the endpoint.
properties:
ca:
- description: Struct containing the CA cert to use for the
- targets.
+ description: Certificate authority used when verifying server
+ certificates.
properties:
configMap:
description: ConfigMap containing data to use for the
@@ -520,8 +520,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
cert:
- description: Struct containing the client cert file for
- the targets.
+ description: Client certificate to present when doing client-authentication.
properties:
configMap:
description: ConfigMap containing data to use for the
diff --git a/manifests/setup/0probeCustomResourceDefinition.yaml b/manifests/setup/0probeCustomResourceDefinition.yaml
index de0f6ac5bb41e676659fa356b25846e95530e91e..d8047f42e53a22d1de5fc18e17e1e772256c4a4d 100644
--- a/manifests/setup/0probeCustomResourceDefinition.yaml
+++ b/manifests/setup/0probeCustomResourceDefinition.yaml
@@ -587,7 +587,8 @@ spec:
description: TLS configuration to use when scraping the endpoint.
properties:
ca:
- description: Struct containing the CA cert to use for the targets.
+ description: Certificate authority used when verifying server
+ certificates.
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -628,7 +629,7 @@ spec:
x-kubernetes-map-type: atomic
type: object
cert:
- description: Struct containing the client cert file for the targets.
+ description: Client certificate to present when doing client-authentication.
properties:
configMap:
description: ConfigMap containing data to use for the targets.
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index 21f66be01bca03239213903367da66407bb3cba6..7ac2a21bb245e204b1d226b0b2908786ce95f000 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -1080,8 +1080,8 @@ spec:
description: TLS Config to use for alertmanager connection.
properties:
ca:
- description: Struct containing the CA cert to use for
- the targets.
+ description: Certificate authority used when verifying
+ server certificates.
properties:
configMap:
description: ConfigMap containing data to use for
@@ -1132,8 +1132,8 @@ spec:
to use for the targets.
type: string
cert:
- description: Struct containing the client cert file
- for the targets.
+ description: Client certificate to present when doing
+ client-authentication.
properties:
configMap:
description: ConfigMap containing data to use for
@@ -1326,8 +1326,8 @@ spec:
description: TLS Config to use for accessing apiserver.
properties:
ca:
- description: Struct containing the CA cert to use for the
- targets.
+ description: Certificate authority used when verifying server
+ certificates.
properties:
configMap:
description: ConfigMap containing data to use for the
@@ -1375,8 +1375,7 @@ spec:
to use for the targets.
type: string
cert:
- description: Struct containing the client cert file for the
- targets.
+ description: Client certificate to present when doing client-authentication.
properties:
configMap:
description: ConfigMap containing data to use for the
@@ -4694,8 +4693,8 @@ spec:
description: TLS Config to use for remote read.
properties:
ca:
- description: Struct containing the CA cert to use for the
- targets.
+ description: Certificate authority used when verifying server
+ certificates.
properties:
configMap:
description: ConfigMap containing data to use for the
@@ -4743,8 +4742,7 @@ spec:
to use for the targets.
type: string
cert:
- description: Struct containing the client cert file for
- the targets.
+ description: Client certificate to present when doing client-authentication.
properties:
configMap:
description: ConfigMap containing data to use for the
@@ -5145,8 +5143,8 @@ spec:
description: TLS Config to use for remote write.
properties:
ca:
- description: Struct containing the CA cert to use for the
- targets.
+ description: Certificate authority used when verifying server
+ certificates.
properties:
configMap:
description: ConfigMap containing data to use for the
@@ -5194,8 +5192,7 @@ spec:
to use for the targets.
type: string
cert:
- description: Struct containing the client cert file for
- the targets.
+ description: Client certificate to present when doing client-authentication.
properties:
configMap:
description: ConfigMap containing data to use for the
@@ -6434,8 +6431,8 @@ spec:
Maps to the ''--grpc-server-tls-*'' CLI args.'
properties:
ca:
- description: Struct containing the CA cert to use for the
- targets.
+ description: Certificate authority used when verifying server
+ certificates.
properties:
configMap:
description: ConfigMap containing data to use for the
@@ -6483,8 +6480,7 @@ spec:
to use for the targets.
type: string
cert:
- description: Struct containing the client cert file for the
- targets.
+ description: Client certificate to present when doing client-authentication.
properties:
configMap:
description: ConfigMap containing data to use for the
diff --git a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
index a164c5d99ba9db023ff699cfdecc4ced96a8b8c3..25fec4daa19112dde2d97c45cf904b320b5324f8 100644
--- a/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusruleCustomResourceDefinition.yaml
@@ -42,18 +42,26 @@ spec:
groups:
description: Content of Prometheus rule file
items:
- description: 'RuleGroup is a list of sequentially evaluated recording
- and alerting rules. Note: PartialResponseStrategy is only used
- by ThanosRuler and will be ignored by Prometheus instances. Valid
- values for this field are ''warn'' or ''abort''. More info: https://github.com/thanos-io/thanos/blob/main/docs/components/rule.md#partial-response'
+ description: RuleGroup is a list of sequentially evaluated recording
+ and alerting rules.
properties:
interval:
+ description: Interval determines how often rules in the group
+ are evaluated.
+ pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
type: string
name:
+ description: Name of the rule group.
+ minLength: 1
type: string
partial_response_strategy:
+ default: ""
+ description: 'PartialResponseStrategy is only used by ThanosRuler
+ and will be ignored by Prometheus instances. More info: https://github.com/thanos-io/thanos/blob/main/docs/components/rule.md#partial-response'
+ pattern: ^(?i)(abort|warn)?$
type: string
rules:
+ description: List of alerting and recording rules.
items:
description: 'Rule describes an alerting or recording rule
See Prometheus documentation: [alerting](https://www.prometheus.io/docs/prometheus/latest/configuration/alerting_rules/)
@@ -61,23 +69,35 @@ spec:
rule'
properties:
alert:
+ description: Name of the alert. Must be a valid label
+ value. Only one of `record` and `alert` must be set.
type: string
annotations:
additionalProperties:
type: string
+ description: Annotations to add to each alert. Only valid
+ for alerting rules.
type: object
expr:
anyOf:
- type: integer
- type: string
+ description: PromQL expression to evaluate.
x-kubernetes-int-or-string: true
for:
+ description: Alerts are considered firing once they have
+ been returned for this long.
+ pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
type: string
labels:
additionalProperties:
type: string
+ description: Labels to add or overwrite.
type: object
record:
+ description: Name of the time series to output to. Must
+ be a valid metric name. Only one of `record` and `alert`
+ must be set.
type: string
required:
- expr
@@ -88,6 +108,9 @@ spec:
- rules
type: object
type: array
+ x-kubernetes-list-map-keys:
+ - name
+ x-kubernetes-list-type: map
type: object
required:
- spec
diff --git a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
index 8e34655d3c906430bb1bec530d962798ff82a9bb..61110fd918918932921945d3e52d5a13bdfbb8b4 100644
--- a/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
+++ b/manifests/setup/0servicemonitorCustomResourceDefinition.yaml
@@ -434,8 +434,8 @@ spec:
description: TLS configuration to use when scraping the endpoint
properties:
ca:
- description: Struct containing the CA cert to use for the
- targets.
+ description: Certificate authority used when verifying server
+ certificates.
properties:
configMap:
description: ConfigMap containing data to use for the
@@ -483,8 +483,7 @@ spec:
to use for the targets.
type: string
cert:
- description: Struct containing the client cert file for
- the targets.
+ description: Client certificate to present when doing client-authentication.
properties:
configMap:
description: ConfigMap containing data to use for the
diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
index 9eb66174d98f173774ad9ed7fc952f489e2544a8..4dfd54df0dafd6d02a99a6a7ff65d4fe788eb79c 100644
--- a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
+++ b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
@@ -2236,7 +2236,8 @@ spec:
the ''--grpc-server-tls-*'' CLI args.'
properties:
ca:
- description: Struct containing the CA cert to use for the targets.
+ description: Certificate authority used when verifying server
+ certificates.
properties:
configMap:
description: ConfigMap containing data to use for the targets.
@@ -2281,7 +2282,7 @@ spec:
use for the targets.
type: string
cert:
- description: Struct containing the client cert file for the targets.
+ description: Client certificate to present when doing client-authentication.
properties:
configMap:
description: ConfigMap containing data to use for the targets.