From 08fd1fcb5ce6c7ea3358a6761c1dac75de109e71 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Fri, 28 Jul 2017 15:24:01 +0200 Subject: [PATCH] recommit for updates in build 143 --- CHANGELOG.md | 375 ++++++++++-------- doc/_index.html | 2 +- doc/file.README.html | 20 +- doc/index.html | 20 +- doc/puppet_classes/cd_nagios.html | 2 +- .../cd_nagios_3A_3Acertbot_3A_3Acerts.html | 2 +- .../cd_nagios_3A_3Aclient_3A_3Atarget.html | 210 +++++----- ...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 | 28 +- .../cd_nagios_3A_3Amain_3A_3Auser.html | 2 +- ...s_3A_3Aobjects_3A_3Aadd_contact_rules.html | 2 +- ...Aobjects_3A_3Aadd_contactgroups_rules.html | 2 +- ...3A_3Aobjects_3A_3Aadd_hostgroup_rules.html | 2 +- ...3Aobjects_3A_3Aadd_servicegroup_rules.html | 2 +- ...A_3Aobjects_3A_3Aadd_timeperiod_rules.html | 2 +- ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 2 +- ..._3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | 2 +- ...agios_3A_3Aobjects_3A_3Acontactgroups.html | 2 +- ...A_3Anagios_3A_3Aobjects_3A_3Acontacts.html | 2 +- ...3Anagios_3A_3Aobjects_3A_3Ahostgroups.html | 2 +- ...agios_3A_3Aobjects_3A_3Aservicegroups.html | 2 +- ...gios_3A_3Aobjects_3A_3Atemplate_rules.html | 2 +- ...Anagios_3A_3Aobjects_3A_3Atimeperiods.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 37 +- .../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 +- ...gios_3A_3Aobjects_3A_3Aadd_hostgroups.html | 2 +- ...s_3A_3Aobjects_3A_3Aadd_servicegroups.html | 2 +- ...ios_3A_3Aobjects_3A_3Aadd_timeperiods.html | 2 +- ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 38 files changed, 406 insertions(+), 348 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e3d118..47edf3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,30 +8,220 @@ Changelog of Git Changelog.

No issue

+ee6aecb2e2e8b68 Jenkins Server 2017-07-28 12:20:53 +

+

recommit for updates in build 140

+ +

0039bc732732717 Jenkins Server 2017-07-28 11:57:37

recommit for updates in build 138

-

-9b6550c92ae3965 Arne Teuke 2017-07-28 11:56:56 -

-

fixed ping check on service

-

355e7d2eb09d813 Jenkins Server 2017-07-28 11:39:00

recommit for updates in build 137

-

-7551e03486668a8 Arne Teuke 2017-07-28 11:38:15 -

-

edited parameter documentation

-

7296da22ecd57f8 Jenkins Server 2017-07-28 11:32:51

recommit for updates in build 136

+

+0cb2e563c835a16 Jenkins Server 2017-07-28 11:22:02 +

+

recommit for updates in build 134

+ +

+f913376d9cfd10a Jenkins Server 2017-07-27 15:34:56 +

+

recommit for updates in build 130

+ +

+d6da17fd103efa5 Jenkins Server 2017-07-27 15:30:56 +

+

recommit for updates in build 129

+ +

+a51c3d01180ce89 Jenkins Server 2017-07-27 15:23:15 +

+

recommit for updates in build 128

+ +

+7f92261f0997dfe Jenkins Server 2017-07-27 15:20:36 +

+

recommit for updates in build 127

+ +

+8a1d9f8292afcbe Jenkins Server 2017-07-27 15:01:48 +

+

recommit for updates in build 126

+ +

+15a189c8403c2c0 Jenkins Server 2017-07-27 14:55:31 +

+

recommit for updates in build 125

+ +

+d0a5bbadefcac07 Jenkins Server 2017-07-27 14:49:39 +

+

recommit for updates in build 124

+ +

+f8d19b46fdae2fb Jenkins Server 2017-07-27 14:44:56 +

+

recommit for updates in build 123

+ +

+137753dafe03b7a Jenkins Server 2017-07-27 14:29:05 +

+

recommit for updates in build 120

