From 7027df13c9539cfbce259e15425a70b316dea9f7 Mon Sep 17 00:00:00 2001
From: Sven Velt <sven@velt.de>
Date: Sun, 22 Apr 2018 14:14:03 +0200
Subject: [PATCH] Additional package install via variables

- monitored_packages_additional (both SSH and NRPE)
- monitored_packages_additional_nrpe (NRPE only)
- monitored_packages_additional_ssh (SSH only)
---
 defaults/main.yml  |  3 +++
 tasks/main.yml     | 12 ++++++++----
 tasks/nrpe.yml     |  9 +++++++++
 tasks/packages.yml |  9 +++++++++
 tasks/ssh.yml      |  9 +++++++++
 5 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 07ae42d..7f1519d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -8,6 +8,9 @@ monitored_homedir: /var/lib/nagios
 monitored_shell: /bin/bash
 
 monitored_packages_install: True
+monitored_packages_additional: []
+monitored_packages_additional_nrpe: []
+monitored_packages_additional_ssh: []
 
 monitored_nrpe_server_address: null
 monitored_nrpe_port: 5666
diff --git a/tasks/main.yml b/tasks/main.yml
index cde3169..da656a8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -14,14 +14,18 @@
     - "{{ (ansible_os_family|lower).split(' ')[0] }}.yml"
     - "defaults.yml"
 
-- import_tasks: user.yml
+- name: "INCLUDE: Create monitoring user"
+  import_tasks: user.yml
 
-- include_tasks: packages.yml
+- name: "INCLUDE: Install always necessary packages"
+  include_tasks: packages.yml
   when: monitored_packages_install != False
 
-- include_tasks: nrpe.yml
+- name: "INCLUDE: Monitoring by NRPE"
+  include_tasks: nrpe.yml
   when: monitored_by_nrpe == True
 
-- include_tasks: ssh.yml
+- name: "INCLUDE: Monitoring by SSH"
+  include_tasks: ssh.yml
   when: monitored_by_ssh == True
 
diff --git a/tasks/nrpe.yml b/tasks/nrpe.yml
index b8f5ab5..c282a88 100644
--- a/tasks/nrpe.yml
+++ b/tasks/nrpe.yml
@@ -35,3 +35,12 @@
     name: "{{ monitored_nrpe_servicename }}"
     state: restarted
 
+
+- name: Instal additional packages for NRPE monitoring
+  package:
+    name: "{{ item }}"
+    state: latest
+  with_items: "{{ monitored_packages_additional_nrpe }}"
+  when: monitored_packages_additional_nrpe
+
+
diff --git a/tasks/packages.yml b/tasks/packages.yml
index b3495b4..307aa01 100644
--- a/tasks/packages.yml
+++ b/tasks/packages.yml
@@ -15,3 +15,12 @@
   with_items: "{{ monitored_packages_np }}"
   when: monitoringplugins|failed
 
+
+- name: Instal additional packages
+  package:
+    name: "{{ item }}"
+    state: latest
+  with_items: "{{ monitored_packages_additional }}"
+  when: monitored_packages_additional
+
+
diff --git a/tasks/ssh.yml b/tasks/ssh.yml
index 2629013..66b7c41 100644
--- a/tasks/ssh.yml
+++ b/tasks/ssh.yml
@@ -24,3 +24,12 @@
     backup: yes
   when: monitored_ssh_key_wrapper_src|default(null)
 
+
+- name: Instal additional packages for SSH monitoring
+  package:
+    name: "{{ item }}"
+    state: latest
+  with_items: "{{ monitored_packages_additional_ssh }}"
+  when: monitored_packages_additional_ssh
+
+