Skip to content

Commit fb66692

Browse files
committed
regenerates k8s manifests
Signed-off-by: Weifeng Wang <[email protected]>
1 parent 60c7982 commit fb66692

File tree

11 files changed

+201
-169
lines changed

11 files changed

+201
-169
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/qclaogui/codelab-monitoring
22

3-
go 1.23
3+
go 1.24
44

55
require (
66
github.com/MakeNowJust/heredoc v1.0.0

kubernetes/common/grafana/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace: monitoring-system
44
helmCharts:
55
- name: grafana
66
repo: https://grafana.github.io/helm-charts
7-
version: 8.11.0
7+
version: 8.11.1
88
releaseName: grafana
99
namespace: monitoring-system
1010
includeCRDs: false

kubernetes/common/grafana/manifests/k8s-all-in-one.yaml

+11-11
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
app.kubernetes.io/instance: grafana
1212
app.kubernetes.io/name: grafana
1313
app.kubernetes.io/version: 11.6.0
14-
helm.sh/chart: grafana-8.11.0
14+
helm.sh/chart: grafana-8.11.1
1515
name: grafana
1616
namespace: monitoring-system
1717
---
@@ -22,7 +22,7 @@ metadata:
2222
app.kubernetes.io/instance: grafana
2323
app.kubernetes.io/name: grafana
2424
app.kubernetes.io/version: 11.6.0
25-
helm.sh/chart: grafana-8.11.0
25+
helm.sh/chart: grafana-8.11.1
2626
name: grafana
2727
namespace: monitoring-system
2828
rules: []
@@ -34,7 +34,7 @@ metadata:
3434
app.kubernetes.io/instance: grafana
3535
app.kubernetes.io/name: grafana
3636
app.kubernetes.io/version: 11.6.0
37-
helm.sh/chart: grafana-8.11.0
37+
helm.sh/chart: grafana-8.11.1
3838
name: grafana-clusterrole
3939
rules:
4040
- apiGroups:
@@ -54,7 +54,7 @@ metadata:
5454
app.kubernetes.io/instance: grafana
5555
app.kubernetes.io/name: grafana
5656
app.kubernetes.io/version: 11.6.0
57-
helm.sh/chart: grafana-8.11.0
57+
helm.sh/chart: grafana-8.11.1
5858
name: grafana
5959
namespace: monitoring-system
6060
roleRef:
@@ -73,7 +73,7 @@ metadata:
7373
app.kubernetes.io/instance: grafana
7474
app.kubernetes.io/name: grafana
7575
app.kubernetes.io/version: 11.6.0
76-
helm.sh/chart: grafana-8.11.0
76+
helm.sh/chart: grafana-8.11.1
7777
name: grafana-clusterrolebinding
7878
roleRef:
7979
apiGroup: rbac.authorization.k8s.io
@@ -151,7 +151,7 @@ metadata:
151151
app.kubernetes.io/instance: grafana
152152
app.kubernetes.io/name: grafana
153153
app.kubernetes.io/version: 11.6.0
154-
helm.sh/chart: grafana-8.11.0
154+
helm.sh/chart: grafana-8.11.1
155155
name: grafana-config-dashboards
156156
namespace: monitoring-system
157157
---
@@ -4219,7 +4219,7 @@ metadata:
42194219
app.kubernetes.io/instance: grafana
42204220
app.kubernetes.io/name: grafana
42214221
app.kubernetes.io/version: 11.6.0
4222-
helm.sh/chart: grafana-8.11.0
4222+
helm.sh/chart: grafana-8.11.1
42234223
name: grafana
42244224
namespace: monitoring-system
42254225
spec:
@@ -4240,7 +4240,7 @@ metadata:
42404240
app.kubernetes.io/instance: grafana
42414241
app.kubernetes.io/name: grafana
42424242
app.kubernetes.io/version: 11.6.0
4243-
helm.sh/chart: grafana-8.11.0
4243+
helm.sh/chart: grafana-8.11.1
42444244
name: grafana
42454245
namespace: monitoring-system
42464246
spec:
@@ -4264,7 +4264,7 @@ spec:
42644264
app.kubernetes.io/instance: grafana
42654265
app.kubernetes.io/name: grafana
42664266
app.kubernetes.io/version: 11.6.0
4267-
helm.sh/chart: grafana-8.11.0
4267+
helm.sh/chart: grafana-8.11.1
42684268
spec:
42694269
automountServiceAccountToken: true
42704270
containers:
@@ -4460,7 +4460,7 @@ metadata:
44604460
app.kubernetes.io/instance: grafana
44614461
app.kubernetes.io/name: grafana
44624462
app.kubernetes.io/version: 11.6.0
4463-
helm.sh/chart: grafana-8.11.0
4463+
helm.sh/chart: grafana-8.11.1
44644464
name: grafana
44654465
namespace: monitoring-system
44664466
spec:
@@ -4487,7 +4487,7 @@ metadata:
44874487
app.kubernetes.io/instance: grafana
44884488
app.kubernetes.io/name: grafana
44894489
app.kubernetes.io/version: 11.6.0
4490-
helm.sh/chart: grafana-8.11.0
4490+
helm.sh/chart: grafana-8.11.1
44914491
name: grafana
44924492
namespace: monitoring-system
44934493
spec:

kubernetes/common/grafana/values-k3d-k3s.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ sidecar:
4646
dashboards:
4747
enabled: true
4848
label: grafana_dashboard
49-
labelValue: 1
49+
labelValue: "1"
5050
folder: /dashboards
5151
searchNamespace: ALL
5252
folderAnnotation: grafana_dashboard_folder
@@ -60,5 +60,5 @@ sidecar:
6060
datasources:
6161
enabled: true
6262
label: grafana_datasource
63-
labelValue: 1
63+
labelValue: "1"
6464
searchNamespace: monitoring-system

kubernetes/common/grafana/values.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -966,9 +966,9 @@ sidecar:
966966
env: {}
967967
# Do not reprocess already processed unchanged resources on k8s API reconnect.
968968
# ignoreAlreadyProcessed: true
969-
# label that the configmaps with alert are marked with
969+
# label that the configmaps with alert are marked with (can be templated)
970970
label: grafana_alert
971-
# value of label that the configmaps with alert are set to
971+
# value of label that the configmaps with alert are set to (can be templated)
972972
labelValue: ""
973973
# Log level. Can be one of: DEBUG, INFO, WARN, ERROR, CRITICAL.
974974
# logLevel: INFO
@@ -1039,9 +1039,9 @@ sidecar:
10391039
# Do not reprocess already processed unchanged resources on k8s API reconnect.
10401040
# ignoreAlreadyProcessed: true
10411041
SCProvider: true
1042-
# label that the configmaps with dashboards are marked with
1042+
# label that the configmaps with dashboards are marked with (can be templated)
10431043
label: grafana_dashboard
1044-
# value of label that the configmaps with dashboards are set to
1044+
# value of label that the configmaps with dashboards are set to (can be templated)
10451045
labelValue: ""
10461046
# Log level. Can be one of: DEBUG, INFO, WARN, ERROR, CRITICAL.
10471047
# logLevel: INFO
@@ -1134,9 +1134,9 @@ sidecar:
11341134
# key: value_key
11351135
# Do not reprocess already processed unchanged resources on k8s API reconnect.
11361136
# ignoreAlreadyProcessed: true
1137-
# label that the configmaps with datasources are marked with
1137+
# label that the configmaps with datasources are marked with (can be templated)
11381138
label: grafana_datasource
1139-
# value of label that the configmaps with datasources are set to
1139+
# value of label that the configmaps with datasources are set to (can be templated)
11401140
labelValue: ""
11411141
# Log level. Can be one of: DEBUG, INFO, WARN, ERROR, CRITICAL.
11421142
# logLevel: INFO
@@ -1193,9 +1193,9 @@ sidecar:
11931193
env: {}
11941194
# Do not reprocess already processed unchanged resources on k8s API reconnect.
11951195
# ignoreAlreadyProcessed: true
1196-
# label that the configmaps with plugins are marked with
1196+
# label that the configmaps with plugins are marked with (can be templated)
11971197
label: grafana_plugin
1198-
# value of label that the configmaps with plugins are set to
1198+
# value of label that the configmaps with plugins are set to (can be templated)
11991199
labelValue: ""
12001200
# Log level. Can be one of: DEBUG, INFO, WARN, ERROR, CRITICAL.
12011201
# logLevel: INFO
@@ -1252,9 +1252,9 @@ sidecar:
12521252
env: {}
12531253
# Do not reprocess already processed unchanged resources on k8s API reconnect.
12541254
# ignoreAlreadyProcessed: true
1255-
# label that the configmaps with notifiers are marked with
1255+
# label that the configmaps with notifiers are marked with (can be templated)
12561256
label: grafana_notifier
1257-
# value of label that the configmaps with notifiers are set to
1257+
# value of label that the configmaps with notifiers are set to (can be templated)
12581258
labelValue: ""
12591259
# Log level. Can be one of: DEBUG, INFO, WARN, ERROR, CRITICAL.
12601260
# logLevel: INFO

kubernetes/common/kube-prometheus-stack/kustomization.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Kustomization
33
helmCharts:
44
- name: kube-prometheus-stack
55
repo: https://prometheus-community.github.io/helm-charts
6-
version: 70.3.0
6+
version: 70.4.1
77
releaseName: kube-prometheus-stack
88
namespace: monitoring-system
99
includeCRDs: false

0 commit comments

Comments
 (0)