+ +

+cba65ddb7cb64cf Jenkins Server 2017-07-27 13:33:36 +

+

recommit for updates in build 117

+ +

+83782a592f1fe78 Jenkins Server 2017-07-27 13:22:48 +

+

recommit for updates in build 116

+ +

+dd4d061fe556bfb Jenkins Server 2017-07-27 12:47:24 +

+

recommit for updates in build 115

+ +

+5193e6a8d2dedc5 Jenkins Server 2017-07-27 12:33:19 +

+

recommit for updates in build 114

+ +

+f4321e6da976742 Jenkins Server 2017-07-27 11:58:59 +

+

recommit for updates in build 113

+ +

+cad8229c0821ad4 Jenkins Server 2017-07-27 11:44:51 +

+

recommit for updates in build 112

+ +

+d6267355c6ba26f Jenkins Server 2017-07-27 11:11:57 +

+

recommit for updates in build 111

+ +

+14a1e7412ff6792 Jenkins Server 2017-07-27 11:00:10 +

+

recommit for updates in build 110

+ +

+699586d7d8b5253 Jenkins Server 2017-07-27 10:56:34 +

+

recommit for updates in build 109

+ +

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

+

recommit for updates in build 108

+ +

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

+

recommit for updates in build 105

+ +

+af34a0587d9f48e Jenkins Server 2017-07-26 13:05:02 +

+

recommit for updates in build 104

+ +

+4dd15fea2853777 Jenkins Server 2017-07-26 12:48:06 +

+

recommit for updates in build 103

+ +

+19d33cb8a512c2f Jenkins Server 2017-07-26 12:40:46 +

+

recommit for updates in build 102

+ +

+5a33b87c5a01e94 Jenkins Server 2017-07-26 12:36:37 +

+

recommit for updates in build 101

+ +

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

+

recommit for updates in build 99

+ +

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

+

recommit for updates in build 97

+ +

+62feddee64c23f9 Jenkins Server 2017-07-25 18:04:08 +

+

recommit for updates in build 96

+ +

+a23722a67a2afb6 Jenkins Server 2017-07-25 17:56:39 +

+

recommit for updates in build 93

+ +

+445db500b3ab876 Jenkins Server 2017-07-25 16:15:39 +

+

recommit for updates in build 92

+ +

+a3517b81e663a07 Jenkins Server 2017-07-25 16:13:43 +

+

recommit for updates in build 91

+ +

+cc2d2cbf2968cce Jenkins Server 2017-07-25 15:57:28 +

+

recommit for updates in build 90

+ +

+b4b3de53a39ef00 Jenkins Server 2017-07-25 14:48:58 +

+

recommit for updates in build 84

+ +

+ +

v0.0.1.1

+

No issue

+ + +00c977abcfeba99 Arne Teuke 2017-07-28 12:20:15 +

+

removed incomplete class

+ +

+ +

v0.0.1.0

+

No issue

+ + +3e4f06a1fa27002 Arne Teuke 2017-07-28 12:16:40 +

+

linked client installations to target

+ +

+9b6550c92ae3965 Arne Teuke 2017-07-28 11:56:56 +

+

fixed ping check on service

+ +

+7551e03486668a8 Arne Teuke 2017-07-28 11:38:15 +

+

edited parameter documentation

+

04db67fdf99dced Arne Teuke 2017-07-28 11:32:10

@@ -42,11 +232,6 @@ Changelog of Git Changelog.

edited README and parameter documentation

-

-0cb2e563c835a16 Jenkins Server 2017-07-28 11:22:02 -

-

recommit for updates in build 134

-

fec775ad45a87d5 Arne Teuke 2017-07-28 11:21:20

@@ -67,81 +252,41 @@ Changelog of Git Changelog.

fixed typo

-

-f913376d9cfd10a Jenkins Server 2017-07-27 15:34:56 -

-

recommit for updates in build 130

-

6403b5f7a9c8357 Arne Teuke 2017-07-27 15:34:19

fixed typo

-

-d6da17fd103efa5 Jenkins Server 2017-07-27 15:30:56 -

-

recommit for updates in build 129

-

98c65c3b14a0d09 Arne Teuke 2017-07-27 15:30:20

