Skip to content

Commit af43aea

Browse files
qclaoguiqclaogui
committed
regenerates k8s manifests
Signed-off-by: Weifeng Wang <[email protected]> regenerates k8s manifests Signed-off-by: Weifeng Wang <[email protected]>
1 parent dffebd3 commit af43aea

File tree

12 files changed

+212
-212
lines changed

12 files changed

+212
-212
lines changed

‎compose.override.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ services:
3131
metrics.grafana.com/scrape: true
3232
profiles.grafana.com/service_name: grafana
3333
profiles.grafana.com/port: 6060
34-
image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.0}
34+
image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.3}
3535
volumes:
3636
- ./monitoring-mixins/loki-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/loki-mixin
3737
- ./monitoring-mixins/tempo-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/tempo-mixin

‎docker-compose/common/compose-include/grafana.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
grafana:
2121
labels:
2222
metrics.grafana.com/scrape: false
23-
image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.0}
23+
image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.3}
2424
command:
2525
- --config=/etc/grafana-config/grafana.ini
2626
volumes:

‎docker-compose/common/config/.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ALLOY_IMAGE=grafana/alloy:v1.2.1
22
LOKI_IMAGE=grafana/loki:3.1.0
3-
GRAFANA_IMAGE=grafana/grafana:11.1.0
3+
GRAFANA_IMAGE=grafana/grafana:11.1.3
44
TEMPO_IMAGE=grafana/tempo:2.5.0
55
MIMIR_IMAGE=grafana/mimir-alpine:2.13.0
66
MIMIRTOOL_IMAGE=grafana/mimirtool:2.13.0

‎examples/grafana-explore-logs/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ include:
2626
services:
2727
# override included service grafana environment
2828
grafana:
29-
image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.0}
29+
image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.3}
3030
volumes:
3131
- ./grafana/provisioning/plugins/grafana-lokiexplore-app.yaml:/etc/grafana/provisioning/plugins/grafana-lokiexplore-app.yaml
3232
environment:

‎examples/grafana-explore-logs/compose.override.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
services:
33
# override included service grafana environment
44
grafana:
5-
image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.0}
5+
image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.3}
66
volumes:
77
- ./grafana/provisioning/plugins/grafana-lokiexplore-app.yaml:/etc/grafana/provisioning/plugins/grafana-lokiexplore-app.yaml
88
environment:

‎examples/grafana-explore-profiles/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ include:
1818
services:
1919
# override included service grafana environment
2020
grafana:
21-
image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.0}
21+
image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.3}
2222
volumes:
2323
- ./grafana/provisioning/plugins/grafana-pyroscope-app.yaml:/etc/grafana/provisioning/plugins/grafana-pyroscope-app.yaml
2424
environment:

‎examples/grafana-explore-profiles/compose.override.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ services:
88
profiles.grafana.com/goroutine.scrape: true
99
profiles.grafana.com/service_name: grafana
1010
profiles.grafana.com/port: 6060
11-
image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.0}
11+
image: ${GRAFANA_IMAGE:-docker.io/grafana/grafana:11.1.3}
1212
volumes:
1313
- ./grafana/provisioning/plugins/grafana-pyroscope-app.yaml:/etc/grafana/provisioning/plugins/grafana-pyroscope-app.yaml
1414
environment:

