Skip to content

Commit 27824a8

Browse files
committed
fix 2024/2024-10-25--Promtail_syslog-Loki-Grafana to use grafana envvars (remove deprecated pluginInit())
Signed-off-by: JuanJo Ciarlante <[email protected]>
1 parent 6679a00 commit 27824a8

File tree

3 files changed

+4
-20
lines changed

3 files changed

+4
-20
lines changed

2024/2024-10-25--Promtail_syslog-Loki-Grafana/docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ services:
1515
- GF_AUTH_ANONYMOUS_ENABLED=true
1616
- GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
1717
- GF_USERS_DEFAULT_THEME=light
18+
- GF_INSTALL_PLUGINS=grafana-lokiexplore-app,grafana-exploretraces-app,grafana-pyroscope-app
19+
- GF_FEATURE_TOGGLES_ENABLE=flameGraph traceqlSearch traceQLStreaming correlations metricsSummary traceqlEditor traceToMetrics traceToProfiles datatrails
1820
image: grafana/grafana:11.3.0-ubuntu
1921
ports:
2022
- 3000:3000

2024/2024-10-28--LGTM_stack/compose.jsonnet

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@ local manifest = compose.new({
2525
c.tempo.new()
2626
+ c.tempo.withVolume()
2727
+ compose.withDependsOn([root.tempo_init]),
28-
grafana_plugin_traces_app:
29-
c.grafana.initPlugin(
30-
root.grafana,
31-
'https://storage.googleapis.com/integration-artifacts/grafana-exploretraces-app/grafana-exploretraces-app-latest.zip',
32-
'grafana-traces-app'
33-
),
3428
grafana:
3529
local datasources = std.objectValues({
3630
prom: c.grafana.datasource.withPrometheus(root.prometheus, true),

2024/2024-10-28--LGTM_stack/docker-compose.yml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,13 @@ services:
1515
- GF_AUTH_ANONYMOUS_ENABLED=true
1616
- GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
1717
- GF_USERS_DEFAULT_THEME=light
18+
- GF_INSTALL_PLUGINS=grafana-lokiexplore-app,grafana-exploretraces-app,grafana-pyroscope-app
19+
- GF_FEATURE_TOGGLES_ENABLE=flameGraph traceqlSearch traceQLStreaming correlations metricsSummary traceqlEditor traceToMetrics traceToProfiles datatrails
1820
image: grafana/grafana:11.3.0-ubuntu
1921
ports:
2022
- 3000:3000
2123
volumes:
2224
- grafana-storage:/var/lib/grafana
23-
grafana-plugin-grafana-traces-app:
24-
command: []
25-
container_name: grafana-plugin-grafana-traces-app
26-
entrypoint:
27-
- grafana
28-
- cli
29-
- --pluginUrl=https://storage.googleapis.com/integration-artifacts/grafana-exploretraces-app/grafana-exploretraces-app-latest.zip
30-
- plugins
31-
- install
32-
- grafana-traces-app
33-
image: grafana/grafana:11.3.0-ubuntu
34-
user: grafana
35-
volumes:
36-
- grafana-storage:/var/lib/grafana
3725
loki:
3826
command: -config.file=/etc/loki/loki.yaml
3927
configs:

0 commit comments

Comments
 (0)