fixed typo

-

-a51c3d01180ce89 Jenkins Server 2017-07-27 15:23:15 -

-

recommit for updates in build 128

-

fe1661007fe70d4 Arne Teuke 2017-07-27 15:22:39

fixed typo

-

-7f92261f0997dfe Jenkins Server 2017-07-27 15:20:36 -

-

recommit for updates in build 127

-

6f0c3a6903ae69a Arne Teuke 2017-07-27 15:19:59

removed special params

-

-8a1d9f8292afcbe Jenkins Server 2017-07-27 15:01:48 -

-

recommit for updates in build 126

-

c31d2d038ba8b97 Arne Teuke 2017-07-27 15:01:06

removed special params

-

-15a189c8403c2c0 Jenkins Server 2017-07-27 14:55:31 -

-

recommit for updates in build 125

-

eb8a92a4b4aabd9 Arne Teuke 2017-07-27 14:54:54

fixed typo

-

-d0a5bbadefcac07 Jenkins Server 2017-07-27 14:49:39 -

-

recommit for updates in build 124

-

82ca12e0363c956 Arne Teuke 2017-07-27 14:48:56

fixed typo

-

-f8d19b46fdae2fb Jenkins Server 2017-07-27 14:44:56 -

-

recommit for updates in build 123

-

34e172d7bd1fbb2 Arne Teuke 2017-07-27 14:44:07

@@ -162,11 +307,6 @@ Changelog of Git Changelog.

added parameter documentation

-

-137753dafe03b7a Jenkins Server 2017-07-27 14:29:05 -

-

recommit for updates in build 120

-

e76e4f857c4baf8 Arne Teuke 2017-07-27 14:28:21

@@ -187,101 +327,51 @@ Changelog of Git Changelog.

added timeperiods

-

-cba65ddb7cb64cf Jenkins Server 2017-07-27 13:33:36 -

-

recommit for updates in build 117

-

645cb4255af90d5 Arne Teuke 2017-07-27 13:33:00

added parameter documentation

-

-83782a592f1fe78 Jenkins Server 2017-07-27 13:22:48 -

-

recommit for updates in build 116

-

ab8b3878e7d76a3 Arne Teuke 2017-07-27 13:22:11

added servicegroup control

-

-dd4d061fe556bfb Jenkins Server 2017-07-27 12:47:24 -

-

recommit for updates in build 115

-

25a31ffc1bc0790 Arne Teuke 2017-07-27 12:46:46

edited README and fixed template

-

-5193e6a8d2dedc5 Jenkins Server 2017-07-27 12:33:19 -

-

recommit for updates in build 114

-

26e2220ec9da0b2 Arne Teuke 2017-07-27 12:32:48

added service description and add_hostgroup_rules

-

-f4321e6da976742 Jenkins Server 2017-07-27 11:58:59 -

-

recommit for updates in build 113

-

842d86a504f6198 Arne Teuke 2017-07-27 11:58:30

added _ to service name

-

-cad8229c0821ad4 Jenkins Server 2017-07-27 11:44:51 -

-

recommit for updates in build 112

-

7b27896ccb84382 Arne Teuke 2017-07-27 11:44:19

added and linked hostgroups

-

-d6267355c6ba26f Jenkins Server 2017-07-27 11:11:57 -

-

recommit for updates in build 111

-

3f12bbd92d567f6 Arne Teuke 2017-07-27 11:11:26

added and linked add_contactgroups_rules

-

-14a1e7412ff6792 Jenkins Server 2017-07-27 11:00:10 -

-

recommit for updates in build 110

-

a90da5d3ed18e7a Arne Teuke 2017-07-27 10:59:39

added and linked add_contactgroups_rules

-

-699586d7d8b5253 Jenkins Server 2017-07-27 10:56:34 -

-

recommit for updates in build 109

-

672f61d994a4360 Arne Teuke 2017-07-27 10:56:09

added and linked add_contactgroups_rules

-

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

-

recommit for updates in build 108

-

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

@@ -297,51 +387,26 @@ Changelog of Git Changelog.

added add_contactgroups

-

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

-

recommit for updates in build 105

-

