Skip to content
This repository was archived by the owner on May 31, 2023. It is now read-only.

Few smaller improvements, backward compatible #110

Merged
merged 10 commits into from
Nov 12, 2018

Conversation

krzyzakp
Copy link
Contributor

@krzyzakp krzyzakp commented Nov 9, 2018

  • Fixed running role in check_mode, so it's not failing anymore
  • Added environment param for getting GPG key and installing Grafana - usefull, when you have to use PROXY
  • Added option to disable managing dashboards. Useful when you modify them manually via web interface.

README.md Outdated
@@ -49,9 +49,11 @@ All variables which can be overridden are stored in [defaults/main.yml](defaults
| `grafana_tracing` | {} | [tracing](http://docs.grafana.org/installation/configuration/#tracing) configuration section |
| `grafana_snapshots` | {} | [snapshots](http://docs.grafana.org/installation/configuration/#snapshots) configuration section |
| `grafana_image_storage` | {} | [image storage](http://docs.grafana.org/installation/configuration/#external-image-storage) configuration section |
| `grafana_manage_dashboards` | true | Defines if dashboards should be managed by Ansible (will overwrite exisiting) |
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems unnecessary and a bit redundant. Why not check for grafana_dashboards | length > 0 and if there are any "{{ grafana_dashboards_dir }}/*.json ?

@paulfantom
Copy link
Member

This is great, could you rebase to fix git conflicts?

@krzyzakp
Copy link
Contributor Author

Merge conflicts resolved.

@paulfantom paulfantom merged commit c8648a6 into cloudalchemy:master Nov 12, 2018
dimavin pushed a commit to intento/ansible-grafana that referenced this pull request Jan 16, 2019
* Replaced tag always, which colidate when including role. Renamed tags, to include service name, for better handling with other roles

* Updating molecule command, basing on official docs for latest version

* Installing older pytest, which is not broken

* Fixed module name typo

* Fixed check_mode, to work smoothly. Added environment param, so you can set ie. http_proxy for getting GPG key. Added possibility to skip managing dashboards.

* Fixed skipping environment when not setup

* Updated README with new configuration params

* Removed unnecessary variable for managing dashboards

* Fixed pattern for templates
@lock
Copy link

lock bot commented Mar 24, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked and limited conversation to collaborators Mar 24, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants