[icinga-checkins] icinga.org: icinga2-ansible/master: Move variables from vars to defaults

git at icinga.org git at icinga.org
Fri Nov 21 17:37:22 CET 2014


Module: icinga2-ansible
Branch: master
Commit: 3c2821cbdc8070b0dd5b9895e0c3cad45ab9ad6b
URL:    https://git.icinga.org/?p=icinga2-ansible.git;a=commit;h=3c2821cbdc8070b0dd5b9895e0c3cad45ab9ad6b

Author: Valentino Gagliardi <valentino.g at servermanaged.it>
Date:   Fri Nov 21 17:36:24 2014 +0100

Move variables from vars to defaults

---

 icinga2-nrpe-agent/defaults/main.yml |   46 ++++++++++++++++++++++++++++++++++
 icinga2-nrpe-agent/vars/main.yml     |   46 ----------------------------------
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/icinga2-nrpe-agent/defaults/main.yml b/icinga2-nrpe-agent/defaults/main.yml
index 506f8fb..e5272f1 100644
--- a/icinga2-nrpe-agent/defaults/main.yml
+++ b/icinga2-nrpe-agent/defaults/main.yml
@@ -1,2 +1,48 @@
 ---
 # defaults file for icinga2-nrpe-agent
+
+nrpe_agent_RedHat:
+ - { package: "nrpe" }
+ - { package: "nagios-plugins-all" }
+
+nrpe_agent_Debian:
+ - { package: "nagios-nrpe-server" }
+ - { package: "nagios-nrpe-plugin" }
+ - { package: "nagios-plugins" }
+
+nrpe_configuration:
+ - { directive: "log_facility=daemon" }
+ - { directive: "server_port=5666" }
+ - { directive: "server_address={{ ansible_default_ipv4.address }}" }
+ - { directive: "dont_blame_nrpe=0" }
+ - { directive: "debug=0" }
+ - { directive: "command_timeout=60" }
+ - { directive: "connection_timeout=150" }
+
+nrpe_users_RedHat:
+ - { user: "nrpe_user=nrpe" }
+ - { user: "nrpe_group=nrpe" }
+
+nrpe_users_Debian:
+ - { user: "nrpe_user=nagios" }
+ - { user: "nrpe_group=nagios" }
+
+nrpe_agent_config: "/etc/nagios/nrpe.cfg"
+
+# Plugins path for Debian x86_64 and other i386
+nrpe_agent_plugins: "/usr/lib/nagios/plugins"
+
+# Plugins path for RH and other x86_64
+nrpe_agent_plugins_x86_64: "/usr/lib64/nagios/plugins"
+
+# Sample NRPE check commands
+nrpe_check_commands:
+  check_load:
+    check_load: "-w 15,10,5 -c 30,25,20"
+  check_disk:
+    check_disk: "-w 20% -c 10% -p /"
+
+# Specific NRPE check commands for Debian
+nrpe_check_commands_Debian:
+  check_apt:
+    check_apt: "#Works fine without arguments"
diff --git a/icinga2-nrpe-agent/vars/main.yml b/icinga2-nrpe-agent/vars/main.yml
index 958fc54..89f303a 100644
--- a/icinga2-nrpe-agent/vars/main.yml
+++ b/icinga2-nrpe-agent/vars/main.yml
@@ -1,48 +1,2 @@
 ---
 # vars file for icinga2-nrpe-agent
-
-nrpe_agent_RedHat:
- - { package: "nrpe" }
- - { package: "nagios-plugins-all" }
-
-nrpe_agent_Debian:
- - { package: "nagios-nrpe-server" }
- - { package: "nagios-nrpe-plugin" }
- - { package: "nagios-plugins" }
-
-nrpe_configuration:
- - { directive: "log_facility=daemon" }
- - { directive: "server_port=5666" }
- - { directive: "server_address={{ ansible_eth0.ipv4.address }}" }
- - { directive: "dont_blame_nrpe=0" }
- - { directive: "debug=0" }
- - { directive: "command_timeout=60" }
- - { directive: "connection_timeout=150" }
-
-nrpe_users_RedHat:
- - { user: "nrpe_user=nrpe" }
- - { user: "nrpe_group=nrpe" }
-
-nrpe_users_Debian:
- - { user: "nrpe_user=nagios" }
- - { user: "nrpe_group=nagios" }
-
-nrpe_agent_config: "/etc/nagios/nrpe.cfg"
-
-# Plugins path for Debian x86_64 and other i386
-nrpe_agent_plugins: "/usr/lib/nagios/plugins"
-
-# Plugins path for RH and other x86_64
-nrpe_agent_plugins_x86_64: "/usr/lib64/nagios/plugins"
-
-# Sample NRPE check commands
-nrpe_check_commands:
-  check_load:
-    check_load: "-w 15,10,5 -c 30,25,20"
-  check_disk:
-    check_disk: "-w 20% -c 10% -p /"
-
-# Specific NRPE check commands for Debian
-nrpe_check_commands_Debian:
-  check_apt:
-    check_apt: "#Works fine without arguments"



More information about the icinga-checkins mailing list