12f835aa4ff29bd Arne Teuke 2017-07-26 14:27:16

added and linked base contactgroups

-

-af34a0587d9f48e Jenkins Server 2017-07-26 13:05:02 -

-

recommit for updates in build 104

-

6094321d4f0cebb Arne Teuke 2017-07-26 13:04:39

sorted deprecated syntax

-

-4dd15fea2853777 Jenkins Server 2017-07-26 12:48:06 -

-

recommit for updates in build 103

-

6ee49a5e33f28cb Arne Teuke 2017-07-26 12:47:45

fixed typo

-

-19d33cb8a512c2f Jenkins Server 2017-07-26 12:40:46 -

-

recommit for updates in build 102

-

6955770373d63a1 Arne Teuke 2017-07-26 12:40:23

fixed typo

-

-5a33b87c5a01e94 Jenkins Server 2017-07-26 12:36:37 -

-

recommit for updates in build 101

-

8fafc260c8a85c2 Arne Teuke 2017-07-26 12:36:14

@@ -352,11 +417,6 @@ Changelog of Git Changelog.

finalizing contacts

-

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

-

recommit for updates in build 99

-

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

@@ -372,21 +432,11 @@ Changelog of Git Changelog.

added base contacts and additional contacts

-

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

-

recommit for updates in build 97

-

85ade68820b8379 Arne Teuke 2017-07-26 11:16:25

added base contacts and additional contacts

-

-62feddee64c23f9 Jenkins Server 2017-07-25 18:04:08 -

-

recommit for updates in build 96

-

099828e47a377d2 Arne Teuke 2017-07-25 18:02:29

@@ -397,41 +447,21 @@ Changelog of Git Changelog.

testing templates

-

-a23722a67a2afb6 Jenkins Server 2017-07-25 17:56:39 -

-

recommit for updates in build 93

-

a04f079a6cbeec8 Arne Teuke 2017-07-25 17:56:18

testing templates

-

-445db500b3ab876 Jenkins Server 2017-07-25 16:15:39 -

-

recommit for updates in build 92

-

b4e4ceb9b07cde4 Arne Teuke 2017-07-25 16:15:21

added parameter documentation

-

-a3517b81e663a07 Jenkins Server 2017-07-25 16:13:43 -

-

recommit for updates in build 91

-

e03a5d94750b182 Arne Teuke 2017-07-25 16:13:25

added parameter documentation

-

-cc2d2cbf2968cce Jenkins Server 2017-07-25 15:57:28 -

-

recommit for updates in build 90

-

6a57847a121f632 Arne Teuke 2017-07-25 15:57:10

@@ -462,11 +492,6 @@ Changelog of Git Changelog.

linked commands.pp

-

-b4b3de53a39ef00 Jenkins Server 2017-07-25 14:48:58 -

-

recommit for updates in build 84

-

3327f6d8692753b Arne Teuke 2017-07-25 14:48:39

diff --git a/doc/_index.html b/doc/_index.html index 4cfa834..aed073a 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -281,7 +281,7 @@

diff --git a/doc/file.README.html b/doc/file.README.html index 0b23bc5..f7e3f85 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -61,7 +61,7 @@

|Repo Name| version | Build Status| |---|---|---|---| -|cd_nagios| 0.0.1.0 | cd_nagios| 0.0.1.3 | {Build Status/]|