‎kubernetes/common/grafana/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ helmCharts:
1212
valuesFile: values-k3d-k3s.yaml
1313
images:
1414
- name: docker.io/grafana/grafana
15-
newTag: 11.1.0
15+
newTag: 11.1.3
1616
- name: quay.io/kiwigrid/k8s-sidecar
1717
newTag: 1.26.1
1818
resources:

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ metadata:
1212
app.kubernetes.io/managed-by: Helm
1313
app.kubernetes.io/name: grafana
1414
app.kubernetes.io/version: 11.1.0
15-
helm.sh/chart: grafana-8.3.6
15+
helm.sh/chart: grafana-8.4.0
1616
name: grafana
1717
namespace: monitoring-system
1818
---
@@ -24,7 +24,7 @@ metadata:
2424
app.kubernetes.io/managed-by: Helm
2525
app.kubernetes.io/name: grafana
2626
app.kubernetes.io/version: 11.1.0
27-
helm.sh/chart: grafana-8.3.6
27+
helm.sh/chart: grafana-8.4.0
2828
name: grafana
2929
namespace: monitoring-system
3030
rules: []
@@ -37,7 +37,7 @@ metadata:
3737
app.kubernetes.io/managed-by: Helm
3838
app.kubernetes.io/name: grafana
3939
app.kubernetes.io/version: 11.1.0
40-
helm.sh/chart: grafana-8.3.6
40+
helm.sh/chart: grafana-8.4.0
4141
name: grafana-clusterrole
4242
rules:
4343
- apiGroups:
@@ -58,7 +58,7 @@ metadata:
5858
app.kubernetes.io/managed-by: Helm
5959
app.kubernetes.io/name: grafana
6060
app.kubernetes.io/version: 11.1.0
61-
helm.sh/chart: grafana-8.3.6
61+
helm.sh/chart: grafana-8.4.0
6262
name: grafana
6363
namespace: monitoring-system
6464
roleRef:
@@ -78,7 +78,7 @@ metadata:
7878
app.kubernetes.io/managed-by: Helm
7979
app.kubernetes.io/name: grafana
8080
app.kubernetes.io/version: 11.1.0
81-
helm.sh/chart: grafana-8.3.6
81+
helm.sh/chart: grafana-8.4.0
8282
name: grafana-clusterrolebinding
8383
roleRef:
8484
apiGroup: rbac.authorization.k8s.io
@@ -157,7 +157,7 @@ metadata:
157157
app.kubernetes.io/managed-by: Helm
158158
app.kubernetes.io/name: grafana
159159
app.kubernetes.io/version: 11.1.0
160-
helm.sh/chart: grafana-8.3.6
160+
helm.sh/chart: grafana-8.4.0
161161
name: grafana-config-dashboards
162162
namespace: monitoring-system
163163
---
@@ -4226,7 +4226,7 @@ metadata:
42264226
app.kubernetes.io/managed-by: Helm
42274227
app.kubernetes.io/name: grafana
42284228
app.kubernetes.io/version: 11.1.0
4229-
helm.sh/chart: grafana-8.3.6
4229+
helm.sh/chart: grafana-8.4.0
42304230
name: grafana
42314231
namespace: monitoring-system
42324232
spec:
@@ -4248,7 +4248,7 @@ metadata:
42484248
app.kubernetes.io/managed-by: Helm
42494249
app.kubernetes.io/name: grafana
42504250
app.kubernetes.io/version: 11.1.0
4251-
helm.sh/chart: grafana-8.3.6
4251+
helm.sh/chart: grafana-8.4.0
42524252
name: grafana
42534253
namespace: monitoring-system
42544254
spec:
@@ -4383,7 +4383,7 @@ spec:
43834383
- secretRef:
43844384
name: grafana-env
43854385
optional: true
4386-
image: docker.io/grafana/grafana:11.1.0
4386+
image: docker.io/grafana/grafana:11.1.3
43874387
imagePullPolicy: IfNotPresent
43884388
livenessProbe:
43894389
failureThreshold: 10
@@ -4456,7 +4456,7 @@ metadata:
44564456
app.kubernetes.io/managed-by: Helm
44574457
app.kubernetes.io/name: grafana
44584458
app.kubernetes.io/version: 11.1.0
4459-
helm.sh/chart: grafana-8.3.6
4459+
helm.sh/chart: grafana-8.4.0
44604460
name: grafana
44614461
namespace: monitoring-system
44624462
spec:
@@ -4484,7 +4484,7 @@ metadata:
44844484
app.kubernetes.io/managed-by: Helm
44854485
app.kubernetes.io/name: grafana
44864486
app.kubernetes.io/version: 11.1.0
4487-
helm.sh/chart: grafana-8.3.6
4487+
helm.sh/chart: grafana-8.4.0
44884488
name: grafana
44894489
namespace: monitoring-system
44904490
spec:

0 commit comments

Comments
 (0)