Skip to content

Commit

Permalink
Merge branch 'main' of github.com:Icinga/ansible-collection-icinga in…
Browse files Browse the repository at this point in the history
…to main
  • Loading branch information
mkayontour committed May 24, 2024
2 parents f88efe3 + a89669b commit 3516f3b
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 15 deletions.
10 changes: 5 additions & 5 deletions doc/role-icinga2/objects.md
Original file line number Diff line number Diff line change
Expand Up @@ -470,11 +470,11 @@ icinga2_objects:
description: The notification address
-6: $notification_address6$
-b: $notification_author$
vars:
+: true
notification_address: $address$
notification_address6: $address6$
notification_author: $notification.author$
vars:
+: true
notification_address: $address$
notification_address6: $address6$
notification_author: $notification.author$
````

#### UserGroup
Expand Down
1 change: 1 addition & 0 deletions roles/icinga2/tasks/configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
delimiter: ' '
owner: "{{ icinga2_user }}"
group: "{{ icinga2_group }}"
mode: 0644
loop: "{{ result.files }}"
notify: reload icinga2 service

Expand Down
2 changes: 2 additions & 0 deletions roles/icinga2/tasks/objects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,15 @@
state: directory
owner: root
group: root
mode: 0755
path: "{{ icinga2_fragments_path }}/{{ item.path }}/"
loop: "{{ icinga2_custom_config }}"

- name: add custom config to assemble
ansible.builtin.copy:
owner: root
group: root
mode: 0644
src: "files/{{ item.name }}"
dest: "{{ icinga2_fragments_path }}/{{ item.path }}/{{ item.order|default('20')|string }}_{{ item.name }}"
loop: "{{ icinga2_custom_config }}"
14 changes: 4 additions & 10 deletions roles/monitoring_plugins/tasks/install_on_RedHat.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
---

- name: Activate epel repository
include_role:
name: icinga.icinga.repos
vars:
icinga_repo_epel: true
icinga_repo_stable: false
icinga_repo_testing: false
icinga_repo_snapshot: false
when: icinga_monitoring_plugins_epel
when: icinga_monitoring_plugins_epel|bool == true
ansible.builtin.yum:
name: epel-release
state: present
when: icinga_monitoring_plugins_epel|bool

- name: Yum - install requested packages
become: yes
Expand Down

0 comments on commit 3516f3b

Please sign in to comment.