Merge pull request #16 from jjo/jjo/grafana-plugins-via-envvars

change plugin implementation to use envvars

Author: jjo

2024/2024-10-23--Grafana_n_Friends-Jugando_con_eBPF_en_Linux-Oct2024/40-beyla/compose.jsonnet

@@ -21,12 +21,6 @@ local manifest = compose.new({
     + c.tempo.withVolume()
     + c.tempo.withMetricsRemoteWrite(root.prometheus)
     + compose.withDependsOn([root.tempo_init]),
-  grafana_plugin_traces_app:
-    c.grafana.initPlugin(
-      root.grafana,
-      'https://storage.googleapis.com/integration-artifacts/grafana-exploretraces-app/grafana-exploretraces-app-latest.zip',
-      'grafana-traces-app'
-    ),
   grafana:
     local datasources = std.objectValues({
       prom: c.grafana.datasource.withPrometheus(root.prometheus, true),

2024/2024-10-23--Grafana_n_Friends-Jugando_con_eBPF_en_Linux-Oct2024/40-beyla/docker-compose.yml

@@ -38,25 +38,13 @@ services:
       - GF_AUTH_ANONYMOUS_ENABLED=true
       - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
       - GF_USERS_DEFAULT_THEME=light
+      - GF_INSTALL_PLUGINS=grafana-lokiexplore-app,grafana-exploretraces-app,grafana-pyroscope-app
+      - GF_FEATURE_TOGGLES_ENABLE=flameGraph traceqlSearch traceQLStreaming correlations metricsSummary traceqlEditor traceToMetrics traceToProfiles datatrails
     image: grafana/grafana:11.3.0-ubuntu
     ports:
       - 3000:3000
     volumes:
       - grafana-storage:/var/lib/grafana
-  grafana-plugin-grafana-traces-app:
-    command: []
-    container_name: grafana-plugin-grafana-traces-app
-    entrypoint:
-      - grafana
-      - cli
-      - --pluginUrl=https://storage.googleapis.com/integration-artifacts/grafana-exploretraces-app/grafana-exploretraces-app-latest.zip
-      - plugins
-      - install
-      - grafana-traces-app
-    image: grafana/grafana:11.3.0-ubuntu
-    user: grafana
-    volumes:
-      - grafana-storage:/var/lib/grafana
   k6:
     command: run --out json /k6/load_test.js
     container_name: k6

compose/jsonnet/lib/containers/grafana/main.libsonnet

@@ -23,6 +23,8 @@ local images = import '../images.libsonnet';
         'GF_AUTH_ANONYMOUS_ENABLED=true',
         'GF_AUTH_ANONYMOUS_ORG_ROLE=Admin',
         'GF_USERS_DEFAULT_THEME=light',
+        'GF_INSTALL_PLUGINS=grafana-lokiexplore-app,grafana-exploretraces-app,grafana-pyroscope-app',
+        'GF_FEATURE_TOGGLES_ENABLE=flameGraph traceqlSearch traceQLStreaming correlations metricsSummary traceqlEditor traceToMetrics traceToProfiles datatrails',
       ],
       configs: [
         {
@@ -134,22 +136,4 @@ local images = import '../images.libsonnet';
       ),
     },
   },
-
-  initPlugin(container, pluginUrl, pluginName):: {
-    // HACK: matches withVolume() below
-    local root = self,
-    name:: container.name + '-plugin-%s' % pluginName,
-    service: {
-      user: 'grafana',
-      container_name: root.name,
-      image: container.service.image,
-      volumes+: [
-        '%s:/var/lib/grafana' % container.volume_name,
-      ],
-      entrypoint: std.split('grafana cli --pluginUrl=%s plugins install %s' % [pluginUrl, pluginName], ' '),
-      command: [],
-
-    },
-  },
-
 }