From e03a5d94750b18238c893167ba4125604cf1c596 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Tue, 25 Jul 2017 17:13:25 +0100 Subject: [PATCH 1/2] added parameter documentation --- manifests/nagios/objects/template_rules.pp | 5 ++-- manifests/nagios/objects/templates.pp | 30 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/manifests/nagios/objects/template_rules.pp b/manifests/nagios/objects/template_rules.pp index f802b18..947dc5b 100644 --- a/manifests/nagios/objects/template_rules.pp +++ b/manifests/nagios/objects/template_rules.pp @@ -46,8 +46,9 @@ class cd_nagios::nagios::objects::template_rules ( } # example rule - cd_nagios::objects::templates { $name: - ng_template_object => 'contact', + cd_nagios::objects::templates { 'generic contact': + ng_template_object => 'contact', + ng_template_object_name => 'generic-contact', } } } diff --git a/manifests/nagios/objects/templates.pp b/manifests/nagios/objects/templates.pp index 7c05639..889803a 100644 --- a/manifests/nagios/objects/templates.pp +++ b/manifests/nagios/objects/templates.pp @@ -19,6 +19,36 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # @summary Define manages populates /etc/nagios/conf.d/templates.cfg. +# @param [string] ng_template_object the object type for the templates. +# valid options are `contact`, `host` and `service`. +# @param [string] ng_template_object_name populates the name field, +# i.e. `generic-contact`, `generic-host`, `generic-service`. +# @param [string] ng_svc_notification_period Period in which to send out +# notifications for service events, i.e. `24x7`. +# @param [string] ng_svc_notification_period Period in which to send out +# notifications for host events , i.e. `24x7`. +# @param [string] ng_service_notification_options What service events to send +# out notifications for: +# w = notify on WARNING service states, +# u = notify on UNKNOWN service states, +# c = notify on CRITICAL service states, +# r = notify on service recoveries (OK states), +# f = notify when the service starts and stops flapping. +# n = none (the contact will not receive any type of service notifications). +# @param [string] ng_host_notification_options What host events to send +# out notifications for: +# d = notify on DOWN host states, +# u = notify on UNREACHABLE host states, +# r = notify on host recoveries (UP states), +# f = notify when the host starts and stops flapping, +# s = snotify when host or service scheduled downtime starts and ends. +# n = none (the contact will not receive any type of host notifications). +# @param [string] ng_service_notification_commands Command to use for +# service event notification. Command must be defined in commands.cfg +# @param [string] ng_host_notification_commands Command to use for +# host event notification. Command must be defined in commands.cfg. +# @param [string] ng_object_register Whether to register the object to Nagios. +# Since this is a template definition, we do not want to register those. ################################################################################ define cd_nagios::nagios::objects::templates ( From a3517b81e663a07e7033eb164b7f6d6e88710218 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 25 Jul 2017 18:13:43 +0200 Subject: [PATCH 2/2] recommit for updates in build 91 --- CHANGELOG.md | 35 +++ REPOSTRUCTURE.md | 4 +- doc/_index.html | 2 +- doc/file.README.html | 2 +- doc/index.html | 2 +- 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 +- ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 2 +- ...gios_3A_3Aobjects_3A_3Atemplate_rules.html | 10 +- 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 | 2 +- ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html | 287 ++++++++++++------ .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 23 files changed, 254 insertions(+), 120 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a1a4c2..7e83ede 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,41 @@ Changelog of Git Changelog.

No issue

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

+

recommit for updates in build 90

+ +

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

+

added contact stanza

+ +

+8a97768e4b258d7 Arne Teuke 2017-07-25 15:46:00 +

+

added template concat

+ +

+53e7b9d0b24391e Arne Teuke 2017-07-25 15:39:28 +

+

added template concat

+ +

+f5657930f604a9a Arne Teuke 2017-07-25 15:32:38 +

+

added and linked template_rules

+ +

+633f59375b02f4b Arne Teuke 2017-07-25 15:30:03 +

+

added and linked template_rules

+ +

+0f8cf13c3ea9b4a Arne Teuke 2017-07-25 14:56:52 +

+

linked commands.pp

+ +

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

