From 645cb4255af90d57fec4bf7cc692d562f0856e6e Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 27 Jul 2017 14:33:00 +0100 Subject: [PATCH 1/2] added parameter documentation --- manifests/nagios/objects/add_contact.pp | 5 +++++ manifests/nagios/objects/config.pp | 1 + manifests/nagios/objects/templates.pp | 5 ++--- manifests/server/service.pp | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/manifests/nagios/objects/add_contact.pp b/manifests/nagios/objects/add_contact.pp index 7f6fbaf..f5c065f 100644 --- a/manifests/nagios/objects/add_contact.pp +++ b/manifests/nagios/objects/add_contact.pp @@ -27,6 +27,11 @@ # ng_contact_groups => 'admins', # ng_contact_email => 'example@example.net', # } +# @param [string] ng_contact_name Specify the contact short name. +# @param [string] ng_contact_use which contact template to use +# @param [string] ng_contact_alias Specify the contact alias (long name). +# @param [string] ng_contact_email Specify the contact email address. +# @param [string] ng_contact_groups Specidy the contact group for the contact. ################################################################################ define cd_nagios::nagios::objects::add_contact ( diff --git a/manifests/nagios/objects/config.pp b/manifests/nagios/objects/config.pp index ff1953b..ff8508c 100644 --- a/manifests/nagios/objects/config.pp +++ b/manifests/nagios/objects/config.pp @@ -36,5 +36,6 @@ class cd_nagios::nagios::objects::config ( require cd_nagios::nagios::objects::add_hostgroup_rules require cd_nagios::nagios::objects::servicegroups require cd_nagios::nagios::objects::add_servicegroup_rules + } } diff --git a/manifests/nagios/objects/templates.pp b/manifests/nagios/objects/templates.pp index 34cf0df..bf11aae 100644 --- a/manifests/nagios/objects/templates.pp +++ b/manifests/nagios/objects/templates.pp @@ -57,8 +57,6 @@ # Valid options are `0` and `1`. # @param [string] ng_flap_detection_enabled Whether flap detection is enabled. # Valid options are `0` and `1`. -# @param [string] ng_failure_prediction_enabled Whether failure prediction is -# enabled. Valid options are `0` and `1`. # @param [string] ng_process_perf_data Whether to process performance data. # Valid options are `0` and `1`. # @param [string] ng_retain_status_information Whether to retain status @@ -77,7 +75,6 @@ # retries for the defined object. # @param [string] ng_max_check_attempts how often to check the defined object # maximal. -# @param [string] ng_check_command The command to use for host checks. # @param [string] ng_notification_options see `ng_service_notification_options` # and `ng_host_notification_options`. # @param [string] ng_contact_groups contact groups for the defined oject. @@ -98,6 +95,8 @@ # under normal conditions. # @param [string] ng_retry_interval Re-check the service every x minutes # until a hard state can be determined. +# @param [string] ng_host_check_command the check command for host checks +# @param [string] ################################################################################ define cd_nagios::nagios::objects::templates ( $ng_template_object = undef, diff --git a/manifests/server/service.pp b/manifests/server/service.pp index 949d951..076ccf0 100644 --- a/manifests/server/service.pp +++ b/manifests/server/service.pp @@ -51,7 +51,7 @@ class cd_nagios::server::service ( group => $ng_user, mode => '0640', check_command => "check_ping!${ng_ping_warn}!${ng_ping_crit}", - notify => Service ['nagios'], + notify => Service[$ng_service], } @@nagios_service { 'check_nagios_localhost': From cba65ddb7cb64cf79f887f7a7ae50c0515b1e521 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 27 Jul 2017 15:33:36 +0200 Subject: [PATCH 2/2] recommit for updates in build 117 --- CHANGELOG.md | 10 ++++ REPOSTRUCTURE.md | 5 +- doc/_index.html | 7 ++- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_class_list.html | 7 +++ 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_3Anagios_3A_3Aobjects_3A_3Acommands.html | 2 +- ..._3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | 6 +- ...agios_3A_3Aobjects_3A_3Acontactgroups.html | 2 +- ...A_3Anagios_3A_3Aobjects_3A_3Acontacts.html | 2 +- ...3Anagios_3A_3Aobjects_3A_3Ahostgroups.html | 2 +- ...agios_3A_3Aobjects_3A_3Aservicegroups.html | 2 +- ...gios_3A_3Aobjects_3A_3Atemplate_rules.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 4 +- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aservice.html | 54 +++++++++++++---- ...Anagios_3A_3Aobjects_3A_3Aadd_contact.html | 51 ++++++++++++---- ...s_3A_3Aobjects_3A_3Aadd_contactgroups.html | 2 +- ...gios_3A_3Aobjects_3A_3Aadd_hostgroups.html | 2 +- ...s_3A_3Aobjects_3A_3Aadd_servicegroups.html | 2 +- ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html | 60 +++++++------------ .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 37 files changed, 165 insertions(+), 95 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d401a02..de2d9b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