@@ -114,7 +114,9 @@ Structure

  • Httpd vHost Files

  • -

    [Manage additional resources]

    +

    Client Connections

    +
  • +

    Manage additional resources

  • Known Problems

  • @@ -230,6 +232,9 @@ for selinux policy adjustments

    cd_certbot to auto-manage TLS certificates (optional)

  • +

    cd_nrpe to +manage NRPE (optional)

    +

  • cd_stdlib or puppetlabs stdlib to facilitate concat

    @@ -332,6 +337,15 @@ on a regular web server with various other web instances (not recommended through for performance reasons), we will not want to manage ssl.conf directly, hence the module creates a vhost for the ssl host.

    +

    Client Connections

    + +

    In order to monitor clients, NAGIOS must be able to connect to them. There +are multiple ways of doing so, the most common ones being NRPE and SSH. +So +far this module works through the usage of NRPE, which by default is +enabled. Class cd_nagios::client::nrpe configures nrpe.cfg and opens the +required firewall port on clients (optional,default).

    +

    Manage additional resources

    Known Problems

    @@ -393,7 +407,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index d889d78..cded359 100644 --- a/doc/index.html +++ b/doc/index.html @@ -61,7 +61,7 @@

    |Repo Name| version | Build Status| |---|---|---|---| -|cd_nagios| 0.0.1.0 | cd_nagios| 0.0.1.3 | {Build Status/]|

    @@ -114,7 +114,9 @@ Structure

  • Httpd vHost Files

  • -

    [Manage additional resources]

    +

    Client Connections

    +
  • +

    Manage additional resources

  • Known Problems

  • @@ -230,6 +232,9 @@ for selinux policy adjustments

    cd_certbot to auto-manage TLS certificates (optional)

  • +

    cd_nrpe to +manage NRPE (optional)

    +

  • cd_stdlib or puppetlabs stdlib to facilitate concat

    @@ -332,6 +337,15 @@ on a regular web server with various other web instances (not recommended through for performance reasons), we will not want to manage ssl.conf directly, hence the module creates a vhost for the ssl host.

    +

    Client Connections

    + +

    In order to monitor clients, NAGIOS must be able to connect to them. There +are multiple ways of doing so, the most common ones being NRPE and SSH. +So +far this module works through the usage of NRPE, which by default is +enabled. Class cd_nagios::client::nrpe configures nrpe.cfg and opens the +required firewall port on clients (optional,default).

    +

    Manage additional resources

    Known Problems

    @@ -393,7 +407,7 @@ environments.

    diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 4b1d240..1ee1aa3 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 03fa825..0a96e4f 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 7a018da..f6f0c73 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html @@ -243,7 +243,10 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    136 137 138 -139 +139 +140 +141 +142 
    # File 'manifests/client/target.pp', line 23
