diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index e9022e6cf6aee36233f5de0d58a1d0993571e36f..940c9c4e0b4cc76a7174420397e15a9b5fef6aff 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "ea24fb850762ce38155738aff5ae71368eadb904",
+ "version": "ab9563dc8e4d84d06080c765f9c6c0d50313f794",
"sum": "5XhYOigrKipOWDbIn9hlrz7JcbelzvJnormxSaup9JI="
},
{
@@ -38,7 +38,7 @@
"subdir": "grafana-builder"
}
},
- "version": "e0c0f8caf0296138f7a74f1af5e9964339881788",
+ "version": "0d13e5ba1b3a4c29015738c203d92ea39f71ebe2",
"sum": "GRf2GvwEU4jhXV+JOonXSZ4wdDv8mnHBPCQ6TUVd+g8="
},
{
@@ -48,8 +48,8 @@
"subdir": ""
}
},
- "version": "9adde6c4eef082ad05b46124d780f42d6b19b896",
- "sum": "y8BjnZprY4KvjPJhLXtTf6MyE6EKFzGjCvxuwc/Ucv8="
+ "version": "7120319a5b5c45e8dd2e79f0ad60e2284c6d6f1b",
+ "sum": "SDq4RWF3EKhMI/+/rZfG75Oh7hcXVmGNZ7kM0D21s6M="
},
{
"source": {
@@ -58,7 +58,7 @@
"subdir": "lib/promgrafonnet"
}
},
- "version": "9adde6c4eef082ad05b46124d780f42d6b19b896",
+ "version": "7120319a5b5c45e8dd2e79f0ad60e2284c6d6f1b",
"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "7649bb8d5c1c0a8900e804dbef44c10057fa7c96",
+ "version": "805d4ff2f5486081757f51bbd6e6d96e54b9148e",
"sum": "6reUygVmQrLEWQzTKcH8ceDbvM+2ztK3z2VBR2K2l+U=",
"name": "prometheus-operator-mixin"
},
@@ -99,8 +99,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "7649bb8d5c1c0a8900e804dbef44c10057fa7c96",
- "sum": "dIYX9ERZvBUcPNcIVwgdWHnc5BDlAlTocAAdyuqu2ig="
+ "version": "805d4ff2f5486081757f51bbd6e6d96e54b9148e",
+ "sum": "J1G++A8hrtr3+OZQMmcNeb1w/C30bXqqwpwHL/Xhsd4="
},
{
"source": {
@@ -120,8 +120,8 @@
"subdir": "docs/node-mixin"
}
},
- "version": "4356c09ebd2d6c6056855cbb6bc51f34235ad919",
- "sum": "vvgImniWcZVtiU3rEQmeN4DaIktPXNn7u3Zqzdv5bMg="
+ "version": "832909dd257eb368cf83363ffcae3ab84cb4bcb1",
+ "sum": "MmxGhE2PJ1a52mk2x7vDpMT2at4Jglbud/rK74CB5i0="
},
{
"source": {
@@ -141,7 +141,7 @@
"subdir": "mixin"
}
},
- "version": "79d9480728052d698691f5e18c032c8332c6656e",
+ "version": "7a8d1894e80038f783a6396312051c7d62d25d35",
"sum": "cajthvLKDjYgYHCKQU2g/pTMRkxcbuJEvTnCyJOihl8=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 90438154e4543831097c6a4dfb9055196c816b3d..14bdfdf97d088c0bec3e1aba2bf97e4b31e21bc0 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -4149,7 +4149,7 @@ items:
"options": [
],
- "query": "label_values(kube_pod_info, cluster)",
+ "query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)",
"refresh": 2,
"regex": "",
"sort": 0,
@@ -5289,7 +5289,7 @@ items:
"options": [
],
- "query": "label_values(kube_pod_info, cluster)",
+ "query": "label_values(up{job=\"kube-controller-manager\"}, cluster)",
"refresh": 2,
"regex": "",
"sort": 1,
@@ -5315,7 +5315,7 @@ items:
"options": [
],
- "query": "label_values(process_cpu_seconds_total{cluster=\"$cluster\", job=\"kube-controller-manager\"}, instance)",
+ "query": "label_values(up{cluster=\"$cluster\", job=\"kube-controller-manager\"}, instance)",
"refresh": 2,
"regex": "",
"sort": 1,
@@ -8328,7 +8328,7 @@ items:
"options": [
],
- "query": "label_values(node_cpu_seconds_total, cluster)",
+ "query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)",
"refresh": 2,
"regex": "",
"sort": 1,
@@ -20770,7 +20770,7 @@ items:
"options": [
],
- "query": "label_values(kube_pod_info, cluster)",
+ "query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics\"}, cluster)",
"refresh": 2,
"regex": "",
"sort": 1,
@@ -22137,7 +22137,7 @@ items:
"options": [
],
- "query": "label_values(kube_pod_info, cluster)",
+ "query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)",
"refresh": 2,
"regex": "",
"sort": 0,
@@ -23830,7 +23830,7 @@ items:
"options": [
],
- "query": "label_values(kube_pod_info, cluster)",
+ "query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)",
"refresh": 2,
"regex": "",
"sort": 0,
@@ -28723,7 +28723,7 @@ items:
"options": [
],
- "query": "label_values(kube_pod_info, cluster)",
+ "query": "label_values(up{job=\"kubelet\", metrics_path=\"/metrics/cadvisor\"}, cluster)",
"refresh": 2,
"regex": "",
"sort": 0,
@@ -34059,7 +34059,7 @@ items:
"options": [
],
- "query": "label_values(kube_pod_info, cluster)",
+ "query": "label_values(up{job=\"kube-scheduler\"}, cluster)",
"refresh": 2,
"regex": "",
"sort": 1,
diff --git a/manifests/node-exporter-prometheusRule.yaml b/manifests/node-exporter-prometheusRule.yaml
index 0d582add59eb0466c1a00ce2602f1a420a680f3e..e24216fafa8211b7192df4fa63d8b890e68ab766 100644
--- a/manifests/node-exporter-prometheusRule.yaml
+++ b/manifests/node-exporter-prometheusRule.yaml
@@ -57,7 +57,7 @@ spec:
and
node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
)
- for: 1h
+ for: 30m
labels:
severity: warning
- alert: NodeFilesystemAlmostOutOfSpace
@@ -71,7 +71,7 @@ spec:
and
node_filesystem_readonly{job="node-exporter",fstype!=""} == 0
)
- for: 1h
+ for: 30m
labels:
severity: critical
- alert: NodeFilesystemFilesFillingUp
diff --git a/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
index d35c3060b3390aec9380d963a504e3fda811db63..726283bf9c5a84a81f68465101efa9ad527bdfdc 100644
--- a/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0prometheusCustomResourceDefinition.yaml
@@ -2946,6 +2946,9 @@ spec:
remoteTimeout:
description: Timeout for requests to the remote write endpoint.
type: string
+ sendExemplars:
+ description: Enables sending of exemplars over remote write. Note that exemplar-storage itself must be enabled using the enableFeature option for exemplars to be scraped in the first place. Only valid in Prometheus versions 2.27.0 and newer.
+ type: boolean
tlsConfig:
description: TLS Config to use for remote write.
properties:
diff --git a/manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml b/manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
index e537e2fd3adc388ebd0d978bed41e0e816205c96..a44c7058c0ba6affcf55d62fde82e3b67fead38a 100644
--- a/manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
+++ b/manifests/setup/prometheus-operator-0prometheusruleCustomResourceDefinition.yaml
@@ -8,6 +8,8 @@ metadata:
spec:
group: monitoring.coreos.com
names:
+ categories:
+ - prometheus-operator
kind: PrometheusRule
listKind: PrometheusRuleList
plural: prometheusrules