Skip to content

Commit a3da00b

Browse files
committed
Adjust monitoring plugins for EL 10
1 parent b8168dd commit a3da00b

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

changelogs/fragments/422_el_10.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
minor_changes:
2+
- "Add EL 10 to the :code:`monitoring_plugins` role."

roles/monitoring_plugins/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ icinga_monitoring_plugins_crb: false
66
icinga_monitoring_plugins_remove: true
77
icinga_monitoring_plugins_autoremove: false
88
icinga_monitoring_plugins_dependency_repos:
9-
- "{{ 'powertools' if ansible_distribution_major_version == '8' and icinga_monitoring_plugins_crb else 'crb' if ansible_distribution_major_version == '9' and icinga_monitoring_plugins_crb }}"
9+
- "{{ 'powertools' if ansible_distribution_major_version | int == 8 and icinga_monitoring_plugins_crb else 'crb' if ansible_distribution_major_version | int >= 9 and icinga_monitoring_plugins_crb }}"

roles/monitoring_plugins/tasks/install_on_RedHat.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
name: "{{ needed_packages }}"
1313
update_cache: true
1414
when:
15-
- ansible_distribution_major_version < "8"
15+
- ansible_distribution_major_version | int < 8
1616
- needed_packages is defined
1717
- needed_packages | length > 0
1818

@@ -24,7 +24,7 @@
2424
update_cache: true
2525
enablerepo: "{{ icinga_monitoring_plugins_dependency_repos }}"
2626
when:
27-
- ansible_distribution_major_version >= "8"
27+
- ansible_distribution_major_version | int >= 8
2828
- needed_packages is defined
2929
- needed_packages | length > 0
3030

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
3+
icinga_monitoring_plugins_available_packages_exclude:
4+
- name: radius
5+
pkg_name: "nagios-plugins-radius"

0 commit comments

Comments
 (0)