From 38479e628c259ab541343fddabbce3183bc98c75 Mon Sep 17 00:00:00 2001
From: PromOperatorBot <85787986+prom-op-bot@users.noreply.github.com>
Date: Wed, 5 Feb 2025 16:17:47 +0100
Subject: [PATCH] [bot] [main] Automated version update (#2599)
Co-authored-by: Prometheus Operator Bot <prom-op-bot@users.noreply.github.com>
---
jsonnet/kube-prometheus/versions.json | 2 +-
jsonnetfile.lock.json | 36 +-
manifests/grafana-config.yaml | 2 +-
manifests/grafana-dashboardDatasources.yaml | 2 +-
manifests/grafana-dashboardDefinitions.yaml | 55 +-
manifests/grafana-dashboardSources.yaml | 2 +-
manifests/grafana-deployment.yaml | 12 +-
manifests/grafana-networkPolicy.yaml | 2 +-
manifests/grafana-prometheusRule.yaml | 6 +-
manifests/grafana-service.yaml | 2 +-
manifests/grafana-serviceAccount.yaml | 2 +-
manifests/grafana-serviceMonitor.yaml | 2 +-
.../0prometheusCustomResourceDefinition.yaml | 12 +
...ometheusagentCustomResourceDefinition.yaml | 12 +
...0scrapeconfigCustomResourceDefinition.yaml | 631 +++++++++++++++++-
15 files changed, 709 insertions(+), 71 deletions(-)
diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index bbf26aec..1ce2476e 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,7 +1,7 @@
{
"alertmanager": "0.28.0",
"blackboxExporter": "0.25.0",
- "grafana": "11.4.0",
+ "grafana": "11.5.0",
"kubeStateMetrics": "2.14.0",
"nodeExporter": "1.8.2",
"prometheus": "3.1.0",
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 3e7771af..fdf40dd9 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,8 +18,8 @@
"subdir": "contrib/mixin"
}
},
- "version": "f7a36a55668d51f5046f38b8885446bcacee824d",
- "sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
+ "version": "b197332b135870ee7af7e9128fe16e82d46c19d7",
+ "sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="
},
{
"source": {
@@ -28,8 +28,8 @@
"subdir": "grafana-mixin"
}
},
- "version": "ebe2f442bdc2c35b8183e2004338c210aa93abde",
- "sum": "S8mRTRH4w62kMCa2je3iCtvscYrwQmkyJ7Y/aM14KbE="
+ "version": "1120f9e255760a3c104b57871fcb91801e934382",
+ "sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
},
{
"source": {
@@ -78,7 +78,7 @@
"subdir": "grafana-builder"
}
},
- "version": "4baa491e9b2da98e131f55ab53638e237a5f9c7b",
+ "version": "39bc80b6c67e08f6fec0d1edfdfdf908cecf66a7",
"sum": "yxqWcq/N3E/a/XreeU6EuE6X7kYPnG0AspAQFKOjASo="
},
{
@@ -88,7 +88,7 @@
"subdir": "mixin-utils"
}
},
- "version": "4baa491e9b2da98e131f55ab53638e237a5f9c7b",
+ "version": "39bc80b6c67e08f6fec0d1edfdfdf908cecf66a7",
"sum": "SRElwa/XrKAN8aZA9zvdRUx8iebl2It7KNQ7VFvMcBA="
},
{
@@ -118,8 +118,8 @@
"subdir": ""
}
},
- "version": "9ceec88755d71e8cee9a47c91d7ed50faf4de493",
- "sum": "7RWenSjnZLzHINp4rVqBug6utrAoaAeDcRkeHcXtv9o="
+ "version": "1ec7a45857197f7d5633fd3997f6150ae735a0fa",
+ "sum": "iEv7wGQAoGSUojMK9jl8mwwFjy85LDhRj9qUZkx/KFY="
},
{
"source": {
@@ -128,8 +128,8 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "288b3cf855c33e6e222dcd16a4c44d3490c757ef",
- "sum": "lO7jUSzAIy8Yk9pOWJIWgPRhubkWzVh56W6wtYfbVH4="
+ "version": "c7caee60c9f8338154b371ed8d617d9908412021",
+ "sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM="
},
{
"source": {
@@ -138,7 +138,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "288b3cf855c33e6e222dcd16a4c44d3490c757ef",
+ "version": "c7caee60c9f8338154b371ed8d617d9908412021",
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
},
{
@@ -148,7 +148,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "0775779242d5e3e837eb4f697fda2e9ba5074d71",
+ "version": "d2509e58841ba0b9653d0ac8cb87b9c3b5d5a0f9",
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
"name": "prometheus-operator-mixin"
},
@@ -159,8 +159,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "0775779242d5e3e837eb4f697fda2e9ba5074d71",
- "sum": "PAbGU2mH1jIH9MH9NGrMpecSWkvitcntijdMzsV0ZAM="
+ "version": "d2509e58841ba0b9653d0ac8cb87b9c3b5d5a0f9",
+ "sum": "jCnFMqNkehVBFriIFiFcdKZ7RghgTCUXXPJkK8ZQpfk="
},
{
"source": {
@@ -169,7 +169,7 @@
"subdir": "doc/alertmanager-mixin"
}
},
- "version": "d0eaa9fcd116fd2ef87390cd0f6966b2dfaee6f5",
+ "version": "b5d1a64ad5bb0ff879705714d1e40cea82efbd5c",
"sum": "Mf4h1BYLle2nrgjf/HXrBbl0Zk8N+xaoEM017o0BC+k=",
"name": "alertmanager"
},
@@ -180,7 +180,7 @@
"subdir": "docs/node-mixin"
}
},
- "version": "810510e12b063690e6e52700a867676b93492e92",
+ "version": "b6b8288211c7da4f2b6e98836ce470dc8138e35d",
"sum": "xYj6VYFT/eafsbleNlC+Z2VfLy1CndyYrJs9BcTmnX8="
},
{
@@ -190,7 +190,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "2915b197730e6d0292fb9f4dded0e97150b19e9a",
+ "version": "8be416a67cea1663b90e360463fb2091cb0ffe9a",
"sum": "CwaQpW66lHx+++sY2g4BgrUTEFZtlDnQzFjo0AlgfIg=",
"name": "prometheus"
},
@@ -212,7 +212,7 @@
"subdir": "mixin"
}
},
- "version": "236777732278c64ca01c1c09d726f0f712c87164",
+ "version": "57efc2aacd6fd53822cd37f39d77d65fac9890ea",
"sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
"name": "thanos-mixin"
},
diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml
index 7ee77c23..daab97a8 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: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-config
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index a635e5f4..eca54101 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: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-datasources
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 58e0c188..2cf20bc4 100644
--- a/manifests/grafana-dashboardDefinitions.yaml
+++ b/manifests/grafana-dashboardDefinitions.yaml
@@ -360,7 +360,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-alertmanager-overview
namespace: monitoring
- apiVersion: v1
@@ -1242,7 +1242,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-apiserver
namespace: monitoring
- apiVersion: v1
@@ -2056,7 +2056,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-cluster-total
namespace: monitoring
- apiVersion: v1
@@ -2660,7 +2660,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-controller-manager
namespace: monitoring
- apiVersion: v1
@@ -3158,6 +3158,7 @@ items:
}
],
"schemaVersion": 30,
+ "style": "dark",
"tags": [
],
@@ -3284,7 +3285,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-grafana-overview
namespace: monitoring
- apiVersion: v1
@@ -4871,7 +4872,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-k8s-resources-cluster
namespace: monitoring
- apiVersion: v1
@@ -5512,7 +5513,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-k8s-resources-multicluster
namespace: monitoring
- apiVersion: v1
@@ -7030,7 +7031,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-k8s-resources-namespace
namespace: monitoring
- apiVersion: v1
@@ -7711,7 +7712,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-k8s-resources-node
namespace: monitoring
- apiVersion: v1
@@ -9095,7 +9096,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-k8s-resources-pod
namespace: monitoring
- apiVersion: v1
@@ -10161,7 +10162,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-k8s-resources-workload
namespace: monitoring
- apiVersion: v1
@@ -11424,7 +11425,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-k8s-resources-workloads-namespace
namespace: monitoring
- apiVersion: v1
@@ -12677,7 +12678,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-kubelet
namespace: monitoring
- apiVersion: v1
@@ -13315,7 +13316,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-namespace-by-pod
namespace: monitoring
- apiVersion: v1
@@ -14111,7 +14112,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-namespace-by-workload
namespace: monitoring
- apiVersion: v1
@@ -14712,7 +14713,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-node-cluster-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -15316,7 +15317,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -16039,7 +16040,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-nodes-aix
namespace: monitoring
- apiVersion: v1
@@ -16786,7 +16787,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-nodes-darwin
namespace: monitoring
- apiVersion: v1
@@ -17525,7 +17526,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-nodes
namespace: monitoring
- apiVersion: v1
@@ -17847,7 +17848,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-persistentvolumesusage
namespace: monitoring
- apiVersion: v1
@@ -18339,7 +18340,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-pod-total
namespace: monitoring
- apiVersion: v1
@@ -19140,7 +19141,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-prometheus-remote-write
namespace: monitoring
- apiVersion: v1
@@ -19979,7 +19980,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-prometheus
namespace: monitoring
- apiVersion: v1
@@ -20634,7 +20635,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-proxy
namespace: monitoring
- apiVersion: v1
@@ -21235,7 +21236,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-scheduler
namespace: monitoring
- apiVersion: v1
@@ -21817,7 +21818,7 @@ items:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index d1c5b8a9..f8ae4cdf 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: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index 1fdbdfb6..05432087 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: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana
namespace: monitoring
spec:
@@ -18,19 +18,19 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-config: cb0d6303ddbb694464bde843b0fe874c
- checksum/grafana-dashboardproviders: ca302ceedc58d72663436a77e5e0ea29
- checksum/grafana-datasources: b748e773cdfff19dcfe874d29600675b
+ checksum/grafana-config: aebc3bc49354ecacc50b923ebe2addff
+ checksum/grafana-dashboardproviders: 4841997124c2ee1be47e38f6655d697e
+ checksum/grafana-datasources: 4fa6738677cddb088390c9176797973d
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 11.4.0
+ app.kubernetes.io/version: 11.5.0
spec:
automountServiceAccountToken: false
containers:
- env: []
- image: grafana/grafana:11.4.0
+ image: grafana/grafana:11.5.0
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml
index 3e26f4f2..39c964f9 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: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml
index 3c74612c..f47c009d 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: 11.4.0
+ app.kubernetes.io/version: 11.5.0
prometheus: k8s
role: alert-rules
name: grafana-rules
@@ -19,8 +19,8 @@ spec:
message: '{{ $labels.namespace }}/{{ $labels.job }}/{{ $labels.handler }} is experiencing {{ $value | humanize }}% errors'
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/grafana/grafanarequestsfailing
expr: |
- 100 * sum without (status_code) (namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query", status_code=~"5.."})
- /
+ 100 * namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query", status_code=~"5.."}
+ / ignoring (status_code)
sum without (status_code) (namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query"})
> 50
for: 5m
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index 8f1ae1cb..79702215 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: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml
index 8297a17c..2c728604 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: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana
namespace: monitoring
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index e9722694..219a5f04 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: 11.4.0
+ app.kubernetes.io/version: 11.5.0
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/setup/0prometheusCustomResourceDefinition.yaml b/manifests/setup/0prometheusCustomResourceDefinition.yaml
index f114f5be..4c9e5eef 100644
--- a/manifests/setup/0prometheusCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusCustomResourceDefinition.yaml
@@ -8176,6 +8176,18 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
+ scrapeFailureLogFile:
+ description: |-
+ File to which scrape failures are logged.
+ Reloading the configuration will reopen the file.
+
+ If the filename has an empty path, e.g. 'file.log', The Prometheus Pods
+ will mount the file into an emptyDir volume at `/var/log/prometheus`.
+ If a full path is provided, e.g. '/var/log/prometheus/file.log', you
+ must mount a volume in the specified directory and it must be writable.
+ It requires Prometheus >= v2.55.0.
+ minLength: 1
+ type: string
scrapeInterval:
default: 30s
description: |-
diff --git a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
index 79e1a3c9..ec187e26 100644
--- a/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
+++ b/manifests/setup/0prometheusagentCustomResourceDefinition.yaml
@@ -6569,6 +6569,18 @@ spec:
type: object
type: object
x-kubernetes-map-type: atomic
+ scrapeFailureLogFile:
+ description: |-
+ File to which scrape failures are logged.
+ Reloading the configuration will reopen the file.
+
+ If the filename has an empty path, e.g. 'file.log', The Prometheus Pods
+ will mount the file into an emptyDir volume at `/var/log/prometheus`.
+ If a full path is provided, e.g. '/var/log/prometheus/file.log', you
+ must mount a volume in the specified directory and it must be writable.
+ It requires Prometheus >= v2.55.0.
+ minLength: 1
+ type: string
scrapeInterval:
default: 30s
description: |-
diff --git a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
index 5d4884a2..5aa43843 100644
--- a/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
+++ b/manifests/setup/0scrapeconfigCustomResourceDefinition.yaml
@@ -97,8 +97,100 @@ spec:
- ManagedIdentity
- SDK
type: string
+ authorization:
+ description: |-
+ Authorization header configuration to authenticate against the target HTTP endpoint.
+ Cannot be set at the same time as `oAuth2`, or `basicAuth`.
+ properties:
+ credentials:
+ description: Selects a key of a Secret in the namespace that contains the credentials for authentication.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type:
+ description: |-
+ Defines the authentication type. The value is case-insensitive.
+
+ "Basic" is not a supported value.
+
+ Default: "Bearer"
+ type: string
+ type: object
+ basicAuth:
+ description: |-
+ BasicAuth information to authenticate against the target HTTP endpoint.
+ More info: https://prometheus.io/docs/operating/configuration/#endpoints
+ Cannot be set at the same time as `authorization`, or `oAuth2`.
+ properties:
+ password:
+ description: |-
+ `password` specifies a key of a Secret containing the password for
+ authentication.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ username:
+ description: |-
+ `username` specifies a key of a Secret containing the username for
+ authentication.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
clientID:
description: Optional client ID. Only required with the OAuth authentication method.
+ minLength: 1
type: string
clientSecret:
description: Optional client secret. Only required with the OAuth authentication method.
@@ -115,27 +207,392 @@ spec:
almost certainly wrong.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
type: string
- optional:
- description: Specify whether the Secret or its key must be defined
- type: boolean
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ enableHTTP2:
+ description: Whether to enable HTTP2.
+ type: boolean
+ environment:
+ description: The Azure environment.
+ minLength: 1
+ type: string
+ followRedirects:
+ description: Configure whether HTTP requests follow HTTP 3xx redirects.
+ type: boolean
+ noProxy:
+ description: |-
+ `noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
+ that should be excluded from proxying. IP and domain names can
+ contain port numbers.
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: string
+ oauth2:
+ description: |-
+ Optional OAuth 2.0 configuration to authenticate against the target HTTP endpoint.
+ Cannot be set at the same time as `authorization`, or `basicAuth`.
+ properties:
+ clientId:
+ description: |-
+ `clientId` specifies a key of a Secret or ConfigMap containing the
+ OAuth2 client's ID.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ clientSecret:
+ description: |-
+ `clientSecret` specifies a key of a Secret containing the OAuth2
+ client's secret.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ endpointParams:
+ additionalProperties:
+ type: string
+ description: |-
+ `endpointParams` configures the HTTP parameters to append to the token
+ URL.
+ type: object
+ noProxy:
+ description: |-
+ `noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
+ that should be excluded from proxying. IP and domain names can
+ contain port numbers.
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: string
+ proxyConnectHeader:
+ additionalProperties:
+ items:
+ description: SecretKeySelector selects a key of a Secret.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: array
+ description: |-
+ ProxyConnectHeader optionally specifies headers to send to
+ proxies during CONNECT requests.
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to use.'
+ pattern: ^http(s)?://.+$
+ type: string
+ scopes:
+ description: '`scopes` defines the OAuth2 scopes used for the token request.'
+ items:
+ type: string
+ type: array
+ tlsConfig:
+ description: |-
+ TLS configuration to use when connecting to the OAuth2 server.
+ It requires Prometheus >= v2.43.0.
+ properties:
+ ca:
+ description: Certificate authority used when verifying server certificates.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ cert:
+ description: Client certificate to present when doing client-authentication.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ insecureSkipVerify:
+ description: Disable target certificate validation.
+ type: boolean
+ keySecret:
+ description: Secret containing the client key file for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ serverName:
+ description: Used to verify the hostname for the targets.
+ type: string
+ type: object
+ tokenUrl:
+ description: '`tokenURL` configures the URL to fetch the token from.'
+ minLength: 1
+ type: string
required:
- - key
+ - clientId
+ - clientSecret
+ - tokenUrl
type: object
- x-kubernetes-map-type: atomic
- environment:
- description: The Azure environment.
- type: string
port:
description: |-
The port to scrape metrics from. If using the public IP address, this must
instead be specified in the relabeling rule.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
+ proxyConnectHeader:
+ additionalProperties:
+ items:
+ description: SecretKeySelector selects a key of a Secret.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: array
+ description: |-
+ ProxyConnectHeader optionally specifies headers to send to
+ proxies during CONNECT requests.
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: object
+ x-kubernetes-map-type: atomic
+ proxyFromEnvironment:
+ description: |-
+ Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
+
+ It requires Prometheus >= v2.43.0 or Alertmanager >= 0.25.0.
+ type: boolean
+ proxyUrl:
+ description: '`proxyURL` defines the HTTP proxy server to use.'
+ pattern: ^http(s)?://.+$
+ type: string
refreshInterval:
description: RefreshInterval configures the refresh interval at which Prometheus will re-read the instance list.
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
resourceGroup:
- description: Optional resource group name. Limits discovery to this resource group.
+ description: |-
+ Optional resource group name. Limits discovery to this resource group.
+ Requires Prometheus v2.35.0 and above
+ minLength: 1
type: string
subscriptionID:
description: The subscription ID. Always required.
@@ -143,7 +600,158 @@ spec:
type: string
tenantID:
description: Optional tenant ID. Only required with the OAuth authentication method.
+ minLength: 1
type: string
+ tlsConfig:
+ description: TLS configuration applying to the target HTTP endpoint.
+ properties:
+ ca:
+ description: Certificate authority used when verifying server certificates.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ cert:
+ description: Client certificate to present when doing client-authentication.
+ properties:
+ configMap:
+ description: ConfigMap containing data to use for the targets.
+ properties:
+ key:
+ description: The key to select.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the ConfigMap or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ secret:
+ description: Secret containing data to use for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ type: object
+ insecureSkipVerify:
+ description: Disable target certificate validation.
+ type: boolean
+ keySecret:
+ description: Secret containing the client key file for the targets.
+ properties:
+ key:
+ description: The key of the secret to select from. Must be a valid secret key.
+ type: string
+ name:
+ default: ""
+ description: |-
+ Name of the referent.
+ This field is effectively required, but due to backwards compatibility is
+ allowed to be empty. Instances of this type with an empty value here are
+ almost certainly wrong.
+ More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+ type: string
+ optional:
+ description: Specify whether the Secret or its key must be defined
+ type: boolean
+ required:
+ - key
+ type: object
+ x-kubernetes-map-type: atomic
+ maxVersion:
+ description: |-
+ Maximum acceptable TLS version.
+
+ It requires Prometheus >= v2.41.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ minVersion:
+ description: |-
+ Minimum acceptable TLS version.
+
+ It requires Prometheus >= v2.35.0.
+ enum:
+ - TLS10
+ - TLS11
+ - TLS12
+ - TLS13
+ type: string
+ serverName:
+ description: Used to verify the hostname for the targets.
+ type: string
+ type: object
required:
- subscriptionID
type: object
@@ -3845,11 +4453,15 @@ spec:
Filter can be used optionally to filter the instance list by other criteria
Syntax of this filter is described in the filter query parameter section:
https://cloud.google.com/compute/docs/reference/latest/instances/list
+ minLength: 1
type: string
port:
description: |-
The port to scrape metrics from. If using the public IP address, this must
instead be specified in the relabeling rule.
+ format: int32
+ maximum: 65535
+ minimum: 0
type: integer
project:
description: The Google Cloud Project ID
@@ -3861,6 +4473,7 @@ spec:
type: string
tagSeparator:
description: The tag separator is used to separate the tags on concatenation
+ minLength: 1
type: string
zone:
description: The zone of the scrape targets. If you need multiple zones use multiple GCESDConfigs.
--
GitLab