From 04c206f448ff267b6fad7bed32006d29d80e506c Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Wed, 26 Jul 2017 13:34:50 +0100 Subject: [PATCH 1/3] finalizing contacts --- manifests/nagios/objects/add_contact.pp | 11 +++++++++++ manifests/nagios/objects/config.pp | 1 + manifests/params.pp | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/manifests/nagios/objects/add_contact.pp b/manifests/nagios/objects/add_contact.pp index 520d644..099f621 100644 --- a/manifests/nagios/objects/add_contact.pp +++ b/manifests/nagios/objects/add_contact.pp @@ -32,4 +32,15 @@ $ng_contact_groups = undef, ) { +$ng_nagios_server = $::cd_nagios::params::ng_nagios_server +$ng_target_add_contact = $::cd_nagios::params::ng_target_add_contact +ng_contacts_rule_erb = $::cd_nagios::params::ng_contacts_rule_erb + + if $::fqdn == $ng_nagios_server { + + concat::fragment { $name: + target => $ng_target_add_contact, + content => template($ng_contacts_rule_erb), + } + } } diff --git a/manifests/nagios/objects/config.pp b/manifests/nagios/objects/config.pp index cf828d0..e202543 100644 --- a/manifests/nagios/objects/config.pp +++ b/manifests/nagios/objects/config.pp @@ -28,6 +28,7 @@ class cd_nagios::nagios::objects::config ( require cd_nagios::nagios::objects::commands require cd_nagios::nagios::objects::template_rules + require cd_nagios::nagios::objects::contacts require cd_nagios::nagios::objects::add_contact_rules } diff --git a/manifests/params.pp b/manifests/params.pp index 7ad6e13..9283a0f 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -974,7 +974,7 @@ $ng_target_servicegroup = "${ng_conf_d_dir}/nagios_servicegroup.cfg" $ng_target_base_contact = "${ng_conf_d_dir}/nagios_base_contact.cfg" $ng_target_add_contact = "${ng_conf_d_dir}/nagios_add_contact.cfg" $ng_contacts_head_erb = 'cd_nagios/nagios/contacts_cfg_head.erb' -$ng_contact_rule_erb = 'cd_nagios/nagios/contact_cfg_rule.erb' +$ng_contacts_rule_erb = 'cd_nagios/nagios/contact_cfg_rule.erb' $ng_target_contactgroup = "${ng_conf_d_dir}/nagios_contactgroup.cfg" $ng_target_command = "${ng_conf_d_dir}/nagios_command.cfg" From 8fafc260c8a85c2b28dcbe8e8ea54e04ffecc970 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Wed, 26 Jul 2017 13:36:14 +0100 Subject: [PATCH 2/3] finalizing contacts --- manifests/nagios/objects/add_contact.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/nagios/objects/add_contact.pp b/manifests/nagios/objects/add_contact.pp index 099f621..8bd69d5 100644 --- a/manifests/nagios/objects/add_contact.pp +++ b/manifests/nagios/objects/add_contact.pp @@ -34,7 +34,7 @@ $ng_contact_groups = undef, $ng_nagios_server = $::cd_nagios::params::ng_nagios_server $ng_target_add_contact = $::cd_nagios::params::ng_target_add_contact -ng_contacts_rule_erb = $::cd_nagios::params::ng_contacts_rule_erb +$ng_contacts_rule_erb = $::cd_nagios::params::ng_contacts_rule_erb if $::fqdn == $ng_nagios_server { From 5a33b87c5a01e94ea060d19690c0b95c79e7e374 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Wed, 26 Jul 2017 14:36:37 +0200 Subject: [PATCH 3/3] recommit for updates in build 101 --- CHANGELOG.md | 20 ++++++++++++++ doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_classes/cd_nagios.html | 2 +- .../cd_nagios_3A_3Acertbot_3A_3Acerts.html | 2 +- .../cd_nagios_3A_3Aclient_3A_3Atarget.html | 2 +- ...cd_nagios_3A_3Afirewall_3A_3Aiptables.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Aconfig.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- ...s_3A_3Aobjects_3A_3Aadd_contact_rules.html | 2 +- ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 2 +- ..._3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | 6 +++-- ...A_3Anagios_3A_3Aobjects_3A_3Acontacts.html | 2 +- ...gios_3A_3Aobjects_3A_3Atemplate_rules.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 4 +-- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +- ...Anagios_3A_3Aobjects_3A_3Aadd_contact.html | 26 +++++++++++++++++-- ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 26 files changed, 72 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e53fb6b..41941b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,26 @@ Changelog of Git Changelog.

No issue

+039523e1f69f07e Jenkins Server 2017-07-26 11:30:54 +

+

recommit for updates in build 99

+ +

+a99920d7888b4ca Arne Teuke 2017-07-26 11:30:34 +

+

linting

+ +

+1ed1db6e8f56d49 Arne Teuke 2017-07-26 11:26:16 +

+

linting

+ +

+2e52ec411c530eb Arne Teuke 2017-07-26 11:24:31 +

+

added base contacts and additional contacts

+ +

d395b5f60d08f61 Jenkins Server 2017-07-26 11:16:49

recommit for updates in build 97

diff --git a/doc/_index.html b/doc/_index.html index 2956f97..df3650e 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -221,7 +221,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 740b477..2c83e21 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -352,7 +352,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index c813c8b..aa46a6a 100644 --- a/doc/index.html +++ b/doc/index.html @@ -352,7 +352,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 183098d..1699e3a 100644 --- a/doc/puppet_classes/cd_nagios.html +++ b/doc/puppet_classes/cd_nagios.html @@ -139,7 +139,7 @@ class cd_nagios { diff --git a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html index 03cb2eb..020705e 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html +++ b/doc/puppet_classes/cd_nagios_3A_3Acertbot_3A_3Acerts.html @@ -230,7 +230,7 @@ class cd_nagios::certbot::certs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html index 009b19f..b60454b 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html @@ -368,7 +368,7 @@ class cd_nagios::client::target ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index f252d10..b6e2d24 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html +++ b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html @@ -207,7 +207,7 @@ class cd_nagios::firewall::iptables ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html index 27500bd..ea122de 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Aconfig.html @@ -195,7 +195,7 @@ class cd_nagios::main::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html index 444de5e..7e70137 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html @@ -468,7 +468,7 @@ class cd_nagios::main::dirs ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html index bd59ea3..972e65c 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -235,7 +235,7 @@ class cd_nagios::main::install ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html index 313758f..28e650b 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -200,7 +200,7 @@ class cd_nagios::main::user ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html index 24c6083..445c110 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html @@ -228,7 +228,7 @@ class cd_nagios::nagios::objects::add_contact_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html index 771f9f0..c9ceee8 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html @@ -595,7 +595,7 @@ class cd_nagios::nagios::objects::commands ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html index 1d72edd..cb61b52 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html @@ -140,7 +140,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

31 32 33 -34 +34 +35 
# File 'manifests/nagios/objects/config.pp', line 23
@@ -153,6 +154,7 @@ class cd_nagios::nagios::objects::config (
 
     require cd_nagios::nagios::objects::commands
     require cd_nagios::nagios::objects::template_rules
+    require cd_nagios::nagios::objects::contacts
     require cd_nagios::nagios::objects::add_contact_rules
 
   }
@@ -164,7 +166,7 @@ class cd_nagios::nagios::objects::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html
index cf64eae..6241237 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html
@@ -280,7 +280,7 @@ class cd_nagios::nagios::objects::contacts (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
index 4252fce..bf7bca7 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
@@ -303,7 +303,7 @@ class cd_nagios::nagios::objects::template_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index 942556c..6f7443d 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -5552,7 +5552,7 @@ $ng_target_servicegroup   = "${ng_conf_d_dir}/nagios_servicegroup.cfg"
 $ng_target_base_contact   = "${ng_conf_d_dir}/nagios_base_contact.cfg"
 $ng_target_add_contact    = "${ng_conf_d_dir}/nagios_add_contact.cfg"
 $ng_contacts_head_erb     = 'cd_nagios/nagios/contacts_cfg_head.erb'
-$ng_contact_rule_erb      = 'cd_nagios/nagios/contact_cfg_rule.erb'
+$ng_contacts_rule_erb     = 'cd_nagios/nagios/contact_cfg_rule.erb'
 $ng_target_contactgroup   = "${ng_conf_d_dir}/nagios_contactgroup.cfg"
 $ng_target_command        = "${ng_conf_d_dir}/nagios_command.cfg"
 
@@ -5569,7 +5569,7 @@ $ng_target_command        = "${ng_conf_d_dir}/nagios_command.cfg"
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
index e52aca3..dc8a8a8 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html
@@ -249,7 +249,7 @@ class cd_nagios::selinux::config (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
index 5064980..03796e6 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -195,7 +195,7 @@ class cd_nagios::server::access_rules (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
index c14c357..2436955 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Afiles.html
@@ -334,7 +334,7 @@ class cd_nagios::server::files (
 
 
       
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
index 942f9ce..22a35cd 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -268,7 +268,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html
index 2032edc..359cdc8 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html
@@ -202,7 +202,18 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

 32
 33
 34
-35
+35 +36 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 
# File 'manifests/nagios/objects/add_contact.pp', line 25
@@ -217,6 +228,17 @@ $ng_contact_groups  = undef,
 
 ) {
 
+$ng_nagios_server       = $::cd_nagios::params::ng_nagios_server
+$ng_target_add_contact  = $::cd_nagios::params::ng_target_add_contact
+$ng_contacts_rule_erb   = $::cd_nagios::params::ng_contacts_rule_erb
+
+  if $::fqdn == $ng_nagios_server {
+
+    concat::fragment { $name:
+      target    =>  $ng_target_add_contact,
+      content   =>  template($ng_contacts_rule_erb),
+    }
+  }
 }
@@ -225,7 +247,7 @@ $ng_contact_groups = undef, diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html index 7227920..65ba357 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html @@ -935,7 +935,7 @@ $ng_templates_rule_erb = $::cd_nagios::params::ng_templates_rule_erb diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html index 69bdeab..ec7cc20 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Aserver_3A_3Aaccess.html @@ -220,7 +220,7 @@ $ng_service = $::cd_nagios::params::ng_service diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html index eb411f0..ecb2697 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@