Merge branch 'master' into workaround-for-bug-with-python-plugins-in-Ubuntu-20.04

mvdriel · mvdriel · commit 6ee580361882 · 2023-05-23T15:16:08.000+02:00
diff --git a/.ansible-lint b/.ansible-lint
@@ -1,4 +1,5 @@
 ---
 warn_list:
   - role-name
+  - name[play]
   - name[casing]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -65,7 +65,7 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies
-        run: pip install 'ansible${{ matrix.ansible-version }}' molecule[docker] docker
+        run: pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
 
       - name: Run Molecule tests
         run: |
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,8 +1,11 @@
 # tasks file
 ---
 - name: install dependencies
+  tags:
+    - configuration
+    - collectd
+    - collectd-dependencies
   block:
-
     # See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199
     - name: ensure man directory
       ansible.builtin.file:
@@ -20,11 +23,6 @@
         update_cache: true
         cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
 
-  tags:
-    - configuration
-    - collectd
-    - collectd-dependencies
-
 - name: install additional
   ansible.builtin.apt:
     name: "{{ collectd_install }}"
diff --git a/templates/etc/collectd/collectd.conf.d/apache.conf.j2 b/templates/etc/collectd/collectd.conf.d/apache.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 LoadPlugin apache
 
@@ -12,8 +12,8 @@ LoadPlugin apache
 {% if item.password is defined %}
     Password "{{ item.password }}"
 {% endif %}
-    VerifyPeer "{{ item.verify_peer | default(true) }}"
-    VerifyHost "{{ item.verify_host | default(true) }}"
+    VerifyPeer {{ item.verify_peer | default(true) | bool | to_json }}
+    VerifyHost {{ item.verify_host | default(true) | bool | to_json }}
 {% if item.ca_cert_file is defined %}
     CACert "{{ item.ca_cert_file }}"
 {% endif %}
diff --git a/templates/etc/collectd/collectd.conf.d/contextswitch.conf.j2 b/templates/etc/collectd/collectd.conf.d/contextswitch.conf.j2
@@ -1,3 +1,3 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 LoadPlugin contextswitch
diff --git a/templates/etc/collectd/collectd.conf.d/cpu.conf.j2 b/templates/etc/collectd/collectd.conf.d/cpu.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 <Plugin cpu>
   ReportByCpu true
diff --git a/templates/etc/collectd/collectd.conf.d/df.conf.j2 b/templates/etc/collectd/collectd.conf.d/df.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 LoadPlugin df
 
diff --git a/templates/etc/collectd/collectd.conf.d/disk.conf.j2 b/templates/etc/collectd/collectd.conf.d/disk.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 LoadPlugin disk
 
diff --git a/templates/etc/collectd/collectd.conf.d/interface.conf.j2 b/templates/etc/collectd/collectd.conf.d/interface.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 <Plugin "interface">
 {% for interface in collectd_plugin_interface_interfaces | default([]) %}
diff --git a/templates/etc/collectd/collectd.conf.d/irq.conf.j2 b/templates/etc/collectd/collectd.conf.d/irq.conf.j2
@@ -1,3 +1,3 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 LoadPlugin irq
diff --git a/templates/etc/collectd/collectd.conf.d/mysql.conf.j2 b/templates/etc/collectd/collectd.conf.d/mysql.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 LoadPlugin mysql
 
@@ -21,9 +21,9 @@ LoadPlugin mysql
 {% if item.socket is defined %}
     Socket "{{ item.socket }}"
 {% endif %}
-    InnodbStats {{ item.innodb_stats | default('true') }}
-    MasterStats {{ item.master_stats | default('false') }}
-    MasterStats {{ item.slave_stats | default('false') }}
+    InnodbStats {{ item.innodb_stats | default(true) | bool | to_json }}
+    MasterStats {{ item.master_stats | default(false) | bool | to_json }}
+    MasterStats {{ item.slave_stats | default(false) | bool | to_json }}
   </Database>
 {% endfor %}
 </Plugin>
diff --git a/templates/etc/collectd/collectd.conf.d/network.conf.j2 b/templates/etc/collectd/collectd.conf.d/network.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 LoadPlugin network
 
diff --git a/templates/etc/collectd/collectd.conf.d/processes.conf.j2 b/templates/etc/collectd/collectd.conf.d/processes.conf.j2
@@ -1,3 +1,3 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 LoadPlugin processes
diff --git a/templates/etc/collectd/collectd.conf.d/rrdtool.conf.j2 b/templates/etc/collectd/collectd.conf.d/rrdtool.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 LoadPlugin rrdtool
 
diff --git a/templates/etc/collectd/collectd.conf.d/swap.conf.j2 b/templates/etc/collectd/collectd.conf.d/swap.conf.j2
@@ -1,3 +1,3 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 LoadPlugin swap
diff --git a/templates/etc/collectd/collectd.conf.d/tcpconns.conf.j2 b/templates/etc/collectd/collectd.conf.d/tcpconns.conf.j2
@@ -1,4 +1,4 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 LoadPlugin tcpconns
 
diff --git a/templates/etc/collectd/collectd.conf.d/uptime.conf.j2 b/templates/etc/collectd/collectd.conf.d/uptime.conf.j2
@@ -1,3 +1,3 @@
-# {{ ansible_managed }}
+{{ ansible_managed | comment }}
 
 LoadPlugin uptime

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-# {{ ansible_managed }}`
	`1`	`+{{ ansible_managed \| comment }}`
`2`	`2`
`3`	`3`	`LoadPlugin contextswitch`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# {{ ansible_managed }}`
	`1`	`+{{ ansible_managed \| comment }}`
`2`	`2`
`3`	`3`	`<Plugin cpu>`
`4`	`4`	`ReportByCpu true`