@@ -129,7 +130,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
-23
24
25
26
@@ -355,10 +355,11 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
246
247
248
-249
+249
+250
- # File 'manifests/nagios/objects/commands.pp', line 23
+ # File 'manifests/nagios/objects/commands.pp', line 24
class cd_nagios::nagios::objects::commands (
@@ -594,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
new file mode 100644
index 0000000..d5dcf38
--- /dev/null
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
@@ -0,0 +1,219 @@
+
+
+
+
+
+
+ Puppet Class: cd_nagios::nagios::objects::template_rules
+
+ — Documentation by YARD 0.9.9
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Puppet Class: cd_nagios::nagios::objects::template_rules
+
+
+
+ Inherits:
+ cd_nagios::params
+
+
+
+
+ Defined in:
+
+ manifests/nagios/objects/template_rules.pp
+
+
+
+
+
Summary
+ Class manages /etc/nagios/conf.d/templates.cfg through concat.
+
+
Overview
+
+
+
+
cd_nagios::nagios::objects::template_rules.pp
+Module name:
+cd_nagios
+Author: Arne Teuke (arne_teuke@ConfDroid.com)
+
+
License:
+
+
This file is part of cd_nagios.
+
+
cd_nagios is used for providing automatic configuration of Nagios
+
+Copyright (C) 2016 ConfDroid (copyright@ConfDroid.com)
+ This program is
+free software: you can redistribute it and/or modify
+ it under the terms of
+the GNU General Public License as published by
+ the Free Software
+Foundation, either version 3 of the License, or
+ (at your option) any later
+version.
+
+
This program is distributed in the hope that it will be useful,
+ but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License
+for more details.
+
+
You should have received a copy of the GNU General Public License
+ along
+with this program. If not, see www.gnu.org/licenses /.
+ }
+
+
+
+
+
+
+
+
+
+
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+
+
+ # File 'manifests/nagios/objects/template_rules.pp', line 26
+
+class cd_nagios::nagios::objects::template_rules (
+
+) inherits cd_nagios::params {
+
+ if $::fqdn == $ng_nagios_server {
+
+ # create the templates.cfg file
+
+ concat { $ng_target_templates:
+ ensure => present,
+ path => $ng_target_templates,
+ owner => $ng_user,
+ group => $ng_user,
+ mode => '0640',
+ selrange => s0,
+ selrole => object_r,
+ seltype => nagios_etc_t,
+ seluser => system_u,
+ content => template[$ng_templates_head_erb],
+ notify => Service[$ng_service],
+ }
+
+ # example rule
+ cd_nagios::objects::templates { $name:
+ ng_template_object => 'contact',
+ }
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/doc/puppet_classes/cd_nagios_3A_3Aparams.html b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
index 25a71f9..2228370 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -91,6 +91,8 @@
cd_nagios::nagios::objects::commands
+ cd_nagios::nagios::objects::template_rules
+
@@ -5204,7 +5206,8 @@ up
979
980
981
-982
+982
+983
# File 'manifests/params.pp', line 646
@@ -5525,8 +5528,9 @@ $ng_certbot_check = "${ng_certbot_archive}/${ng_webserver_name}/cer
$ng_certbot_live = "${ng_certbot_main_dir}/live"
# nagios
-
$ng_target_templates = "${ng_conf_d_dir}/templates.cfg"
+$ng_templates_head_erb = 'cd_nagios/nagios/templates_cfg_head.erb'
+$ng_templates_rule_erb = 'cd_nagios/nagios/templates_cfg_rule.erb'
$ng_target_timeperiods = "${ng_conf_d_dir}/timeperiods.cfg"
$ng_target_localhost = "${ng_conf_d_dir}/nagios_localhost.cfg"
$ng_target_host = "${ng_conf_d_dir}/nagios_host.cfg"
@@ -5553,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 38bd21a..09f6d8e 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 d959d0e..199c557 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 ec0e8a8..59e8d77 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 4886b7f..38e5f8d 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -191,7 +191,9 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
82
83
84
-85
+85
+86
+87
# File 'manifests/server/service.pp', line 23
@@ -204,6 +206,8 @@ class cd_nagios::server::service (
require cd_nagios::server::files
require cd_nagios::server::access_rules
+ require cd_nagios::nagios::objects::commands
+ require cd_nagios::nagios::objects::template_rules
service { $ng_service:
ensure => running,
@@ -266,7 +270,7 @@ class cd_nagios::server::service (
diff --git a/doc/puppet_defined_type_list.html b/doc/puppet_defined_type_list.html
index 1a1b62b..cf5fe31 100644
--- a/doc/puppet_defined_type_list.html
+++ b/doc/puppet_defined_type_list.html
@@ -40,7 +40,14 @@
-
+
+
+
+
+
+
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
new file mode 100644
index 0000000..b3b0604
--- /dev/null
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
@@ -0,0 +1,316 @@
+
+
+
+
+
+
+ Defined Type: cd_nagios::nagios::objects::templates
+
+ — Documentation by YARD 0.9.9
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Defined Type: cd_nagios::nagios::objects::templates
+
+
+ Defined in:
+
+ manifests/nagios/objects/templates.pp
+
+
+
+
+
Summary
+ Define manages populates /etc/nagios/conf.d/templates.cfg.
+
+
Overview
+
+
+
+
cd_nagios::nagios::objects::templates.pp
+Module name: cd_nagios
+Author:
+Arne Teuke (arne_teuke@ConfDroid.com)
+
+
License:
+
+
This file is part of cd_nagios.
+
+
cd_nagios is used for providing automatic configuration of Nagios
+
+Copyright (C) 2016 ConfDroid (copyright@ConfDroid.com)
+ This program is
+free software: you can redistribute it and/or modify
+ it under the terms of
+the GNU General Public License as published by
+ the Free Software
+Foundation, either version 3 of the License, or
+ (at your option) any later
+version.
+
+
This program is distributed in the hope that it will be useful,
+ but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License
+for more details.
+
+
You should have received a copy of the GNU General Public License
+ along
+with this program. If not, see 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
+
+
+ # File 'manifests/nagios/objects/templates.pp', line 23
+
+define cd_nagios::nagios::objects::templates (
+
+$ng_template_object = undef,
+$ng_template_object_name = undef,
+$ng_svc_notification_period = '24x7',
+$ng_host_notification_period = '24x7',
+$ng_service_notification_options = 'w,u,c,r,f,s',
+$ng_host_notification_options = 'd,u,r,f,s',
+$ng_service_notification_commands = 'notify-service-by-email',
+$ng_host_notification_commands = 'notify-host-by-email',
+$ng_object_register = '0',
+
+) {
+
+$ng_nagios_server = $::cd_nagios::params::ng_nagios_server
+$ng_target_templates = $::cd_nagios::params::ng_target_templates
+$ng_templates_rule_erb = $::cd_nagios::params::ng_templates_rule_erb
+
+ if $::fqdn == $ng_nagios_server {
+
+ concat::fragment { $name:
+ target => $ng_target_templates,
+ content => template($ng_templates_rule_erb),
+ }
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 7bacdd4..ec329c8 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 cee4a67..2f4cabc 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
From a3517b81e663a07e7033eb164b7f6d6e88710218 Mon Sep 17 00:00:00 2001
From: Jenkins Server
Date: Tue, 25 Jul 2017 18:13:43 +0200
Subject: [PATCH 3/5] 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 @@
From 445db500b3ab876c100b4116e25e38bf388d52fb Mon Sep 17 00:00:00 2001
From: Jenkins Server
Date: Tue, 25 Jul 2017 18:15:39 +0200
Subject: [PATCH 4/5] recommit for updates in build 92
---
CHANGELOG.md | 10 ++++++++++
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 +-
doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Adirs.html | 2 +-
.../cd_nagios_3A_3Amain_3A_3Ainstall.html | 2 +-
doc/puppet_classes/cd_nagios_3A_3Amain_3A_3Auser.html | 2 +-
..._nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 2 +-
...s_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html | 2 +-
doc/puppet_classes/cd_nagios_3A_3Aparams.html | 2 +-
.../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +-
.../cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +-
.../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +-
.../cd_nagios_3A_3Aserver_3A_3Aservice.html | 2 +-
...nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html | 10 +++-------
.../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +-
doc/top-level-namespace.html | 2 +-
22 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e83ede..1aa3e04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
No issue
+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
diff --git a/doc/_index.html b/doc/_index.html
index de848c9..6d3e204 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 455bb3a..c8390ba 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 c36ed39..0c88fde 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 f14d582..5a159fc 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 7788d95..718f516 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 8e8c18e..79d4e07 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 6543c5a..65a4529 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 0984baa..f6bc446 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 364057a..f71b1ee 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 72d021a..3b885e8 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 4963102..78755d0 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 a7a2c1d..59ddc93 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 67ce595..fc713bd 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
@@ -211,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 8d7d52b..436d0ea 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 160c13f..48bb1d5 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 a8e0098..a2ad9b2 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 3eec314..faa7045 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 eefeb2f..66952c0 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 308433d..4228bc2 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
@@ -361,19 +361,16 @@ definition, we do not want to register those.
73
74
75
-76
-77
-78
+76
# File 'manifests/nagios/objects/templates.pp', line 53
define cd_nagios::nagios::objects::templates (
-
$ng_template_object = undef,
$ng_template_object_name = undef,
$ng_svc_notification_period = '24x7',
-$ng_host_notification_period = '24x7',
+$ng_host_notification_period = '24x7',
$ng_service_notification_options = 'w,u,c,r,f,s',
$ng_host_notification_options = 'd,u,r,f,s',
$ng_service_notification_commands = 'notify-service-by-email',
@@ -381,7 +378,6 @@ $ng_host_notification_commands = 'notify-host-by-email',
$ng_object_register = '0',
) {
-
$ng_nagios_server = $::cd_nagios::params::ng_nagios_server
$ng_target_templates = $::cd_nagios::params::ng_target_templates
$ng_templates_rule_erb = $::cd_nagios::params::ng_templates_rule_erb
@@ -401,7 +397,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 97dd078..e207eba 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 742ac62..0088636 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
From a23722a67a2afb691ca41038faf5e20602a2cd02 Mon Sep 17 00:00:00 2001
From: Jenkins Server
Date: Tue, 25 Jul 2017 19:56:39 +0200
Subject: [PATCH 5/5] recommit for updates in build 93
---
CHANGELOG.md | 10 +
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 | 75 ++-
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 | 597 +++++++++++++++++-
.../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +-
doc/top-level-namespace.html | 2 +-
22 files changed, 662 insertions(+), 58 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1aa3e04..c06976b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
No issue
+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
diff --git a/doc/_index.html b/doc/_index.html
index 6d3e204..83e59cb 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 c8390ba..078b03e 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 0c88fde..8d3596c 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 5a159fc..612e56f 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 718f516..3d1152f 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 79d4e07..ac6d322 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 65a4529..860d1fc 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 f6bc446..a974abe 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 f71b1ee..29f97e4 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 3b885e8..edd3806 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 78755d0..9a28605 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 59ddc93..d320d4c 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 fc713bd..e4e21b9 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
@@ -115,8 +115,7 @@ for more details.
You should have received a copy of the GNU General Public License
along
with this program. If not, see www.gnu.org/licenses /.
- }
+href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
@@ -127,10 +126,12 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
-
cd_nagios::objects::templates { $name:
+
cd_nagios::nagios::objects::templates { 'generic contact':
- ng_template_object => 'service',
+ ng_template_object => 'contact',
+ng_template_object_name => 'generic-contact',
+}
@@ -142,7 +143,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
-26
27
28
29
@@ -170,10 +170,38 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
51
52
53
-54
+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
+79
+80
+81
+82
- # File 'manifests/nagios/objects/template_rules.pp', line 26
+ # File 'manifests/nagios/objects/template_rules.pp', line 27
class cd_nagios::nagios::objects::template_rules (
@@ -197,11 +225,38 @@ class cd_nagios::nagios::objects::template_rules (
notify => Service[$ng_service],
}
- # example rule
- cd_nagios::objects::templates { 'generic contact':
+ # basic templates
+ cd_nagios::nagios::objects::templates { 'generic contact':
ng_template_object => 'contact',
ng_template_object_name => 'generic-contact',
}
+ cd_nagios::nagios::objects::templates { 'generic-host':
+ ng_template_object => 'host',
+ ng_template_object_name => 'generic-host',
+ }
+ cd_nagios::nagios::objects::templates { 'linux-server':
+ ng_template_object => 'host',
+ ng_template_object_name => 'linux-server',
+ ng_template_object_use => 'generic-host',
+ ng_notification_options => 'd,u,r',
+ }
+ cd_nagios::nagios::objects::templates { 'windows-server':
+ ng_template_object => 'host',
+ ng_template_object_name => 'windows-server',
+ ng_template_object_use => 'generic-host',
+ ng_notification_options => 'd,u,r',
+ }
+ cd_nagios::nagios::objects::templates { 'generic-service':
+ ng_template_object => 'service',
+ ng_template_object_name => 'generic-service',
+ ng_max_check_attempts => '3',
+ ng_notification_options => 'w,u,c,r',
+ }
+ cd_nagios::nagios::objects::templates { 'local-service':
+ ng_template_object => 'service',
+ ng_template_object_name => 'generic-service',
+ ng_max_check_attempts => '4',
+ }
}
}
@@ -211,7 +266,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 436d0ea..e8aabb4 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 48bb1d5..f6eed7a 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 a2ad9b2..6100b63 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 faa7045..e20de0b 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 66952c0..755f07d 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 4228bc2..5379fda 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
@@ -108,7 +108,9 @@ for more details.
You should have received a copy of the GNU General Public License
along
with this program. If not, see www.gnu.org/licenses /.
+href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
+notifications.
+for the defined service or host.
@@ -130,7 +132,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
—