From e6256e44f5fb2047b1928eda8434aac1af64aecb Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Mon, 18 Sep 2017 18:57:19 +0200 Subject: [PATCH 1/2] added service checks for nagios host including fqdn etc. so that nagios server can be treated both as nagios process and client --- Gemfile | 1 + README.md | 2 +- manifests/server/service.pp | 115 +++++++++++++++++++++++++++++++++++- 3 files changed, 115 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index f1c0ec8..ba360ff 100644 --- a/Gemfile +++ b/Gemfile @@ -11,6 +11,7 @@ gem 'puppet-strings' gem 'rake' gem 'semantic_puppet' gem 'rgen' +gem 'public_suffix', '<= 2.0.5' # rspec must be v2 for ruby 1.8.7 if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9' diff --git a/README.md b/README.md index 1f23ac8..de9508b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ |Repo Name| version | Build Status| |---|---|---|---| -|`cd_nagios`| 0.0.1.7 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)| +|`cd_nagios`| 0.0.1.8 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)| ### Synopsis Nagios is a powerful open source software solution for monitoring your IT environments. diff --git a/manifests/server/service.pp b/manifests/server/service.pp index f9658ff..2ed1393 100644 --- a/manifests/server/service.pp +++ b/manifests/server/service.pp @@ -40,7 +40,7 @@ class cd_nagios::server::service ( enable => true, } - @@nagios_host { 'localhost': + @@nagios_host { 'localhost': ensure => $ng_ping_ensure, alias => 'localhost', address => '127.0.0.1', @@ -55,7 +55,7 @@ class cd_nagios::server::service ( mode => '0640', check_command => "check_ping!${ng_ping_warn}!${ng_ping_crit}", notify => Service[$ng_service], - } + } @@nagios_service { 'check_nagios_localhost': check_command => $ng_nagios_service_cmd, @@ -70,6 +70,117 @@ class cd_nagios::server::service ( contacts => 'ops', } + @@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', + } + + if $ng_enable_swap_check == true { + + @@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 { "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 { "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', + } + resources { [ 'nagios_host', 'nagios_hostgroup', 'nagios_hostdependency', From 0d1f15222ca35818f934bd7ee715c2f634b741ed Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Mon, 18 Sep 2017 18:56:13 +0200 Subject: [PATCH 2/2] recommit for updates in build 155 --- CHANGELOG.md | 765 +++++++++--------- doc/_index.html | 2 +- doc/file.README.html | 4 +- doc/index.html | 4 +- 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 +- ...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 | 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 | 230 +++++- ...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, 654 insertions(+), 417 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27feb99..a6d5ace 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,21 @@ Changelog of Git Changelog.

No issue

+b49cfa7ba7fdfc7 Jenkins Server 2017-08-02 16:35:56 +

+

recommit for updates in build 154

+ +

+ +

v0.0.1.7

+

No issue

+ + +e434c34c4d82853 Arne Teuke 2017-08-02 16:35:12 +

+

removed jenkins check command from base commands, as that has been outsourced to the jenkins module

+ +

4c10771c8838668 Jenkins Server 2017-07-31 16:26:56

recommit for updates in build 153

@@ -82,351 +97,76 @@ Changelog of Git Changelog.

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.6

-

No issue

- - -2d567bc6296bc21 Arne Teuke 2017-07-31 16:26:23 -

-

added parameter to enable or disable swap checking, as this can now be done better through cd_swap

- -

-d12abd7cd16065d Arne Teuke 2017-07-30 19:38:00 -

-

updating README

- -

-93b47c0f012bb71 Arne Teuke 2017-07-30 19:34:53 -

-

updating README

- -

-fc05564e8986360 Arne Teuke 2017-07-30 15:00:13 -

-

added checknagios selinux exception

- -

-cf807acd5606c02 Arne Teuke 2017-07-30 14:40:07 -

-

added selinux policy for checknrpe

- -

- -

v0.0.1.5

-

No issue

- - -4154041de6b8563 Arne Teuke 2017-07-30 14:19:36 -

-

reversed user change and made sure it always can login

- -

-ebdf85199f0f27d Arne Teuke 2017-07-30 14:09:13 -

-

changed user shell depending on role, on nagios server it requires bash access, else /sbin/nologin

- -

- -

v0.0.1.4

