From 699586d7d8b5253ef05f8cfffedca4a542d38c0d Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 27 Jul 2017 12:56:34 +0200 Subject: [PATCH] recommit for updates in build 109 --- CHANGELOG.md | 20 ++++++++++++++++ REPOSTRUCTURE.md | 4 +++- doc/_index.html | 2 +- doc/file.README.html | 23 +++++++++++-------- doc/index.html | 23 +++++++++++-------- 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 +- ...Aobjects_3A_3Aadd_contactgroups_rules.html | 2 +- ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 2 +- ..._3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | 6 +++-- ...agios_3A_3Aobjects_3A_3Acontactgroups.html | 2 +- ...A_3Anagios_3A_3Aobjects_3A_3Acontacts.html | 2 +- ...gios_3A_3Aobjects_3A_3Atemplate_rules.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 2 +- .../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 | 2 +- ...s_3A_3Aobjects_3A_3Aadd_contactgroups.html | 2 +- ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 30 files changed, 78 insertions(+), 48 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f10e16f..9af2078 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,26 @@ Changelog of Git Changelog.

No issue

+2b24ed69186142a Jenkins Server 2017-07-27 10:41:48 +

+

recommit for updates in build 108

+ +

+e02276ecc70dbca Arne Teuke 2017-07-27 10:41:22 +

+

added and linked add_contactgroups_rules

+ +

+26ef9aac8152b99 Arne Teuke 2017-07-27 10:39:45 +

+

added and linked add_contactgroups_rules

+ +

+5108aab0dc48113 Arne Teuke 2017-07-27 10:05:58 +

+

added add_contactgroups

+ +

0564cc970be1899 Jenkins Server 2017-07-26 14:27:43

recommit for updates in build 105

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 0f2b935..ae7cb78 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -17,6 +17,7 @@ | | |-- cd_nagios_3A_3Amain_3A_3Adirs.html | | |-- cd_nagios_3A_3Amain_3A_3Ainstall.html | | |-- cd_nagios_3A_3Amain_3A_3Auser.html +| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html @@ -30,6 +31,7 @@ | | |-- cd_nagios_3A_3Aserver_3A_3Aservice.html | | `-- cd_nagios.html | |-- puppet_defined_types +| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html | | `-- cd_nagios_3A_3Aserver_3A_3Aaccess.html @@ -106,4 +108,4 @@ |-- README.md `-- REPOSTRUCTURE.md -20 directories, 86 files +20 directories, 88 files diff --git a/doc/_index.html b/doc/_index.html index 8478f55..0c43123 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -236,7 +236,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 7dce3b7..8d1f9dd 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -150,15 +150,18 @@ rules via define * manage Nagios main contacts through Puppet exports. Additional contacts can be created through external Puppet rules via define, to avoid having to alter the module code. -* configure NRPE on -clients (optional) -* configure firewall (optional) -* configure selinux -policies (optional) -* configure forwarding http to https including accesing -the /nagios url directly (optional) -* manage TLS certificates through -certbot (optional)

+* manage Nagios main +contactgroups through Puppet exports. Additional contact groups can be +created through external Puppet rules via define, to avoid having to alter +the module code. +* configure NRPE on clients (optional) +* configure +firewall (optional) +* configure selinux policies (optional) +* configure +forwarding http to https including accesing the /nagios url directly +(optional) +* manage TLS certificates through certbot (optional)

Service * manage Nagios service on server @@ -352,7 +355,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index 29e9606..73f2fd0 100644 --- a/doc/index.html +++ b/doc/index.html @@ -150,15 +150,18 @@ rules via define * manage Nagios main contacts through Puppet exports. Additional contacts can be created through external Puppet rules via define, to avoid having to alter the module code. -* configure NRPE on -clients (optional) -* configure firewall (optional) -* configure selinux -policies (optional) -* configure forwarding http to https including accesing -the /nagios url directly (optional) -* manage TLS certificates through -certbot (optional)

+* manage Nagios main +contactgroups through Puppet exports. Additional contact groups can be +created through external Puppet rules via define, to avoid having to alter +the module code. +* configure NRPE on clients (optional) +* configure +firewall (optional) +* configure selinux policies (optional) +* configure +forwarding http to https including accesing the /nagios url directly +(optional) +* manage TLS certificates through certbot (optional)

Service * manage Nagios service on server @@ -352,7 +355,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 346486e..c141a59 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 a416ddb..b7b1720 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 919c8d4..3b4b8bd 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 f44065f..73edaf7 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 d237917..d3dd009 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 b1d8477..0dd7d08 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 18fbd6b..c1f24f1 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 22f1adc..347c8b5 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 1cf422b..e19297a 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 @@ -210,7 +210,7 @@ class cd_nagios::nagios::objects::add_contact_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html index 4ef20c9..1bb52e8 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html @@ -227,7 +227,7 @@ class cd_nagios::nagios::objects::add_contactgroups_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 4400851..2fb497d 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 5b2979c..1bf8ad5 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 @@ -142,7 +142,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

33 34 35 -36 +36 +37 
# File 'manifests/nagios/objects/config.pp', line 23
@@ -158,6 +159,7 @@ class cd_nagios::nagios::objects::config (
     require cd_nagios::nagios::objects::contacts
     require cd_nagios::nagios::objects::add_contact_rules
     require cd_nagios::nagios::objects::contactgroups
+    require cd_nagios::nagios::objects::add_contactgroups_rules
 
   }
 }
@@ -168,7 +170,7 @@ class cd_nagios::nagios::objects::config ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html index b0949be..e1db96b 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html @@ -237,7 +237,7 @@ class cd_nagios::nagios::objects::contactgroups ( 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 f3b9c1d..d00852f 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 4a25944..2444915 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 @@ -305,7 +305,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 90d106e..8ef8562 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -5579,7 +5579,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 0cee954..bf4fb80 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 3149bed..da5b953 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 9e0f31f..d728aa3 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 97370a8..a9a3c00 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 c158f1b..26d3978 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 @@ -247,7 +247,7 @@ $ng_contacts_rule_erb = $::cd_nagios::params::ng_contacts_rule_erb diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html index f1c0f10..648d20b 100644 --- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html +++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html @@ -217,7 +217,7 @@ $ng_tgt_contactgroup_add = $::cd_nagios::params::ng_tgt_contactgroup_add 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 052b4cd..3f2e1c1 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 9d108ac..5f5c998 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 1a19bb7..c92902e 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@