diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index c92094992c14027b1d2de9b75b5f079c9bcfa3e8..d27a9628bb39cc0b4d26ef6e55d5e1bada711324 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,7 +1,7 @@
{
"alertmanager": "0.23.0",
"blackboxExporter": "0.19.0",
- "grafana": "8.1.2",
+ "grafana": "8.1.3",
"kubeStateMetrics": "2.2.0",
"nodeExporter": "1.2.2",
"prometheus": "2.29.2",
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 4fa6ffc9bc570f4553ac1e75da5d7bdb1aae9e51..9880c65456c150dc007158807d595f2b7dcc0c39 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "91a5089d17f786d244ce49704774a29faf4e4ed2",
+ "version": "c2937d78d2722d774f69dbf91a956f382d32f4d3",
"sum": "5XhYOigrKipOWDbIn9hlrz7JcbelzvJnormxSaup9JI="
},
{
@@ -28,8 +28,8 @@
"subdir": "grafonnet"
}
},
- "version": "3082bfca110166cd69533fa3c0875fdb1b68c329",
- "sum": "4/sUV0Kk+o8I+wlYxL9R6EPhL/NiLfYHk+NXlU64RUk="
+ "version": "05fb200ee1a1816fc1b4c522071d5606d8dd71c1",
+ "sum": "mEoObbqbyVaXrHFEJSM2Nad31tOvadzIevWuyNHHBgI="
},
{
"source": {
@@ -38,7 +38,7 @@
"subdir": "grafana-builder"
}
},
- "version": "ff22d1d6698573e7cb76228198edfa2b2f632dcc",
+ "version": "746874e4836a4bfbb7034d32de0c98ab1282aaae",
"sum": "GRf2GvwEU4jhXV+JOonXSZ4wdDv8mnHBPCQ6TUVd+g8="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "5fe12e2dbe118a5a3604e3ce2531a14f22848c5f",
+ "version": "2c81b0cf6a5673e08057499a08ddce396b19dda4",
"sum": "6reUygVmQrLEWQzTKcH8ceDbvM+2ztK3z2VBR2K2l+U=",
"name": "prometheus-operator-mixin"
},
@@ -99,8 +99,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "5fe12e2dbe118a5a3604e3ce2531a14f22848c5f",
- "sum": "FUGl2HPBXDJQ3W9WeHPDBvATBHODKRAsyTP0G5PtviM="
+ "version": "2c81b0cf6a5673e08057499a08ddce396b19dda4",
+ "sum": "WUuFzKqxzxmTWLeic/IU1SMjdCV/zClt11MHucJ9MSc="
},
{
"source": {
@@ -109,7 +109,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "8da517524a878ee8933ed12376bb997ebaba3a09",
+ "version": "44011410d7065487789c447ce55157ae6e0b917d",
"sum": "pep+dHzfIjh2SU5pEkwilMCAT/NoL6YYflV4x8cr7vU=",
"name": "alertmanager"
},
@@ -120,7 +120,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "6f1286b314fdf16155928e92d436be0a107ce9c6",
+ "version": "dc68e035a5b37a9a3b47e1547f07d96df29ba575",
"sum": "OFNs9Te1QMqSscXqNqMv0zwaJoJxaEg7NyQVNyT4VeA="
},
{
@@ -130,7 +130,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "c244fe27a323a69d062b5c2c40a52fd15a831b0f",
+ "version": "46286cb6abfff961e8c257de091443e835ec444f",
"sum": "m4VHwft4fUcxzL4+52lLZG/V5aH5ZEdjaweb88vISL0=",
"name": "prometheus"
},
@@ -141,7 +141,7 @@
"subdir": "mixin"
}
},
- "version": "bd134d7a823708fa135e7a6931e76f581be5f879",
+ "version": "2dd8c22e8c15f5ec0daaa07ae20be44bed419aa5",
"sum": "X+060DnePPeN/87fgj0SrfxVitywTk8hZA9V4nHxl1g=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index bc171d566b46072b8ad7b7e9394b3a30f215444f..c3cce22fd388f7a3907dd624243ea91146ae5ba0 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.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-datasources
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 58915037eb72ec298c4538d1bd5d7b20ac982dbc..a80d3de2f4f1997ec93f32223dfd02078aac7c00 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.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-alertmanager-overview
namespace: monitoring
- apiVersion: v1
@@ -2332,7 +2332,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-apiserver
namespace: monitoring
- apiVersion: v1
@@ -4203,7 +4203,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-cluster-total
namespace: monitoring
- apiVersion: v1
@@ -5369,7 +5369,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-controller-manager
namespace: monitoring
- apiVersion: v1
@@ -8382,7 +8382,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-k8s-resources-cluster
namespace: monitoring
- apiVersion: v1
@@ -11115,7 +11115,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-k8s-resources-namespace
namespace: monitoring
- apiVersion: v1
@@ -12082,7 +12082,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-k8s-resources-node
namespace: monitoring
- apiVersion: v1
@@ -14498,7 +14498,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-k8s-resources-pod
namespace: monitoring
- apiVersion: v1
@@ -16473,7 +16473,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-k8s-resources-workload
namespace: monitoring
- apiVersion: v1
@@ -18613,7 +18613,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-k8s-resources-workloads-namespace
namespace: monitoring
- apiVersion: v1
@@ -20850,7 +20850,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-kubelet
namespace: monitoring
- apiVersion: v1
@@ -22303,7 +22303,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-namespace-by-pod
namespace: monitoring
- apiVersion: v1
@@ -24028,7 +24028,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-namespace-by-workload
namespace: monitoring
- apiVersion: v1
@@ -25080,7 +25080,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-node-cluster-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -26158,7 +26158,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -27138,7 +27138,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-nodes
namespace: monitoring
- apiVersion: v1
@@ -27704,7 +27704,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-persistentvolumesusage
namespace: monitoring
- apiVersion: v1
@@ -28921,7 +28921,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-pod-total
namespace: monitoring
- apiVersion: v1
@@ -30580,7 +30580,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-prometheus-remote-write
namespace: monitoring
- apiVersion: v1
@@ -31804,7 +31804,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-prometheus
namespace: monitoring
- apiVersion: v1
@@ -33050,7 +33050,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-proxy
namespace: monitoring
- apiVersion: v1
@@ -34139,7 +34139,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-scheduler
namespace: monitoring
- apiVersion: v1
@@ -35566,7 +35566,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index 2fad90b45f2e7cabdd814dceb3a5cd5cf890f2a6..f6e281ebf4553673d38e864c80aa644a9a1801ec 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.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 1ff981fdbc6614e6ab48b1cbbe6a1e3791e70dcc..4b23928096d4fe46b9ca14664ca4d43d402431e2 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.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana
namespace: monitoring
spec:
@@ -18,18 +18,18 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-config: 9e92fcf7cec54ae70af0deab79e283d0
- checksum/grafana-dashboardproviders: e8fc7f6247c9dec844098ae0d4b24d26
- checksum/grafana-datasources: ea73b70ba8595400d1ed21af33684ff9
+ checksum/grafana-config: e1f5b84a1d40edb8a6527c98d24ff656
+ checksum/grafana-dashboardproviders: 2c7c248e5512bb5576d633004725159c
+ checksum/grafana-datasources: b2cbbea3079b8634b7bdf42cb56c1537
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 8.1.2
+ app.kubernetes.io/version: 8.1.3
spec:
containers:
- env: []
- image: grafana/grafana:8.1.2
+ image: grafana/grafana:8.1.3
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index ed55f96f5e12bb04a592bf0c2044956439da0fc0..258a972070c275a9a907c975abf420c1a1c26bef 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.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index c2d3d9915cf52da6b18c60a48e71b4916787b6d3..fedfd40cda1a6646c6156671d74e35a2c0fc8244 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.1.2
+ app.kubernetes.io/version: 8.1.3
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
index d69502aa6ef7eecaab9fb945622072c1f1ec390f..4bbdb953491d9849dd8ccbc2f3dd31c23042d728 100644
--- a/manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0alertmanagerCustomResourceDefinition.yaml
@@ -1929,6 +1929,10 @@ spec:
logLevel:
description: Log level for Alertmanager to be configured with.
type: string
+ minReadySeconds:
+ description: Minimum number of seconds for which a newly created pod should be ready without any of its container crashing for it to be considered available. Defaults to 0 (pod will be considered available as soon as it is ready) This is an alpha field and requires enabling StatefulSetMinReadySeconds feature gate.
+ format: int32
+ type: integer
nodeSelector:
additionalProperties:
type: string
diff --git a/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
index c3cd21a5ebad3d68fd519b38c19d9791c1764003..1122aec463e260a50f47e74ba7f6edab522fad5a 100644
--- a/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
@@ -2289,6 +2289,10 @@ spec:
logLevel:
description: Log level for Prometheus to be configured with.
type: string
+ minReadySeconds:
+ description: Minimum number of seconds for which a newly created pod should be ready without any of its container crashing for it to be considered available. Defaults to 0 (pod will be considered available as soon as it is ready) This is an alpha field and requires enabling StatefulSetMinReadySeconds feature gate.
+ format: int32
+ type: integer
nodeSelector:
additionalProperties:
type: string
diff --git a/manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml
index a48e0f77f8c7e6cac26ddabfa7a9cf84e4edcde4..bd9ede435271facafce0cf62083b5f5fd1089e28 100644
--- a/manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0thanosrulerCustomResourceDefinition.yaml
@@ -1967,6 +1967,10 @@ spec:
logLevel:
description: Log level for ThanosRuler to be configured with.
type: string
+ minReadySeconds:
+ description: Minimum number of seconds for which a newly created pod should be ready without any of its container crashing for it to be considered available. Defaults to 0 (pod will be considered available as soon as it is ready) This is an alpha field and requires enabling StatefulSetMinReadySeconds feature gate.
+ format: int32
+ type: integer
nodeSelector:
additionalProperties:
type: string