-

No issue

- - -8f1c9766d2edf97 Arne Teuke 2017-07-30 13:58:17 -

-

updated user

- -

-303100c01923549 Arne Teuke 2017-07-30 13:56:40 -

-

updated user and README

- -

-19034c2a5c70f56 Arne Teuke 2017-07-28 17:54:33 -

-

included NRPE on server as well

- -

- -

v0.0.1.3

-

No issue

- - -6d494590a708a5d Arne Teuke 2017-07-28 13:18:27 -

-

linked client to user to have a consistent nagios uid/gid across estate

- -

-3cac3f1a409abf6 Arne Teuke 2017-07-28 13:17:39 -

-

linked client to user

- -

- -

v0.0.1.2

-

No issue

- - -531fcfac5c02dd2 Arne Teuke 2017-07-28 12:50:23 -

-

edited README

- -

-c134c8de3459e9b Arne Teuke 2017-07-28 12:49:05 -

-

outsourcing NRPE to cd_nrpe

- -

- -

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 -

-

edited parameter documentation

- -

-960c34b9edd9b30 Arne Teuke 2017-07-28 11:27:58 -

-

edited README and parameter documentation

- -

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

-

edited README

- -

-dc88f47d7df4015 Arne Teuke 2017-07-28 11:07:53 -

-

fixed parameter for max_check_attempts

- -

-edf2f16ea5e7289 Arne Teuke 2017-07-28 10:54:42 -

-

fixed timeperiods and edited README

- -

-61c181393c4574b Arne Teuke 2017-07-28 10:51:00 -

-

fixed typo

-

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

@@ -447,6 +187,11 @@ 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

@@ -467,51 +212,101 @@ 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

@@ -527,26 +322,51 @@ 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

@@ -557,6 +377,11 @@ 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

@@ -572,11 +397,21 @@ 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

@@ -587,21 +422,41 @@ 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

@@ -632,6 +487,11 @@ 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

@@ -1082,11 +942,36 @@ Changelog of Git Changelog.

recommit for updates in build 18

+

+5de81e818498830 Arne Teuke 2017-07-21 11:34:48 +

+

testing options both for hosts and ips

+ +

+41434c9607ab037 Arne Teuke 2017-07-21 11:28:50 +

+

adding options both for hosts and ips

+ +

+544f48d800ad39a Arne Teuke 2017-07-21 11:21:12 +

+

adding options both for hosts and ips

+

969e377d5db6423 Jenkins Server 2017-07-21 11:06:59

recommit for updates in build 15

+

+e402224ff9bb367 Arne Teuke 2017-07-21 11:06:36 +

+

trying empty array

+ +

+49551a3d9af3460 Arne Teuke 2017-07-21 10:43:06 +

+

included control for nagios.conf

+

05036af24182601 Jenkins Server 2017-07-20 16:26:40

@@ -1107,21 +992,216 @@ Changelog of Git Changelog.

recommit for updates in build 8

+

+508e672c317a2b8 Arne Teuke 2017-07-20 15:16:51 +

+

added statuscgi_pol to template

+ +

+8d204947db73672 Arne Teuke 2017-07-20 15:15:51 +

+

added statuscgi_pol

+ +

+aefb0a83a611a13 Arne Teuke 2017-07-20 14:55:30 +

+

undoing array

+ +

+00267d122ba29c2 Arne Teuke 2017-07-20 14:54:56 +

+

testing array

+

84a42a16a33cd80 Jenkins Server 2017-07-20 14:46:15

recommit for updates in build 4

+

+4c9cff0e73d216c Arne Teuke 2017-07-20 14:45:54 +

+

added check for nagios_server to access

+

030e5f68f509f71 Jenkins Server 2017-07-20 14:11:13

recommit for updates in build 3

+

+8a14684ca214be5 Arne Teuke 2017-07-20 14:10:54 +

+

changed creates rule for exec

+ +

+cb2010e7d20dcc6 Arne Teuke 2017-07-20 14:09:11 +

+

moved service dependency to access_rules

+

3a3e3ceef9a4a2f Jenkins Server 2017-07-20 13:47:46

recommit for updates in build 2

+

+febc8f1a348f2e7 Arne Teuke 2017-07-20 13:47:24 +

+

re-added all files

+ +

+ +