@@ -254,114 +257,117 @@ class cd_nagios::client::target (
 ) inherits cd_nagios::params {
 
   if $::fqdn != $ng_nagios_server {
+    if $ng_include_nrpe == true {
 
-    require cd_nagios::main::install
+    require cd_nagios::main::user
+    require cd_nrpe
 
-    @@nagios_host { $::fqdn:
-        ensure              =>  $ng_ping_ensure,
-        alias               =>  $::hostname,
-        address             =>  $::fqdn,
-        use                 =>  'linux-server',
-        target              =>  $ng_target_host,
-        hostgroups          =>  'linux-servers',
-        contacts            =>  'ops',
-        max_check_attempts  =>  $ng_max_check_attempts,
-        notification_period =>  '24x7',
-        owner               =>  $ng_user,
-        group               =>  $ng_user,
-        mode                =>  '0640',
-        check_command       =>  "check_ping!${ng_ping_warn}!${ng_ping_crit}",
-        notify              =>  Service[$ng_user],
-    }
+      @@nagios_host { $::fqdn:
+          ensure              =>  $ng_ping_ensure,
+          alias               =>  $::hostname,
+          address             =>  $::fqdn,
+          use                 =>  'linux-server',
+          target              =>  $ng_target_host,
+          hostgroups          =>  'linux-servers',
+          contacts            =>  'ops',
+          max_check_attempts  =>  $ng_max_check_attempts,
+          notification_period =>  '24x7',
+          owner               =>  $ng_user,
+          group               =>  $ng_user,
+          mode                =>  '0640',
+          check_command       =>  "check_ping!${ng_ping_warn}!${ng_ping_crit}",
+          notify              =>  Service[$ng_user],
+      }
 
-    @@nagios_service { "root_partition_${::hostname}":
-        ensure              =>  $ng_disk_ensure,
-        check_command       =>  "check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/",
-        use                 =>  'generic-service',
-        host_name           =>  $::fqdn,
-        contacts            =>  'ops',
-        notification_period =>  '24x7',
-        service_description =>  "${::hostname}_root_partition",
-        servicegroups       =>  'linux-services',
-        target              =>  $ng_target_service,
-        owner               =>  $ng_user,
-        group               =>  $ng_user,
-        mode                =>  '0640',
-    }
+      @@nagios_service { "root_partition_${::hostname}":
+          ensure              =>  $ng_disk_ensure,
+          check_command       =>  "check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/",
+          use                 =>  'generic-service',
+          host_name           =>  $::fqdn,
+          contacts            =>  'ops',
+          notification_period =>  '24x7',
+          service_description =>  "${::hostname}_root_partition",
+          servicegroups       =>  'linux-services',
+          target              =>  $ng_target_service,
+          owner               =>  $ng_user,
+          group               =>  $ng_user,
+          mode                =>  '0640',
+      }
 
-    @@nagios_service { "Swap_Usage_${::hostname}":
-        ensure              =>  $ng_swap_ensure,
-        check_command       =>  "check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}",
-        use                 =>  'generic-service',
-        host_name           =>  $::fqdn,
-        contacts            =>  'ops',
-        notification_period =>  '24x7',
-        service_description =>  "${::hostname}_swap_usage",
-        servicegroups       =>  'linux-services',
-        target              =>  $ng_target_service,
-        owner               =>  $ng_user,
-        group               =>  $ng_user,
-        mode                =>  '0640',
-    }
+      @@nagios_service { "Swap_Usage_${::hostname}":
+          ensure              =>  $ng_swap_ensure,
+          check_command       =>  "check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}",
+          use                 =>  'generic-service',
+          host_name           =>  $::fqdn,
+          contacts            =>  'ops',
+          notification_period =>  '24x7',
+          service_description =>  "${::hostname}_swap_usage",
+          servicegroups       =>  'linux-services',
+          target              =>  $ng_target_service,
+          owner               =>  $ng_user,
+          group               =>  $ng_user,
+          mode                =>  '0640',
+      }
 
-    @@nagios_service { "Local_Users_${::hostname}":
-        ensure              =>  $ng_users_ensure,
-        check_command       =>  "check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}",
-        use                 =>  'generic-service',
-        host_name           =>  $::fqdn,
-        contacts            =>  'ops',
-        notification_period =>  '24x7',
-        service_description =>  "${::hostname}_local_users",
-        servicegroups       =>  'linux-services',
-        target              =>  $ng_target_service,
-        owner               =>  $ng_user,
-        group               =>  $ng_user,
-        mode                =>  '0640',
-    }
+      @@nagios_service { "Local_Users_${::hostname}":
+          ensure              =>  $ng_users_ensure,
+          check_command       =>  "check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}",
+          use                 =>  'generic-service',
+          host_name           =>  $::fqdn,
+          contacts            =>  'ops',
+          notification_period =>  '24x7',
+          service_description =>  "${::hostname}_local_users",
+          servicegroups       =>  'linux-services',
+          target              =>  $ng_target_service,
+          owner               =>  $ng_user,
+          group               =>  $ng_user,
+          mode                =>  '0640',
+      }
 
-    @@nagios_service { "Total Processes_${::hostname}":
-        ensure              =>  $ng_procs_tot_ens,
-        check_command       =>  "check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}",
-        use                 =>  'generic-service',
-        host_name           =>  $::fqdn,
-        contacts            =>  'ops',
-        notification_period =>  '24x7',
-        service_description =>  "${::hostname}_total_processes",
-        servicegroups       =>  'linux-services',
-        target              =>  $ng_target_service,
-        owner               =>  $ng_user,
-        group               =>  $ng_user,
-        mode                =>  '0640',
-    }
+      @@nagios_service { "Total Processes_${::hostname}":
+          ensure              =>  $ng_procs_tot_ens,
+          check_command       =>  "check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}",
+          use                 =>  'generic-service',
+          host_name           =>  $::fqdn,
+          contacts            =>  'ops',
+          notification_period =>  '24x7',
+          service_description =>  "${::hostname}_total_processes",
+          servicegroups       =>  'linux-services',
+          target              =>  $ng_target_service,
+          owner               =>  $ng_user,
+          group               =>  $ng_user,
+          mode                =>  '0640',
+      }
 
-    @@nagios_service { "Zombie Processes_${::hostname}":
-        ensure              =>  $ng_procs_z_ensure,
-        check_command       =>  "check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}",
-        use                 =>  'generic-service',
-        host_name           =>  $::fqdn,
-        contacts            =>  'ops',
-        notification_period =>  '24x7',
-        service_description =>  "${::hostname}_zombie_processes",
-        servicegroups       =>  'linux-services',
-        target              =>  $ng_target_service,
-        owner               =>  $ng_user,
-        group               =>  $ng_user,
-        mode                =>  '0640',
-    }
+      @@nagios_service { "Zombie Processes_${::hostname}":
+          ensure              =>  $ng_procs_z_ensure,
+          check_command       =>  "check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}",
+          use                 =>  'generic-service',
+          host_name           =>  $::fqdn,
+          contacts            =>  'ops',
+          notification_period =>  '24x7',
+          service_description =>  "${::hostname}_zombie_processes",
+          servicegroups       =>  'linux-services',
+          target              =>  $ng_target_service,
+          owner               =>  $ng_user,
+          group               =>  $ng_user,
+          mode                =>  '0640',
+      }
 
-    @@nagios_service { "Current_Load_${::hostname}":
-        ensure              =>  $ng_load_ensure,
-        check_command       =>  "check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}",
-        use                 =>  'generic-service',
-        host_name           =>  $::fqdn,
-        contacts            =>  'ops',
-        notification_period =>  '24x7',
-        service_description =>  "${::hostname}_current_load",
-        servicegroups       =>  'linux-services',
-        target              =>  $ng_target_service,
-        owner               =>  $ng_user,
-        group               =>  $ng_user,
-        mode                =>  '0640',
+      @@nagios_service { "Current_Load_${::hostname}":
+          ensure              =>  $ng_load_ensure,
+          check_command       =>  "check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}",
+          use                 =>  'generic-service',
+          host_name           =>  $::fqdn,
+          contacts            =>  'ops',
+          notification_period =>  '24x7',
+          service_description =>  "${::hostname}_current_load",
+          servicegroups       =>  'linux-services',
+          target              =>  $ng_target_service,
+          owner               =>  $ng_user,
+          group               =>  $ng_user,
+          mode                =>  '0640',
+      }
     }
   }
 }
    @@ -372,7 +378,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 c00d661..0baed40 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 aef71d0..3be915d 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 25de34f..650719b 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 5b1ddfa..2c319f5 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -165,18 +165,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    56 57 58 -59 -60 -61 -62 -63 -64 -65 -66 -67 -68 -69 -70 +59 
    # File 'manifests/main/install.pp', line 24
@@ -201,15 +190,6 @@ class cd_nagios::main::install (
     package {$reqpackages_client:
       ensure => $pkg_ensure,
     }
-
-    # install NRPE if enabled
-
-    if $ng_include_nrpe == true {
-
-      package {$reqpackages_nrpe:
-        ensure => $pkg_ensure,
-      }
-    }
   }
 
   # if we are not the nagios server, install client packages
@@ -222,9 +202,7 @@ class cd_nagios::main::install (
     # if we want to use NRPE, install it
 
     if $ng_include_nrpe == true {
-      package {$reqpackages_nrpe:
-        ensure => $pkg_ensure,
-      }
+      require cd_nrpe
     }
   }
 }
    @@ -235,7 +213,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 4739dd5..34ce8b3 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 b312d2a..def0c53 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 @@ -217,7 +217,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 e69afa0..0eeee9b 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 @@ -215,7 +215,7 @@ class cd_nagios::nagios::objects::add_contactgroups_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html index 9f1b2ac..734d8b1 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html @@ -214,7 +214,7 @@ class cd_nagios::nagios::objects::add_hostgroup_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html index 894e824..52adff9 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html @@ -224,7 +224,7 @@ class cd_nagios::nagios::objects::add_servicegroup_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiod_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiod_rules.html index c54fec8..b56a9e6 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiod_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiod_rules.html @@ -222,7 +222,7 @@ class cd_nagios::nagios::objects::add_timeperiod_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 52a8175..5acf81b 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 @@ -597,7 +597,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 9ddb247..5a3bb3b 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 @@ -182,7 +182,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 1ab970c..6c9aede 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 044e24f..b63df40 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_3Ahostgroups.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html index 68d404d..680a184 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html @@ -551,7 +551,7 @@ class cd_nagios::nagios::objects::hostgroups ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aservicegroups.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aservicegroups.html index 2af6356..2deaa0d 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aservicegroups.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aservicegroups.html @@ -235,7 +235,7 @@ class cd_nagios::nagios::objects::servicegroups ( 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 d73adbc..cf30f18 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_3Anagios_3A_3Aobjects_3A_3Atimeperiods.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atimeperiods.html index 7194857..e2f9e75 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atimeperiods.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atimeperiods.html @@ -285,7 +285,7 @@ class cd_nagios::nagios::objects::timeperiods ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index 2990c2e..2fa3f37 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -4871,6 +4871,25 @@ rampup_limit - Minimum rampup_change rampup_change - # of jobs to add to jobs_limit when ramping up

    + + +
    • + +
  • + + ng_nrpe_port + + + (string) + + + (defaults to: '5666') + + + — +
    +

    the port for NRPE. used by firewall and in +configuration file.

    • @@ -4892,8 +4911,6 @@ up

     
 
-646
-647
 648
 649
 650
@@ -5245,10 +5262,13 @@ up
    
 996
 997
 998
-999
    +999 +1000 +1001 +1002 - 
    # File 'manifests/params.pp', line 646
+        
    # File 'manifests/params.pp', line 648
 
 class cd_nagios::params (
 
@@ -5268,6 +5288,7 @@ $ng_http_https_fw           = true,
 $ng_fw_order                = '50',
 $ng_http_port               = '80',
 $ng_https_port              = '443',
+$ng_nrpe_port               = '5666',
 
 # check command parameters
 ## ping
@@ -5514,9 +5535,6 @@ $ng_loadctl_options         = 'jobs_max=100;backoff_limit=10;rampup_change=5
                                         'nagios-plugins-nrpe',
                                         'nagios-common']
   }
