diff --git a/jsonnet/kube-prometheus/versions.json b/jsonnet/kube-prometheus/versions.json
index decd399fde932e73caff87c1a45abe8a5e9fa391..b2840c47f94bdc4b82c787a0fb8c5d2e6886ce8a 100644
--- a/jsonnet/kube-prometheus/versions.json
+++ b/jsonnet/kube-prometheus/versions.json
@@ -1,7 +1,7 @@
{
"alertmanager": "0.24.0",
"blackboxExporter": "0.22.0",
- "grafana": "9.0.6",
+ "grafana": "9.0.7",
"kubeStateMetrics": "2.5.0",
"nodeExporter": "1.3.1",
"prometheus": "2.37.0",
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 7a03e2befce103308920e602d69ba32b5e1b82c4..5444c25b9fe2be75cedb0c8e808b640b5fd495ef 100644
--- a/jsonnetfile.lock.json
+++ b/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
"subdir": "contrib/mixin"
}
},
- "version": "c070dedb92820cf66a33af994f1adff6a54a8707",
+ "version": "a1405e9633a8b50d1542b293d7e54b921a276e7e",
"sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds="
},
{
@@ -58,7 +58,7 @@
"subdir": "grafana-builder"
}
},
- "version": "da70df69e80ff98173883268a57b980d8022c395",
+ "version": "a2ba95acc8b7653d33bd57075678d8de2a64e5b3",
"sum": "1Ge62JmmPDq7fWyDAt3uCTobGEj4sJdbkqxRGWK22p0="
},
{
@@ -78,7 +78,7 @@
"subdir": "jsonnet/kube-state-metrics"
}
},
- "version": "fad76e457a5cc0da10a6defed00539d256435c20",
+ "version": "767af98d2f8eaba93d8834b56dc346b4235c043e",
"sum": "dFXBd/OAQREzokDmW+6Wnp28KrjK5ZLUz4YX7GO4/m0="
},
{
@@ -88,7 +88,7 @@
"subdir": "jsonnet/kube-state-metrics-mixin"
}
},
- "version": "fad76e457a5cc0da10a6defed00539d256435c20",
+ "version": "767af98d2f8eaba93d8834b56dc346b4235c043e",
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
},
{
@@ -98,7 +98,7 @@
"subdir": "jsonnet/mixin"
}
},
- "version": "ad9ae0a764423eddd158ae53f7809409ff494fc6",
+ "version": "9f64561535810a9a3e4862beeb72577044be993f",
"sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
"name": "prometheus-operator-mixin"
},
@@ -109,8 +109,8 @@
"subdir": "jsonnet/prometheus-operator"
}
},
- "version": "ad9ae0a764423eddd158ae53f7809409ff494fc6",
- "sum": "RhKMm1XZfGiUfalPKc/lbIRCJjQHxZblOudvifFIDVw="
+ "version": "9f64561535810a9a3e4862beeb72577044be993f",
+ "sum": "hV3FK2ekNFLUlKnj5chRp8WKKxZemfbwynYWK5RkY1E="
},
{
"source": {
@@ -140,7 +140,7 @@
"subdir": "documentation/prometheus-mixin"
}
},
- "version": "d91621890a2ccb3191a6d74812cc1827dd4093bf",
+ "version": "0fa8469f76107dc12e949164fc174a4098aedb19",
"sum": "crD6rsagAMJFnVRw4pO63z3LLYfz4QFIiMR14zjjIfY=",
"name": "prometheus"
},
@@ -151,8 +151,8 @@
"subdir": "config/crd/bases"
}
},
- "version": "4c7fa4b9fbd054ddfd0a878af6dc93807b7c199e",
- "sum": "OcgJ4F0OaDwz6JgO2NkaXRz+hpB3puMkJRl/0L4za0Y="
+ "version": "dc85a954055e7893d31fa2a1e6b04f0d9c04051c",
+ "sum": "d1550yhsX4VxdVN7b0gWT0cido/W90P6OGLzLqPwZcs="
},
{
"source": {
@@ -161,8 +161,8 @@
"subdir": "mixin"
}
},
- "version": "291b6fa4afbab3228d5251a440acf132ff059989",
- "sum": "M8vlJRfaKuqG8LJMMYBdFKuuKQgcLiFG27ZDWePHzTQ=",
+ "version": "cbe66572419153e8ee180e97565c4f8afd63a4b2",
+ "sum": "oksO55VdKbsLAVA3vl7b1woE9TLmfvH7sz5+1A7iOBE=",
"name": "thanos-mixin"
},
{
diff --git a/manifests/grafana-config.yaml b/manifests/grafana-config.yaml
index cf981bc408444b3f73c98e798c91a7e5ce4d6ed1..a7e28fb85c01225619e5b7170ec543406d5021ba 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.0.6
+ app.kubernetes.io/version: 9.0.7
name: grafana-config
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDatasources.yaml b/manifests/grafana-dashboardDatasources.yaml
index 7f563fee6a3facef4e2a256e09c292b2de5da3e3..4d76347857da4b987cc070dac8d11a46376d3a6f 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.0.6
+ app.kubernetes.io/version: 9.0.7
name: grafana-datasources
namespace: monitoring
stringData:
diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml
index 8e4ccb58d6f61070496d7bffd85c671fa486ceef..149c19d913a5932a266c0b4d1d9c392ac785c1fd 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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
name: grafana-dashboard-namespace-by-workload
namespace: monitoring
- apiVersion: v1
@@ -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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
name: grafana-dashboard-node-rsrc-use
namespace: monitoring
- apiVersion: v1
@@ -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.0.6
+ app.kubernetes.io/version: 9.0.7
name: grafana-dashboard-nodes-darwin
namespace: monitoring
- apiVersion: v1
@@ -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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
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.0.6
+ app.kubernetes.io/version: 9.0.7
name: grafana-dashboard-workload-total
namespace: monitoring
kind: ConfigMapList
diff --git a/manifests/grafana-dashboardSources.yaml b/manifests/grafana-dashboardSources.yaml
index 92371c0e62a6ba02a30eedff49a6163af223fe7d..7a4860573f4ee73c522a262aca886238e7ebdbeb 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.0.6
+ app.kubernetes.io/version: 9.0.7
name: grafana-dashboards
namespace: monitoring
diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml
index e8c5322bf636da075282c8d5b1a302f065456030..7f795c5aa5089e2274e5901c7f166cdb28458dc5 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.0.6
+ app.kubernetes.io/version: 9.0.7
name: grafana
namespace: monitoring
spec:
@@ -18,19 +18,19 @@ spec:
template:
metadata:
annotations:
- checksum/grafana-config: a0f9a1881f7108b30093dceac202a3e9
- checksum/grafana-dashboardproviders: 1e71a9b69046c3460199161bcd401d88
- checksum/grafana-datasources: 9253b0cb91ec58ed4f7dd7a600b4297f
+ checksum/grafana-config: bc631c541633845dc1a68f67b5149c23
+ checksum/grafana-dashboardproviders: a443bf3ad562a96949f2d279a91c2be1
+ checksum/grafana-datasources: 0834755c4ada730ae3dad3db753d560d
labels:
app.kubernetes.io/component: grafana
app.kubernetes.io/name: grafana
app.kubernetes.io/part-of: kube-prometheus
- app.kubernetes.io/version: 9.0.6
+ app.kubernetes.io/version: 9.0.7
spec:
automountServiceAccountToken: false
containers:
- env: []
- image: grafana/grafana:9.0.6
+ image: grafana/grafana:9.0.7
name: grafana
ports:
- containerPort: 3000
diff --git a/manifests/grafana-networkPolicy.yaml b/manifests/grafana-networkPolicy.yaml
index deb9c3e7b4ccac2b69efc026eaa02ef1dbcfd84a..ff6d6d4a57946a404dfc9571647e48ec9b1ba312 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.0.6
+ app.kubernetes.io/version: 9.0.7
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-prometheusRule.yaml b/manifests/grafana-prometheusRule.yaml
index 30d55e69af82d0496f35ac2abd5ad0299ced0eb3..615e7714c30b45866d6a75c6db001ff9022dbd88 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.0.6
+ app.kubernetes.io/version: 9.0.7
prometheus: k8s
role: alert-rules
name: grafana-rules
diff --git a/manifests/grafana-service.yaml b/manifests/grafana-service.yaml
index 7f28127b60e726f6d220e34dcf37d7c8fc1c11c0..706b52291bd8f4bd16eb7752346965dff2b73103 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.0.6
+ app.kubernetes.io/version: 9.0.7
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/grafana-serviceAccount.yaml b/manifests/grafana-serviceAccount.yaml
index 0fc639caae9008323d6aeb52ee2e9b77083aaba8..5a17d4f6a7593ac5bb355f6e9909d75662853bf4 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.0.6
+ app.kubernetes.io/version: 9.0.7
name: grafana
namespace: monitoring
diff --git a/manifests/grafana-serviceMonitor.yaml b/manifests/grafana-serviceMonitor.yaml
index 831c36c388ba2bc18cd4b2df9611aeb2d22e4a72..c47519add5e53f0b2ec591939b1ee52b50a19f86 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.0.6
+ app.kubernetes.io/version: 9.0.7
name: grafana
namespace: monitoring
spec:
diff --git a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
index 65b0a4f36293d5ddf2354848ddc421bfaf9601b7..394f8fbd513885403f411c0cad3bc45d2fd89ec3 100644
--- a/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
+++ b/manifests/setup/0thanosrulerCustomResourceDefinition.yaml
@@ -4830,6 +4830,11 @@ spec:
- key
type: object
x-kubernetes-map-type: atomic
+ tracingConfigFile:
+ description: TracingConfig specifies the path of the tracing configuration
+ file. When used alongside with TracingConfig, TracingConfigFile
+ takes precedence.
+ type: string
volumes:
description: Volumes allows configuration of additional volumes on
the output StatefulSet definition. Volumes specified will be appended