v0.0.1.6

+

No issue

+ + +2d567bc6296bc21 Arne Teuke 2017-07-31 16:26:23 +

+

added parameter to enable or disable swap checking, as this can now be done better through cd_swap

+ +

+d12abd7cd16065d Arne Teuke 2017-07-30 19:38:00 +

+

updating README

+ +

+93b47c0f012bb71 Arne Teuke 2017-07-30 19:34:53 +

+

updating README

+ +

+fc05564e8986360 Arne Teuke 2017-07-30 15:00:13 +

+

added checknagios selinux exception

+ +

+cf807acd5606c02 Arne Teuke 2017-07-30 14:40:07 +

+

added selinux policy for checknrpe

+ +

+ +

v0.0.1.5

+

No issue

+ + +4154041de6b8563 Arne Teuke 2017-07-30 14:19:36 +

+

reversed user change and made sure it always can login

+ +

+ebdf85199f0f27d Arne Teuke 2017-07-30 14:09:13 +

+

changed user shell depending on role, on nagios server it requires bash access, else /sbin/nologin

+ +

+ +

v0.0.1.4

+

No issue

+ + +8f1c9766d2edf97 Arne Teuke 2017-07-30 13:58:17 +

+

updated user

+ +

+303100c01923549 Arne Teuke 2017-07-30 13:56:40 +

+

updated user and README

+ +

+19034c2a5c70f56 Arne Teuke 2017-07-28 17:54:33 +

+

included NRPE on server as well

+ +

+ +

v0.0.1.3

+

No issue

+ + +6d494590a708a5d Arne Teuke 2017-07-28 13:18:27 +

+

linked client to user to have a consistent nagios uid/gid across estate

+ +

+3cac3f1a409abf6 Arne Teuke 2017-07-28 13:17:39 +

+

linked client to user

+ +

+ +

v0.0.1.2

+

No issue

+ + +531fcfac5c02dd2 Arne Teuke 2017-07-28 12:50:23 +

+

edited README

+ +

+c134c8de3459e9b Arne Teuke 2017-07-28 12:49:05 +

+

outsourcing NRPE to cd_nrpe

+ +

+ +

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 +

+

edited parameter documentation

+ +

+960c34b9edd9b30 Arne Teuke 2017-07-28 11:27:58 +

+

edited README and parameter documentation

+ +

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

+

edited README

+ +

+dc88f47d7df4015 Arne Teuke 2017-07-28 11:07:53 +

+

fixed parameter for max_check_attempts

+ +

+edf2f16ea5e7289 Arne Teuke 2017-07-28 10:54:42 +

+

fixed timeperiods and edited README

+ +

+61c181393c4574b Arne Teuke 2017-07-28 10:51:00 +

+

fixed typo

+

v0.0.0.8

@@ -1182,31 +1262,6 @@ Changelog of Git Changelog.

testing options both for hosts and ips

-

-5de81e818498830 Arne Teuke 2017-07-21 11:34:48 -

-

testing options both for hosts and ips

- -

-41434c9607ab037 Arne Teuke 2017-07-21 11:28:50 -

-

adding options both for hosts and ips

- -

-544f48d800ad39a Arne Teuke 2017-07-21 11:21:12 -

-

adding options both for hosts and ips

- -

-e402224ff9bb367 Arne Teuke 2017-07-21 11:06:36 -

-

trying empty array

- -

-49551a3d9af3460 Arne Teuke 2017-07-21 10:43:06 -

-

included control for nagios.conf

-

v0.0.0.7

@@ -1238,44 +1293,4 @@ Changelog of Git Changelog.

trying to work my way again through selinux

-508e672c317a2b8 Arne Teuke 2017-07-20 15:16:51 -

-

added statuscgi_pol to template

- -

-8d204947db73672 Arne Teuke 2017-07-20 15:15:51 -

-

added statuscgi_pol

- -

-aefb0a83a611a13 Arne Teuke 2017-07-20 14:55:30 -

-

undoing array

- -

-00267d122ba29c2 Arne Teuke 2017-07-20 14:54:56 -

-

testing array

- -

-4c9cff0e73d216c Arne Teuke 2017-07-20 14:45:54 -

-

added check for nagios_server to access

- -

-8a14684ca214be5 Arne Teuke 2017-07-20 14:10:54 -