No issue

+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

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 22736c6..16fea34 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -20,11 +20,13 @@ | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html +| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html +| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aservicegroups.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html | | |-- cd_nagios_3A_3Aparams.html | | |-- cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -36,6 +38,7 @@ | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroups.html +| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroups.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html | | `-- cd_nagios_3A_3Aserver_3A_3Aaccess.html | |-- file.README.html @@ -121,4 +124,4 @@ |-- README.md `-- REPOSTRUCTURE.md -20 directories, 101 files +20 directories, 104 files diff --git a/doc/_index.html b/doc/_index.html index 2e4ee8d..e04a99c 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -183,6 +183,11 @@ +
  • + cd_nagios::server::service + +
    • + @@ -261,7 +266,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 3bc23eb..739db06 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -372,7 +372,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index b625eb3..1c72e24 100644 --- a/doc/index.html +++ b/doc/index.html @@ -372,7 +372,7 @@ environments.

    diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index 2527771..893113f 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -201,6 +201,13 @@ +
  • +
    + cd_nagios::server::service +
    +
    • + + diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 4634e87..04d0f94 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 681e9ac..40a59e1 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 0aac8c2..8fc0cce 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aclient_3A_3Atarget.html @@ -368,7 +368,7 @@ class cd_nagios::client::target ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html b/doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html index 1c5b3ad..6515a8a 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 43d8107..da866b5 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 330f965..dc96209 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 b59cb2b..95038ab 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 8051f8e..9f5c4a0 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 29c8eb7..e15ce47 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 74e0b99..8175481 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 781e63d..6e2e1fc 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 26c6f01..2fa5adb 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_3Acommands.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html index 22fad75..e3f0876 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html @@ -595,7 +595,7 @@ class cd_nagios::nagios::objects::commands ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html index a8456d2..d690809 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 @@ -146,7 +146,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    37 38 39 -40 +40 +41 
    # File 'manifests/nagios/objects/config.pp', line 23