-  $reqpackages_nrpe = $::operatingsystem ? {
-    /(?i-mx:centos|fedora|redhat)/ => ['nrpe']
-  }
 
 # service
 $ng_service                 = 'nagios'
@@ -5599,6 +5617,9 @@ $ng_cntctgrps_rule_erb      = 'cd_nagios/nagios/contactgroups_cfg_rule.erb&#
 $ng_target_command          = "${ng_conf_d_dir}/nagios_commands_base.cfg"
 $ng_nagios_service_cmd      = 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios'
 
+# nrpe
+$ng_nrpe_file               = "${ng_main_dir}/nrpe.cfg"
+
 # includes must be last
 
   include cd_nagios::main::config
@@ -5611,7 +5632,7 @@ $ng_nagios_service_cmd      = 'check_nagios!/var/log/nagios/status.dat!5!/us
 
 
       
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 2c06d26..8c5995a 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 ed9a998..54db28b 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 36febc7..9b23360 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 13b51b9..0c79211 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -304,7 +304,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 50d6b95..a4b06c7 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
@@ -285,7 +285,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 0d1d010..bd37764 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
@@ -237,7 +237,7 @@ $ng_cntctgrps_rule_erb    = $::cd_nagios::params::ng_cntctgrps_rule_erb
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroups.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroups.html
index 822cf72..a74687d 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroups.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroups.html
@@ -245,7 +245,7 @@ $ng_tgt_hostgrp_rule_erb  = $::cd_nagios::params::ng_tgt_hostgrp_rule_erb
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroups.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroups.html
index e99bdd0..688b836 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroups.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroups.html
@@ -245,7 +245,7 @@ $ng_tgt_svcgrp_rule_erb   = $::cd_nagios::params::ng_tgt_svcgrp_rule_erb
 
 
       
diff --git a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiods.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiods.html
index ed1ccd8..c76292f 100644
--- a/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiods.html
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiods.html
@@ -370,7 +370,7 @@ $ng_tgt_timep_rule_erb    = $::cd_nagios::params::ng_tgt_timep_rule_erb
 
 
       
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 e3e05e4..1030676 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
@@ -906,7 +906,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 876c0a1..21e5fb1 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 cc98b72..9afa31e 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@