Merge ~aluria/grafana-snap/+git/grafana-snap:fix/cliplugins into grafana-snap:master

[Alvaro Uria]

[Alvaro Uria (aluria)]

The envvar was correct. GF_PLUGIN_DIR affects grafana-cli. The envvars for the grafana service are not applicable to grafana-cli.

Hence, I've rejected the MP.

[Alvaro Uria (aluria)]

review: Disapprove

[Alvaro Uria (aluria)]

root@focal:~# cat /snap/grafana/current/bin/grafana-cli.wrapper
#!/bin/sh
export PATH="$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH"
export LD_LIBRARY_PATH=$SNAP_LIBRARY_PATH:$LD_LIBRARY_PATH
export GF_PLUGIN_DIR=$SNAP_COMMON/data/plugins

exec "$SNAP/bin/grafana-cli" "$@"
root@focal:~# grafana.grafana-cli plugins install voxter-app
installing voxter-app @ 0.0.2
from: https://grafana.com/api/plugins/voxter-app/versions/0.0.2/download
into: /var/snap/grafana/common/data/plugins

✔ Installed voxter-app successfully

Restart grafana after installing plugins . <service grafana-server restart>

Unmerged commits

309b576... by Alvaro Uria on 2021-09-28

Update grafana-cli.wrapper envvars

The grafana service already uses the correct environment variables that
override changes in grafana.ini. However, the grafana-cli wrapper did
not use the same environment variables, causing the install of plugins
to use the default folder for non-snap packages. This change amends the
mistake.

diff --git a/bin/grafana-cli.wrapper b/bin/grafana-cli.wrapper
index e98c138..a2dece0 100755
--- a/bin/grafana-cli.wrapper
+++ b/bin/grafana-cli.wrapper
@@ -1,6 +1,9 @@
 #!/bin/sh
 export PATH="$SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH"
 export LD_LIBRARY_PATH=$SNAP_LIBRARY_PATH:$LD_LIBRARY_PATH
-export GF_PLUGIN_DIR=$SNAP_COMMON/data/plugins
+export GF_PATHS_DATA=$SNAP_COMMON/data
+export GF_PATHS_LOGS=$SNAP_COMMON/data/log
+export GF_PATHS_PLUGINS=$SNAP_COMMON/data/plugins
+export GF_PATHS_PROVISIONING=$SNAP_COMMON/conf/provisioning
 
 exec "$SNAP/bin/grafana-cli" "$@"