From bcf040793e383cd49f48b37e0702647fe5f30d98 Mon Sep 17 00:00:00 2001 From: Kevin Coakley Date: Sat, 1 May 2021 19:15:35 +0000 Subject: [PATCH 1/6] Ignore truthy errors on molecule-test.yaml --- molecule/yaml-lint.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/molecule/yaml-lint.yml b/molecule/yaml-lint.yml index afeaac8..3f13066 100644 --- a/molecule/yaml-lint.yml +++ b/molecule/yaml-lint.yml @@ -4,3 +4,6 @@ rules: line-length: max: 250 level: warning + truthy: + ignore: | + molecule-test.yml From 3cb89e79f9389749b654c0bc69d94a8199c5cac5 Mon Sep 17 00:00:00 2001 From: Kevin Coakley Date: Sat, 1 May 2021 19:23:49 +0000 Subject: [PATCH 2/6] Added ansible-lint config --- molecule/ansible-lint.yml | 6 ++++++ molecule/default/molecule.yml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 molecule/ansible-lint.yml diff --git a/molecule/ansible-lint.yml b/molecule/ansible-lint.yml new file mode 100644 index 0000000..bac4c46 --- /dev/null +++ b/molecule/ansible-lint.yml @@ -0,0 +1,6 @@ +--- +warn_list: + - internal-error + - role-name +skip_list: + - yaml diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 64074ea..270ecf8 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -6,7 +6,7 @@ driver: lint: | set -e yamllint -c molecule/yaml-lint.yml . - ansible-lint + ansible-lint -c molecule/ansible-lint.yml . flake8 platforms: - name: instance From a9a737fd1b8bb56921659bd87daf86c201145789 Mon Sep 17 00:00:00 2001 From: Kevin Coakley Date: Sat, 1 May 2021 19:28:28 +0000 Subject: [PATCH 3/6] Added namespace --- meta/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/main.yml b/meta/main.yml index bd22173..0003c4a 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,9 +1,9 @@ --- galaxy_info: role_name: prometheus-node-exporter + namespace: kevincoakley author: Kevin Coakley description: Install Prometheus Node Exporter - # If the issue tracker for your role is not on github, uncomment the license: BSD min_ansible_version: 2.2 platforms: From f47743ee179fe3c5324ce98f9bd229104a060a20 Mon Sep 17 00:00:00 2001 From: Kevin Coakley Date: Sat, 1 May 2021 19:30:04 +0000 Subject: [PATCH 4/6] Ignore the .cache directory --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 6bdcfc2..45b699f 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,5 @@ crashlytics-build.properties fabric.properties *.retry + +.cache/ \ No newline at end of file From 092ace994ed851f5e2c3e18c70d5451cd767f317 Mon Sep 17 00:00:00 2001 From: Kevin Coakley Date: Sat, 1 May 2021 19:31:09 +0000 Subject: [PATCH 5/6] Updated Install dependencies --- .github/workflows/molecule-test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/molecule-test.yml b/.github/workflows/molecule-test.yml index 1294191..9bdec3a 100644 --- a/.github/workflows/molecule-test.yml +++ b/.github/workflows/molecule-test.yml @@ -6,6 +6,7 @@ jobs: runs-on: ubuntu-latest strategy: fail-fast: false + max-parallel: 4 matrix: molecule_distro: ['centos7', 'centos8', 'ubuntu1804', 'ubuntu2004'] env: @@ -20,7 +21,10 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install ansible-lint flake8 molecule docker + pip install ansible ansible-lint flake8 molecule molecule-docker docker yamllint + ansible --version + ansible-lint --version + molecule --version - name: Test with molecule run: | molecule test --all From e5dbd3e4e64293343080f88fc9d6dc807665e742 Mon Sep 17 00:00:00 2001 From: Kevin Coakley Date: Sat, 1 May 2021 19:31:29 +0000 Subject: [PATCH 6/6] Updated node-exporter version to 1.1.2 --- defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index 98ec709..1dcd832 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,5 @@ --- -prometheus_node_exporter_version: 1.0.0 +prometheus_node_exporter_version: 1.1.2 prometheus_node_exporter_download_url: https://github.com/prometheus/node_exporter/releases/download/v{{ prometheus_node_exporter_version }}/node_exporter-{{ prometheus_node_exporter_version }}.linux-amd64.tar.gz prometheus_node_exporter_manage_user: true prometheus_node_exporter_service_username: node-exp