recommit for updates in build 84

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index b978031..0ed4ca0 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -18,6 +18,7 @@ | | |-- cd_nagios_3A_3Amain_3A_3Ainstall.html | | |-- cd_nagios_3A_3Amain_3A_3Auser.html | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html +| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html | | |-- cd_nagios_3A_3Aparams.html | | |-- cd_nagios_3A_3Aselinux_3A_3Aconfig.html | | |-- cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html @@ -25,6 +26,7 @@ | | |-- cd_nagios_3A_3Aserver_3A_3Aservice.html | | `-- cd_nagios.html | |-- puppet_defined_types +| | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html | | `-- cd_nagios_3A_3Aserver_3A_3Aaccess.html | |-- file.README.html | |-- frames.html @@ -88,4 +90,4 @@ |-- README.md `-- REPOSTRUCTURE.md -20 directories, 68 files +20 directories, 70 files diff --git a/doc/_index.html b/doc/_index.html index aa19c87..de848c9 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -201,7 +201,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 311f07c..455bb3a 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -338,7 +338,7 @@ environments.

diff --git a/doc/index.html b/doc/index.html index 4ff7656..c36ed39 100644 --- a/doc/index.html +++ b/doc/index.html @@ -338,7 +338,7 @@ environments.

diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 7448d1d..f14d582 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 18a63c9..7788d95 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 113dbd5..8e8c18e 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 b619962..6543c5a 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 15ce4a4..0984baa 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 5f43310..364057a 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 2797401..72d021a 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 3ff3271..4963102 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_3Acommands.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html index c7368ea..a7a2c1d 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_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html index d5dcf38..67ce595 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 @@ -169,7 +169,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/. 50 51 52 -53 +53 +54 
# File 'manifests/nagios/objects/template_rules.pp', line 26
@@ -197,8 +198,9 @@ class cd_nagios::nagios::objects::template_rules (
     }
 
     # example rule 
-    cd_nagios::objects::templates { $name:
-      ng_template_object => 'contact',
+    cd_nagios::objects::templates { 'generic contact':
+      ng_template_object      => 'contact',
+      ng_template_object_name =>  'generic-contact',
     }
   }
 }
@@ -209,7 +211,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 2228370..8d7d52b 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -5557,7 +5557,7 @@ $ng_target_command = "${ng_conf_d_dir}/nagios_command.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 09f6d8e..160c13f 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 199c557..a8e0098 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 59e8d77..3eec314 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 38e5f8d..eefeb2f 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -270,7 +270,7 @@ class cd_nagios::server::service ( 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 b3b0604..308433d 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 @@ -121,12 +121,19 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

ng_template_object - (Any) + (string) (defaults to: undef) + — +
+

the object type for the templates. +valid options are contact, +host and service.

+
+
  • @@ -134,12 +141,19 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    ng_template_object_name - (Any) + (string) (defaults to: undef) + — +
    +

    populates the name field, +i.e. generic-contact, +generic-host, generic-service.

    +
    +
  • @@ -147,12 +161,158 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    ng_svc_notification_period - (Any) + (string) (defaults to: '24x7') + — +
    +

    Period in which to send out +notifications for service events, i.e. +24x7.

    +
    + +
    • + +
  • + + ng_svc_notification_period + + + (string) + + + (defaults to: '24x7') + + + — +
    +

    Period in which to send out +notifications for host events , i.e. +24x7.

    +
    + +
    • + +
  • + + ng_service_notification_options + + + (string) + + + (defaults to: 'w,u,c,r,f,s') + + + — +
    +

    What service events to send +out notifications for: +w = notify on WARNING +service states, +u = notify on UNKNOWN service states, +c = notify on +CRITICAL service states, +r = notify on service recoveries (OK states), +f = +notify when the service starts and stops flapping. +n = none (the contact +will not receive any type of service notifications).

    +
    + +
    • + +
  • + + ng_host_notification_options + + + (string) + + + (defaults to: 'd,u,r,f,s') + + + — +
    +

    What host events to send +out notifications for: +d = notify on DOWN host +states, +u = notify on UNREACHABLE host states, +r = notify on host +recoveries (UP states), +f = notify when the host starts and stops +flapping, +s = snotify when host or service scheduled downtime starts and +ends. +n = none (the contact will not receive any type of host +notifications).

    +
    + +
    • + +
  • + + ng_service_notification_commands + + + (string) + + + (defaults to: 'notify-service-by-email') + + + — +
    +

    Command to use for +service event notification. Command must be defined in +commands.cfg

    +
    + +
    • + +
  • + + ng_host_notification_commands + + + (string) + + + (defaults to: 'notify-host-by-email') + + + — +
    +

    Command to use for +host event notification. Command must be defined in +commands.cfg.

    +
    + +
    • + +
  • + + ng_object_register + + + (string) + + + (defaults to: '0') + + + — +
    +

    Whether to register the object to Nagios. +Since this is a template +definition, we do not want to register those.

    +
    +
  • @@ -168,71 +328,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    • -
  • - - ng_service_notification_options - - - (Any) - - - (defaults to: 'w,u,c,r,f,s') - - -
    • - -
  • - - ng_host_notification_options - - - (Any) - - - (defaults to: 'd,u,r,f,s') - - -
    • - -
  • - - ng_service_notification_commands - - - (Any) - - - (defaults to: 'notify-service-by-email') - - -
    • - -
  • - - ng_host_notification_commands - - - (Any) - - - (defaults to: 'notify-host-by-email') - - -
    • - -
  • - - ng_object_register - - - (Any) - - - (defaults to: '0') - - -
    • - @@ -243,35 +338,35 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

     
 
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
    +53 +54 +55 +56 +57 +58 +59 +60 +61 +62 +63 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 - 
    # File 'manifests/nagios/objects/templates.pp', line 23
+        
    # File 'manifests/nagios/objects/templates.pp', line 53
 
 define cd_nagios::nagios::objects::templates (
 
@@ -306,7 +401,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 ec329c8..97dd078 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 2f4cabc..742ac62 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@