Few smaller improvements, backward compatible (#110)

* 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

Author: krzyzakp

README.md

@@ -52,6 +52,7 @@ All variables which can be overridden are stored in [defaults/main.yml](defaults
 | `grafana_dashboards` | [] | List of dashboards which should be imported |
 | `grafana_dashboards_dir` | "dashboards" | Path to a local directory containing dashboards files in `json` format |
 | `grafana_datasources` | [] | List of datasources which should be configured |
+| `grafana_environment` | {} | Optional Environment param for Grafana installation, usefull ie for setting http_proxy |
 
 Datasource example:
 

defaults/main.yml

@@ -170,7 +170,7 @@ grafana_image_storage: {}
 # Plugins from https://grafana.com/plugins
 grafana_plugins: []
 #  - raintank-worldping-app
-#
+
 # Dashboards from https://grafana.com/dashboards
 grafana_dashboards: []
 #  - dashboard_id: '4271'
@@ -219,3 +219,5 @@ grafana_api_keys: []
 
 # The location where the keys should be stored.
 grafana_api_keys_dir: "{{ lookup('env', 'HOME') }}/grafana/keys"
+
+grafana_environment: {}

tasks/dashboards.yml

@@ -7,6 +7,7 @@
     mode: 0755
   delegate_to: localhost
   run_once: true
+  check_mode: false
 
 # - name: download grafana dashboard from grafana.net to local folder
 #   become: false
@@ -40,6 +41,7 @@
   when: grafana_dashboards | length > 0
   tags:
     - skip_ansible_lint
+  check_mode: false
 
 # As noted in [1] an exported dashboard replaces the exporter's datasource
 # name with a representative name, something like 'DS_GRAPHITE'. The name

tasks/install.yml

@@ -50,6 +50,7 @@
       delay: 2
   when:
     - ansible_pkg_mgr == "apt"
+  environment: "{{ grafana_environment }}"
 
 - name: Install Grafana
   package:

tasks/main.yml

@@ -74,7 +74,14 @@
     - grafana_configure
     - grafana_notifications
 
+- name: "Check if there are any dashboards in {{ grafana_dashboards_dir }}"
+  find:
+    paths: "{{ grafana_dashboards_dir }}"
+    patterns: '*.json'
+  register: found_dashboards
+
 - include: dashboards.yml
+  when: grafana_dashboards | length > 0 or found_dashboards.matched > 0
   tags:
     - grafana_configure
     - grafana_dashboards