diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index 8fc9f17b09e79b3a21e5a9cca5605baf7edf7d70..49ae334739dc096f4406682bced73bcafaab2ab9 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,12 +1,12 @@
{
"alertmanager": "0.23.0",
"blackboxExporter": "0.19.0",
- "grafana": "8.3.1",
- "kubeStateMetrics": "2.2.4",
+ "grafana": "8.3.2",
+ "kubeStateMetrics": "2.3.0",
"nodeExporter": "1.3.1",
"prometheus": "2.31.1",
"prometheusAdapter": "0.9.1",
"prometheusOperator": "0.52.1",
"kubeRbacProxy": "0.11.0",
"configmapReload": "0.5.0"
-}
\ No newline at end of file
+}
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index b28a1d0fd3977f054f5fa8ce06d49cd754d6ef70..7b06c7be61bdeeef6ce9427601ffcf4b9124ce5e 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -38,7 +38,7 @@
"subdir": "grafana-builder"
}
},
- "version": "9927be87af4be9ff6b009e4503868b1b5493011b",
+ "version": "b102f9ac7d1290ac025c2a7ac99f7fd9a9948503",
"sum": "0KkygBQd/AFzUvVzezE4qF/uDYgrwUXVpZfINBti0oc="
},
{
@@ -68,7 +68,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "840d30ce57f75d0ec466a2d612879602c433d5e6",
+ "version": "b761b5382bdd85d7af915516f48cba1c46859c1d",
"sum": "U1wzIpTAtOvC1yj43Y8PfvT0JfvnAcMfNH12Wi+ab0Y="
},
{
@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "840d30ce57f75d0ec466a2d612879602c433d5e6",
+ "version": "b761b5382bdd85d7af915516f48cba1c46859c1d",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "009606736ffdcc14b23c77831a5ded26b3c8db43",
+ "version": "335ebbc2f6ecf10b699821fa8cebcbff4a718ca7",
"sum": "qZ4WgiweaE6eeKtFK60QUjLO8sf2L9Q8fgafWvDcyfY=",
"name": "prometheus-operator-mixin"
},
@@ -99,8 +99,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "009606736ffdcc14b23c77831a5ded26b3c8db43",
- "sum": "T1NSdVUDjEfANyLi73zS8+ysAXMmoRLObI6vsCnDAJQ="
+ "version": "335ebbc2f6ecf10b699821fa8cebcbff4a718ca7",
+ "sum": "Vr2IY6Uz1lYYyGDF7QaEAVkJwAtOEikCfuXJN2eAUM0="
},
{
"source": {
@@ -120,7 +120,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "b5cb72b4097f5782474efb37b66edace7a33cdb1",
+ "version": "7dbf35891570f9ce3bccb25a55176ea4923b35dd",
"sum": "MlWDAKGZ+JArozRKdKEvewHeWn8j2DNBzesJfLVd0dk="
},
{
@@ -130,7 +130,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "14986e52cf256b6ed0590b705fbcbfc938e1c4e4",
+ "version": "6f3e664ae712850b020d95c5c8b8a6ff841803bd",
"sum": "ZjQoYhvgKwJNkg+h+m9lW3SYjnjv5Yx5btEipLhru88=",
"name": "prometheus"
},
@@ -141,7 +141,7 @@
"subdir": "mixin"
}
},
- "version": "c0a3f145f8c8aa3f5146d8c5e504aae74c8dfa42",
+ "version": "9a26b0edee19a06c6e99a09e33ebceca734c91f9",
"sum": "1Y1cPIeoPg2nCAEhKPCt8bAGuwuOP2eZ3kVF432mlMA=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml
index 1d1ba4757ea491424ceb33e9811a03139f0b0049..4ffee6d0611c8c4df3754d81c81e7e401a0460db 100644
--- a/manifests/grafana-config.yaml
+++ b/manifests/grafana-config.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-config
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index 59441c7720f263190efb12bfaa0a57af1f796f85..943ab8fc7870d347175f2255c291fdf2813db633 100644
--- a/manifests/grafana-dashboardDatasources.yaml
+++ b/manifests/grafana-dashboardDatasources.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-datasources
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 764a674933aa2ff3bbf569ad3b88284aec7294e4..071237b832aeea01696291a63d4573066a448a50 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -596,7 +596,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-alertmanager-overview
namespace: monitoring
- apiVersion: v1
@@ -2357,7 +2357,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-apiserver
namespace: monitoring
- apiVersion: v1
@@ -4228,7 +4228,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-cluster-total
namespace: monitoring
- apiVersion: v1
@@ -5407,7 +5407,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-controller-manager
namespace: monitoring
- apiVersion: v1
@@ -8484,7 +8484,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-k8s-resources-cluster
namespace: monitoring
- apiVersion: v1
@@ -11270,7 +11270,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-k8s-resources-namespace
namespace: monitoring
- apiVersion: v1
@@ -12285,7 +12285,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-k8s-resources-node
namespace: monitoring
- apiVersion: v1
@@ -14743,7 +14743,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-k8s-resources-pod
namespace: monitoring
- apiVersion: v1
@@ -16756,7 +16756,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-k8s-resources-workload
namespace: monitoring
- apiVersion: v1
@@ -18934,7 +18934,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-k8s-resources-workloads-namespace
namespace: monitoring
- apiVersion: v1
@@ -21177,7 +21177,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-kubelet
namespace: monitoring
- apiVersion: v1
@@ -22630,7 +22630,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-namespace-by-pod
namespace: monitoring
- apiVersion: v1
@@ -24355,7 +24355,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-namespace-by-workload
namespace: monitoring
- apiVersion: v1
@@ -25407,7 +25407,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-node-cluster-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -26485,7 +26485,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -27465,7 +27465,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-nodes
namespace: monitoring
- apiVersion: v1
@@ -28041,7 +28041,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-persistentvolumesusage
namespace: monitoring
- apiVersion: v1
@@ -29258,7 +29258,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-pod-total
namespace: monitoring
- apiVersion: v1
@@ -30917,7 +30917,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-prometheus-remote-write
namespace: monitoring
- apiVersion: v1
@@ -32141,7 +32141,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-prometheus
namespace: monitoring
- apiVersion: v1
@@ -33401,7 +33401,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-proxy
namespace: monitoring
- apiVersion: v1
@@ -34502,7 +34502,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-scheduler
namespace: monitoring
- apiVersion: v1
@@ -35929,7 +35929,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index 183dde792934d6e2cd5e01cbe0cb80571d1d07b5..75ce140f6f2d512a570b2982045db6b932df35b5 100644
--- a/manifests/grafana-dashboardSources.yaml
+++ b/manifests/grafana-dashboardSources.yaml
@@ -22,6 +22,6 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 2968cb5d23825ac92d8bb7037cefa6b34878cfcd..0288ad327550f92d3582d4789556537211cd76cd 100644
--- a/manifests/grafana-deployment.yaml
+++ b/manifests/grafana-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana
namespace: monitoring
spec:
@@ -18,18 +18,18 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-config: 195eb41a323ee6cfb55c97686f401be3
- checksum/grafana-dashboardproviders: b3605fa7a3ffdbf40289bf690a05e24f
- checksum/grafana-datasources: b186175d4c8b0cd39feebffbe0b2d528
+ checksum/grafana-config: d4e939d23a413137879cd13440f6fc08
+ checksum/grafana-dashboardproviders: e1fcedb41ecb666960567d80cc68b95e
+ checksum/grafana-datasources: e466f18dd51529faa5bfee30db41af3a
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
spec:
containers:
- env: []
- image: grafana/grafana:8.3.1
+ image: grafana/grafana:8.3.2
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index 7020a146006d20b4c96f81d623675491d68d4354..450533ba2ce0607b1f8875449d21d990c9dc3bc8 100644
--- a/manifests/grafana-service.yaml
+++ b/manifests/grafana-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml
index 4a41183ece5ba6f1b2c7bfb391ff852f9857844f..3243b9d9609c2a9c0e5001e3fb6eeab560e8ce44 100644
--- a/manifests/grafana-serviceAccount.yaml
+++ b/manifests/grafana-serviceAccount.yaml
@@ -5,6 +5,6 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana
namespace: monitoring
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index 4d8e9efcf0464f25ef2d1990cb6dcbbfe1753b19..f70f0aac13e33c8b6c1b1275ec7d1a37df8f5248 100644
--- a/manifests/grafana-serviceMonitor.yaml
+++ b/manifests/grafana-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.3.1
+ app.kubernetes.io/version: 8.3.2
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/kubeStateMetrics-clusterRole.yaml b/manifests/kubeStateMetrics-clusterRole.yaml
index 518da9bc1bb360c05f610f5ab0a61fe812ce20d1..dd499ec3bf53d32e3cd0dd5c140af0b76f403e75 100644
--- a/manifests/kubeStateMetrics-clusterRole.yaml
+++ b/manifests/kubeStateMetrics-clusterRole.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.2.4
+ app.kubernetes.io/version: 2.3.0
name: kube-state-metrics
rules:
- apiGroups:
diff --git a/manifests/kubeStateMetrics-clusterRoleBinding.yaml b/manifests/kubeStateMetrics-clusterRoleBinding.yaml
index 33e42e5144be789d33546e1daa87ef590b3be4e4..9117e1d3cfe525c355cfde7543c1ddb4a9c054b9 100644
--- a/manifests/kubeStateMetrics-clusterRoleBinding.yaml
+++ b/manifests/kubeStateMetrics-clusterRoleBinding.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.2.4
+ app.kubernetes.io/version: 2.3.0
name: kube-state-metrics
roleRef:
apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/kubeStateMetrics-deployment.yaml b/manifests/kubeStateMetrics-deployment.yaml
index 3952dfd8883b4145244d2980524394815f7b561f..77a7f2ce473c08875483f0ee0ab8de91c212120b 100644
--- a/manifests/kubeStateMetrics-deployment.yaml
+++ b/manifests/kubeStateMetrics-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.2.4
+ app.kubernetes.io/version: 2.3.0
name: kube-state-metrics
namespace: monitoring
spec:
@@ -23,7 +23,7 @@ spec:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.2.4
+ app.kubernetes.io/version: 2.3.0
spec:
containers:
- args:
@@ -31,7 +31,7 @@ spec:
- --port=8081
- --telemetry-host=127.0.0.1
- --telemetry-port=8082
- image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.2.4
+ image: k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.3.0
name: kube-state-metrics
resources:
limits:
diff --git a/manifests/kubeStateMetrics-prometheusRule.yaml b/manifests/kubeStateMetrics-prometheusRule.yaml
index cae33fcdbf6aa5971b4d8ff07cf0121e7c211103..629dd2367e1199e96c59c347c9887ce7875e86b7 100644
--- a/manifests/kubeStateMetrics-prometheusRule.yaml
+++ b/manifests/kubeStateMetrics-prometheusRule.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.2.4
+ app.kubernetes.io/version: 2.3.0
prometheus: k8s
role: alert-rules
name: kube-state-metrics-rules
diff --git a/manifests/kubeStateMetrics-service.yaml b/manifests/kubeStateMetrics-service.yaml
index 70a54fdff06d8f21ab482eacff0c9703d2d12928..87159f9166fc1b9efc2e0b12de34c17cb09a022e 100644
--- a/manifests/kubeStateMetrics-service.yaml
+++ b/manifests/kubeStateMetrics-service.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.2.4
+ app.kubernetes.io/version: 2.3.0
name: kube-state-metrics
namespace: monitoring
spec:
diff --git a/manifests/kubeStateMetrics-serviceAccount.yaml b/manifests/kubeStateMetrics-serviceAccount.yaml
index dd6600372ffece8c4536057b1ee83e9e468925cf..0dfd86a5adf732b7e73822c638785463f671e215 100644
--- a/manifests/kubeStateMetrics-serviceAccount.yaml
+++ b/manifests/kubeStateMetrics-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.2.4
+ app.kubernetes.io/version: 2.3.0
name: kube-state-metrics
namespace: monitoring
diff --git a/manifests/kubeStateMetrics-serviceMonitor.yaml b/manifests/kubeStateMetrics-serviceMonitor.yaml
index 262fdc6ab9cd30b434f768f8fb8c687efbb1446e..ca8faf62436e7b77bad2524833f9540a6ed72a15 100644
--- a/manifests/kubeStateMetrics-serviceMonitor.yaml
+++ b/manifests/kubeStateMetrics-serviceMonitor.yaml
@@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: exporter
app.kubernetes.io/name: kube-state-metrics
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 2.2.4
+ app.kubernetes.io/version: 2.3.0
name: kube-state-metrics
namespace: monitoring
spec:
diff --git a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
index aeea6c161e5c8a6c9718474f4dbc30fd0754078d..2e3a5bea0c9a43c99ae372e548e31fd69015fd8e 100644
--- a/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0alertmanagerConfigCustomResourceDefinition.yaml
@@ -1158,6 +1158,7 @@ spec:
description: How long your notification will continue
to be retried for, unless the user acknowledges the
notification.
+ pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
type: string
html:
description: Whether notification message is HTML or plain
@@ -1410,6 +1411,7 @@ spec:
description: How often the Pushover servers will send
the same notification to the user. Must be at least
30 seconds.
+ pattern: ^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$
type: string
sendResolved:
description: Whether or not to notify about resolved alerts.
@@ -2759,14 +2761,14 @@ spec:
type: string
type: array
groupInterval:
- description: How long to wait before sending an updated notification.
- Must match the regular expression `[0-9]+(ms|s|m|h)` (milliseconds
- seconds minutes hours).
+ description: 'How long to wait before sending an updated notification.
+ Must match the regular expression`^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$`
+ Example: "5m"'
type: string
groupWait:
- description: How long to wait before sending the initial notification.
- Must match the regular expression `[0-9]+(ms|s|m|h)` (milliseconds
- seconds minutes hours).
+ description: 'How long to wait before sending the initial notification.
+ Must match the regular expression`^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$`
+ Example: "30s"'
type: string
matchers:
description: 'List of matchers that the alert’s labels should
@@ -2805,7 +2807,7 @@ spec:
muteTimeIntervals:
description: 'Note: this comment applies to the field definition
above but appears below otherwise it gets included in the generated
- manifest. CRD schema doesn''t support self referential types
+ manifest. CRD schema doesn''t support self-referential types
for now (see https://github.com/kubernetes/kubernetes/issues/62872).
We have to use an alternative type to circumvent the limitation.
The downside is that the Kube API can''t validate the data beyond
@@ -2820,9 +2822,9 @@ spec:
it should be listed in the `receivers` field.
type: string
repeatInterval:
- description: How long to wait before repeating the last notification.
- Must match the regular expression `[0-9]+(ms|s|m|h)` (milliseconds
- seconds minutes hours).
+ description: 'How long to wait before repeating the last notification.
+ Must match the regular expression`^(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?$`
+ Example: "4h"'
type: string
routes:
description: Child routes.