diff --git a/CHANGELOG.md b/CHANGELOG.md index 302f3c1..1769dad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+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

diff --git a/README.md b/README.md index c3c1571..d52b2f5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ |Repo Name| version | Build Status| |---|---|---|---| -|`cd_nagios`| 0.0.0.9 | [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=cd_nagios)](https://jenkins.confdroid.com/job/cd_nagios/)| +|`cd_nagios`| 0.0.0.10 | [![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. @@ -67,7 +67,14 @@ Service Monitoring * monitor Nagios host * monitor Nagios service - +* monitor clients: + * ping + * root partition + * swap usage + * logged-in local users + * amount of total processes + * amount of zombie processes + * current Load ### Repo Structure Repostructure has moved to REPOSTRUCTURE.md in repo. diff --git a/doc/_index.html b/doc/_index.html index 64da3a9..d74e816 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 28a712d..13c043f 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -61,7 +61,7 @@

|Repo Name| version | Build Status| |---|---|---|---| -|cd_nagios| 0.0.0.9 | cd_nagios| 0.0.0.10 | {Build Status/]|

@@ -185,7 +185,17 @@ certbot (optional)

Monitoring * monitor Nagios host -* monitor Nagios service

+* monitor Nagios service +* monitor +clients: + * ping + * root partition + * swap usage + * logged-in local users + +* amount of total processes + * amount of zombie processes + * current Load

Repo Structure

@@ -376,7 +386,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index 3e4b0ed..1b1c793 100644 --- a/doc/index.html +++ b/doc/index.html @@ -61,7 +61,7 @@

|Repo Name| version | Build Status| |---|---|---|---| -|cd_nagios| 0.0.0.9 | cd_nagios| 0.0.0.10 | {Build Status/]|

@@ -185,7 +185,17 @@ certbot (optional)

Monitoring * monitor Nagios host -* monitor Nagios service

+* monitor Nagios service +* monitor +clients: + * ping + * root partition + * swap usage + * logged-in local users + +* amount of total processes + * amount of zombie processes + * current Load

Repo Structure

@@ -376,7 +386,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 91e05f2..2828c84 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 86e3189..e9cedee 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 5a5855f..11812b8 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html @@ -261,13 +261,13 @@ class cd_nagios::client::target ( target => $ng_target_host, hostgroups => 'linux-servers', contacts => 'ops', - max_check_attempts => $max_check_attempts, + ng_max_check_attempts => $ng_max_check_attempts, notification_period => '24x7', - owner => 'nagios', - group => 'nagios', - mode => '0664', + owner => $ng_user, + group => $ng_user, + mode => '0640', check_command => "check_ping!${ng_ping_warn}!${ng_ping_crit}", - notify => Service['nagios'], + notify => Service[$ng_user], } @@nagios_service { "root_partition_${::hostname}": @@ -280,9 +280,9 @@ class cd_nagios::client::target ( service_description => "${::hostname}_root_partition", servicegroups => 'linux-services', target => $ng_target_service, - owner => 'nagios', - group => 'nagios', - mode => '0664', + owner => $ng_user, + group => $ng_user, + mode => '0640', } @@nagios_service { "Swap_Usage_${::hostname}": @@ -295,9 +295,9 @@ class cd_nagios::client::target ( service_description => "${::hostname}_swap_usage", servicegroups => 'linux-services', target => $ng_target_service, - owner => 'nagios', - group => 'nagios', - mode => '0664', + owner => $ng_user, + group => $ng_user, + mode => '0640', } @@nagios_service { "Local_Users_${::hostname}": @@ -310,9 +310,9 @@ class cd_nagios::client::target ( service_description => "${::hostname}_local_users", servicegroups => 'linux-services', target => $ng_target_service, - owner => 'nagios', - group => 'nagios', - mode => '0664', + owner => $ng_user, + group => $ng_user, + mode => '0640', } @@nagios_service { "Total Processes_${::hostname}": @@ -325,9 +325,9 @@ class cd_nagios::client::target ( service_description => "${::hostname}_total_processes", servicegroups => 'linux-services', target => $ng_target_service, - owner => 'nagios', - group => 'nagios', - mode => '0664', + owner => $ng_user, + group => $ng_user, + mode => '0640', } @@nagios_service { "Zombie Processes_${::hostname}": @@ -340,9 +340,9 @@ class cd_nagios::client::target ( service_description => "${::hostname}_zombie_processes", servicegroups => 'linux-services', target => $ng_target_service, - owner => 'nagios', - group => 'nagios', - mode => '0664', + owner => $ng_user, + group => $ng_user, + mode => '0640', } @@nagios_service { "Current_Load_${::hostname}": @@ -355,9 +355,9 @@ class cd_nagios::client::target ( service_description => "${::hostname}_current_load", servicegroups => 'linux-services', target => $ng_target_service, - owner => 'nagios', - group => 'nagios', - mode => '0664', + owner => $ng_user, + group => $ng_user, + mode => '0640', } } } @@ -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 bb1d651..2642385 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 ca08cf8..d4d6c75 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 52168e5..5f7f602 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 f099a02..0f757a8 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 c57cc32..52bb6fe 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 b02236c..18dba77 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 06c5c2f..92250b6 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 7ef7937..320b09b 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 abdac5f..6422802 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 bf85883..185a36b 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 @@ -178,20 +178,7 @@ ng_timep_friday => '00:00-00:00', 61 62 63 -64 -65 -66 -67 -68 -69 -70 -71 -72 -73 -74 -75 -76 -77 +64 
# File 'manifests/nagios/objects/add_timeperiod_rules.pp', line 35
@@ -224,19 +211,6 @@ class cd_nagios::nagios::objects::add_timeperiod_rules (
       content   =>  template($ng_tgt_timep_head_erb),
       order     =>  '000',
     }
-
-    # example rule
-    cd_nagios::nagios::objects::add_timeperiods { 'example_timeperiod':
-      ng_timep_name       => 'example_timeperiod',
-      ng_timep_alias      => 'Example timeperiod',
-      ng_timep_monday     => '00:00-00:00',
-      ng_timep_tuesday    => '00:00-00:00',
-      ng_timep_wednesday  => '00:00-00:00',
-      ng_timep_thursday   => '00:00-00:00',
-      ng_timep_friday     => '00:00-00:00',
-      ng_timep_saturday   => '00:00-00:00',
-      ng_timep_sunday     => '00:00-00:00',
-    }
   }
 }
@@ -246,7 +220,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 1534743..f5ed466 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 c475c4b..7318342 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 77f258a..c626171 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 d7d28e8..cafe150 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 73bb450..0cb2758 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 716fa4a..0750751 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 efa2223..e7efc88 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 c596f4e..d27dab9 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 fd35ded..29651d3 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -5611,7 +5611,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 cdc1542..94e0777 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 04eea35..7be9082 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 077c50e..2b1208b 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 bfd1d1f..c7513f8 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -240,12 +240,12 @@ class cd_nagios::server::service ( target => $ng_target_localhost, hostgroups => 'linux-servers', contacts => 'ops', - max_check_attempts => $max_check_attempts, + 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}", + check_command => "${check_ping}!${ng_ping_warn}!${ng_ping_crit}", notify => Service[$ng_service], } @@ -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 579372d..95bcce9 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 d7b15dc..0f65cd0 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 de03fef..a4b4033 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 55d2120..0e3e492 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 @@ -228,7 +228,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 ef4f9c7..3393649 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 @@ -386,7 +386,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 2dce2a4..84ff7d4 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 71245ee..cd17d1f 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 5aa1965..266488c 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ diff --git a/manifests/client/target.pp b/manifests/client/target.pp index b35af5c..591c1f7 100644 --- a/manifests/client/target.pp +++ b/manifests/client/target.pp @@ -35,13 +35,13 @@ class cd_nagios::client::target ( target => $ng_target_host, hostgroups => 'linux-servers', contacts => 'ops', - max_check_attempts => $max_check_attempts, + ng_max_check_attempts => $ng_max_check_attempts, notification_period => '24x7', - owner => 'nagios', - group => 'nagios', - mode => '0664', + owner => $ng_user, + group => $ng_user, + mode => '0640', check_command => "check_ping!${ng_ping_warn}!${ng_ping_crit}", - notify => Service['nagios'], + notify => Service[$ng_user], } @@nagios_service { "root_partition_${::hostname}": @@ -54,9 +54,9 @@ class cd_nagios::client::target ( service_description => "${::hostname}_root_partition", servicegroups => 'linux-services', target => $ng_target_service, - owner => 'nagios', - group => 'nagios', - mode => '0664', + owner => $ng_user, + group => $ng_user, + mode => '0640', } @@nagios_service { "Swap_Usage_${::hostname}": @@ -69,9 +69,9 @@ class cd_nagios::client::target ( service_description => "${::hostname}_swap_usage", servicegroups => 'linux-services', target => $ng_target_service, - owner => 'nagios', - group => 'nagios', - mode => '0664', + owner => $ng_user, + group => $ng_user, + mode => '0640', } @@nagios_service { "Local_Users_${::hostname}": @@ -84,9 +84,9 @@ class cd_nagios::client::target ( service_description => "${::hostname}_local_users", servicegroups => 'linux-services', target => $ng_target_service, - owner => 'nagios', - group => 'nagios', - mode => '0664', + owner => $ng_user, + group => $ng_user, + mode => '0640', } @@nagios_service { "Total Processes_${::hostname}": @@ -99,9 +99,9 @@ class cd_nagios::client::target ( service_description => "${::hostname}_total_processes", servicegroups => 'linux-services', target => $ng_target_service, - owner => 'nagios', - group => 'nagios', - mode => '0664', + owner => $ng_user, + group => $ng_user, + mode => '0640', } @@nagios_service { "Zombie Processes_${::hostname}": @@ -114,9 +114,9 @@ class cd_nagios::client::target ( service_description => "${::hostname}_zombie_processes", servicegroups => 'linux-services', target => $ng_target_service, - owner => 'nagios', - group => 'nagios', - mode => '0664', + owner => $ng_user, + group => $ng_user, + mode => '0640', } @@nagios_service { "Current_Load_${::hostname}": @@ -129,9 +129,9 @@ class cd_nagios::client::target ( service_description => "${::hostname}_current_load", servicegroups => 'linux-services', target => $ng_target_service, - owner => 'nagios', - group => 'nagios', - mode => '0664', + owner => $ng_user, + group => $ng_user, + mode => '0640', } } } diff --git a/manifests/nagios/objects/add_timeperiod_rules.pp b/manifests/nagios/objects/add_timeperiod_rules.pp index dff8d46..697c13b 100644 --- a/manifests/nagios/objects/add_timeperiod_rules.pp +++ b/manifests/nagios/objects/add_timeperiod_rules.pp @@ -60,18 +60,5 @@ class cd_nagios::nagios::objects::add_timeperiod_rules ( content => template($ng_tgt_timep_head_erb), order => '000', } - - # example rule - cd_nagios::nagios::objects::add_timeperiods { 'example_timeperiod': - ng_timep_name => 'example_timeperiod', - ng_timep_alias => 'Example timeperiod', - ng_timep_monday => '00:00-00:00', - ng_timep_tuesday => '00:00-00:00', - ng_timep_wednesday => '00:00-00:00', - ng_timep_thursday => '00:00-00:00', - ng_timep_friday => '00:00-00:00', - ng_timep_saturday => '00:00-00:00', - ng_timep_sunday => '00:00-00:00', - } } } diff --git a/manifests/server/service.pp b/manifests/server/service.pp index 076ccf0..74d7430 100644 --- a/manifests/server/service.pp +++ b/manifests/server/service.pp @@ -45,12 +45,12 @@ class cd_nagios::server::service ( target => $ng_target_localhost, hostgroups => 'linux-servers', contacts => 'ops', - max_check_attempts => $max_check_attempts, + 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}", + check_command => "${check_ping}!${ng_ping_warn}!${ng_ping_crit}", notify => Service[$ng_service], }