-

changed creates rule for exec

- -

-cb2010e7d20dcc6 Arne Teuke 2017-07-20 14:09:11 -

-

moved service dependency to access_rules

- -

-febc8f1a348f2e7 Arne Teuke 2017-07-20 13:47:24 -

-

re-added all files

- -

diff --git a/doc/_index.html b/doc/_index.html index 2160529..0d1fc45 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 9bd301b..2a47e54 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.7 | cd_nagios| 0.0.1.8 | {Build Status/]|

@@ -404,7 +404,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index 963d677..92325ac 100644 --- a/doc/index.html +++ b/doc/index.html @@ -61,7 +61,7 @@

|Repo Name| version | Build Status| |---|---|---|---| -|cd_nagios| 0.0.1.7 | cd_nagios| 0.0.1.8 | {Build Status/]|

@@ -404,7 +404,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 9c278e1..e442d63 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 e5a98f9..9496c5d 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 2405a4d..63e2fd5 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html @@ -384,7 +384,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 64f00c9..b63b328 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 6a81ccd..327c586 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 ebf93c6..530cf41 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 89e9089..c168cb9 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Ainstall.html @@ -213,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 e1f5857..1ff5cb9 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html +++ b/doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html @@ -194,7 +194,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 1f93305..d0a734e 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 ca9a261..95184e2 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 5021768..f48afdb 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 c964921..44822bd 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 @@ -214,7 +214,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 90204cb..a305385 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 819acf8..5363e2e 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 @@ -575,7 +575,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 4b39f45..c78da04 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 47deeba..b313918 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 59aa0ed..5a54eb3 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 1ce780f..1214caf 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 060b6d3..19acfd9 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 ccc9570..0375bf4 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 b98541c..bb1e46d 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 6144d22..1908789 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -5665,7 +5665,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 60ea0ee..1fac0ae 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -324,7 +324,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 245edde..5334282 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 007408f..f2d9d5c 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 bfd1626..1e5945f 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -213,7 +213,118 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

104 105 106 -107 +107 +108 +109 +110 +111 +112 +113 +114 +115 +116 +117 +118 +119 +120 +121 +122 +123 +124 +125 +126 +127 +128 +129 +130 +131 +132 +133 +134 +135 +136 +137 +138 +139 +140 +141 +142 +143 +144 +145 +146 +147 +148 +149 +150 +151 +152 +153 +154 +155 +156 +157 +158 +159 +160 +161 +162 +163 +164 +165 +166 +167 +168 +169 +170 +171 +172 +173 +174 +175 +176 +177 +178 +179 +180 +181 +182 +183 +184 +185 +186 +187 +188 +189 +190 +191 +192 +193 +194 +195 +196 +197 +198 +199 +200 +201 +202 +203 +204 +205 +206 +207 +208 +209 +210 +211 +212 +213 +214 +215 +216 +217 +218 
# File 'manifests/server/service.pp', line 23
@@ -238,7 +349,7 @@ class cd_nagios::server::service (
       enable      => true,
     }
 
-  @@nagios_host { 'localhost':
+    @@nagios_host { 'localhost':
       ensure              =>  $ng_ping_ensure,
       alias               =>  'localhost',
       address             =>  '127.0.0.1',
@@ -253,7 +364,7 @@ class cd_nagios::server::service (
       mode                =>  '0640',
       check_command       =>  "check_ping!${ng_ping_warn}!${ng_ping_crit}",
       notify              =>  Service[$ng_service],
-  }
+    }
 
     @@nagios_service { 'check_nagios_localhost':
         check_command       => $ng_nagios_service_cmd,
@@ -268,6 +379,117 @@ class cd_nagios::server::service (
         contacts            => 'ops',
     }
 
+    @@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',
+    }
+
+    if $ng_enable_swap_check == true {
+
+      @@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 { "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 { "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',
+    }
+
       resources { [ 'nagios_host',
                     'nagios_hostgroup',
                     'nagios_hostdependency',
@@ -310,7 +532,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 dca20b7..56ebf97 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 54a1756..20133fc 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 76fc302..0cc62f3 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 425234e..427ffbe 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 3792ad1..f658109 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 8d2a6b2..c154251 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 c881804..93d6341 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 b73394c..3a8622b 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@