@@ -167,6 +168,7 @@ class cd_nagios::nagios::objects::config (
     require cd_nagios::nagios::objects::add_hostgroup_rules
     require cd_nagios::nagios::objects::servicegroups
     require cd_nagios::nagios::objects::add_servicegroup_rules
+
   }
 }
    @@ -176,7 +178,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 115c9bf..ff75798 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 3ccb8af..a52aac3 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 aea194b..0d8927f 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 7bd236f..ab119cd 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 98c2e9c..6ac95b1 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html @@ -305,7 +305,7 @@ class cd_nagios::nagios::objects::template_rules ( diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html index f15e624..d5b8e33 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -83,6 +83,8 @@ cd_nagios::selinux::config
    + cd_nagios::server::service
    + cd_nagios::firewall::iptables
    cd_nagios::server::access_rules
    @@ -5614,7 +5616,7 @@ $ng_target_command = "${ng_conf_d_dir}/nagios_commands_base.cfg" diff --git a/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html b/doc/puppet_classes/cd_nagios_3A_3Aselinux_3A_3Aconfig.html index f7977dd..cc626dc 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 8d021c4..a0ab7e5 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 40a3ccf..4af1ac7 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 3f00f20..0c1ae9b 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -193,7 +193,24 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    84 85 86 -87 +87 +88 +89 +90 +91 +92 +93 +94 +95 +96 +97 +98 +99 +100 +101 +102 +103 +104 
    # File 'manifests/server/service.pp', line 23
@@ -215,16 +232,33 @@ class cd_nagios::server::service (
       enable      => true,
     }
 
-    @@nagios_service { "check_nagios_${::hostname}":
-        check_command       => 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios',
+  @@nagios_host { 'localhost':
+      ensure              =>  $ng_ping_ensure,
+      alias               =>  'localhost',
+      address             =>  '127.0.0.1',
+      use                 =>  'linux-server',
+      target              =>  $ng_target_localhost,
+      hostgroups          =>  'linux-servers',
+      contacts            =>  'ops',
+      max_check_attempts  =>  $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_service],
+  }
+
+    @@nagios_service { 'check_nagios_localhost':
+        check_command       => $ng_nagios_service_cmd,
         use                 => 'generic-service',
-        host_name           => $::fqdn,
+        host_name           => 'localhost',
         notification_period => '24x7',
-        service_description =>  "${::hostname}_nagios_service",
-        target              =>  $ng_target_service,
-        owner               => 'nagios',
-        group               => 'nagios',
-        mode                => '0660',
+        service_description => 'localhost_nagios_service',
+        target              => $ng_target_service,
+        owner               => $ng_user,
+        group               => $ng_user,
+        mode                => '0640',
         contacts            => 'ops',
     }
 
@@ -270,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 29adf7c..c38197e 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
@@ -135,12 +135,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
         ng_contact_name
       
       
-        (Any)
+        (string)
       
       
         (defaults to: undef)
       
       
+        —
+        
    
+
    Specify the contact short name.
    
+
    
+      
     
   
     
  • 
@@ -148,12 +153,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
         ng_contact_use
       
       
-        (Any)
+        (string)
       
       
         (defaults to: 'generic-contact')
       
       
+        —
+        
    
+
    which contact template to use
    
+
    
+      
     
    • 
   
     
  • 
@@ -161,12 +171,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
         ng_contact_alias
       
       
-        (Any)
+        (string)
       
       
         (defaults to: undef)
       
       
+        —
+        
    
+
    Specify the contact alias (long name).
    
+
    
+      
     
    • 
   
     
  • 
@@ -174,12 +189,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
         ng_contact_email
       
       
-        (Any)
+        (string)
       
       
         (defaults to: undef)
       
       
+        —
+        
    
+
    Specify the contact email address.
    
+
    
+      
     
    • 
   
     
  • 
@@ -187,12 +207,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
         ng_contact_groups
       
       
-        (Any)
+        (string)
       
       
         (defaults to: undef)
       
       
+        —
+        
    
+
    Specidy the contact group for the contact.
    
+
    
+      
     
    • 
   
 
@@ -205,11 +230,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
         
     
 
-31
-32
-33
-34
-35
 36
 37
 38
@@ -226,10 +246,15 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 49
 50
 51
-52
    
+52
+53
+54
+55
+56
+57
    - 
    # File 'manifests/nagios/objects/add_contact.pp', line 31
+        
    # File 'manifests/nagios/objects/add_contact.pp', line 36
 
 define cd_nagios::nagios::objects::add_contact (
 
@@ -260,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 10e0078..b3b674e 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 833a6c0..63b44d7 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
@@ -230,7 +230,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 fe23f8e..2d1fb1a 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_3Atemplates.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
index 6452b21..29d934c 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
@@ -397,24 +397,6 @@ Valid options are 0 and
       
     
   
-    
  • 
-      
-        ng_failure_prediction_enabled
-      
-      
-        (string)
-      
-      
-      
-        —
-        
    
-
    Whether failure prediction is
-enabled. Valid options are 0 and
-1.
    
-
    
-      
-    
    • 
-  
     
  • 
       
         ng_process_perf_data
@@ -589,22 +571,6 @@ maximal.
    
       
     
    • 
   
-    
  • 
-      
-        ng_check_command
-      
-      
-        (string)
-      
-      
-      
-        —
-        
    
-
    The command to use for host checks.
    
-
    
-      
-    
    • 
-  
     
  • 
       
         ng_notification_options
@@ -808,12 +774,28 @@ until a hard state can be determined.
    
         ng_host_check_command
       
       
-        (Any)
+        (string)
       
       
         (defaults to: 'check-host-alive')
       
       
+        —
+        
    
+
    the check command for host checks
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        
+      
+      
+        (string)
+      
+      
+      
     
    • 
   
 
@@ -826,6 +808,7 @@ until a hard state can be determined.
    
         
     
 
+101
 102
 103
 104
@@ -873,11 +856,10 @@ until a hard state can be determined.
    
 146
 147
 148
-149
-150
    
+149
    
       
       
-        
    # File 'manifests/nagios/objects/templates.pp', line 102
+        
    # File 'manifests/nagios/objects/templates.pp', line 101
 
 define cd_nagios::nagios::objects::templates (
 $ng_template_object               = undef,
@@ -935,7 +917,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 9183481..6dd27fa 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 077ffa6..6341e94 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@