From 6b23d63faa97a09b4efc3e015db403b5bbc0fc73 Mon Sep 17 00:00:00 2001
From: Thomas Schneider <thomas@fsmpi.rwth-aachen.de>
Date: Sat, 4 Mar 2023 21:33:59 +0100
Subject: [PATCH] *: ansible-lint cleanup
---
.ansible-lint | 1 +
.gitlab-ci.yml | 1 -
alertmanager/handlers/main.yml | 4 ++--
alertmanager/tasks/main.yml | 6 +++---
grafana/handlers/main.yml | 4 ++--
grafana/tasks/main.yml | 20 +++++++++++---------
grafana/tasks/postgres.yml | 9 +++++----
mysqld_exporter/handlers/main.yml | 2 +-
mysqld_exporter/tasks/main.yml | 8 ++++----
node_exporter/handlers/main.yml | 2 +-
node_exporter/tasks/main.yml | 15 ++++++++-------
node_exporter/tasks/needrestart.yml | 8 ++++----
prometheus/handlers/main.yml | 4 ++--
prometheus/tasks/main.yml | 10 +++++-----
14 files changed, 49 insertions(+), 45 deletions(-)
diff --git a/.ansible-lint b/.ansible-lint
index 8735351..e2e7f6c 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -1,2 +1,3 @@
---
+
use_default_rules: true
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e91fe3f..4f40666 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,6 @@ test:
- >-
ansible-lint
--format codeclimate
- ./*/
> codeclimate.json
- "! rg --fixed-strings 'passwordstore' ./*/templates"
artifacts:
diff --git a/alertmanager/handlers/main.yml b/alertmanager/handlers/main.yml
index 94a8c21..75340c1 100644
--- a/alertmanager/handlers/main.yml
+++ b/alertmanager/handlers/main.yml
@@ -1,11 +1,11 @@
---
- name: Restart alertmanager
- systemd:
+ ansible.builtin.systemd:
name: prometheus-alertmanager.service
state: restarted
- name: Reload alertmanager
- systemd:
+ ansible.builtin.systemd:
name: prometheus-alertmanager.service
state: reloaded
diff --git a/alertmanager/tasks/main.yml b/alertmanager/tasks/main.yml
index a878955..33c431c 100644
--- a/alertmanager/tasks/main.yml
+++ b/alertmanager/tasks/main.yml
@@ -1,12 +1,12 @@
---
- name: Install alertmanager
- apt:
+ ansible.builtin.apt:
name: prometheus-alertmanager
state: present
- name: Configure alertmanager command arguments
- template:
+ ansible.builtin.template:
src: default.j2
dest: /etc/default/prometheus-alertmanager
owner: root
@@ -18,7 +18,7 @@
- config
- name: Configure alertmanager
- template:
+ ansible.builtin.template:
src: alertmanager.yml.j2
dest: /etc/prometheus/alertmanager.yml
owner: root
diff --git a/grafana/handlers/main.yml b/grafana/handlers/main.yml
index d4d98b6..a420492 100644
--- a/grafana/handlers/main.yml
+++ b/grafana/handlers/main.yml
@@ -1,10 +1,10 @@
---
- name: Restart Grafana
- systemd:
+ ansible.builtin.systemd:
name: grafana-server.service
state: restarted
- name: Reload systemd
- systemd:
+ ansible.builtin.systemd:
daemon_reload: true
diff --git a/grafana/tasks/main.yml b/grafana/tasks/main.yml
index c475450..49ddf77 100644
--- a/grafana/tasks/main.yml
+++ b/grafana/tasks/main.yml
@@ -15,7 +15,7 @@
- config
- name: Install Grafana repo
- apt_repository:
+ ansible.builtin.apt_repository:
repo: "deb https://packages.grafana.com/enterprise/deb stable main"
tags:
- packages
@@ -24,7 +24,7 @@
- config
- name: Install Grafana
- apt:
+ ansible.builtin.apt:
name:
- grafana-enterprise
state: present
@@ -33,7 +33,7 @@
- grafana
- name: Create systemd unit override directory
- file:
+ ansible.builtin.file:
path: /etc/systemd/system/grafana-server.service.d
state: directory
owner: root
@@ -44,7 +44,7 @@
- config
- name: Configure Grafana systemd service
- copy:
+ ansible.builtin.copy:
src: grafana-server-override.service
dest: /etc/systemd/system/grafana-server.service.d/ansible-override.conf
owner: root
@@ -58,7 +58,7 @@
- config
- name: Configure Grafana
- template:
+ ansible.builtin.template:
src: grafana.ini.j2
dest: /etc/grafana/grafana.ini
owner: root
@@ -71,7 +71,7 @@
- grafana
- name: Configure Grafana LDAP auth
- template:
+ ansible.builtin.template:
src: ldap.toml.j2
dest: /etc/grafana/ldap.toml
owner: root
@@ -85,7 +85,8 @@
- config
- grafana
-- import_tasks: postgres.yml
+- name: Configure Postgres for Grafana
+ ansible.builtin.import_tasks: postgres.yml
when:
- grafana_database is defined
- grafana_database.type == "postgres"
@@ -94,10 +95,11 @@
- grafana
- postgres
-- meta: flush_handlers
+- name: Flush handlers
+ ansible.builtin.meta: flush_handlers
- name: Enable and start Grafana
- systemd:
+ ansible.builtin.systemd:
name: grafana-server.service
state: started
enabled: true
diff --git a/grafana/tasks/postgres.yml b/grafana/tasks/postgres.yml
index f69793b..ee1e172 100644
--- a/grafana/tasks/postgres.yml
+++ b/grafana/tasks/postgres.yml
@@ -1,21 +1,22 @@
---
-- become: true
+- name: Become postgres system user
+ become: true
become_user: postgres
block:
- name: Create postgres user
- postgresql_user:
+ community.postgresql.postgresql_user:
name: grafana
state: present
- name: Create database
- postgresql_db:
+ community.postgresql.postgresql_db:
name: grafana
owner: grafana
state: present
- name: Grant database privileges
- postgresql_privs:
+ community.postgresql.postgresql_privs:
database: grafana
privs: ALL
state: present
diff --git a/mysqld_exporter/handlers/main.yml b/mysqld_exporter/handlers/main.yml
index 0c1a1c1..a377972 100644
--- a/mysqld_exporter/handlers/main.yml
+++ b/mysqld_exporter/handlers/main.yml
@@ -1,6 +1,6 @@
---
- name: Restart mysqld_exporter
- systemd:
+ ansible.builtin.systemd:
name: prometheus-mysqld-exporter.service
state: restarted
diff --git a/mysqld_exporter/tasks/main.yml b/mysqld_exporter/tasks/main.yml
index 9d8d2ed..a2a44fc 100644
--- a/mysqld_exporter/tasks/main.yml
+++ b/mysqld_exporter/tasks/main.yml
@@ -1,7 +1,7 @@
---
- name: Install mysqld_exporter
- apt:
+ ansible.builtin.apt:
name: prometheus-mysqld-exporter
state: present
when: ansible_distribution_major_version|int >= 10
@@ -10,7 +10,7 @@
- prometheus-exporter
- name: Install mysqld_exporter (stretch)
- apt:
+ ansible.builtin.apt:
name: prometheus-mysqld-exporter
state: present
default_release: stretch-backports
@@ -20,7 +20,7 @@
- prometheus-exporter
- name: Configure mysqld_exporter
- template:
+ ansible.builtin.template:
src: prometheus-mysqld-exporter.j2
dest: /etc/default/prometheus-mysqld-exporter
owner: root
@@ -34,7 +34,7 @@
- config
- name: Configure Prometheus server to scrape us
- template:
+ ansible.builtin.template:
src: scrape.yml.j2
dest: "/etc/prometheus/scrape/mysqld_{{ ansible_fqdn }}.yml"
owner: root
diff --git a/node_exporter/handlers/main.yml b/node_exporter/handlers/main.yml
index f25d9e7..61d109d 100644
--- a/node_exporter/handlers/main.yml
+++ b/node_exporter/handlers/main.yml
@@ -1,6 +1,6 @@
---
- name: Restart node_exporter
- systemd:
+ ansible.builtin.systemd:
name: prometheus-node-exporter.service
state: restarted
diff --git a/node_exporter/tasks/main.yml b/node_exporter/tasks/main.yml
index 26a48cd..f43ef22 100644
--- a/node_exporter/tasks/main.yml
+++ b/node_exporter/tasks/main.yml
@@ -1,7 +1,7 @@
---
- name: Install node_exporter
- apt:
+ ansible.builtin.apt:
name: prometheus-node-exporter
state: present
when: ansible_distribution_major_version|int >= 10
@@ -10,7 +10,7 @@
- prometheus-exporter
- name: Install node_exporter (stretch)
- apt:
+ ansible.builtin.apt:
name: prometheus-node-exporter
state: present
default_release: stretch-backports
@@ -20,7 +20,7 @@
- prometheus-exporter
- name: Install additional node_exporter collectors
- apt:
+ ansible.builtin.apt:
name: prometheus-node-exporter-collectors
state: present
when: ansible_distribution_major_version|int >= 11
@@ -29,7 +29,7 @@
- prometheus-exporter
- name: Ensure smartmontools is present only on bare-metal hosts
- apt:
+ ansible.builtin.apt:
name: smartmontools
state: >-
{% if force_smartmontools_on_vm_guest or
@@ -41,7 +41,7 @@
{%- endif %}
- name: Configure node_exporter
- template:
+ ansible.builtin.template:
src: prometheus-node-exporter.j2
dest: /etc/default/prometheus-node-exporter
owner: root
@@ -55,7 +55,7 @@
- config
- name: Configure Prometheus server to scrape us
- template:
+ ansible.builtin.template:
src: scrape.yml.j2
dest: "/etc/prometheus/scrape/node_{{ ansible_fqdn }}.yml"
owner: root
@@ -67,5 +67,6 @@
- prometheus-exporter
- config
-- import_tasks: needrestart.yml
+- name: Configure needrestart integration
+ ansible.builtin.import_tasks: needrestart.yml
when: node_exporter_needrestart
diff --git a/node_exporter/tasks/needrestart.yml b/node_exporter/tasks/needrestart.yml
index 8a3be68..07a518a 100644
--- a/node_exporter/tasks/needrestart.yml
+++ b/node_exporter/tasks/needrestart.yml
@@ -1,7 +1,7 @@
---
- name: Install needrestart
- apt:
+ ansible.builtin.apt:
name: needrestart
state: present
tags:
@@ -9,7 +9,7 @@
- prometheus-exporter
- name: Install needrestart2prom
- get_url:
+ ansible.builtin.get_url:
url: >-
https://git.fsmpi.rwth-aachen.de/api/v4/projects/233/packages/generic/needrestart2prom/{{
needrestart2prom_version }}/needrestart2prom-{{ ansible_system|lower }}-{{
@@ -24,7 +24,7 @@
- prometheus-exporter
- name: Configure needrestart2prom cronjob PATH
- cron:
+ ansible.builtin.cron:
cron_file: needrestart2prom
user: root
env: true
@@ -36,7 +36,7 @@
- prometheus-exporter
- name: Configure needrestart2prom cronjob
- cron:
+ ansible.builtin.cron:
cron_file: needrestart2prom
user: root
name: needrestart2prom
diff --git a/prometheus/handlers/main.yml b/prometheus/handlers/main.yml
index 0be95fd..208fecb 100644
--- a/prometheus/handlers/main.yml
+++ b/prometheus/handlers/main.yml
@@ -1,11 +1,11 @@
---
- name: Restart prometheus
- systemd:
+ ansible.builtin.systemd:
name: prometheus.service
state: restarted
- name: Reload prometheus
- systemd:
+ ansible.builtin.systemd:
name: prometheus.service
state: reloaded
diff --git a/prometheus/tasks/main.yml b/prometheus/tasks/main.yml
index 0e5b619..d5a7f63 100644
--- a/prometheus/tasks/main.yml
+++ b/prometheus/tasks/main.yml
@@ -1,7 +1,7 @@
---
- name: Install prometheus
- apt:
+ ansible.builtin.apt:
name:
- prometheus
state: present
@@ -9,7 +9,7 @@
- prometheus
- name: Configure prometheus command arguments
- template:
+ ansible.builtin.template:
src: default-prometheus.j2
dest: /etc/default/prometheus
owner: root
@@ -22,7 +22,7 @@
- config
- name: Configure prometheus
- template:
+ ansible.builtin.template:
src: prometheus.yml.j2
dest: /etc/prometheus/prometheus.yml
validate: "promtool check config %s"
@@ -36,7 +36,7 @@
- config
- name: Create necessary directories
- file:
+ ansible.builtin.file:
path: "/etc/prometheus/{{ item }}"
state: directory
owner: root
@@ -51,7 +51,7 @@
- config
- name: Configure rules
- template:
+ ansible.builtin.template:
src: "rules.yml.j2"
dest: "/etc/prometheus/rules/ansible_rules.yml"
validate: "promtool check rules %s"
--
GitLab