diff --git a/.kitchen.yml b/.kitchen.yml index 7a16e14..3cdce5f 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -15,13 +15,13 @@ provisioner: ansible_inventory: ./test/integration/inventory platforms: - - name: debian-9 + - name: debian-10 driver_config: - image: "nishiki/debian9:ansible-<%= ENV['ANSIBLE_VERSION'] ? ENV['ANSIBLE_VERSION'] : '2.7' %>" + image: "nishiki/debian10:ansible-<%= ENV['ANSIBLE_VERSION'] ? ENV['ANSIBLE_VERSION'] : '2.9' %>" command: /bin/systemd volume: - /sys/fs/cgroup:/sys/fs/cgroup:ro - security_opt: seccomp=unconfined + privileged: cap-add=SYS_ADMIN suites: - name: default diff --git a/Gemfile.lock b/Gemfile.lock index 2f4c668..1dd4e2c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,43 +2,55 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.0) - builder (3.2.3) - erubis (2.7.0) - ffi (1.10.0) - gssapi (1.2.0) + bcrypt_pbkdf (1.0.1) + builder (3.2.4) + ed25519 (1.2.4) + equatable (0.6.1) + erubi (1.9.0) + ffi (1.12.2) + gssapi (1.3.0) ffi (>= 1.0.1) gyoku (1.3.1) builder (>= 2.1.2) httpclient (2.8.3) - kitchen-ansible (0.49.1) + kitchen-ansible (0.50.1) net-ssh (>= 3) - test-kitchen (~> 1.4) + test-kitchen (>= 1.4) kitchen-docker_cli (0.19.0) test-kitchen (>= 1.3) + license-acceptance (1.0.13) + pastel (~> 0.7) + tomlrb (~> 1.2) + tty-box (~> 0.3) + tty-prompt (~> 0.18) little-plugger (1.1.4) logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) - mixlib-install (3.11.11) + mixlib-install (3.11.26) mixlib-shellout mixlib-versioning thor - mixlib-shellout (2.4.4) - mixlib-versioning (1.2.7) - multi_json (1.13.1) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (4.2.0) - net-ssh-gateway (1.3.0) - net-ssh (>= 2.6.5) + mixlib-shellout (3.0.9) + mixlib-versioning (1.2.12) + multi_json (1.14.1) + necromancer (0.5.1) + net-scp (2.0.0) + net-ssh (>= 2.6.5, < 6.0.0) + net-ssh (5.2.0) + net-ssh-gateway (2.0.0) + net-ssh (>= 4.0.0) nori (2.6.0) - parallel (1.16.0) - parser (2.6.2.0) + parallel (1.19.1) + parser (2.7.0.2) ast (~> 2.4.0) + pastel (0.7.3) + equatable (~> 0.6) + tty-color (~> 0.5) powerpack (0.1.2) rainbow (2.2.2) rake - rake (12.3.2) + rake (13.0.1) rubocop (0.50.0) parallel (~> 1.10) parser (>= 2.3.3.1, < 3.0) @@ -46,38 +58,65 @@ GEM rainbow (>= 2.2.2, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.10.0) + ruby-progressbar (1.10.1) rubyntlm (0.6.2) - rubyzip (1.2.2) - test-kitchen (1.24.0) + rubyzip (2.2.0) + strings (0.1.8) + strings-ansi (~> 0.1) + unicode-display_width (~> 1.5) + unicode_utils (~> 1.4) + strings-ansi (0.2.0) + test-kitchen (2.3.4) + bcrypt_pbkdf (~> 1.0) + ed25519 (~> 1.2) + license-acceptance (~> 1.0, >= 1.0.11) mixlib-install (~> 3.6) - mixlib-shellout (>= 1.2, < 3.0) - net-scp (~> 1.1) - net-ssh (>= 2.9, < 5.0) - net-ssh-gateway (~> 1.2) + mixlib-shellout (>= 1.2, < 4.0) + net-scp (>= 1.1, < 3.0) + net-ssh (>= 2.9, < 6.0) + net-ssh-gateway (>= 1.2, < 3.0) thor (~> 0.19) winrm (~> 2.0) winrm-elevated (~> 1.0) winrm-fs (~> 1.1) thor (0.20.3) - unicode-display_width (1.5.0) - winrm (2.3.1) + tomlrb (1.2.9) + tty-box (0.5.0) + pastel (~> 0.7.2) + strings (~> 0.1.6) + tty-cursor (~> 0.7) + tty-color (0.5.1) + tty-cursor (0.7.1) + tty-prompt (0.20.0) + necromancer (~> 0.5.0) + pastel (~> 0.7.0) + tty-reader (~> 0.7.0) + tty-reader (0.7.0) + tty-cursor (~> 0.7) + tty-screen (~> 0.7) + wisper (~> 2.0.0) + tty-screen (0.7.1) + unicode-display_width (1.6.1) + unicode_utils (1.4.0) + winrm (2.3.4) builder (>= 2.1.2) - erubis (~> 2.7) + erubi (~> 1.8) gssapi (~> 1.2) gyoku (~> 1.0) httpclient (~> 2.2, >= 2.2.0.2) logging (>= 1.6.1, < 3.0) nori (~> 2.0) rubyntlm (~> 0.6.0, >= 0.6.1) - winrm-elevated (1.1.1) + winrm-elevated (1.2.1) + erubi (~> 1.8) winrm (~> 2.0) winrm-fs (~> 1.0) - winrm-fs (1.3.2) - erubis (~> 2.7) + winrm-fs (1.3.4) + erubi (~> 1.8) logging (>= 1.6.1, < 3.0) - rubyzip (~> 1.1) + rubyzip (~> 2.0) winrm (~> 2.0) + wisper (2.0.1) PLATFORMS ruby @@ -89,4 +128,4 @@ DEPENDENCIES test-kitchen BUNDLED WITH - 1.16.6 + 1.17.3 diff --git a/README.md b/README.md index 68d9083..c875986 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Install and configure Grafana ## Requirements * Ansible >= 2.7 -* Debian Stretch +* Debian Stretch and Buster ## Role variables diff --git a/meta/main.yml b/meta/main.yml index b05fe6f..d9fc61c 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -11,6 +11,7 @@ galaxy_info: - name: Debian versions: - stretch + - buster galaxy_tags: - dashboard diff --git a/templates/grafana.ini.j2 b/templates/grafana.ini.j2 index a40055c..130fff4 100644 --- a/templates/grafana.ini.j2 +++ b/templates/grafana.ini.j2 @@ -1,10 +1,10 @@ # {{ ansible_managed }} -{% for section, options in grafana_config.iteritems() %} +{% for section, options in grafana_config.items() %} {% if section|lower != 'default' %} [{{ section }}] {% endif %} -{% for option, value in options.iteritems() %} +{% for option, value in options.items() %} {{ option }} = {% if value is sameas true %}true {% elif value is sameas false %}false {% elif value is string %}"{{ value }}" diff --git a/templates/ldap.toml.j2 b/templates/ldap.toml.j2 index b433986..168c711 100644 --- a/templates/ldap.toml.j2 +++ b/templates/ldap.toml.j2 @@ -1,10 +1,10 @@ # {{ ansible_managed }} -{% for section, options in grafana_ldap_config.iteritems() %} +{% for section, options in grafana_ldap_config.items() %} {% if section|lower != 'default' %} [{{ section }}] {% endif %} -{% for option, value in options.iteritems() %} +{% for option, value in options.items() %} {{ option }} = {% if value is sameas true %}true {% elif value is sameas false %}false {% elif value is string %}"{{ value }}"