Skip to content

Commit ca4c72f

Browse files
Fix bug in grafana admin password reset script
Grafana CLI global options _must_ come before command and command options. Currently we are seeing the following error in `less /var/vcap/sys/log/grafana/post-start.stdout.log`: ``` [Wed Nov 20 14:30:12 UTC 2019] Resetting grafana admin password ... Waiting for grafana to listen on port 3000 (0/60) Grafana is ready Incorrect Usage: flag provided but not defined: -homepath NAME: Grafana cli admin reset-admin-password - reset-admin-password <new password> USAGE: Grafana cli admin reset-admin-password [arguments...] ``` This is because the `grafana-admin-password` script was passing the `-homepath` and `-config` global options _after_ the `admin reset-admin-password` command, which is not supported. I have verified this fix works by manually updating `/var/vcap/jobs/grafana/bin/grafana-admin-password` to fix the argument ordering on a running prometheus deployment and verifying that the script no longer fails.
1 parent cf30b07 commit ca4c72f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

jobs/grafana/templates/bin/grafana-admin-password

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ if [[ i -gt $retries ]]; then
1818
exit 1
1919
fi
2020

21-
/var/vcap/packages/grafana/bin/grafana-cli admin reset-admin-password \
21+
/var/vcap/packages/grafana/bin/grafana-cli \
2222
--homepath=/var/vcap/packages/grafana \
2323
--config=/var/vcap/jobs/grafana/config/grafana.ini \
24+
admin reset-admin-password \
2425
<%= p("grafana.security.admin_password") %>
2526

2627
exit 0

0 commit comments

Comments
 (0)