Fix bug in grafana admin password reset script #360
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
|
Easy test to verify CLI requires argument ordering: |
|
Thanks @peterellisjones! |
|
Hi @frodenas — any chance you could cut this into a new release? We rotate our passwords regularly so we see this bug quite a lot. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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:This is because the
grafana-admin-passwordscript was passing the-homepathand-configglobal options after theadmin reset-admin-passwordcommand, which is not supported. I have verified this fix works by manually updating/var/vcap/jobs/grafana/bin/grafana-admin-passwordto fix the argument ordering on a running prometheus deployment and verifying that the script no longer fails.I assume that the argument ordering requirement was introduced into the grafana CLI at some point after this script was made.