From 645cb4255af90d57fec4bf7cc692d562f0856e6e Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 27 Jul 2017 14:33:00 +0100 Subject: [PATCH] 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':