Skip to content

Commit ce4b114

Browse files
authored
Merge branch 'main' into fix/prometheus-overview-dashboard
2 parents d1bc726 + 74f4e0c commit ce4b114

File tree

61 files changed

+8753
-304
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+8753
-304
lines changed

docs/access-ui.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Prometheus, Grafana, and Alertmanager dashboards can be accessed quickly using `
1313

1414
> Kubernetes 1.10 or later is required.
1515
16-
You can also learn how to [expose Prometheus/Alertmanager/Grafana via Ingress ->]({{<ref "kube-prometheus/kube/exposing-prometheus-alertmanager-grafana-ingress">}})
16+
You can also learn how to [expose Prometheus/Alertmanager/Grafana via Ingress](customizations/exposing-prometheus-alertmanager-grafana-ingress.md)
1717

1818
## Prometheus
1919

jsonnet/kube-prometheus/versions.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"alertmanager": "0.27.0",
33
"blackboxExporter": "0.25.0",
4-
"grafana": "11.1.0",
5-
"kubeStateMetrics": "2.12.0",
6-
"nodeExporter": "1.8.1",
7-
"prometheus": "2.53.0",
4+
"grafana": "11.1.3",
5+
"kubeStateMetrics": "2.13.0",
6+
"nodeExporter": "1.8.2",
7+
"prometheus": "2.54.0",
88
"prometheusAdapter": "0.12.0",
9-
"prometheusOperator": "0.75.1",
9+
"prometheusOperator": "0.75.2",
1010
"kubeRbacProxy": "0.18.0",
1111
"configmapReload": "0.13.1",
1212
"pyrra": "0.6.4"

jsonnetfile.lock.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "24e05998c68f481af2bd567ee104cf89879bbf89",
21+
"version": "ad942b7118b0b2b640ea7bba2f1c45c39211f4c1",
2222
"sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
2323
},
2424
{
@@ -58,7 +58,7 @@
5858
"subdir": "gen/grafonnet-latest"
5959
}
6060
},
61-
"version": "119d65363dff84a1976bba609f2ac3a8f450e760",
61+
"version": "733beadbc8dab55c5fe1bcdcf0d8a2d215759a55",
6262
"sum": "eyuJ0jOXeA4MrobbNgU4/v5a7ASDHslHZ0eS6hDdWoI="
6363
},
6464
{
@@ -68,7 +68,7 @@
6868
"subdir": "gen/grafonnet-v10.0.0"
6969
}
7070
},
71-
"version": "119d65363dff84a1976bba609f2ac3a8f450e760",
71+
"version": "733beadbc8dab55c5fe1bcdcf0d8a2d215759a55",
7272
"sum": "xdcrJPJlpkq4+5LpGwN4tPAuheNNLXZjE6tDcyvFjr0="
7373
},
7474
{
@@ -78,8 +78,8 @@
7878
"subdir": "gen/grafonnet-v11.0.0"
7979
}
8080
},
81-
"version": "119d65363dff84a1976bba609f2ac3a8f450e760",
82-
"sum": "Fuo+qTZZzF+sHDBWX/8fkPsUmwW6qhH8hRVz45HznfI="
81+
"version": "733beadbc8dab55c5fe1bcdcf0d8a2d215759a55",
82+
"sum": "0BvzR0i4bS4hc2O3xDv6i9m52z7mPrjvqxtcPrGhynA="
8383
},
8484
{
8585
"source": {
@@ -98,8 +98,8 @@
9898
"subdir": "mixin-utils"
9999
}
100100
},
101-
"version": "0c35fcfb35658ed16fb73d5b5546a36cbdf73f7a",
102-
"sum": "Qg992ZB0jkrS+YLq0Q7RV1fSHa8+hQT0jbpTyCGE2NI="
101+
"version": "d9ba581fb27aa6689e911f288d4df06948eb8aad",
102+
"sum": "LoYq5QxJmUXEtqkEG8CFUBLBhhzDDaNANHc7Gz36ZdM="
103103
},
104104
{
105105
"source": {
@@ -128,8 +128,8 @@
128128
"subdir": ""
129129
}
130130
},
131-
"version": "de834e9a291b49396125768f041e2078763f48b5",
132-
"sum": "E6z1j4MS6/NnIVZkUuk+gb0m9FvRmZ77H6SSopIZEa8="
131+
"version": "1b71e399caee334af8ba2d15d0dd615043a652d0",
132+
"sum": "qcRxavmCpuWQuwCMqYaOZ+soA8jxwWLrK7LYqohN5NA="
133133
},
134134
{
135135
"source": {
@@ -138,8 +138,8 @@
138138
"subdir": "jsonnet/kube-state-metrics"
139139
}
140140
},
141-
"version": "85d1423b5b896f4fbce8394afed20cfe17371251",
142-
"sum": "vR59KSqhRDBmKpYbia5VBs/1QFNFXud47G3+RfWSGnQ="
141+
"version": "f8aa7d9bb9d8e29876e19f4859391a54a7e61d63",
142+
"sum": "lO7jUSzAIy8Yk9pOWJIWgPRhubkWzVh56W6wtYfbVH4="
143143
},
144144
{
145145
"source": {
@@ -148,7 +148,7 @@
148148
"subdir": "jsonnet/kube-state-metrics-mixin"
149149
}
150150
},
151-
"version": "85d1423b5b896f4fbce8394afed20cfe17371251",
151+
"version": "f8aa7d9bb9d8e29876e19f4859391a54a7e61d63",
152152
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
153153
},
154154
{
@@ -158,7 +158,7 @@
158158
"subdir": "jsonnet/mixin"
159159
}
160160
},
161-
"version": "cf96bf6e95aab9985b58be61ebd278d0c171fec6",
161+
"version": "a7a1ad63492f1de3b09b2c960c7159b16ce00e84",
162162
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
163163
"name": "prometheus-operator-mixin"
164164
},
@@ -169,8 +169,8 @@
169169
"subdir": "jsonnet/prometheus-operator"
170170
}
171171
},
172-
"version": "cf96bf6e95aab9985b58be61ebd278d0c171fec6",
173-
"sum": "z2/5LjQpWC7snhT+n/mtQqoy5986uI95sTqcKQziwGU="
172+
"version": "a7a1ad63492f1de3b09b2c960c7159b16ce00e84",
173+
"sum": "EZR4sBAtmFRsUR7U4SybuBUhK9ncMCvEu9xHtu8B9KA="
174174
},
175175
{
176176
"source": {
@@ -179,7 +179,7 @@
179179
"subdir": "doc/alertmanager-mixin"
180180
}
181181
},
182-
"version": "eb8369ec510d76f63901379a8437c4b55885d6c5",
182+
"version": "27b6eb7ce02680c84b9a06503edbddc9213f586d",
183183
"sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
184184
"name": "alertmanager"
185185
},
@@ -190,8 +190,8 @@
190190
"subdir": "docs/node-mixin"
191191
}
192192
},
193-
"version": "4cc1c177d05e80176f26fe1ca2a1f193c03c67a0",
194-
"sum": "R9ROsvpjZLgQJ78WAyD4HzrIq976Bpr4V2P2Fo2Kfns="
193+
"version": "b9d0932179a0c5b3a8863f3d6cdafe8584cedc8e",
194+
"sum": "rhUvbqviGjQ2mwsRhHKMN0TiS3YvnYpUXHew3XlQ+Wg="
195195
},
196196
{
197197
"source": {
@@ -200,7 +200,7 @@
200200
"subdir": "documentation/prometheus-mixin"
201201
}
202202
},
203-
"version": "8849b7dcadc2960c70467734efce35d737be25f5",
203+
"version": "5fd66ba8556053545fa1a1525aaaecfefb2c978a",
204204
"sum": "dYLcLzGH4yF3qB7OGC/7z4nqeTNjv42L7Q3BENU8XJI=",
205205
"name": "prometheus"
206206
},
@@ -222,7 +222,7 @@
222222
"subdir": "mixin"
223223
}
224224
},
225-
"version": "cb27548cc43553033d179cec76a13b9f52c5c927",
225+
"version": "c9500df77b93bf2d9d54d47022760c020e285dcf",
226226
"sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
227227
"name": "thanos-mixin"
228228
},

manifests/grafana-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/component: grafana
66
app.kubernetes.io/name: grafana
77
app.kubernetes.io/part-of: kube-prometheus
8-
app.kubernetes.io/version: 11.1.0
8+
app.kubernetes.io/version: 11.1.3
99
name: grafana-config
1010
namespace: monitoring
1111
stringData:

manifests/grafana-dashboardDatasources.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
app.kubernetes.io/component: grafana
66
app.kubernetes.io/name: grafana
77
app.kubernetes.io/part-of: kube-prometheus
8-
app.kubernetes.io/version: 11.1.0
8+
app.kubernetes.io/version: 11.1.3
99
name: grafana-datasources
1010
namespace: monitoring
1111
stringData:

0 commit comments

Comments
 (0)