From b4b3de53a39ef006355c372187f8c75b4deda894 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 25 Jul 2017 16:48:58 +0200 Subject: [PATCH 01/25] recommit for updates in build 84 --- CHANGELOG.md | 80 +++ REPOSTRUCTURE.md | 5 +- doc/_index.html | 7 +- doc/file.README.html | 21 +- doc/index.html | 21 +- doc/puppet_class_list.html | 17 +- 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 | 604 ++++++++++++++++++ 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 | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 22 files changed, 745 insertions(+), 42 deletions(-) create mode 100644 doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 08f8a3a..68b6dc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,86 @@ Changelog of Git Changelog.

No issue

+4ae4a056901361a Jenkins Server 2017-07-25 14:34:30 +

+

recommit for updates in build 83

+ +

+f2a243b7c28f935 Arne Teuke 2017-07-25 14:34:14 +

+

checked and documented all parameters, fixed template syntaxes

+ +

+66d7dbd91cffae4 Arne Teuke 2017-07-25 14:28:08 +

+

template syntax

+ +

+d57274747a8e494 Arne Teuke 2017-07-25 14:25:50 +

+

template syntax

+ +

+e8dc9c43f2a4929 Arne Teuke 2017-07-25 14:24:34 +

+

template syntax

+ +

+b59eff871f3c507 Arne Teuke 2017-07-25 14:23:29 +

+

template syntax

+ +

+616d0c3e9fb58b2 Arne Teuke 2017-07-25 14:21:38 +

+

template syntax

+ +

+a902f3441b0341f Arne Teuke 2017-07-25 14:15:07 +

+

template syntax

+ +

+c00ece4cb6c8f90 Arne Teuke 2017-07-25 14:13:38 +

+

template syntax

+ +

+f853a7b923a54d3 Arne Teuke 2017-07-25 14:11:16 +

+

template syntax

+ +

+1c83a1e829005c2 Arne Teuke 2017-07-25 14:09:51 +

+

template syntax

+ +

+bd7822710c44a07 Arne Teuke 2017-07-25 14:06:56 +

+

template syntax

+ +

+3ef1c7d9c75f229 Arne Teuke 2017-07-25 14:05:13 +

+

template syntax

+ +

+9571dc875b0362e Arne Teuke 2017-07-25 14:01:26 +

+

template syntax

+ +

+12e671b3419dd2a Arne Teuke 2017-07-25 13:58:36 +

+

template syntax

+ +

+86d4dd1db69fd1a Arne Teuke 2017-07-25 13:50:33 +

+

finished params for nagios.cfg

+ +

449f2f7825b0d88 Jenkins Server 2017-07-24 15:25:38

recommit for updates in build 68

diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index acf8c42..9261220 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -44,6 +44,9 @@ | | |-- dirs.pp | | |-- install.pp | | `-- user.pp +| |-- nagios +| | `-- objects +| | `-- commands.pp | |-- selinux | | `-- config.pp | |-- server @@ -79,4 +82,4 @@ |-- README.md `-- REPOSTRUCTURE.md -18 directories, 61 files +20 directories, 62 files diff --git a/doc/_index.html b/doc/_index.html index 448e55a..64f9fc8 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -108,6 +108,11 @@ +
  • + cd_nagios::nagios::objects::commands + +
    • +
  • cd_nagios::params @@ -186,7 +191,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 8fe3fb3..48d09e9 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -141,17 +141,18 @@ directories (filesystem permissions, selinux ) * manage cgi.cfg through parameters * manage nagios.cfg through parameters -* manage nagios users +* manage Nagios users through external Puppet rules via define -* configure NRPE on clients +* manage Nagios commands through +Puppet exports +* configure NRPE on clients (optional) +* configure firewall (optional) -* configure firewall (optional) -* configure selinux policies -(optional) -* configure forwarding http to https including accesing the -/nagios url directly (optional) -* manage TLS certificates through certbot -(optional)

    +* configure selinux policies (optional) +* configure forwarding +http to https including accesing the /nagios url directly (optional) +* +manage TLS certificates through certbot (optional)

    Service * manage Nagios service on server @@ -337,7 +338,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index 3877d07..8d6b073 100644 --- a/doc/index.html +++ b/doc/index.html @@ -141,17 +141,18 @@ directories (filesystem permissions, selinux ) * manage cgi.cfg through parameters * manage nagios.cfg through parameters -* manage nagios users +* manage Nagios users through external Puppet rules via define -* configure NRPE on clients +* manage Nagios commands through +Puppet exports +* configure NRPE on clients (optional) +* configure firewall (optional) -* configure firewall (optional) -* configure selinux policies -(optional) -* configure forwarding http to https including accesing the -/nagios url directly (optional) -* manage TLS certificates through certbot -(optional)

    +* configure selinux policies (optional) +* configure forwarding +http to https including accesing the /nagios url directly (optional) +* +manage TLS certificates through certbot (optional)

    Service * manage Nagios service on server @@ -337,7 +338,7 @@ environments.

    diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index 53a29cd..79b0b3c 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -96,35 +96,42 @@
    • -
  • +
  • +
    + cd_nagios::nagios::objects::commands +
    +
    • + + +
  • cd_nagios::params
    • -
  • +
  • cd_nagios::selinux::config
    • -
  • +
  • cd_nagios::server::access_rules
    • -
  • +
  • cd_nagios::server::files
    • -
  • +
  • cd_nagios::server::service
    diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 1127305..f1c943f 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 a545981..c035721 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 2a5bdc3..27890a0 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 fce13b4..f1ad5b9 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 c5f144a..30e3a93 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 fcd68d0..110c7f2 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 0b67770..0a24015 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 35d9e5a..7899f32 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 new file mode 100644 index 0000000..bc907ec --- /dev/null +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html @@ -0,0 +1,604 @@ + + + + + + + Puppet Class: cd_nagios::nagios::objects::commands + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    + + +

    Puppet Class: cd_nagios::nagios::objects::commands

    +
    + +
    +
    Inherits:
    +
    cd_nagios::params
    +
    + + +
    +
    Defined in:
    +
    + manifests/nagios/objects/commands.pp +
    +
    +
    + +

    Summary

    + Class manages all configuration files required for cd_nagios. + +

    Overview

    +
    +
    + +

    cd_nagios::nagios::objects::commands.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
+49
+50
+51
+52
+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
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169
+170
+171
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
+200
+201
+202
+203
+204
+205
+206
+207
+208
+209
+210
+211
+212
+213
+214
+215
+216
+217
+218
+219
+220
+221
+222
+223
+224
+225
+226
+227
+228
+229
+230
+231
+232
+233
+234
+235
+236
+237
+238
+239
+240
+241
+242
+243
+244
+245
+246
+247
+248
+249
    +     		+ 
    # File 'manifests/nagios/objects/commands.pp', line 23
+
+class cd_nagios::nagios::objects::commands (
+
+) inherits cd_nagios::params {
+
+  require cd_nagios::main::install
+
+  @@nagios_command { 'notify-host-by-email':
+    ensure        =>  present,
+    command_name  =>  'notify-host-by-email',
+    command_line  =>  '/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTADDRESS$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /bin/mail -s "** $NOTIFICATIONTYPE$ Host Alert: $HOSTADDRESS$ is $HOSTSTATE$ **" $CONTACTEMAIL$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'notify-service-by-email':
+    ensure        =>  present,
+    command_name  =>  'notify-service-by-email',
+    command_line  =>  '/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$\n" | /bin/mail -s "** $NOTIFICATIONTYPE$ Service Alert: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check-host-alive':
+    ensure        =>  present,
+    command_name  =>  'check-host-alive',
+    command_line  =>  '$USER1$/check_ping -H $HOSTADDRESS$ -w 3000.0,80% -c 5000.0,100% -p 5',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_disk':
+    ensure        =>  present,
+    command_name  =>  'check_disk',
+    command_line  =>  '$USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_local_load':
+    ensure        =>  present,
+    command_name  =>  'check_local_load',
+    command_line  =>  '$USER1$/check_load -w $ARG1$ -c $ARG2$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_local_procs':
+    ensure        =>  present,
+    command_name  =>  'check_local_procs',
+    command_line  =>  '$USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_local_users':
+    ensure        =>  present,
+    command_name  =>  'check_local_users',
+    command_line  =>  '$USER1$/check_users -w $ARG1$ -c $ARG2$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_local_swap':
+    ensure        =>  present,
+    command_name  =>  'check_local_swap',
+    command_line  =>  '$USER1$/check_swap -w $ARG1$ -c $ARG2$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_ftp':
+    ensure        =>  present,
+    command_name  =>  'check_ftp',
+    command_line  =>  '$USER1$/check_ftp -H $HOSTADDRESS$ $ARG1$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_snmp':
+    ensure        =>  present,
+    command_name  =>  'check_snmp',
+    command_line  =>  '$USER1$/check_snmp -H $HOSTADDRESS$ $ARG1$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_http':
+    ensure        =>  present,
+    command_name  =>  'check_http',
+    command_line  =>  '$USER1$/check_http -I $HOSTADDRESS$ $ARG1$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_ssh':
+    ensure        =>  present,
+    command_name  =>  'check_ssh',
+    command_line  =>  '$USER1$/check_ssh $ARG1$ $HOSTADDRESS$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_ping':
+    ensure        =>  present,
+    command_name  =>  'check_ping',
+    command_line  =>  '$USER1$/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_tcp':
+    ensure        =>  present,
+    command_name  =>  'check_tcp',
+    command_line  =>  '$USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_udp':
+    ensure        =>  present,
+    command_name  =>  'check_udp',
+    command_line  =>  '$USER1$/check_udp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_nrpe':
+    ensure        =>  present,
+    command_name  =>  'check_nrpe',
+    command_line  =>  '$USER1$/check_nrpe -t 30 -H $HOSTADDRESS$ -c $ARG1$  -a $ARG2$ $ARG3$ $ARG4$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_nagios':
+    ensure        =>  present,
+    command_name  =>  'check_nagios',
+    command_line  =>  '$USER1$/check_nagios -F $ARG1$ -e $ARG2$ -C $ARG3$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'check_bandwidth':
+    ensure        =>  present,
+    command_name  =>  'check_bandwidth',
+    command_line  =>  '$USER1$/check_bandwidth.sh -t 30 -H $HOSTADDRESS$ linux  $ARG1$  $ARG2$ $ARG3$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command  { 'check_jenkins_api':
+    ensure        =>  present,
+    command_name  =>  'check_jenkins_api',
+    command_line  =>  '$USER1$/check_http -H $HOSTADDRESS$ -u /api/xml?depth=0 -R quietingDown.false $ARG1$ $ARG2$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+
+  @@nagios_command { 'process-service-perfdata-file':
+    ensure        =>  present,
+    command_name  =>  'process-service-perfdata-file',
+    command_line  =>  '/bin/mv /var/log/pnp4nagios/service-perfdata /var/spool/pnp4nagios/service-perfdata.$TIMET$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command { 'process-host-perfdata-file':
+    ensure        =>  present,
+    command_name  =>  'process-host-perfdata-file',
+    command_line  =>  '/bin/mv /var/log/pnp4nagios/host-perfdata /var/spool/pnp4nagios/host-perfdata.$TIMET$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+
+  @@nagios_command {  'check_ntp_time':
+    ensure        =>  present,
+    command_name  =>  'check_ntp_time',
+    command_line  =>  '$USER1$/check_ntp_time -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$',
+    owner         =>  'nagios',
+    group         =>  'nagios',
+    mode          =>  '0640',
+    target        =>  $ng_target_command,
+  }
+}
    +
    +
    +
    + + + +
    + + \ 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 bf9b17e..25a71f9 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -89,6 +89,8 @@ cd_nagios::server::access_rules
    + cd_nagios::nagios::objects::commands
    + @@ -5551,7 +5553,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 519d67e..38bd21a 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 e984ea0..d959d0e 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 dc045f4..ec0e8a8 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 235aa00..4886b7f 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -266,7 +266,7 @@ class cd_nagios::server::service ( 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 f4134cf..7bacdd4 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 bcc5013..cee4a67 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From cc2d2cbf2968ccecb7576b9312a9ec8cdf726f4d Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 25 Jul 2017 17:57:28 +0200 Subject: [PATCH 02/25] recommit for updates in build 90 --- CHANGELOG.md | 10 + REPOSTRUCTURE.md | 12 +- doc/_index.html | 12 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_class_list.html | 17 +- 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 | 11 +- ...gios_3A_3Aobjects_3A_3Atemplate_rules.html | 219 ++++++++++++ doc/puppet_classes/cd_nagios_3A_3Aparams.html | 10 +- .../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 | 8 +- doc/puppet_defined_type_list.html | 9 +- ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html | 316 ++++++++++++++++++ .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 25 files changed, 619 insertions(+), 35 deletions(-) create mode 100644 doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html create mode 100644 doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 68b6dc2..2a1a4c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

    No issue

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

    +

    recommit for updates in build 84

    + +

    +3327f6d8692753b Arne Teuke 2017-07-25 14:48:39 +

    +

    added commands.pp

    + +

    4ae4a056901361a Jenkins Server 2017-07-25 14:34:30

    recommit for updates in build 83

    diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 9261220..b978031 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -17,6 +17,7 @@ | | |-- cd_nagios_3A_3Amain_3A_3Adirs.html | | |-- 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_3Aparams.html | | |-- cd_nagios_3A_3Aselinux_3A_3Aconfig.html | | |-- cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html @@ -46,7 +47,9 @@ | | `-- user.pp | |-- nagios | | `-- objects -| | `-- commands.pp +| | |-- commands.pp +| | |-- template_rules.pp +| | `-- templates.pp | |-- selinux | | `-- config.pp | |-- server @@ -68,7 +71,10 @@ | |-- nagios | | |-- cgi_cfg.erb | | |-- htpasswd_rule.erb -| | `-- nagios_cfg.erb +| | |-- nagios_cfg.erb +| | |-- templates_cfg.erb +| | |-- templates_cfg_head.erb +| | `-- templates_cfg_rule.erb | `-- selinux | |-- statuscgi.erb | `-- taccgi.erb @@ -82,4 +88,4 @@ |-- README.md `-- REPOSTRUCTURE.md -20 directories, 62 files +20 directories, 68 files diff --git a/doc/_index.html b/doc/_index.html index 64f9fc8..aa19c87 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -113,6 +113,11 @@
    • +
  • + cd_nagios::nagios::objects::template_rules + +
    • +
  • cd_nagios::params @@ -158,6 +163,11 @@
  • C
    • @@ -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 04/25] 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 05/25] 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/.
    
         —
         
    
 
    the object type for the templates.
-valid options are contact,
+Valid options are contact,
 host and service.
    
 
    
       
@@ -247,7 +249,7 @@ 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
+s = notify when host or service scheduled downtime starts and
 ends.
 n = none (the contact will not receive any type of host
 notifications).
    
@@ -315,6 +317,478 @@ definition, we do not want to register those.
    
       
     
   
+    
  • 
+      
+        ng_template_object_use
+      
+      
+        (string)
+      
+      
+        (defaults to: undef)
+      
+      
+        —
+        
    
+
    Which template to use for a given
+host or service definition, i.e.
+generic-host, generic-service etc.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_notifications_enabled
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether notifications are enabled.
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_event_handler_enabled
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether event handlers are enabled.
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_flap_detection_enabled
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether flap detection is enabled.
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_failure_prediction_enabled
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether failure prediction is
+enabled. Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_process_perf_data
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether to process performance data.
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_retain_status_information
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether to retain status
+information. Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_retain_nonstatus_information
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether to retain non-status
+information. Valid options are 0
+and 1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_notification_period
+      
+      
+        (string)
+      
+      
+        (defaults to: '24x7')
+      
+      
+        —
+        
    
+
    Which period in to send out
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_notification_interval
+      
+      
+        (string)
+      
+      
+        (defaults to: '30')
+      
+      
+        —
+        
    
+
    Whoe often (in minutes) we should
+resend notifications for the current
+status.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_check_period
+      
+      
+        (string)
+      
+      
+        (defaults to: '24x7')
+      
+      
+        —
+        
    
+
    Which period in to run checks for the defined
+object.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_check_interval
+      
+      
+        (string)
+      
+      
+        (defaults to: '5')
+      
+      
+        —
+        
    
+
    How often in minutes to check the defined
+object.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_retry_interval
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    at what interval in minutes to schedule
+retries for the defined object.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_max_check_attempts
+      
+      
+        (string)
+      
+      
+        (defaults to: '10')
+      
+      
+        —
+        
    
+
    how often to check the defined object
+maximal.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_notification_options
+      
+      
+        (string)
+      
+      
+        (defaults to: undef)
+      
+      
+        —
+        
    
+
    see ng_service_notification_options
+and
+ng_host_notification_options.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_contact_groups
+      
+      
+        (string)
+      
+      
+        (defaults to: 'admins')
+      
+      
+        —
+        
    
+
    contact groups for the defined oject.
+Specified contact group must exit in
+contact_groups
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_active_checks_enabled
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether to enable active checks.
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_passive_checks_enabled
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether to enable passive checks.
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_parallelize_check
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether to parallelize checks
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_obsess_over_service
+      
+      
+        (string)
+      
+      
+        (defaults to: '1')
+      
+      
+        —
+        
    
+
    Whether to obsess over the service.
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_check_freshness
+      
+      
+        (string)
+      
+      
+        (defaults to: '0')
+      
+      
+        —
+        
    
+
    Whether to check freshness.
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_is_volatile
+      
+      
+        (string)
+      
+      
+        (defaults to: '0')
+      
+      
+        —
+        
    
+
    Whether the service is volatile.
+Valid options are 0 and
+1.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_normal_check_interval
+      
+      
+        (string)
+      
+      
+        (defaults to: '10')
+      
+      
+        —
+        
    
+
    How often to check the service
+under normal conditions.
    
+
    
+      
+    
    • 
+  
+    
  • 
+      
+        ng_retry_check_interval
+      
+      
+        (string)
+      
+      
+        (defaults to: '2')
+      
+      
+        —
+        
    
+
    Re-check the service every x minutes
+until a hard state can be determined.
    
+
    
+      
+    
    • 
+  
     
  • 
       
         ng_host_notification_period
@@ -328,6 +802,19 @@ definition, we do not want to register those.
    
       
     
    • 
   
+    
  • 
+      
+        ng_check_command
+      
+      
+        (Any)
+      
+      
+        (defaults to: 'check-host-alive')
+      
+      
+    
    • 
+  
 
 
 
@@ -338,33 +825,59 @@ definition, we do not want to register those.
    
         
     
 
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
    
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
    - 
    # File 'manifests/nagios/objects/templates.pp', line 53
+        
    # File 'manifests/nagios/objects/templates.pp', line 101
 
 define cd_nagios::nagios::objects::templates (
 $ng_template_object               = undef,
@@ -376,6 +889,32 @@ $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_template_object_use           = undef,
+$ng_notifications_enabled         = '1',
+$ng_event_handler_enabled         = '1',
+$ng_flap_detection_enabled        = '1',
+$ng_failure_prediction_enabled    = '1',
+$ng_process_perf_data             = '1',
+$ng_retain_status_information     = '1',
+$ng_retain_nonstatus_information  = '1',
+$ng_notification_period           = '24x7',
+$ng_notification_interval         = '30',
+$ng_check_period                  = '24x7',
+$ng_check_interval                = '5',
+$ng_retry_interval                = '1',
+$ng_max_check_attempts            = '10',
+$ng_check_command                 = 'check-host-alive',
+$ng_notification_options          = undef,
+$ng_contact_groups                = 'admins',
+$ng_active_checks_enabled         = '1',
+$ng_passive_checks_enabled        = '1',
+$ng_parallelize_check             = '1',
+$ng_obsess_over_service           = '1',
+$ng_check_freshness               = '0',
+$ng_is_volatile                   = '0',
+$ng_normal_check_interval         = '10',
+$ng_retry_check_interval          = '2',
+
 
 ) {
 $ng_nagios_server       = $::cd_nagios::params::ng_nagios_server
@@ -397,7 +936,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 e207eba..84b7fad 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 0088636..22cdb75 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From 62feddee64c23f95a3d750675b49cdd410a100a1 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Tue, 25 Jul 2017 20:04:08 +0200
Subject: [PATCH 06/25] recommit for updates in build 96

---
 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 | 42 +++++++++++++++++--
 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 |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |  2 +-
 doc/top-level-namespace.html                  |  2 +-
 22 files changed, 69 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c06976b..6971968 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+a23722a67a2afb6 Jenkins Server 2017-07-25 17:56:39
+
    
+
    recommit for updates in build 93
    
+
+
    
+a04f079a6cbeec8 Arne Teuke 2017-07-25 17:56:18
+
    
+
    testing templates
    
+
+
    
 445db500b3ab876 Jenkins Server 2017-07-25 16:15:39
 
    
 
    recommit for updates in build 92
    
diff --git a/doc/_index.html b/doc/_index.html
index 83e59cb..64a6a02 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 078b03e..847e1e1 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 8d3596c..43a545d 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 612e56f..d3f995c 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 3d1152f..8b06151 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 ac6d322..72934df 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 860d1fc..0781ded 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 a974abe..27c2b69 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 29f97e4..a05034f 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 edd3806..4ec13a9 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 9a28605..75db801 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 d320d4c..4c5f71c 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 e4e21b9..9784b65 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
@@ -198,7 +198,25 @@ ng_template_object_name =>  'generic-contact',
 79
 80
 81
-82
    
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
    # File 'manifests/nagios/objects/template_rules.pp', line 27
@@ -221,10 +239,16 @@ class cd_nagios::nagios::objects::template_rules (
       selrole   =>  object_r,
       seltype   =>  nagios_etc_t,
       seluser   =>  system_u,
-      content   =>  template[$ng_templates_head_erb],
       notify    =>  Service[$ng_service],
     }
 
+  concat::fragment { 'header':
+    target    =>  $ng_target_templates,
+    content   =>  template($ng_templates_head_erb),
+    order     =>  '000',
+    }
+
+
     # basic templates
     cd_nagios::nagios::objects::templates { 'generic contact':
       ng_template_object      => 'contact',
@@ -246,6 +270,18 @@ class cd_nagios::nagios::objects::template_rules (
       ng_template_object_use  =>  'generic-host',
       ng_notification_options =>  'd,u,r',
     }
+    cd_nagios::nagios::objects::templates { 'generic-switch':
+      ng_template_object      =>  'host',
+      ng_template_object_name =>  'generic-switch',
+      ng_template_object_use  =>  'generic-host',
+      ng_notification_options =>  'd,u,r',
+    }
+    cd_nagios::nagios::objects::templates { 'generic-printer':
+      ng_template_object      =>  'host',
+      ng_template_object_name =>  'generic-printer',
+      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',
@@ -266,7 +302,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 e8aabb4..8b7de87 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 f6eed7a..a7b27c0 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 6100b63..461c1a9 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 e20de0b..948a9c2 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 755f07d..c4b28b2 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 5379fda..ac06627 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
@@ -936,7 +936,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 84b7fad..ba71a9b 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 22cdb75..5554661 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From d395b5f60d08f612b779bf9c92184ed750fa51a6 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Wed, 26 Jul 2017 13:16:49 +0200
Subject: [PATCH 07/25] recommit for updates in build 97

---
 CHANGELOG.md                                  |  15 +
 REPOSTRUCTURE.md                              |  10 +-
 doc/_index.html                               |  22 +-
 doc/file.README.html                          |  32 +-
 doc/index.html                                |  32 +-
 doc/puppet_class_list.html                    |  35 ++-
 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 | 238 ++++++++++++++
 ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html |   2 +-
 ..._3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | 174 +++++++++++
 ...A_3Anagios_3A_3Aobjects_3A_3Acontacts.html | 290 ++++++++++++++++++
 ...gios_3A_3Aobjects_3A_3Atemplate_rules.html |  11 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html |  20 +-
 .../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   |   8 +-
 doc/puppet_defined_type_list.html             |  11 +-
 ...Anagios_3A_3Aobjects_3A_3Aadd_contact.html | 235 ++++++++++++++
 ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html |  43 ++-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |   2 +-
 doc/top-level-namespace.html                  |   2 +-
 29 files changed, 1124 insertions(+), 80 deletions(-)
 create mode 100644 doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html
 create mode 100644 doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html
 create mode 100644 doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html
 create mode 100644 doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6971968..215c319 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,21 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+62feddee64c23f9 Jenkins Server 2017-07-25 18:04:08
+
    
+
    recommit for updates in build 96
    
+
+
    
+099828e47a377d2 Arne Teuke 2017-07-25 18:02:29
+
    
+
    testing templates
    
+
+
    
+336e03f6090e222 Arne Teuke 2017-07-25 18:01:03
+
    
+
    testing templates
    
+
+
    
 a23722a67a2afb6 Jenkins Server 2017-07-25 17:56:39
 
    
 
    recommit for updates in build 93
    
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index 0ed4ca0..d3de3ff 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -49,7 +49,11 @@
 |   |   `-- user.pp
 |   |-- nagios
 |   |   `-- objects
+|   |       |-- add_contact.pp
+|   |       |-- add_contact_rules.pp
 |   |       |-- commands.pp
+|   |       |-- config.pp
+|   |       |-- contacts.pp
 |   |       |-- template_rules.pp
 |   |       `-- templates.pp
 |   |-- selinux
@@ -72,9 +76,11 @@
 |   |   `-- nagios_ssl_vhost.erb
 |   |-- nagios
 |   |   |-- cgi_cfg.erb
+|   |   |-- contacts_cfg.erb
+|   |   |-- contacts_cfg_head.erb
+|   |   |-- contacts_cfg_rule.erb
 |   |   |-- htpasswd_rule.erb
 |   |   |-- nagios_cfg.erb
-|   |   |-- templates_cfg.erb
 |   |   |-- templates_cfg_head.erb
 |   |   `-- templates_cfg_rule.erb
 |   `-- selinux
@@ -90,4 +96,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-20 directories, 70 files
+20 directories, 76 files
diff --git a/doc/_index.html b/doc/_index.html
index 64a6a02..04af5c1 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -108,11 +108,26 @@
       
             
     
+            
  • 
+      cd_nagios::nagios::objects::add_contact_rules
+      
+            
    • 
+    
             
  • 
       cd_nagios::nagios::objects::commands
       
             
    • 
     
+            
  • 
+      cd_nagios::nagios::objects::config
+      
+            
    • 
+    
+            
  • 
+      cd_nagios::nagios::objects::contacts
+      
+            
    • 
+    
             
  • 
       cd_nagios::nagios::objects::template_rules
       
@@ -163,6 +178,11 @@
         
  • C
    • 
           
      
     
+            
    • 
+      cd_nagios::nagios::objects::add_contact
+      
+            
      • 
+    
             
    • 
       cd_nagios::nagios::objects::templates
       
@@ -201,7 +221,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index 847e1e1..41ad619 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -145,14 +145,20 @@ parameters
 through external Puppet rules via define
 * manage Nagios commands through
 Puppet exports
-* configure NRPE on clients (optional)
-* configure firewall
-(optional)
-* configure selinux policies (optional)
-* configure forwarding
-http to https including accesing the /nagios url directly (optional)
-*
-manage TLS certificates through certbot (optional)
      
+* manage Nagios template definitions through external Puppet
+rules via define
+* manage Nagios main contacts through Puppet exports.
+Additional contacts can be created through external Puppet rules via
+define, to avoid having to alter the module code.
+* configure NRPE on
+clients (optional)
+* configure firewall (optional)
+* configure selinux
+policies (optional)
+* configure forwarding http to https including accesing
+the /nagios url directly (optional)
+* manage TLS certificates through
+certbot (optional)
      
 
 
      Service
 * manage Nagios service on server
@@ -184,6 +190,14 @@ for selinux policy adjustments
      
 
    • 
 
      cd_certbot
 to auto-manage TLS certificates (optional)
      
+
    • 
+
      cd_stdlib or
+puppetlabs
+stdlib to facilitate concat
      
+
    • 
+
      cd-concat or
+puppetlabs
+concat to concatenate configuration files from different sources.
      
 
    
 
 
    Deployment
    
@@ -338,7 +352,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index 43a545d..8873d0e 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -145,14 +145,20 @@ parameters
 through external Puppet rules via define
 * manage Nagios commands through
 Puppet exports
-* configure NRPE on clients (optional)
-* configure firewall
-(optional)
-* configure selinux policies (optional)
-* configure forwarding
-http to https including accesing the /nagios url directly (optional)
-*
-manage TLS certificates through certbot (optional)
    
+* manage Nagios template definitions through external Puppet
+rules via define
+* manage Nagios main contacts through Puppet exports.
+Additional contacts can be created through external Puppet rules via
+define, to avoid having to alter the module code.
+* configure NRPE on
+clients (optional)
+* configure firewall (optional)
+* configure selinux
+policies (optional)
+* configure forwarding http to https including accesing
+the /nagios url directly (optional)
+* manage TLS certificates through
+certbot (optional)
    
 
 
    Service
 * manage Nagios service on server
@@ -184,6 +190,14 @@ for selinux policy adjustments
    
 
  • 
 
    cd_certbot
 to auto-manage TLS certificates (optional)
    
+
  • 
+
    cd_stdlib or
+puppetlabs
+stdlib to facilitate concat
    
+
  • 
+
    cd-concat or
+puppetlabs
+concat to concatenate configuration files from different sources.
    
 
    • 
 
 
    Deployment
    
@@ -338,7 +352,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html
index 4a0751b..ef22ac1 100644
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -96,49 +96,70 @@
     
     
 
-    
  • 
+    
  • 
+      
    
+        cd_nagios::nagios::objects::add_contact_rules
+      
    
+    
    • 
+    
+
+    
  • 
       
    
         cd_nagios::nagios::objects::commands
       
    
     
    • 
     
 
-    
  • 
+    
  • 
+      
    
+        cd_nagios::nagios::objects::config
+      
    
+    
    • 
+    
+
+    
  • 
+      
    
+        cd_nagios::nagios::objects::contacts
+      
    
+    
    • 
+    
+
+    
  • 
       
    
         cd_nagios::nagios::objects::template_rules
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::params
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::selinux::config
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::server::access_rules
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::server::files
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::server::service
       
    
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index d3f995c..0b79a94 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 8b06151..bcd384a 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 72934df..6d6a6b6 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 0781ded..4155ac2 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 27c2b69..50981cb 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 a05034f..cba2537 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 4ec13a9..64bc256 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 75db801..e38567e 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
new file mode 100644
index 0000000..4e4fe93
--- /dev/null
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html
@@ -0,0 +1,238 @@
+
+
+  
+    
+
+
+  Puppet Class: cd_nagios::nagios::objects::add_contact_rules
+  
+    — Documentation by YARD 0.9.9
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Puppet Class: cd_nagios::nagios::objects::add_contact_rules
    
+
    
+  
+  
    
+    
    Inherits:
    
+    
    cd_nagios::params
    
+  
    
+  
+  
+  
    
+    
    Defined in:
    
+    
    
+      manifests/nagios/objects/add_contact_rules.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  Class manages /etc/nagios/conf.d/nagios_add_contact.cfg through
+concat.
+
+
    Overview
    
+
    
+  
    
+    
+
    cd_nagios::nagios::objects::add_contact_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/.
+cd_nagios::nagios::objects::add_contact
+{ 'example_user':
+ ng_contact_name => 'example_user',
+
+ng_contact_alias => 'Example User',
+ ng_contact_groups =>
+'admins',
+ ng_contact_email => 'example@example.net',
+ }
    
+
+  
    
+
    
+
    
+  
+
+
    
+  
+    
+      
+      
+    
+  
    
+        
    +
+
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
    
+          		
+        
    # File 'manifests/nagios/objects/add_contact_rules.pp', line 31
+
+class cd_nagios::nagios::objects::add_contact_rules (
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    # manage /etc/nagios/conf.d/nagios_add_contacts.cfg
+
+    concat { $ng_target_add_contact:
+      ensure    =>  present,
+      path      =>  $ng_target_add_contact,
+      owner     =>  $ng_user,
+      group     =>  $ng_user,
+      mode      =>  '0640',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  nagios_etc_t,
+      seluser   =>  system_u,
+      notify    =>  Service[$ng_service],
+    }
+
+    # manage file header
+
+    concat::fragment { 'header':
+      target    =>  $ng_target_add_contact,
+      content   =>  template($ng_contacts_head_erb),
+      order     =>  '000',
+    }
+
+    # example rule for testing
+
+    cd_nagios::nagios::objects::add_contact { 'example_user':
+      ng_contact_name   =>  'example_user',
+      ng_contact_alias  =>  'Example User',
+      ng_contact_groups =>  'admins',
+      ng_contact_email  =>  'example@example.net',
+    }
+  }
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file
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 4c5f71c..b6d49bd 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
new file mode 100644
index 0000000..455ab7e
--- /dev/null
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html
@@ -0,0 +1,174 @@
+
+
+  
+    
+
+
+  Puppet Class: cd_nagios::nagios::objects::config
+  
+    — Documentation by YARD 0.9.9
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Puppet Class: cd_nagios::nagios::objects::config
    
+
    
+  
+  
    
+    
    Inherits:
    
+    
    cd_nagios::params
    
+  
    
+  
+  
+  
    
+    
    Defined in:
    
+    
    
+      manifests/nagios/objects/config.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  Class manages the nagios objects definitions.
+
+
    Overview
    
+
    
+  
    
+    
+
    cd_nagios::server::nagios::objects::config.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
    
+          		
+        
    # File 'manifests/nagios/objects/config.pp', line 23
+
+class cd_nagios::nagios::objects::config (
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    require cd_nagios::nagios::objects::commands
+    require cd_nagios::nagios::objects::template_rules
+    require cd_nagios::nagios::objects::add_contact_rules
+
+  }
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file
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
new file mode 100644
index 0000000..c6e9de2
--- /dev/null
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html
@@ -0,0 +1,290 @@
+
+
+  
+    
+
+
+  Puppet Class: cd_nagios::nagios::objects::contacts
+  
+    — Documentation by YARD 0.9.9
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Puppet Class: cd_nagios::nagios::objects::contacts
    
+
    
+  
+  
    
+    
    Inherits:
    
+    
    cd_nagios::params
    
+  
    
+  
+  
+  
    
+    
    Defined in:
    
+    
    
+      manifests/nagios/objects/contacts.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  Class manages basic contacts known to NAGIOS through Puppet exports,
+and populates /etc/nagios/conf.d/nagios_base_contacts.cfg.
+
+
    Overview
    
+
    
+  
    
+    
+
    cd_nagios::nagios::objects::contacts.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/.
    
+
+  
    
+
    
+
    
+  
+  
    
+    
    Examples:
    
+    
+      
+      
    @@nagios_contact { 'admin':
+  ensure              =>  present,
+  alias               =>  'Nagios Admin',
+  contact_name        =>  'admin',
+  contactgroups       =>  'admins',
+  email               =>  "admin@${::domain}",
+  can_submit_commands =>  '1',
+  register            =>  '1',
+  use                 =>  'generic-contact',
+  target              =>  $ng_target_base_contact,
+  owner               =>  'root',
+  group               =>  'nagios',
+  mode                =>  '0664',
+}
    
+    
+  
    
+
+
+
    
+  
+    
+      
+      
+    
+  
    
+        
    +
+
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+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
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
    
+          		
+        
    # File 'manifests/nagios/objects/contacts.pp', line 39
+
+class cd_nagios::nagios::objects::contacts (
+
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    #  admin contact
+
+    @@nagios_contact { 'admin':
+      ensure              =>  present,
+      alias               =>  'Nagios Admin',
+      contact_name        =>  'admin',
+      contactgroups       =>  'admins',
+      email               =>  "admin@${::domain}",
+      can_submit_commands =>  '1',
+      register            =>  '1',
+      use                 =>  'generic-contact',
+      target              =>  $ng_target_base_contact,
+      owner               =>  $ng_user,
+      group               =>  $ng_user,
+      mode                =>  '0640',
+    }
+
+    # ops contact
+
+    @@nagios_contact { 'ops':
+      ensure              =>  present,
+      alias               =>  'Operations',
+      contact_name        =>  'ops',
+      contactgroups       =>  'operations',
+      email               =>  "ops@${::domain}",
+      can_submit_commands =>  '1',
+      register            =>  '1',
+      use                 =>  'generic-contact',
+      target              =>  $ng_target_base_contact,
+      owner               =>  $ng_user,
+      group               =>  $ng_user,
+      mode                =>  '0640',
+    }
+
+   # support contact
+
+    @@nagios_contact { 'support':
+      ensure              =>  present,
+      alias               =>  'support',
+      contact_name        =>  'support',
+      contactgroups       =>  'support',
+      email               =>  "support@${::domain}",
+      can_submit_commands =>  '1',
+      register            =>  '1',
+      use                 =>  'generic-contact',
+      target              =>  $ng_target_base_contact,
+      owner               =>  $ng_user,
+      group               =>  $ng_user,
+      mode                =>  '0640',
+    }
+  }
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file
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 9784b65..6f0c5c9 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
@@ -77,7 +77,8 @@
 
 
   
    Summary
    
-  Class manages /etc/nagios/conf.d/templates.cfg through concat.
+  Class manages /etc/nagios/conf.d/nagios_templates.cfg through
+concat.
 
 
    Overview
    
 
    
@@ -143,7 +144,6 @@ ng_template_object_name =>  'generic-contact',
         
     
 
-27
 28
 29
 30
@@ -216,10 +216,11 @@ ng_template_object_name =>  'generic-contact',
 97
 98
 99
-100
    
+100
+101
    • - 
    # File 'manifests/nagios/objects/template_rules.pp', line 27
+        
    # File 'manifests/nagios/objects/template_rules.pp', line 28
 
 class cd_nagios::nagios::objects::template_rules (
 
@@ -302,7 +303,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 8b7de87..9c7ed13 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -89,10 +89,16 @@
       
       cd_nagios::server::access_rules
    
       
+      cd_nagios::nagios::objects::config
    
+      
       cd_nagios::nagios::objects::commands
    
       
+      cd_nagios::nagios::objects::contacts
    
+      
       cd_nagios::nagios::objects::template_rules
    
       
+      cd_nagios::nagios::objects::add_contact_rules
    
+      
     
   
   
@@ -5207,7 +5213,10 @@ up
    
 980
 981
 982
-983
    
+983
+984
+985
+986
    # File 'manifests/params.pp', line 646
@@ -5528,7 +5537,7 @@ $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_target_templates      = "${ng_conf_d_dir}/nagios_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"
@@ -5540,7 +5549,10 @@ $ng_target_hostesc        = "${ng_conf_d_dir}/nagios_hostescalation.cfg&quo
 $ng_target_hostext        = "${ng_conf_d_dir}/nagios_hostextinfo.cfg"
 $ng_target_service        = "${ng_conf_d_dir}/nagios_service.cfg"
 $ng_target_servicegroup   = "${ng_conf_d_dir}/nagios_servicegroup.cfg"
-$ng_target_contact        = "${ng_conf_d_dir}/nagios_contact.cfg"
+$ng_target_base_contact   = "${ng_conf_d_dir}/nagios_base_contact.cfg"
+$ng_target_add_contact    = "${ng_conf_d_dir}/nagios_add_contact.cfg"
+$ng_contacts_head_erb     = 'cd_nagios/nagios/contacts_cfg_head.erb'
+$ng_contact_rule_erb      = 'cd_nagios/nagios/contact_cfg_rule.erb'
 $ng_target_contactgroup   = "${ng_conf_d_dir}/nagios_contactgroup.cfg"
 $ng_target_command        = "${ng_conf_d_dir}/nagios_command.cfg"
 
@@ -5557,7 +5569,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 a7b27c0..84db028 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 461c1a9..72b76b8 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 948a9c2..28df8a5 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 c4b28b2..2c40cda 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -192,8 +192,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 83
 84
 85
-86
-87
    +86 
    # File 'manifests/server/service.pp', line 23
@@ -206,8 +205,7 @@ 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
+    require cd_nagios::nagios::objects::config
 
     service { $ng_service:
       ensure      => running,
@@ -270,7 +268,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_type_list.html b/doc/puppet_defined_type_list.html
index cf5fe31..c86cc98 100644
--- a/doc/puppet_defined_type_list.html
+++ b/doc/puppet_defined_type_list.html
@@ -40,14 +40,21 @@
       
    # File 'manifests/nagios/objects/add_contact.pp', line 25
@@ -217,6 +228,17 @@ $ng_contact_groups  = undef,
 
 ) {
 
+$ng_nagios_server       = $::cd_nagios::params::ng_nagios_server
+$ng_target_add_contact  = $::cd_nagios::params::ng_target_add_contact
+$ng_contacts_rule_erb   = $::cd_nagios::params::ng_contacts_rule_erb
+
+  if $::fqdn == $ng_nagios_server {
+
+    concat::fragment { $name:
+      target    =>  $ng_target_add_contact,
+      content   =>  template($ng_contacts_rule_erb),
+    }
+  }
 }
    @@ -225,7 +247,7 @@ $ng_contact_groups = undef, 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 7227920..65ba357 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 @@ -935,7 +935,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 69bdeab..ec7cc20 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 eb411f0..ecb2697 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From 19d33cb8a512c2fe07424428cbaa3e76639848e3 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Wed, 26 Jul 2017 14:40:46 +0200 Subject: [PATCH 10/25] recommit for updates in build 102 --- CHANGELOG.md | 15 +++++++++++++++ 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 +- ...agios_3A_3Aobjects_3A_3Aadd_contact_rules.html | 2 +- ...os_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 2 +- ...gios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | 2 +- ...os_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html | 2 +- ...3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 4 ++-- .../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 +- ...3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html | 2 +- ...s_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 26 files changed, 41 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41941b2..4adae6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,21 @@ Changelog of Git Changelog.

    No issue

    +5a33b87c5a01e94 Jenkins Server 2017-07-26 12:36:37 +

    +

    recommit for updates in build 101

    + +

    +8fafc260c8a85c2 Arne Teuke 2017-07-26 12:36:14 +

    +

    finalizing contacts

    + +

    +04c206f448ff267 Arne Teuke 2017-07-26 12:34:50 +

    +

    finalizing contacts

    + +

    039523e1f69f07e Jenkins Server 2017-07-26 11:30:54

    recommit for updates in build 99

    diff --git a/doc/_index.html b/doc/_index.html index df3650e..58c4291 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -221,7 +221,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 2c83e21..5134422 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -352,7 +352,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index aa46a6a..d7b0c24 100644 --- a/doc/index.html +++ b/doc/index.html @@ -352,7 +352,7 @@ environments.

    diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 1699e3a..55b8dee 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 020705e..c43f777 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 b60454b..7fbc9ec 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 b6e2d24..787a0fe 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 ea122de..f12d7b2 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 7e70137..88c6bff 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 972e65c..701145f 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 28e650b..e84f85a 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 445c110..add7692 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 @@ -228,7 +228,7 @@ class cd_nagios::nagios::objects::add_contact_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 c9ceee8..3cce4e5 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 cb61b52..4b9df4a 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 @@ -166,7 +166,7 @@ class cd_nagios::nagios::objects::config ( 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 6241237..21ef054 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_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html index bf7bca7..62071d2 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 @@ -303,7 +303,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 6f7443d..6c8de52 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -5552,7 +5552,7 @@ $ng_target_servicegroup = "${ng_conf_d_dir}/nagios_servicegroup.cfg" $ng_target_base_contact = "${ng_conf_d_dir}/nagios_base_contact.cfg" $ng_target_add_contact = "${ng_conf_d_dir}/nagios_add_contact.cfg" $ng_contacts_head_erb = 'cd_nagios/nagios/contacts_cfg_head.erb' -$ng_contacts_rule_erb = 'cd_nagios/nagios/contact_cfg_rule.erb' +$ng_contacts_rule_erb = 'cd_nagios/nagios/contacts_cfg_rule.erb' $ng_target_contactgroup = "${ng_conf_d_dir}/nagios_contactgroup.cfg" $ng_target_command = "${ng_conf_d_dir}/nagios_command.cfg" @@ -5569,7 +5569,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 dc8a8a8..ae71284 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 03796e6..1a80a02 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 2436955..e2ad661 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 22a35cd..7aaa1af 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -268,7 +268,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 359cdc8..1a84bff 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 @@ -247,7 +247,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_3Atemplates.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html index 65ba357..23b1d8e 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 @@ -935,7 +935,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 ec7cc20..5456c38 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 ecb2697..67428f1 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From 4dd15fea28537773d130f7abc4c4fee116d230f6 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Wed, 26 Jul 2017 14:48:06 +0200 Subject: [PATCH 11/25] recommit for updates in build 103 --- 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 +- ...s_3A_3Aobjects_3A_3Aadd_contact_rules.html | 22 ++----------------- ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 2 +- ..._3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | 2 +- ...A_3Anagios_3A_3Aobjects_3A_3Acontacts.html | 2 +- ...gios_3A_3Aobjects_3A_3Atemplate_rules.html | 4 ++-- 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 +- ...Anagios_3A_3Aobjects_3A_3Aadd_contact.html | 2 +- ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 26 files changed, 37 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4adae6e..81a368e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

    No issue

    +19d33cb8a512c2f Jenkins Server 2017-07-26 12:40:46 +

    +

    recommit for updates in build 102

    + +

    +6955770373d63a1 Arne Teuke 2017-07-26 12:40:23 +

    +

    fixed typo

    + +

    5a33b87c5a01e94 Jenkins Server 2017-07-26 12:36:37

    recommit for updates in build 101

    diff --git a/doc/_index.html b/doc/_index.html index 58c4291..1c9bcdf 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -221,7 +221,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 5134422..0025fba 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -352,7 +352,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index d7b0c24..9916c89 100644 --- a/doc/index.html +++ b/doc/index.html @@ -352,7 +352,7 @@ environments.

    diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 55b8dee..c0d73da 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 c43f777..b6e3966 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 7fbc9ec..60b8160 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 787a0fe..73d28d6 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 f12d7b2..21d4073 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 88c6bff..4e089d5 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 701145f..a69f3e4 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 e84f85a..2426325 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 add7692..12ac9fb 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 @@ -168,16 +168,7 @@ ng_contact_alias => 'Example User', 57 58 59 -60 -61 -62 -63 -64 -65 -66 -67 -68 -69 +60 
    # File 'manifests/nagios/objects/add_contact_rules.pp', line 31
@@ -210,15 +201,6 @@ class cd_nagios::nagios::objects::add_contact_rules (
       content   =>  template($ng_contacts_head_erb),
       order     =>  '000',
     }
-
-    # example rule for testing
-
-    cd_nagios::nagios::objects::add_contact { 'example_user':
-      ng_contact_name   =>  'example_user',
-      ng_contact_alias  =>  'Example User',
-      ng_contact_groups =>  'admins',
-      ng_contact_email  =>  'example@example.net',
-    }
   }
 }
    @@ -228,7 +210,7 @@ class cd_nagios::nagios::objects::add_contact_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 3cce4e5..0f7b996 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 4b9df4a..f1c6b64 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 @@ -166,7 +166,7 @@ class cd_nagios::nagios::objects::config ( 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 21ef054..ba735f0 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_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html index 62071d2..f0deb08 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 @@ -291,7 +291,7 @@ class cd_nagios::nagios::objects::template_rules ( } cd_nagios::nagios::objects::templates { 'local-service': ng_template_object => 'service', - ng_template_object_name => 'generic-service', + ng_template_object_name => 'local-service', ng_max_check_attempts => '4', } } @@ -303,7 +303,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 6c8de52..b771f49 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -5569,7 +5569,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 ae71284..c29bc2e 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 1a80a02..7eb5f71 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 e2ad661..c8a0978 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 7aaa1af..c0ecbaf 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -268,7 +268,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 1a84bff..48a2c75 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 @@ -247,7 +247,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_3Atemplates.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html index 23b1d8e..cfae138 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 @@ -935,7 +935,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 5456c38..5e31b96 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 67428f1..c0c43c3 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From af34a0587d9f48e00cfb885001cb6d7eac86669c Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Wed, 26 Jul 2017 15:05:02 +0200 Subject: [PATCH 12/25] recommit for updates in build 104 --- 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 +- ...nagios_3A_3Aobjects_3A_3Aadd_contact_rules.html | 2 +- ...ios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 2 +- ...agios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | 2 +- ...ios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html | 2 +- ..._3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html | 6 ++++-- 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 +- ..._3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html | 2 +- ...os_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html | 14 +++++++------- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 26 files changed, 44 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81a368e..4e2d555 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

    No issue

    +4dd15fea2853777 Jenkins Server 2017-07-26 12:48:06 +

    +

    recommit for updates in build 103

    + +

    +6ee49a5e33f28cb Arne Teuke 2017-07-26 12:47:45 +

    +

    fixed typo

    + +

    19d33cb8a512c2f Jenkins Server 2017-07-26 12:40:46

    recommit for updates in build 102

    diff --git a/doc/_index.html b/doc/_index.html index 1c9bcdf..6645551 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -221,7 +221,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 0025fba..e0367d4 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -352,7 +352,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index 9916c89..e5214dd 100644 --- a/doc/index.html +++ b/doc/index.html @@ -352,7 +352,7 @@ environments.

    diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index c0d73da..84393ae 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 b6e3966..129c465 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 60b8160..201ec71 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 73d28d6..1b40832 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 21d4073..7534229 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 4e089d5..44c8de7 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 a69f3e4..337ed71 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 2426325..95c484f 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 12ac9fb..cee6a2e 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_3Acommands.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html index 0f7b996..f665138 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 f1c6b64..6d2e09e 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 @@ -166,7 +166,7 @@ class cd_nagios::nagios::objects::config ( 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 ba735f0..43e5fd2 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_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html index f0deb08..3491d87 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 @@ -217,7 +217,8 @@ ng_template_object_name => 'generic-contact', 98 99 100 -101 +101 +102 
    # File 'manifests/nagios/objects/template_rules.pp', line 28
@@ -293,6 +294,7 @@ class cd_nagios::nagios::objects::template_rules (
       ng_template_object      =>  'service',
       ng_template_object_name =>  'local-service',
       ng_max_check_attempts   =>  '4',
+      ng_template_object_use  =>  'generic-service',
     }
   }
 }
    @@ -303,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 b771f49..2f32437 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -5569,7 +5569,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 c29bc2e..8cf1ef5 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 7eb5f71..46a55a9 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 c8a0978..8cd2f2b 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 c0ecbaf..4f40e1f 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -268,7 +268,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 48a2c75..acf392c 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 @@ -247,7 +247,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_3Atemplates.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html index cfae138..7791020 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 @@ -767,13 +767,13 @@ Valid options are 0 and
  • - ng_normal_check_interval + ng_check_interval (string) - (defaults to: '10') + (defaults to: '5') — @@ -786,13 +786,13 @@ under normal conditions.

  • - ng_retry_check_interval + ng_retry_interval (string) - (defaults to: '2') + (defaults to: '1') — @@ -911,8 +911,8 @@ $ng_parallelize_check = '1', $ng_obsess_over_service = '1', $ng_check_freshness = '0', $ng_is_volatile = '0', -$ng_normal_check_interval = '10', -$ng_retry_check_interval = '2', +$ng_check_interval = '10', +$ng_retry_interval = '2', ) { @@ -935,7 +935,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 5e31b96..ede1ab3 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 c0c43c3..5cde33d 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From 0564cc970be189999db879cb5bf29008d200f616 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Wed, 26 Jul 2017 16:27:43 +0200 Subject: [PATCH 13/25] recommit for updates in build 105 --- CHANGELOG.md | 10 + REPOSTRUCTURE.md | 3 +- doc/_index.html | 7 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_class_list.html | 21 +- 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 +- ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 2 +- ..._3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | 6 +- ...agios_3A_3Aobjects_3A_3Acontactgroups.html | 227 ++++++++++++++++++ ...A_3Anagios_3A_3Aobjects_3A_3Acontacts.html | 2 +- ...gios_3A_3Aobjects_3A_3Atemplate_rules.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 6 +- .../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 +- ...Anagios_3A_3Aobjects_3A_3Aadd_contact.html | 2 +- ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 29 files changed, 289 insertions(+), 35 deletions(-) create mode 100644 doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e2d555..3f1790e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

    No issue

    +af34a0587d9f48e Jenkins Server 2017-07-26 13:05:02 +

    +

    recommit for updates in build 104

    + +

    +6094321d4f0cebb Arne Teuke 2017-07-26 13:04:39 +

    +

    sorted deprecated syntax

    + +

    4dd15fea2853777 Jenkins Server 2017-07-26 12:48:06

    recommit for updates in build 103

    diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index ddb3048..503e65a 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -57,6 +57,7 @@ | | |-- add_contact_rules.pp | | |-- commands.pp | | |-- config.pp +| | |-- contactgroups.pp | | |-- contacts.pp | | |-- template_rules.pp | | `-- templates.pp @@ -100,4 +101,4 @@ |-- README.md `-- REPOSTRUCTURE.md -20 directories, 80 files +20 directories, 81 files diff --git a/doc/_index.html b/doc/_index.html index 6645551..09f03f3 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -123,6 +123,11 @@
    • +
  • + cd_nagios::nagios::objects::contactgroups + +
    • +
  • cd_nagios::nagios::objects::contacts @@ -221,7 +226,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index e0367d4..6cf1c19 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -352,7 +352,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index e5214dd..52fc89e 100644 --- a/doc/index.html +++ b/doc/index.html @@ -352,7 +352,7 @@ environments.

    diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index ef22ac1..da17fd5 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -117,49 +117,56 @@
    • -
  • +
  • +
    + cd_nagios::nagios::objects::contactgroups +
    +
    • + + +
  • cd_nagios::nagios::objects::contacts
    • -
  • +
  • cd_nagios::nagios::objects::template_rules
    • -
  • +
  • cd_nagios::params
    • -
  • +
  • cd_nagios::selinux::config
    • -
  • +
  • cd_nagios::server::access_rules
    • -
  • +
  • cd_nagios::server::files
    • -
  • +
  • cd_nagios::server::service
    diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 84393ae..bf5f35a 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 129c465..f966992 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 201ec71..d6fcfe6 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 1b40832..f4372f6 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 7534229..e960de5 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 44c8de7..3724a8d 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 337ed71..d8d9035 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 95c484f..9f784b7 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 cee6a2e..3cd4e8d 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_3Acommands.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html index f665138..a56539c 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 6d2e09e..f333b86 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 @@ -141,7 +141,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    32 33 34 -35 +35 +36 
    # File 'manifests/nagios/objects/config.pp', line 23
@@ -156,6 +157,7 @@ class cd_nagios::nagios::objects::config (
     require cd_nagios::nagios::objects::template_rules
     require cd_nagios::nagios::objects::contacts
     require cd_nagios::nagios::objects::add_contact_rules
+    require cd_nagios::nagios::objects::contactgroups
 
   }
 }
    @@ -166,7 +168,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 new file mode 100644 index 0000000..9b6a8e9 --- /dev/null +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html @@ -0,0 +1,227 @@ + + + + + + + Puppet Class: cd_nagios::nagios::objects::contactgroups + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    + + +

    Puppet Class: cd_nagios::nagios::objects::contactgroups

    +
    + +
    +
    Inherits:
    +
    cd_nagios::params
    +
    + + +
    +
    Defined in:
    +
    + manifests/nagios/objects/contactgroups.pp +
    +
    +
    + +

    Overview

    +
    +
    + +

    cd_nagios::nagios::objects::contactgroups.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/

    + +
    +
    +
    + + +
    + + + + + +
    + 
    +
+
+22
+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
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
    +     		+ 
    # File 'manifests/nagios/objects/contactgroups.pp', line 22
+
+class cd_nagios::nagios::objects::contactgroups (
+
+
+) inherits cd_nagios::params {
+  if $::fqdn == $ng_nagios_server {
+
+    @@nagios_contactgroup { 'admins':
+      ensure              =>  present,
+      alias               =>  'Nagios Administrators',
+      contactgroup_name   =>  'admins',
+      owner               =>  $ng_user,
+      group               =>  $ng_user,
+      mode                =>  '0640',
+      register            =>  '1',
+      target              =>  $ng_tgt_contactgroup_base,
+    }
+
+    @@nagios_contactgroup { 'operations':
+      ensure              =>  present,
+      alias               =>  'Operations Team',
+      contactgroup_name   =>  'operations',
+      owner               =>  $ng_user,
+      group               =>  $ng_user,
+      mode                =>  '0640',
+      register            =>  '1',
+      target              =>  $ng_tgt_contactgroup_base,
+    }
+
+    @@nagios_contactgroup { 'support':
+      ensure              =>  present,
+      alias               =>  'Support Team',
+      contactgroup_name   =>  'support',
+      owner               =>  $ng_user,
+      group               =>  $ng_user,
+      mode                =>  '0640',
+      register            =>  '1',
+      target              =>  $ng_tgt_contactgroup_base,
+    }
+  }
+}
    +
    +
    +
    + + + +
    + + \ No newline at end of file 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 43e5fd2..a230b6d 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_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html index 3491d87..b68cd21 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 2f32437..19370f0 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -95,6 +95,8 @@ cd_nagios::nagios::objects::contacts
    + cd_nagios::nagios::objects::contactgroups
    + cd_nagios::nagios::objects::template_rules
    cd_nagios::nagios::objects::add_contact_rules
    @@ -5553,7 +5555,7 @@ $ng_target_base_contact = "${ng_conf_d_dir}/nagios_base_contact.cfg" $ng_target_add_contact = "${ng_conf_d_dir}/nagios_add_contact.cfg" $ng_contacts_head_erb = 'cd_nagios/nagios/contacts_cfg_head.erb' $ng_contacts_rule_erb = 'cd_nagios/nagios/contacts_cfg_rule.erb' -$ng_target_contactgroup = "${ng_conf_d_dir}/nagios_contactgroup.cfg" +$ng_tgt_contactgroup_base = "${ng_conf_d_dir}/nagios_contactgroup_base.cfg" $ng_target_command = "${ng_conf_d_dir}/nagios_command.cfg" @@ -5569,7 +5571,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 8cf1ef5..674b170 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 46a55a9..f8a3fb6 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 8cd2f2b..9907b6a 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 4f40e1f..09a2eb0 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -268,7 +268,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 acf392c..5695054 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 @@ -247,7 +247,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_3Atemplates.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html index 7791020..e2e06ec 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 @@ -935,7 +935,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 ede1ab3..9e75a34 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 5cde33d..f0c25a4 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From 2b24ed69186142a5402884efb6e55f3dab9185dc Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 27 Jul 2017 12:41:48 +0200 Subject: [PATCH 14/25] recommit for updates in build 108 --- CHANGELOG.md | 10 + REPOSTRUCTURE.md | 9 +- doc/_index.html | 12 +- doc/file.README.html | 2 +- doc/index.html | 2 +- doc/puppet_class_list.html | 27 +- 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 | 237 ++++++++++++++++++ ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 2 +- ..._3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | 2 +- ...agios_3A_3Aobjects_3A_3Acontactgroups.html | 50 ++-- ...A_3Anagios_3A_3Aobjects_3A_3Acontacts.html | 2 +- ...gios_3A_3Aobjects_3A_3Atemplate_rules.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 12 +- .../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 +- doc/puppet_defined_type_list.html | 11 +- ...Anagios_3A_3Aobjects_3A_3Aadd_contact.html | 2 +- ...s_3A_3Aobjects_3A_3Aadd_contactgroups.html | 227 +++++++++++++++++ ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 32 files changed, 586 insertions(+), 55 deletions(-) create mode 100644 doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html create mode 100644 doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f1790e..f10e16f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

    No issue

    +0564cc970be1899 Jenkins Server 2017-07-26 14:27:43 +

    +

    recommit for updates in build 105

    + +

    +12f835aa4ff29bd Arne Teuke 2017-07-26 14:27:16 +

    +

    added and linked base contactgroups

    + +

    af34a0587d9f48e Jenkins Server 2017-07-26 13:05:02

    recommit for updates in build 104

    diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 503e65a..0f2b935 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -20,6 +20,7 @@ | | |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_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_3Atemplate_rules.html | | |-- cd_nagios_3A_3Aparams.html @@ -53,6 +54,8 @@ | | `-- user.pp | |-- nagios | | `-- objects +| | |-- add_contactgroups.pp +| | |-- add_contactgroups_rules.pp | | |-- add_contact.pp | | |-- add_contact_rules.pp | | |-- commands.pp @@ -81,7 +84,9 @@ | | `-- nagios_ssl_vhost.erb | |-- nagios | | |-- cgi_cfg.erb -| | |-- contacts_cfg.erb +| | |-- contactgroups_cfg_head.erb +| | |-- contactgroups_cfg_rule.erb +| | |-- contacts.cfg | | |-- contacts_cfg_head.erb | | |-- contacts_cfg_rule.erb | | |-- htpasswd_rule.erb @@ -101,4 +106,4 @@ |-- README.md `-- REPOSTRUCTURE.md -20 directories, 81 files +20 directories, 86 files diff --git a/doc/_index.html b/doc/_index.html index 09f03f3..8478f55 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -113,6 +113,11 @@
    • +
  • + cd_nagios::nagios::objects::add_contactgroups_rules + +
    • +
  • cd_nagios::nagios::objects::commands @@ -188,6 +193,11 @@
    • +
  • + cd_nagios::nagios::objects::add_contactgroups + +
    • +
  • cd_nagios::nagios::objects::templates @@ -226,7 +236,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 6cf1c19..7dce3b7 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -352,7 +352,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index 52fc89e..29e9606 100644 --- a/doc/index.html +++ b/doc/index.html @@ -352,7 +352,7 @@ environments.

    diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index da17fd5..c08ca8f 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -103,70 +103,77 @@
    • -
  • +
  • +
    + cd_nagios::nagios::objects::add_contactgroups_rules +
    +
    • + + +
  • cd_nagios::nagios::objects::commands
    • -
  • +
  • cd_nagios::nagios::objects::config
    • -
  • +
  • cd_nagios::nagios::objects::contactgroups
    • -
  • +
  • cd_nagios::nagios::objects::contacts
    • -
  • +
  • cd_nagios::nagios::objects::template_rules
    • -
  • +
  • cd_nagios::params
    • -
  • +
  • cd_nagios::selinux::config
    • -
  • +
  • cd_nagios::server::access_rules
    • -
  • +
  • cd_nagios::server::files
    • -
  • +
  • cd_nagios::server::service
    diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index bf5f35a..346486e 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 f966992..a416ddb 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 d6fcfe6..919c8d4 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 f4372f6..f44065f 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 e960de5..d237917 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 3724a8d..b1d8477 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 d8d9035..18fbd6b 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 9f784b7..22f1adc 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 3cd4e8d..1cf422b 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 new file mode 100644 index 0000000..4ef20c9 --- /dev/null +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html @@ -0,0 +1,237 @@ + + + + + + + Puppet Class: cd_nagios::nagios::objects::add_contactgroups_rules + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    + + +

    Puppet Class: cd_nagios::nagios::objects::add_contactgroups_rules

    +
    + +
    +
    Inherits:
    +
    cd_nagios::params
    +
    + + +
    +
    Defined in:
    +
    + manifests/nagios/objects/add_contactgroups_rules.pp +
    +
    +
    + +

    Summary

    + Class manages /etc/nagios/conf.d/nagios_add_contactgroups.cfg file +and populates through define and external puppet rules + +

    Overview

    +
    +
    + +

    cd_nagios::nagios::objects::add_contactgroups_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/.

    + +
    +
    +
    + +
    +

    Examples:

    + + + 
    cd_nagios::nagios::objects::add_contactgroups { 'example_group':
+  ng_contactgroup_name      =>  'example_group',
+  ng_contactgroup_alias     =>  'Example Group',
+  ng_contactgroup_register  =>  '1',
+}
    + +
    + + +
    + + + + + +
    + 
    +
+
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
    +     		+ 
    # File 'manifests/nagios/objects/add_contactgroups_rules.pp', line 30
+
+class cd_nagios::nagios::objects::add_contactgroups_rules (
+
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    # manage /etc/nagios/conf.d/nagios_add_contactgroups.cfg
+
+    concat { $ng_tgt_contactgroup_add:
+      ensure    =>  present,
+      path      =>  $ng_tgt_contactgroup_add,
+      owner     =>  $ng_user,
+      group     =>  $ng_user,
+      mode      =>  '0640',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  nagios_etc_t,
+      seluser   =>  system_u,
+      notify    =>  Service[$ng_service],
+    }
+
+    # manage file header
+
+    concat::fragment { 'contactgroups_header':
+      target    =>  $ng_tgt_contactgroup_add,
+      content   =>  template($ng_cntctgrps_head_erb),
+      order     =>  '000',
+    }
+
+    cd_nagios::nagios::objects::add_contactgroups { 'example_group':
+      ng_contactgroup_name      =>  'example_group',
+      ng_contactgroup_alias     =>  'Example Group',
+      ng_contactgroup_register  =>  '1',
+    }
+  }
+}
    +
    +
    +
    + + + +
    + + \ No newline at end of file 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 a56539c..4400851 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 f333b86..5b2979c 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 @@ -168,7 +168,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 9b6a8e9..b0949be 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 @@ -76,6 +76,9 @@ +

    Summary

    + Class manages base contactgroups which always should be there. +

    Overview

    @@ -118,6 +121,23 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/

    +
    +

    Examples:

    + + + 
    @@nagios_contactgroup { 'admins':
+  ensure              =>  present,
+  alias               =>  'Nagios Administrators',
+  contactgroup_name   =>  'admins',
+  owner               =>  $ng_user,
+  group               =>  $ng_user,
+  mode                =>  '0640',
+  register            =>  '1',
+  target              =>  $ng_tgt_contactgroup_base,
+}
    + +
    +
    @@ -126,18 +146,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/

     
 
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
 34
 35
 36
@@ -165,10 +173,22 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/
    
 58
 59
 60
-61
    +61 +62 +63 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 @@ -227,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 3fe4db4..781e63d 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 @@ -171,12 +171,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    56 57 58 -59 -60 -61 -62 -63 -64 +59 @@ -224,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 new file mode 100644 index 0000000..26c6f01 --- /dev/null +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html @@ -0,0 +1,234 @@ + + + + + + + Puppet Class: cd_nagios::nagios::objects::add_servicegroup_rules + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    + + +

    Puppet Class: cd_nagios::nagios::objects::add_servicegroup_rules

    +
    + +
    +
    Inherits:
    +
    cd_nagios::params
    +
    + + +
    +
    Defined in:
    +
    + manifests/nagios/objects/add_servicegroup_rules.pp +
    +
    +
    + +

    Summary

    + Class manages /etc/nagios_conf.d/nagios_servicegroups_add.cfg and +additional servicegroups through external Puppet rules via define. + +

    Overview

    +
    +
    + +

    cd_nagios::nagios::objects::add_servicegroup_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/.

    + +
    +
    +
    + +
    +

    Examples:

    + + + 
    cd_nagios::nagios::objects::add_servicegroups { 'example_servicegroup':
+  ng_servicegroup_name   =>  'example_servicegroup',
+  ng_servicegroup_alias  =>  'Example Servicegroup',
+}
    + +
    + + +
    +
    - 
    # File 'manifests/nagios/objects/contactgroups.pp', line 22
+        
    # File 'manifests/nagios/objects/contactgroups.pp', line 34
 
 class cd_nagios::nagios::objects::contactgroups (
 
@@ -217,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 a230b6d..f3b9c1d 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_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
index b68cd21..4a25944 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 19370f0..90d106e 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -101,6 +101,8 @@
       
       cd_nagios::nagios::objects::add_contact_rules
    
       
+      cd_nagios::nagios::objects::add_contactgroups_rules
    
+      
     
   
   
@@ -5218,7 +5220,10 @@ up
    
 983
 984
 985
-986
    
+986
+987
+988
+989
    		 
    # File 'manifests/params.pp', line 646
@@ -5556,6 +5561,9 @@ $ng_target_add_contact    = "${ng_conf_d_dir}/nagios_add_contact.cfg"
 $ng_contacts_head_erb     = 'cd_nagios/nagios/contacts_cfg_head.erb'
 $ng_contacts_rule_erb     = 'cd_nagios/nagios/contacts_cfg_rule.erb'
 $ng_tgt_contactgroup_base = "${ng_conf_d_dir}/nagios_contactgroup_base.cfg"
+$ng_tgt_contactgroup_add  = "${ng_conf_d_dir}/nagios_contactgroup_add.cfg"
+$ng_cntctgrps_head_erb    = 'cd_nagios/nagios/contactgroups_cfg_head.erb'
+$ng_cntctgrps_rule_erb    = 'cd_nagios/nagios/contactgroups_cfg_rule.erb'
 $ng_target_command        = "${ng_conf_d_dir}/nagios_command.cfg"
 
 
@@ -5571,7 +5579,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 674b170..0cee954 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 f8a3fb6..3149bed 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 9907b6a..9e0f31f 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 09a2eb0..97370a8 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -268,7 +268,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_type_list.html b/doc/puppet_defined_type_list.html
index c86cc98..fa9c994 100644
--- a/doc/puppet_defined_type_list.html
+++ b/doc/puppet_defined_type_list.html
@@ -47,14 +47,21 @@
     
     
 
-    
  • 
+    
  • 
+      
    
+        cd_nagios::nagios::objects::add_contactgroups
+      
    
+    
    • 
+    
+
+    
  • 
       
    
         cd_nagios::nagios::objects::templates
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::server::access
       
    
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 5695054..c158f1b 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
@@ -247,7 +247,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
new file mode 100644
index 0000000..f1c0f10
--- /dev/null
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html
@@ -0,0 +1,227 @@
+
+
+  
+    
+
+
+  Defined Type: cd_nagios::nagios::objects::add_contactgroups
+  
+    — Documentation by YARD 0.9.9
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Defined Type: cd_nagios::nagios::objects::add_contactgroups
    
+
    
+  
    
+    
    Defined in:
    
+    
    
+      manifests/nagios/objects/add_contactgroups.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  Define populates /etc/nagios/conf.d/nagios_add_contactgroups through
+external puppet rules.
+
+
    Overview
    
+
    
+  
    
+    
+
    cd_nagios::nagios::objects::add_contactgroups.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/
    
+
+  
    
+
    
+
    
+  
    Parameters:
    
+
      
+  
+    
    • 
+      
+        ng_contactgroup_name
+      
+      
+        (Any)
+      
+      
+        (defaults to: undef)
+      
+      
+    
      • 
+  
+    
    • 
+      
+        ng_contactgroup_alias
+      
+      
+        (Any)
+      
+      
+        (defaults to: undef)
+      
+      
+    
      • 
+  
+    
    • 
+      
+        ng_contactgroup_register
+      
+      
+        (Any)
+      
+      
+        (defaults to: '1')
+      
+      
+    
      • 
+  
+
    
+
+
+
    
+  
+    
+      
+      
+    
+  
    
+        
    +
+
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
    
+          		
+        
    # File 'manifests/nagios/objects/add_contactgroups.pp', line 24
+
+define cd_nagios::nagios::objects::add_contactgroups (
+
+$ng_contactgroup_name     = undef,
+$ng_contactgroup_alias    = undef,
+$ng_contactgroup_register = '1',
+
+) {
+
+$ng_nagios_server         = $::cd_nagios::params::ng_nagios_server
+$ng_tgt_contactgroup_add  = $::cd_nagios::params::ng_tgt_contactgroup_add
+
+
+  if $::fqdn == $ng_nagios_server {
+
+    concat::fragment { $name:
+      target    =>  $ng_tgt_contactgroup_add,
+      content   =>  template($ng_contacts_rule_erb),
+    }
+  }
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file
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 e2e06ec..052b4cd 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
@@ -935,7 +935,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 9e75a34..9d108ac 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 f0c25a4..1a19bb7 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From 699586d7d8b5253ef05f8cfffedca4a542d38c0d Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Thu, 27 Jul 2017 12:56:34 +0200
Subject: [PATCH 15/25] recommit for updates in build 109

---
 CHANGELOG.md                                  | 20 ++++++++++++++++
 REPOSTRUCTURE.md                              |  4 +++-
 doc/_index.html                               |  2 +-
 doc/file.README.html                          | 23 +++++++++++--------
 doc/index.html                                | 23 +++++++++++--------
 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 +-
 ...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 +-
 ...gios_3A_3Aobjects_3A_3Atemplate_rules.html |  2 +-
 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 +-
 ...Anagios_3A_3Aobjects_3A_3Aadd_contact.html |  2 +-
 ...s_3A_3Aobjects_3A_3Aadd_contactgroups.html |  2 +-
 ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |  2 +-
 doc/top-level-namespace.html                  |  2 +-
 30 files changed, 78 insertions(+), 48 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f10e16f..9af2078 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,26 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+2b24ed69186142a Jenkins Server 2017-07-27 10:41:48
+
    
+
    recommit for updates in build 108
    
+
+
    
+e02276ecc70dbca Arne Teuke 2017-07-27 10:41:22
+
    
+
    added and linked add_contactgroups_rules
    
+
+
    
+26ef9aac8152b99 Arne Teuke 2017-07-27 10:39:45
+
    
+
    added and linked add_contactgroups_rules
    
+
+
    
+5108aab0dc48113 Arne Teuke 2017-07-27 10:05:58
+
    
+
    added add_contactgroups
    
+
+
    
 0564cc970be1899 Jenkins Server 2017-07-26 14:27:43
 
    
 
    recommit for updates in build 105
    
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index 0f2b935..ae7cb78 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -17,6 +17,7 @@
 |   |   |-- cd_nagios_3A_3Amain_3A_3Adirs.html
 |   |   |-- cd_nagios_3A_3Amain_3A_3Ainstall.html
 |   |   |-- cd_nagios_3A_3Amain_3A_3Auser.html
+|   |   |-- 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_3Acommands.html
 |   |   |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html
@@ -30,6 +31,7 @@
 |   |   |-- cd_nagios_3A_3Aserver_3A_3Aservice.html
 |   |   `-- cd_nagios.html
 |   |-- puppet_defined_types
+|   |   |-- 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_3Atemplates.html
 |   |   `-- cd_nagios_3A_3Aserver_3A_3Aaccess.html
@@ -106,4 +108,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-20 directories, 86 files
+20 directories, 88 files
diff --git a/doc/_index.html b/doc/_index.html
index 8478f55..0c43123 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -236,7 +236,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index 7dce3b7..8d1f9dd 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -150,15 +150,18 @@ rules via define
 * manage Nagios main contacts through Puppet exports.
 Additional contacts can be created through external Puppet rules via
 define, to avoid having to alter the module code.
-* configure NRPE on
-clients (optional)
-* configure firewall (optional)
-* configure selinux
-policies (optional)
-* configure forwarding http to https including accesing
-the /nagios url directly (optional)
-* manage TLS certificates through
-certbot (optional)
    
+* manage Nagios main
+contactgroups through Puppet exports. Additional contact groups can be
+created through external Puppet rules via define, to avoid having to alter
+the module code.
+* configure NRPE on clients (optional)
+* configure
+firewall (optional)
+* configure selinux policies (optional)
+* configure
+forwarding http to https including accesing the /nagios url directly
+(optional)
+* manage TLS certificates through certbot (optional)
    
 
 
    Service
 * manage Nagios service on server
@@ -352,7 +355,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index 29e9606..73f2fd0 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -150,15 +150,18 @@ rules via define
 * manage Nagios main contacts through Puppet exports.
 Additional contacts can be created through external Puppet rules via
 define, to avoid having to alter the module code.
-* configure NRPE on
-clients (optional)
-* configure firewall (optional)
-* configure selinux
-policies (optional)
-* configure forwarding http to https including accesing
-the /nagios url directly (optional)
-* manage TLS certificates through
-certbot (optional)
    
+* manage Nagios main
+contactgroups through Puppet exports. Additional contact groups can be
+created through external Puppet rules via define, to avoid having to alter
+the module code.
+* configure NRPE on clients (optional)
+* configure
+firewall (optional)
+* configure selinux policies (optional)
+* configure
+forwarding http to https including accesing the /nagios url directly
+(optional)
+* manage TLS certificates through certbot (optional)
    
 
 
    Service
 * manage Nagios service on server
@@ -352,7 +355,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index 346486e..c141a59 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 a416ddb..b7b1720 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 919c8d4..3b4b8bd 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 f44065f..73edaf7 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 d237917..d3dd009 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 b1d8477..0dd7d08 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 18fbd6b..c1f24f1 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 22f1adc..347c8b5 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 1cf422b..e19297a 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 4ef20c9..1bb52e8 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
@@ -227,7 +227,7 @@ class cd_nagios::nagios::objects::add_contactgroups_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 4400851..2fb497d 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 5b2979c..1bf8ad5 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
@@ -142,7 +142,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 33
 34
 35
-36
    • +36 +37 
    # File 'manifests/nagios/objects/config.pp', line 23
@@ -158,6 +159,7 @@ class cd_nagios::nagios::objects::config (
     require cd_nagios::nagios::objects::contacts
     require cd_nagios::nagios::objects::add_contact_rules
     require cd_nagios::nagios::objects::contactgroups
+    require cd_nagios::nagios::objects::add_contactgroups_rules
 
   }
 }
    @@ -168,7 +170,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 b0949be..e1db96b 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 f3b9c1d..d00852f 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_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html index 4a25944..2444915 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 90d106e..8ef8562 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -5579,7 +5579,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 0cee954..bf4fb80 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 3149bed..da5b953 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 9e0f31f..d728aa3 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 97370a8..a9a3c00 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -268,7 +268,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 c158f1b..26d3978 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 @@ -247,7 +247,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 f1c0f10..648d20b 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 @@ -217,7 +217,7 @@ $ng_tgt_contactgroup_add = $::cd_nagios::params::ng_tgt_contactgroup_add 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 052b4cd..3f2e1c1 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 @@ -935,7 +935,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 9d108ac..5f5c998 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 1a19bb7..c92902e 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From 14a1e7412ff67922db0641f4ba6ed99fc4225b21 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 27 Jul 2017 13:00:10 +0200 Subject: [PATCH 16/25] recommit for updates in build 110 --- 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 +- ...A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html | 2 +- ...gios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html | 2 +- ..._nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 2 +- ...cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | 2 +- ...os_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html | 2 +- ..._nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.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 +- ...gios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html | 2 +- ...A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html | 6 ++++-- ...nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 29 files changed, 41 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9af2078..ad216c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

    No issue

    +699586d7d8b5253 Jenkins Server 2017-07-27 10:56:34 +

    +

    recommit for updates in build 109

    + +

    +672f61d994a4360 Arne Teuke 2017-07-27 10:56:09 +

    +

    added and linked add_contactgroups_rules

    + +

    2b24ed69186142a Jenkins Server 2017-07-27 10:41:48

    recommit for updates in build 108

    diff --git a/doc/_index.html b/doc/_index.html index 0c43123..0246430 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -236,7 +236,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 8d1f9dd..734ba93 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -355,7 +355,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index 73f2fd0..f30ffdf 100644 --- a/doc/index.html +++ b/doc/index.html @@ -355,7 +355,7 @@ environments.

    diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index c141a59..9aa43cc 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 b7b1720..ac669a7 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 3b4b8bd..43893e4 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 73edaf7..ed0e072 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 d3dd009..4277161 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 0dd7d08..615311d 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 c1f24f1..a9e1258 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 347c8b5..8192cec 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 e19297a..b6a6f52 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 1bb52e8..08cf72c 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 @@ -227,7 +227,7 @@ class cd_nagios::nagios::objects::add_contactgroups_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 2fb497d..7031e4f 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 1bf8ad5..73dbf2e 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 @@ -170,7 +170,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 e1db96b..a9aeb3a 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 d00852f..0700656 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_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html index 2444915..f033bb8 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 8ef8562..eb0d887 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -5579,7 +5579,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 bf4fb80..a5382f2 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 da5b953..1367a3a 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 d728aa3..7742147 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 a9a3c00..aafe951 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -268,7 +268,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 26d3978..dd896e3 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 @@ -247,7 +247,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 648d20b..07191cd 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 @@ -185,7 +185,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/

    40 41 42 -43 +43 +44 
    # File 'manifests/nagios/objects/add_contactgroups.pp', line 24
@@ -200,6 +201,7 @@ $ng_contactgroup_register = '1',
 
 $ng_nagios_server         = $::cd_nagios::params::ng_nagios_server
 $ng_tgt_contactgroup_add  = $::cd_nagios::params::ng_tgt_contactgroup_add
+$ng_contacts_rule_erb     = $::cd_nagios::params::ng_contacts_rule_erb
 
 
   if $::fqdn == $ng_nagios_server {
@@ -217,7 +219,7 @@ $ng_tgt_contactgroup_add  = $::cd_nagios::params::ng_tgt_contactgroup_add
 
 
       
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 3f2e1c1..5ad31a2 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
@@ -935,7 +935,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 5f5c998..2b6d5cf 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 c92902e..eca3a82 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From d6267355c6ba26ff40e5eba168848706d0f68cbc Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Thu, 27 Jul 2017 13:11:57 +0200
Subject: [PATCH 17/25] recommit for updates in build 111

---
 CHANGELOG.md                                           | 10 ++++++++++
 doc/_index.html                                        |  2 +-
 doc/file.README.html                                   |  8 +++++++-
 doc/index.html                                         |  8 +++++++-
 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 +-
 ...A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html |  2 +-
 ...gios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html |  2 +-
 ..._nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html |  2 +-
 ...cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html |  2 +-
 ...os_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html |  2 +-
 ..._nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.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 +-
 ...gios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html |  2 +-
 ...A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html |  6 +++---
 ...nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html             |  2 +-
 doc/top-level-namespace.html                           |  2 +-
 29 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad216c0..c916937 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+14a1e7412ff6792 Jenkins Server 2017-07-27 11:00:10
+
    
+
    recommit for updates in build 110
    
+
+
    
+a90da5d3ed18e7a Arne Teuke 2017-07-27 10:59:39
+
    
+
    added and linked add_contactgroups_rules
    
+
+
    
 699586d7d8b5253 Jenkins Server 2017-07-27 10:56:34
 
    
 
    recommit for updates in build 109
    
diff --git a/doc/_index.html b/doc/_index.html
index 0246430..c89d825 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -236,7 +236,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index 734ba93..bf6871a 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -112,6 +112,10 @@ Structure
    
 
  • 
 
    Certbot
    
 
  • 
+
    Httpd vHost Files
    
+
  • 
+
    [Manage additional resources]
    
+
  • 
 
    Known Problems
    
 
  • 
 
    Support
    
@@ -296,6 +300,8 @@ on a regular web server with various other web instances (not recommended
 through for performance reasons), we will not want to manage ssl.conf
 directly, hence the module creates a vhost for the ssl host.
    
 
+
    Manage additional resources
    
+
 
    Known Problems
    
 
 
    Support
    
@@ -355,7 +361,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index f30ffdf..36dadca 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -112,6 +112,10 @@ Structure
    
 
  • 
 
    Certbot
    
 
  • 
+
    Httpd vHost Files
    
+
  • 
+
    [Manage additional resources]
    
+
  • 
 
    Known Problems
    
 
  • 
 
    Support
    
@@ -296,6 +300,8 @@ on a regular web server with various other web instances (not recommended
 through for performance reasons), we will not want to manage ssl.conf
 directly, hence the module creates a vhost for the ssl host.
    
 
+
    Manage additional resources
    
+
 
    Known Problems
    
 
 
    Support
    
@@ -355,7 +361,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index 9aa43cc..bd50208 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 ac669a7..836150f 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 43893e4..c1e54bd 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 ed0e072..c924708 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 4277161..742c9ec 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 615311d..ff4189d 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 a9e1258..27c9e4d 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 8192cec..d412ab1 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 b6a6f52..004f773 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 08cf72c..0d5d14d 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
@@ -227,7 +227,7 @@ class cd_nagios::nagios::objects::add_contactgroups_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 7031e4f..c8d54f5 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 73dbf2e..95bc29f 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
@@ -170,7 +170,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 a9aeb3a..70f2fef 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 0700656..882cd17 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_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
index f033bb8..b96a20b 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 eb0d887..2ec1e07 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -5579,7 +5579,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 a5382f2..6bac11f 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 1367a3a..fc432c3 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 7742147..571c702 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 aafe951..1cc0754 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -268,7 +268,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 dd896e3..3eea3bd 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
@@ -247,7 +247,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 07191cd..ed979ae 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
@@ -201,14 +201,14 @@ $ng_contactgroup_register = '1',
 
 $ng_nagios_server         = $::cd_nagios::params::ng_nagios_server
 $ng_tgt_contactgroup_add  = $::cd_nagios::params::ng_tgt_contactgroup_add
-$ng_contacts_rule_erb     = $::cd_nagios::params::ng_contacts_rule_erb
+$ng_cntctgrps_rule_erb    = $::cd_nagios::params::ng_cntctgrps_rule_erb
 
 
   if $::fqdn == $ng_nagios_server {
 
     concat::fragment { $name:
       target    =>  $ng_tgt_contactgroup_add,
-      content   =>  template($ng_contacts_rule_erb),
+      content   =>  template($ng_cntctgrps_rule_erb),
     }
   }
 }
    • @@ -219,7 +219,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_3Atemplates.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html index 5ad31a2..77b26ae 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 @@ -935,7 +935,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 2b6d5cf..b0471d2 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 eca3a82..6369957 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From cad8229c0821ad40dcc4524f46e372f6edc072de Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 27 Jul 2017 13:44:51 +0200 Subject: [PATCH 18/25] recommit for updates in build 112 --- CHANGELOG.md | 10 + REPOSTRUCTURE.md | 3 +- doc/_index.html | 7 +- doc/file.README.html | 22 +- doc/index.html | 22 +- doc/puppet_class_list.html | 19 +- 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 +- ...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 | 561 ++++++++++++++++++ ...gios_3A_3Aobjects_3A_3Atemplate_rules.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 8 +- .../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 +- ...Anagios_3A_3Aobjects_3A_3Aadd_contact.html | 2 +- ...s_3A_3Aobjects_3A_3Aadd_contactgroups.html | 2 +- ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 32 files changed, 650 insertions(+), 54 deletions(-) create mode 100644 doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html diff --git a/CHANGELOG.md b/CHANGELOG.md index c916937..456a3c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

    No issue

    +d6267355c6ba26f Jenkins Server 2017-07-27 11:11:57 +

    +

    recommit for updates in build 111

    + +

    +3f12bbd92d567f6 Arne Teuke 2017-07-27 11:11:26 +

    +

    added and linked add_contactgroups_rules

    + +

    14a1e7412ff6792 Jenkins Server 2017-07-27 11:00:10

    recommit for updates in build 110

    diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index ae7cb78..1269abd 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -64,6 +64,7 @@ | | |-- config.pp | | |-- contactgroups.pp | | |-- contacts.pp +| | |-- hostgroups.pp | | |-- template_rules.pp | | `-- templates.pp | |-- selinux @@ -108,4 +109,4 @@ |-- README.md `-- REPOSTRUCTURE.md -20 directories, 88 files +20 directories, 89 files diff --git a/doc/_index.html b/doc/_index.html index c89d825..a947c69 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -138,6 +138,11 @@ +
  • + cd_nagios::nagios::objects::hostgroups + +
    • +
  • cd_nagios::nagios::objects::template_rules @@ -236,7 +241,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index bf6871a..a8fee49 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -158,14 +158,18 @@ define, to avoid having to alter the module code. contactgroups through Puppet exports. Additional contact groups can be created through external Puppet rules via define, to avoid having to alter the module code. -* configure NRPE on clients (optional) -* configure -firewall (optional) -* configure selinux policies (optional) -* configure -forwarding http to https including accesing the /nagios url directly -(optional) -* manage TLS certificates through certbot (optional)

    +* manage Nagios main hostgroups through Puppet exports. +Additional host groups can be created through external Puppet rules via +define, to avoid having to alter the module code. +* configure NRPE on +clients (optional) +* configure firewall (optional) +* configure selinux +policies (optional) +* configure forwarding http to https including accesing +the /nagios url directly (optional) +* manage TLS certificates through +certbot (optional)

    Service * manage Nagios service on server @@ -361,7 +365,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index 36dadca..bc0c902 100644 --- a/doc/index.html +++ b/doc/index.html @@ -158,14 +158,18 @@ define, to avoid having to alter the module code. contactgroups through Puppet exports. Additional contact groups can be created through external Puppet rules via define, to avoid having to alter the module code. -* configure NRPE on clients (optional) -* configure -firewall (optional) -* configure selinux policies (optional) -* configure -forwarding http to https including accesing the /nagios url directly -(optional) -* manage TLS certificates through certbot (optional)

    +* manage Nagios main hostgroups through Puppet exports. +Additional host groups can be created through external Puppet rules via +define, to avoid having to alter the module code. +* configure NRPE on +clients (optional) +* configure firewall (optional) +* configure selinux +policies (optional) +* configure forwarding http to https including accesing +the /nagios url directly (optional) +* manage TLS certificates through +certbot (optional)

    Service * manage Nagios service on server @@ -361,7 +365,7 @@ environments.

    diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index c08ca8f..dc13577 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -138,42 +138,49 @@
    • -
  • +
  • +
    + cd_nagios::nagios::objects::hostgroups +
    +
    • + + +
  • cd_nagios::nagios::objects::template_rules
    • -
  • +
  • cd_nagios::params
    • -
  • +
  • cd_nagios::selinux::config
    • -
  • +
  • cd_nagios::server::access_rules
    • -
  • +
  • cd_nagios::server::files
    • -
  • +
  • cd_nagios::server::service
    diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index bd50208..d67d06e 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 836150f..1ecdd98 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 c1e54bd..4b84b20 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 c924708..2530e69 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 742c9ec..a0d0cf6 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 ff4189d..8c85714 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 27c9e4d..132e95a 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 d412ab1..14461e8 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 004f773..5113d85 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 0d5d14d..3e91e6e 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 @@ -227,7 +227,7 @@ class cd_nagios::nagios::objects::add_contactgroups_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 c8d54f5..5d4425a 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 95bc29f..e6124d7 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 @@ -143,7 +143,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    34 35 36 -37 +37 +38 
    • # File 'manifests/nagios/objects/config.pp', line 23
@@ -160,6 +161,7 @@ class cd_nagios::nagios::objects::config (
     require cd_nagios::nagios::objects::add_contact_rules
     require cd_nagios::nagios::objects::contactgroups
     require cd_nagios::nagios::objects::add_contactgroups_rules
+    require cd_nagios::nagios::objects::hostgroups
 
   }
 }
    @@ -170,7 +172,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 70f2fef..36c1696 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 882cd17..f53524e 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 new file mode 100644 index 0000000..a1ac9c2 --- /dev/null +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html @@ -0,0 +1,561 @@ + + + + + + + Puppet Class: cd_nagios::nagios::objects::hostgroups + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    + + +

    Puppet Class: cd_nagios::nagios::objects::hostgroups

    +
    + +
    +
    Inherits:
    +
    cd_nagios::params
    +
    + + +
    +
    Defined in:
    +
    + manifests/nagios/objects/hostgroups.pp +
    +
    +
    + +

    Summary

    + Class manages basic hostgroups known to NAGIOS through Puppet +exports, and populates /etc/nagios/conf.d/nagios_base_hostgroups.cfg. + +

    Overview

    +
    +
    + +

    cd_nagios::nagios::objects::hostgroups.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/.

    + +
    +
    +
    + + +
    + + + + + +
    + 
    +
+
+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
+49
+50
+51
+52
+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
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169
+170
+171
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
+200
+201
+202
+203
+204
+205
+206
+207
+208
+209
+210
+211
+212
+213
+214
+215
+216
+217
+218
+219
+220
+221
+222
+223
+224
+225
+226
+227
+228
    +     		+ 
    # File 'manifests/nagios/objects/hostgroups.pp', line 24
+
+class cd_nagios::nagios::objects::hostgroups (
+
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    # linux servers
+
+    @@nagios_hostgroup { 'linux-servers':
+      ensure          =>  present,
+      hostgroup_name  =>  'linux-servers',
+      alias           =>  'Linux Servers',
+      owner           =>  $ng_user,
+      group           =>  $ng_user,
+      mode            =>  '0640',
+      register        =>  '1',
+      target          =>  $ng_target_hostgroup,
+    }
+
+
+    # RHEL servers
+
+    @@nagios_hostgroup { 'rhel-servers':
+      ensure          =>  present,
+      hostgroup_name  =>  'rhel-servers',
+      alias           =>  'RHEL Servers',
+      owner           =>  $ng_user,
+      group           =>  $ng_user,
+      mode            =>  '0640',
+      register        =>  '1',
+      target          =>  $ng_target_hostgroup,
+    }
+
+    # CentOS servers
+
+    @@nagios_hostgroup { 'centos-servers':
+      ensure          =>  present,
+      hostgroup_name  =>  'centos-servers',
+      alias           =>  'CentOS Servers',
+      owner           =>  $ng_user,
+      group           =>  $ng_user,
+      mode            =>  '0640',
+      register        =>  '1',
+      target          =>  $ng_target_hostgroup,
+    }
+
+    # SuSE servers
+
+    @@nagios_hostgroup { 'suse-servers':
+      ensure          =>  present,
+      hostgroup_name  =>  'suse-servers',
+      alias           =>  'SuSE Servers',
+      owner           =>  $ng_user,
+      group           =>  $ng_user,
+      mode            =>  '0640',
+      register        =>  '1',
+      target          =>  $ng_target_hostgroup,
+    }
+
+    # Unix servers
+
+    @@nagios_hostgroup { 'unix-servers':
+      ensure          =>  present,
+      hostgroup_name  =>  'unix-servers',
+      alias           =>  'Unix Servers',
+      owner           =>  $ng_user,
+      group           =>  $ng_user,
+      mode            =>  '0640',
+      register        =>  '1',
+      target          =>  $ng_target_hostgroup,
+    }
+
+    # Solaris servers
+
+    @@nagios_hostgroup { 'solaris-servers':
+      ensure          =>  present,
+      hostgroup_name  =>  'solaris-servers',
+      alias           =>  'Solaris Servers',
+      owner           =>  $ng_user,
+      group           =>  $ng_user,
+      mode            =>  '0640',
+      register        =>  '1',
+      target          =>  $ng_target_hostgroup,
+    }
+
+    # AIX servers
+
+    @@nagios_hostgroup { 'aix-servers':
+      ensure          =>  present,
+      hostgroup_name  =>  'aix-servers',
+      alias           =>  'AIX Servers',
+      owner           =>  $ng_user,
+      group           =>  $ng_user,
+      mode            =>  '0640',
+      register        =>  '1',
+      target          =>  $ng_target_hostgroup,
+    }
+
+    # Windows servers
+
+    @@nagios_hostgroup { 'windows-servers':
+      ensure          =>  present,
+      hostgroup_name  =>  'windows-servers',
+      alias           =>  'Windows Servers',
+      owner           =>  $ng_user,
+      group           =>  $ng_user,
+      mode            =>  '0640',
+      register        =>  '1',
+      target          =>  $ng_target_hostgroup,
+    }
+
+    # Netware servers
+
+    @@nagios_hostgroup { 'netware-servers':
+      ensure          =>  present,
+      hostgroup_name  =>  'netware-servers',
+      alias           =>  'Netware Servers',
+      owner           =>  $ng_user,
+      group           =>  $ng_user,
+      mode            =>  '0640',
+      register        =>  '1',
+      target          =>  $ng_target_hostgroup,
+    }
+
+    # DB servers
+
+    @@nagios_hostgroup { 'db-servers':
+      ensure          =>  present,
+      hostgroup_name  =>  'db-servers',
+      alias           =>  'DB Servers',
+      owner           =>  $ng_user,
+      group           =>  $ng_user,
+      mode            =>  '0640',
+      register        =>  '1',
+      target          =>  $ng_target_hostgroup,
+    }
+
+    # Oracle servers
+
+    @@nagios_hostgroup { 'oracle-servers':
+      ensure          =>  present,
+      hostgroup_name  =>  'oracle-servers',
+      alias           =>  'Oracle Servers',
+      owner           =>  $ng_user,
+      group           =>  $ng_user,
+      mode            =>  '0640',
+      register        =>  '1',
+      target          =>  $ng_target_hostgroup,
+    }
+
+    # MySQL servers
+
+    @@nagios_hostgroup { 'mysql-servers':
+      ensure          =>  present,
+      hostgroup_name  =>  'mysql-servers',
+      alias           =>  'MySQL Servers',
+      owner           =>  $ng_user,
+      group           =>  $ng_user,
+      mode            =>  '0640',
+      register        =>  '1',
+      target          =>  $ng_target_hostgroup,
+    }
+
+    # MSSQL servers
+
+    @@nagios_hostgroup { 'mssql-servers':
+      ensure          =>  present,
+      hostgroup_name  =>  'mssql-servers',
+      alias           =>  'MSSQL Servers',
+      owner           =>  $ng_user,
+      group           =>  $ng_user,
+      mode            =>  '0640',
+      register        =>  '1',
+      target          =>  $ng_target_hostgroup,
+    }
+
+    # NOSQL servers
+
+    @@nagios_hostgroup { 'nosql-servers':
+      ensure          =>  present,
+      hostgroup_name  =>  'nosql-servers',
+      alias           =>  'NOSQL Servers',
+      owner           =>  $ng_user,
+      group           =>  $ng_user,
+      mode            =>  '0640',
+      register        =>  '1',
+      target          =>  $ng_target_hostgroup,
+    }
+
+    # Hadoop servers
+
+    @@nagios_hostgroup { 'hadoop-servers':
+      ensure          =>  present,
+      hostgroup_name  =>  'hadoop-servers',
+      alias           =>  'HADOOP Servers',
+      owner           =>  $ng_user,
+      group           =>  $ng_user,
+      mode            =>  '0640',
+      register        =>  '1',
+      target          =>  $ng_target_hostgroup,
+    }
+
+  }
+}
    +
    +
    +
    + + + +
    + + \ No newline at end of file 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 b96a20b..852bf5b 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 2ec1e07..182dc85 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -95,6 +95,8 @@ cd_nagios::nagios::objects::contacts
    + cd_nagios::nagios::objects::hostgroups
    + cd_nagios::nagios::objects::contactgroups
    cd_nagios::nagios::objects::template_rules
    @@ -5550,7 +5552,7 @@ $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" -$ng_target_hostgroup = "${ng_conf_d_dir}/nagios_hostgroup.cfg" +$ng_target_hostgroup = "${ng_conf_d_dir}/nagios_hostgroups_base.cfg" $ng_target_hostdep = "${ng_conf_d_dir}/nagios_hostdependency.cfg" $ng_target_hostesc = "${ng_conf_d_dir}/nagios_hostescalation.cfg" $ng_target_hostext = "${ng_conf_d_dir}/nagios_hostextinfo.cfg" @@ -5564,7 +5566,7 @@ $ng_tgt_contactgroup_base = "${ng_conf_d_dir}/nagios_contactgroup_base.cfg& $ng_tgt_contactgroup_add = "${ng_conf_d_dir}/nagios_contactgroup_add.cfg" $ng_cntctgrps_head_erb = 'cd_nagios/nagios/contactgroups_cfg_head.erb' $ng_cntctgrps_rule_erb = 'cd_nagios/nagios/contactgroups_cfg_rule.erb' -$ng_target_command = "${ng_conf_d_dir}/nagios_command.cfg" +$ng_target_command = "${ng_conf_d_dir}/nagios_commands_base.cfg" # includes must be last @@ -5579,7 +5581,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 6bac11f..09fbef3 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 fc432c3..2166aaf 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 571c702..468ffe9 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 1cc0754..29a6b82 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -268,7 +268,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 3eea3bd..d4ce872 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 @@ -247,7 +247,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 ed979ae..6078a2b 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 @@ -219,7 +219,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_3Atemplates.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html index 77b26ae..978daa0 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 @@ -935,7 +935,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 b0471d2..b8addc6 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 6369957..3a4383c 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From f4321e6da976742dd4beb1cbe88e4fe92133253d Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 27 Jul 2017 13:58:59 +0200 Subject: [PATCH 19/25] recommit for updates in build 113 --- CHANGELOG.md | 10 +++++ REPOSTRUCTURE.md | 3 +- 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 +- ...s_3A_3Aobjects_3A_3Aadd_contact_rules.html | 2 +- ...Aobjects_3A_3Aadd_contactgroups_rules.html | 2 +- ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 2 +- ..._3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | 2 +- ...agios_3A_3Aobjects_3A_3Acontactgroups.html | 2 +- ...A_3Anagios_3A_3Aobjects_3A_3Acontacts.html | 2 +- ...3Anagios_3A_3Aobjects_3A_3Ahostgroups.html | 2 +- ...gios_3A_3Aobjects_3A_3Atemplate_rules.html | 2 +- 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 | 4 +- ...Anagios_3A_3Aobjects_3A_3Aadd_contact.html | 2 +- ...s_3A_3Aobjects_3A_3Aadd_contactgroups.html | 42 +++++++++++++------ ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 31 files changed, 71 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 456a3c5..be07db2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

    No issue

    +cad8229c0821ad4 Jenkins Server 2017-07-27 11:44:51 +

    +

    recommit for updates in build 112

    + +

    +7b27896ccb84382 Arne Teuke 2017-07-27 11:44:19 +

    +

    added and linked hostgroups

    + +

    d6267355c6ba26f Jenkins Server 2017-07-27 11:11:57

    recommit for updates in build 111

    diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 1269abd..9f04939 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -23,6 +23,7 @@ | | |-- 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_3Atemplate_rules.html | | |-- cd_nagios_3A_3Aparams.html | | |-- cd_nagios_3A_3Aselinux_3A_3Aconfig.html @@ -109,4 +110,4 @@ |-- README.md `-- REPOSTRUCTURE.md -20 directories, 89 files +20 directories, 90 files diff --git a/doc/_index.html b/doc/_index.html index a947c69..1213a05 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -241,7 +241,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index a8fee49..2762048 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -365,7 +365,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index bc0c902..75e05c2 100644 --- a/doc/index.html +++ b/doc/index.html @@ -365,7 +365,7 @@ environments.

    diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index d67d06e..738410e 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 1ecdd98..c0cd695 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 4b84b20..66d0021 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 2530e69..2ce847a 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 a0d0cf6..55e3eaa 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 8c85714..924243c 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 132e95a..2be108a 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 14461e8..998f6a5 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 5113d85..cf5ddab 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 3e91e6e..eca2419 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 @@ -227,7 +227,7 @@ class cd_nagios::nagios::objects::add_contactgroups_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 5d4425a..b85570c 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 e6124d7..3a59d84 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 @@ -172,7 +172,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 36c1696..42a3e41 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 f53524e..2993bb7 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 a1ac9c2..92fb1d1 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_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html index 852bf5b..c93c804 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 182dc85..278ea0c 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -5581,7 +5581,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 09fbef3..ed43476 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 2166aaf..ba93a93 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 468ffe9..606dfba 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 29a6b82..86de294 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html @@ -214,7 +214,7 @@ class cd_nagios::server::service ( enable => true, } - @@nagios_service { "check_nagios${::hostname}": + @@nagios_service { "check_nagios_${::hostname}": check_command => 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios', use => 'generic-service', host_name => $::fqdn, @@ -268,7 +268,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 d4ce872..cdab8fb 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 @@ -247,7 +247,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 6078a2b..75fd301 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 @@ -122,12 +122,18 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/

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

    Specify the short name of the +contact group.

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

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

    Specify the alias (long name) of the +contact group

    +
    +
  • @@ -148,12 +160,18 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/

    ng_contactgroup_register - (Any) + (string) (defaults to: '1') + — +
    +

    Specify whether the contact group +should be registered in Nagios.

    +
    +
    • @@ -166,12 +184,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/

     
 
-24
-25
-26
-27
-28
-29
 30
 31
 32
@@ -186,10 +198,16 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/
    
 41
 42
 43
-44
    +44 +45 +46 +47 +48 +49 +50     		- 
    # File 'manifests/nagios/objects/add_contactgroups.pp', line 24
+        
    # File 'manifests/nagios/objects/add_contactgroups.pp', line 30
 
 define cd_nagios::nagios::objects::add_contactgroups (
 
@@ -219,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_3Atemplates.html b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
index 978daa0..dcddfc7 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
@@ -935,7 +935,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 b8addc6..4495282 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 3a4383c..da5abf1 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From 5193e6a8d2dedc5fe60a901a46de492e69853133 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Thu, 27 Jul 2017 14:33:19 +0200
Subject: [PATCH 20/25] recommit for updates in build 114

---
 CHANGELOG.md                                  |  10 +
 REPOSTRUCTURE.md                              |   6 +-
 doc/_index.html                               |  12 +-
 doc/file.README.html                          |   2 +-
 doc/index.html                                |   2 +-
 doc/puppet_class_list.html                    |  29 ++-
 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 | 234 +++++++++++++++++
 ...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 |  32 +--
 ...gios_3A_3Aobjects_3A_3Atemplate_rules.html |   2 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html |  12 +-
 .../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   |  10 +-
 doc/puppet_defined_type_list.html             |  11 +-
 ...Anagios_3A_3Aobjects_3A_3Aadd_contact.html |  33 ++-
 ...s_3A_3Aobjects_3A_3Aadd_contactgroups.html |   2 +-
 ...gios_3A_3Aobjects_3A_3Aadd_hostgroups.html | 240 ++++++++++++++++++
 ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html |   2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |   2 +-
 doc/top-level-namespace.html                  |   2 +-
 35 files changed, 608 insertions(+), 73 deletions(-)
 create mode 100644 doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html
 create mode 100644 doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroups.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be07db2..0c1c9b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+f4321e6da976742 Jenkins Server 2017-07-27 11:58:59
+
    
+
    recommit for updates in build 113
    
+
+
    
+842d86a504f6198 Arne Teuke 2017-07-27 11:58:30
+
    
+
    added _ to service name
    
+
+
    
 cad8229c0821ad4 Jenkins Server 2017-07-27 11:44:51
 
    
 
    recommit for updates in build 112
    
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index 9f04939..f6ea7f2 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -61,6 +61,8 @@
 |   |       |-- add_contactgroups_rules.pp
 |   |       |-- add_contact.pp
 |   |       |-- add_contact_rules.pp
+|   |       |-- add_hostgroup_rules.pp
+|   |       |-- add_hostgroups.pp
 |   |       |-- commands.pp
 |   |       |-- config.pp
 |   |       |-- contactgroups.pp
@@ -93,6 +95,8 @@
 |   |   |-- contacts.cfg
 |   |   |-- contacts_cfg_head.erb
 |   |   |-- contacts_cfg_rule.erb
+|   |   |-- hostgroups_cfg_head.erb
+|   |   |-- hostgroups_cfg_rule.erb
 |   |   |-- htpasswd_rule.erb
 |   |   |-- nagios_cfg.erb
 |   |   |-- templates_cfg_head.erb
@@ -110,4 +114,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-20 directories, 90 files
+20 directories, 94 files
diff --git a/doc/_index.html b/doc/_index.html
index 1213a05..94645b2 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -118,6 +118,11 @@
       
             
     
+            
  • 
+      cd_nagios::nagios::objects::add_hostgroup_rules
+      
+            
    • 
+    
             
  • 
       cd_nagios::nagios::objects::commands
       
@@ -203,6 +208,11 @@
       
             
    • 
     
+            
  • 
+      cd_nagios::nagios::objects::add_hostgroups
+      
+            
    • 
+    
             
  • 
       cd_nagios::nagios::objects::templates
       
@@ -241,7 +251,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index 2762048..7705114 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -365,7 +365,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index 75e05c2..2df62c7 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -365,7 +365,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html
index dc13577..2478cf3 100644
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -110,77 +110,84 @@
     
    • 
     
 
-    
  • 
+    
  • 
+      
    
+        cd_nagios::nagios::objects::add_hostgroup_rules
+      
    
+    
    • 
+    
+
+    
  • 
       
    
         cd_nagios::nagios::objects::commands
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::nagios::objects::config
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::nagios::objects::contactgroups
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::nagios::objects::contacts
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::nagios::objects::hostgroups
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::nagios::objects::template_rules
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::params
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::selinux::config
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::server::access_rules
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::server::files
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::server::service
       
    
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index 738410e..78ff566 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 c0cd695..88f7603 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 66d0021..3de9aee 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 2ce847a..c63b675 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 55e3eaa..896ee68 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 924243c..7c1728f 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 2be108a..50f98f6 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 998f6a5..fecb239 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 cf5ddab..7ca4b70 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 eca2419..4abbac9 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
@@ -227,7 +227,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
new file mode 100644
index 0000000..8a84cf0
--- /dev/null
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html
@@ -0,0 +1,234 @@
+
+
+  
+    
+
+
+  Puppet Class: cd_nagios::nagios::objects::add_hostgroup_rules
+  
+    — Documentation by YARD 0.9.9
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Puppet Class: cd_nagios::nagios::objects::add_hostgroup_rules
    
+
    
+  
+  
    
+    
    Inherits:
    
+    
    cd_nagios::params
    
+  
    
+  
+  
+  
    
+    
    Defined in:
    
+    
    
+      manifests/nagios/objects/add_hostgroup_rules.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  Class manages /etc/nagios_conf.d/nagios_hostgroups_add.cfg and
+additional hostgroups through external Puppet rules via define.
+
+
    Overview
    
+
    
+  
    
+    
+
    cd_nagios::nagios::objects::add_hostgroup_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/.
    
+
+  
    
+
    
+
    
+  
+  
    
+    
    Examples:
    
+    
+      
+      
    cd_nagios::nagios::objects::add_hostgroups { 'example_hostgroup':
+  ng_hostgroup_name   =>  'example_hostgroup',
+  ng_hostgroup_alias  =>  'Example Hostgroup',
+}
    
+    
+  
    
+
+
+
    
+  
+    
+      
+      
+    
+  
    
+        
    +
+
+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
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
    
+          		
+        
    # File 'manifests/nagios/objects/add_hostgroup_rules.pp', line 29
+
+class cd_nagios::nagios::objects::add_hostgroup_rules (
+
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    # manage /etc/nagios_conf.d/nagios_hostgroups_add.cfg
+
+    concat { $ng_tgt_hostgroup_add:
+      ensure    =>  present,
+      path      =>  $ng_tgt_hostgroup_add,
+      owner     =>  $ng_user,
+      group     =>  $ng_user,
+      mode      =>  '0640',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  nagios_etc_t,
+      seluser   =>  system_u,
+      notify    =>  Service[$ng_service],
+    }
+
+    # manage file header
+
+    concat::fragment { 'hostgroups_header':
+      target    =>  $ng_tgt_hostgroup_add,
+      content   =>  template($ng_tgt_hostgrp_head_erb),
+      order     =>  '000',
+    }
+
+   cd_nagios::nagios::objects::add_hostgroups { 'example_hostgroup':
+     ng_hostgroup_name   =>  'example_hostgroup',
+     ng_hostgroup_alias  =>  'Example Hostgroup',
+   }
+  }
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file
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 b85570c..804b423 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 3a59d84..bb4c8fd 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
@@ -144,7 +144,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 35
 36
 37
-38
    • 
+38
+39
    		 
    # File 'manifests/nagios/objects/config.pp', line 23
@@ -162,6 +163,7 @@ class cd_nagios::nagios::objects::config (
     require cd_nagios::nagios::objects::contactgroups
     require cd_nagios::nagios::objects::add_contactgroups_rules
     require cd_nagios::nagios::objects::hostgroups
+    require cd_nagios::nagios::objects::add_hostgroup_rules
 
   }
 }
    @@ -172,7 +174,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 42a3e41..863a245 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 2993bb7..4602a04 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 92fb1d1..0a1ca7c 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 @@ -356,7 +356,7 @@ class cd_nagios::nagios::objects::hostgroups ( group => $ng_user, mode => '0640', register => '1', - target => $ng_target_hostgroup, + target => $ng_target_hostgroup_base, } @@ -370,7 +370,7 @@ class cd_nagios::nagios::objects::hostgroups ( group => $ng_user, mode => '0640', register => '1', - target => $ng_target_hostgroup, + target => $ng_target_hostgroup_base, } # CentOS servers @@ -383,7 +383,7 @@ class cd_nagios::nagios::objects::hostgroups ( group => $ng_user, mode => '0640', register => '1', - target => $ng_target_hostgroup, + target => $ng_target_hostgroup_base, } # SuSE servers @@ -396,7 +396,7 @@ class cd_nagios::nagios::objects::hostgroups ( group => $ng_user, mode => '0640', register => '1', - target => $ng_target_hostgroup, + target => $ng_target_hostgroup_base, } # Unix servers @@ -409,7 +409,7 @@ class cd_nagios::nagios::objects::hostgroups ( group => $ng_user, mode => '0640', register => '1', - target => $ng_target_hostgroup, + target => $ng_target_hostgroup_base, } # Solaris servers @@ -422,7 +422,7 @@ class cd_nagios::nagios::objects::hostgroups ( group => $ng_user, mode => '0640', register => '1', - target => $ng_target_hostgroup, + target => $ng_target_hostgroup_base, } # AIX servers @@ -435,7 +435,7 @@ class cd_nagios::nagios::objects::hostgroups ( group => $ng_user, mode => '0640', register => '1', - target => $ng_target_hostgroup, + target => $ng_target_hostgroup_base, } # Windows servers @@ -448,7 +448,7 @@ class cd_nagios::nagios::objects::hostgroups ( group => $ng_user, mode => '0640', register => '1', - target => $ng_target_hostgroup, + target => $ng_target_hostgroup_base, } # Netware servers @@ -461,7 +461,7 @@ class cd_nagios::nagios::objects::hostgroups ( group => $ng_user, mode => '0640', register => '1', - target => $ng_target_hostgroup, + target => $ng_target_hostgroup_base, } # DB servers @@ -474,7 +474,7 @@ class cd_nagios::nagios::objects::hostgroups ( group => $ng_user, mode => '0640', register => '1', - target => $ng_target_hostgroup, + target => $ng_target_hostgroup_base, } # Oracle servers @@ -487,7 +487,7 @@ class cd_nagios::nagios::objects::hostgroups ( group => $ng_user, mode => '0640', register => '1', - target => $ng_target_hostgroup, + target => $ng_target_hostgroup_base, } # MySQL servers @@ -500,7 +500,7 @@ class cd_nagios::nagios::objects::hostgroups ( group => $ng_user, mode => '0640', register => '1', - target => $ng_target_hostgroup, + target => $ng_target_hostgroup_base, } # MSSQL servers @@ -513,7 +513,7 @@ class cd_nagios::nagios::objects::hostgroups ( group => $ng_user, mode => '0640', register => '1', - target => $ng_target_hostgroup, + target => $ng_target_hostgroup_base, } # NOSQL servers @@ -526,7 +526,7 @@ class cd_nagios::nagios::objects::hostgroups ( group => $ng_user, mode => '0640', register => '1', - target => $ng_target_hostgroup, + target => $ng_target_hostgroup_base, } # Hadoop servers @@ -539,7 +539,7 @@ class cd_nagios::nagios::objects::hostgroups ( group => $ng_user, mode => '0640', register => '1', - target => $ng_target_hostgroup, + target => $ng_target_hostgroup_base, } } @@ -551,7 +551,7 @@ class cd_nagios::nagios::objects::hostgroups ( 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 c93c804..29e08f7 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 278ea0c..c7ddef7 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -103,6 +103,8 @@ cd_nagios::nagios::objects::add_contact_rules
    + cd_nagios::nagios::objects::add_hostgroup_rules
    + cd_nagios::nagios::objects::add_contactgroups_rules
    @@ -5225,7 +5227,9 @@ up

    986 987 988 -989 +989 +990 +991 
    # File 'manifests/params.pp', line 646
@@ -5552,7 +5556,9 @@ $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"
-$ng_target_hostgroup      = "${ng_conf_d_dir}/nagios_hostgroups_base.cfg"
+$ng_target_hostgroup_base = "${ng_conf_d_dir}/nagios_hostgroups_base.cfg"
+$ng_tgt_hostgroup_add     = "${ng_conf_d_dir}/nagios_hostgroups_add.cfg"
+$ng_tgt_hostgrp_head_erb  = 'cd_nagios/nagios/hostgroups_cfg_head.erb'
 $ng_target_hostdep        = "${ng_conf_d_dir}/nagios_hostdependency.cfg"
 $ng_target_hostesc        = "${ng_conf_d_dir}/nagios_hostescalation.cfg"
 $ng_target_hostext        = "${ng_conf_d_dir}/nagios_hostextinfo.cfg"
@@ -5581,7 +5587,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 ed43476..1122fe3 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 ba93a93..6ea1551 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 606dfba..3f60677 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 86de294..3f00f20 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -192,7 +192,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 83
 84
 85
-86
    +86 +87 
    # File 'manifests/server/service.pp', line 23
@@ -219,11 +220,12 @@ class cd_nagios::server::service (
         use                 => 'generic-service',
         host_name           => $::fqdn,
         notification_period => '24x7',
+        service_description =>  "${::hostname}_nagios_service",
         target              =>  $ng_target_service,
         owner               => 'nagios',
         group               => 'nagios',
-        mode                => '660',
-        contacts            => 'DevOps',
+        mode                => '0660',
+        contacts            => 'ops',
     }
 
       resources { [ 'nagios_host',
@@ -268,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 fa9c994..55929ba 100644
--- a/doc/puppet_defined_type_list.html
+++ b/doc/puppet_defined_type_list.html
@@ -54,14 +54,21 @@
     
     
 
-    
  • 
+    
  • 
+      
    
+        cd_nagios::nagios::objects::add_hostgroups
+      
    
+    
    • 
+    
+
+    
  • 
       
    
         cd_nagios::nagios::objects::templates
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::server::access
       
    
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 cdab8fb..38941fc 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
@@ -114,7 +114,20 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
   
 
 
    
-  
    Parameters:
    
+  
+  
    
+    
    Examples:
    
+    
+      
+      
    cd_nagios::nagios::objects::add_contact { 'example_user':
+  ng_contact_name   =>  'example_user',
+  ng_contact_alias  =>  'Example User',
+  ng_contact_groups =>  'admins',
+  ng_contact_email  =>  'example@example.net',
+}
    
+    
+  
    
+
    Parameters:
    
 
      
   
     
    • 
@@ -192,12 +205,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
      
         
       
 
-25
-26
-27
-28
-29
-30
 31
 32
 33
@@ -213,10 +220,16 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
      
 43
 44
 45
-46
      
+46
+47
+48
+49
+50
+51
+52
    		•  - 
    # File 'manifests/nagios/objects/add_contact.pp', line 25
+        
    # File 'manifests/nagios/objects/add_contact.pp', line 31
 
 define cd_nagios::nagios::objects::add_contact (
 
@@ -247,7 +260,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 75fd301..1f6938b 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
new file mode 100644
index 0000000..224732f
--- /dev/null
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroups.html
@@ -0,0 +1,240 @@
+
+
+  
+    
+
+
+  Defined Type: cd_nagios::nagios::objects::add_hostgroups
+  
+    — Documentation by YARD 0.9.9
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Defined Type: cd_nagios::nagios::objects::add_hostgroups
    
+
    
+  
    
+    
    Defined in:
    
+    
    
+      manifests/nagios/objects/add_hostgroups.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  define populates /etc/nagios/conf.d/nagios_hostgroups_add through
+extermal Puppet rules.
+
+
    Overview
    
+
    
+  
    
+    
+
    cd_nagios::nagios::objects::add_hostgroups.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/
    
+
+  
    
+
    
+
    
+  
+  
    
+    
    Examples:
    
+    
+      
+      
    cd_nagios::nagios::objects::add_hostgroups { 'example_hostgroup':
+  ng_hostgroup_name   =>  'example_hostgroup',
+  ng_hostgroup_alias  =>  'Example Hostgroup',
+}
    
+    
+  
    
+
    Parameters:
    
+
      
+  
+    
    • 
+      
+        ng_hostgroup_name
+      
+      
+        (Any)
+      
+      
+        (defaults to: undef)
+      
+      
+    
      • 
+  
+    
    • 
+      
+        ng_hostgroup_alias
+      
+      
+        (Any)
+      
+      
+        (defaults to: undef)
+      
+      
+    
      • 
+  
+    
    • 
+      
+        ng_hostgroup_register
+      
+      
+        (Any)
+      
+      
+        (defaults to: '1')
+      
+      
+    
      • 
+  
+
    
+
+
+
    
+  
+    
+      
+      
+    
+  
    
+        
    +
+
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
    
+          		
+        
    # File 'manifests/nagios/objects/add_hostgroups.pp', line 29
+
+define cd_nagios::nagios::objects::add_hostgroups (
+
+$ng_hostgroup_name      = undef,
+$ng_hostgroup_alias     = undef,
+$ng_hostgroup_register  = '1',
+
+) {
+
+$ng_nagios_server         = $::cd_nagios::params::ng_nagios_server
+$ng_tgt_hostgroup_add     = $::cd_nagios::params::ng_tgt_hostgroup_add
+$ng_tgt_hostgrp_head_erb  = $::cd_nagios::params::ng_tgt_hostgrp_head_erb
+
+
+  if $::fqdn == $ng_nagios_server {
+
+    concat::fragment { $name:
+      target    =>  $ng_tgt_hostgroup_add,
+      content   =>  template($ng_tgt_hostgrp_head_erb),
+    }
+  }
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file
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 dcddfc7..81fe573 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
@@ -935,7 +935,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 4495282..da2d7c7 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 da5abf1..6146632 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From dd4d061fe556bfb9e038cbbe84a9021af9e6f1a6 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Thu, 27 Jul 2017 14:47:24 +0200
Subject: [PATCH 21/25] recommit for updates in build 115

---
 CHANGELOG.md                                           | 10 ++++++++++
 REPOSTRUCTURE.md                                       |  4 +++-
 doc/_index.html                                        |  7 +------
 doc/file.README.html                                   |  8 ++++++--
 doc/index.html                                         |  8 ++++++--
 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 +-
 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 +-
 ...A_3Anagios_3A_3Aobjects_3A_3Aadd_contact_rules.html |  2 +-
 ...gios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html |  2 +-
 ...3Anagios_3A_3Aobjects_3A_3Aadd_hostgroup_rules.html |  2 +-
 ..._nagios_3A_3Anagios_3A_3Aobjects_3A_3Acommands.html |  2 +-
 ...cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html |  2 +-
 ...os_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html |  2 +-
 ..._nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontacts.html |  2 +-
 ...agios_3A_3Anagios_3A_3Aobjects_3A_3Ahostgroups.html |  2 +-
 ...s_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html |  2 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html          |  8 ++++----
 .../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 +-
 ...gios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contact.html |  2 +-
 ...A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html |  2 +-
 ...s_3A_3Anagios_3A_3Aobjects_3A_3Aadd_hostgroups.html |  6 +++---
 ...nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html |  2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html             |  2 +-
 doc/top-level-namespace.html                           |  2 +-
 33 files changed, 58 insertions(+), 50 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c1c9b8..7580d37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+5193e6a8d2dedc5 Jenkins Server 2017-07-27 12:33:19
+
    
+
    recommit for updates in build 114
    
+
+
    
+26e2220ec9da0b2 Arne Teuke 2017-07-27 12:32:48
+
    
+
    added service description and add_hostgroup_rules
    
+
+
    
 f4321e6da976742 Jenkins Server 2017-07-27 11:58:59
 
    
 
    recommit for updates in build 113
    
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index f6ea7f2..646eb7f 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -19,6 +19,7 @@
 |   |   |-- cd_nagios_3A_3Amain_3A_3Auser.html
 |   |   |-- 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_3Acommands.html
 |   |   |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html
 |   |   |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Acontactgroups.html
@@ -34,6 +35,7 @@
 |   |-- puppet_defined_types
 |   |   |-- 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_3Atemplates.html
 |   |   `-- cd_nagios_3A_3Aserver_3A_3Aaccess.html
 |   |-- file.README.html
@@ -114,4 +116,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-20 directories, 94 files
+20 directories, 96 files
diff --git a/doc/_index.html b/doc/_index.html
index 94645b2..38e887d 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -173,11 +173,6 @@
       
             
     
-            
  • 
-      cd_nagios::server::service
-      
-            
    • 
-    
       
     
   
@@ -251,7 +246,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index 7705114..3ff9e43 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.8 | cd_nagios| 0.0.0.9 | {Build
 Status/]|
    
 
@@ -176,6 +176,10 @@ certbot (optional)
    
 * manage NRPE service on clients
 (optional)
    
 
+
    Monitoring
+* monitor Nagios host
+* monitor Nagios service
    
+
 
    Repo Structure
    
 
 
    Repostructure has moved to REPOSTRUCTURE.md in repo.
    
@@ -365,7 +369,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index 2df62c7..e40e30e 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -61,7 +61,7 @@
 
    |Repo Name| version | Build
 Status|
 |---|---|---|---|
-|cd_nagios| 0.0.0.8 | cd_nagios| 0.0.0.9 | {Build
 Status/]|
    
 
@@ -176,6 +176,10 @@ certbot (optional)
    
 * manage NRPE service on clients
 (optional)
    
 
+
    Monitoring
+* monitor Nagios host
+* monitor Nagios service
    
+
 
    Repo Structure
    
 
 
    Repostructure has moved to REPOSTRUCTURE.md in repo.
    
@@ -365,7 +369,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html
index 2478cf3..ab5ffd0 100644
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -187,13 +187,6 @@
     
     
 
-    
  • 
-      
    
-        cd_nagios::server::service
-      
    
-    
    • 
-    
-
 
       
     
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index 78ff566..4f37d5e 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 88f7603..c764caf 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 3de9aee..52ad594 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 c63b675..15c2e0f 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 896ee68..96feebe 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 7c1728f..a280cfd 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 50f98f6..5430040 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 fecb239..4c91db8 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 7ca4b70..e3bed8f 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 4abbac9..5e03412 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
@@ -227,7 +227,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 8a84cf0..3fe4db4 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
@@ -224,7 +224,7 @@ class cd_nagios::nagios::objects::add_hostgroup_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 804b423..00daa5e 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 bb4c8fd..4745345 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
@@ -174,7 +174,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 863a245..d1f4323 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 4602a04..073adf7 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 0a1ca7c..6b09e8c 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_3Atemplate_rules.html b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplate_rules.html
index 29e08f7..7469bb9 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 c7ddef7..7ad9ba4 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html
@@ -83,8 +83,6 @@
       
       cd_nagios::selinux::config
    
       
-      cd_nagios::server::service
    
-      
       cd_nagios::firewall::iptables
    
       
       cd_nagios::server::access_rules
    
@@ -5229,7 +5227,8 @@ up
    
 988
 989
 990
-991
    
+991
+992
    		 
    # File 'manifests/params.pp', line 646
@@ -5559,6 +5558,7 @@ $ng_target_host           = "${ng_conf_d_dir}/nagios_host.cfg"
 $ng_target_hostgroup_base = "${ng_conf_d_dir}/nagios_hostgroups_base.cfg"
 $ng_tgt_hostgroup_add     = "${ng_conf_d_dir}/nagios_hostgroups_add.cfg"
 $ng_tgt_hostgrp_head_erb  = 'cd_nagios/nagios/hostgroups_cfg_head.erb'
+$ng_tgt_hostgrp_rule_erb  = 'cd_nagios/nagios/hostgroups_cfg_rule.erb'
 $ng_target_hostdep        = "${ng_conf_d_dir}/nagios_hostdependency.cfg"
 $ng_target_hostesc        = "${ng_conf_d_dir}/nagios_hostescalation.cfg"
 $ng_target_hostext        = "${ng_conf_d_dir}/nagios_hostextinfo.cfg"
@@ -5587,7 +5587,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 1122fe3..66f0e95 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 6ea1551..f3ca109 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 3f60677..64d217b 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_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 38941fc..d3d416b 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
@@ -260,7 +260,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 1f6938b..608e58b 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 224732f..18a5a9c 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
@@ -212,14 +212,14 @@ $ng_hostgroup_register  = '1',
 
 $ng_nagios_server         = $::cd_nagios::params::ng_nagios_server
 $ng_tgt_hostgroup_add     = $::cd_nagios::params::ng_tgt_hostgroup_add
-$ng_tgt_hostgrp_head_erb  = $::cd_nagios::params::ng_tgt_hostgrp_head_erb
+$ng_tgt_hostgrp_rule_erb  = $::cd_nagios::params::ng_tgt_hostgrp_rule_erb
 
 
   if $::fqdn == $ng_nagios_server {
 
     concat::fragment { $name:
       target    =>  $ng_tgt_hostgroup_add,
-      content   =>  template($ng_tgt_hostgrp_head_erb),
+      content   =>  template($ng_tgt_hostgrp_rule_erb),
     }
   }
 }
    @@ -230,7 +230,7 @@ $ng_tgt_hostgrp_head_erb = $::cd_nagios::params::ng_tgt_hostgrp_head_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 81fe573..291de3d 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 @@ -935,7 +935,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 da2d7c7..8e1ed8c 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 6146632..cfa9172 100644 --- a/doc/top-level-namespace.html +++ b/doc/top-level-namespace.html @@ -90,7 +90,7 @@ From 83782a592f1fe78a4a54b64af36b10c466e4806d Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 27 Jul 2017 15:22:48 +0200 Subject: [PATCH 22/25] recommit for updates in build 116 --- CHANGELOG.md | 10 + REPOSTRUCTURE.md | 7 +- doc/_index.html | 17 +- doc/file.README.html | 23 +- doc/index.html | 23 +- doc/puppet_class_list.html | 24 +- 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 | 16 +- ...3A_3Aobjects_3A_3Aadd_hostgroup_rules.html | 14 +- ...3Aobjects_3A_3Aadd_servicegroup_rules.html | 234 +++++++++++++++++ ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 2 +- ..._3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html | 8 +- ...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 | 245 ++++++++++++++++++ ...gios_3A_3Aobjects_3A_3Atemplate_rules.html | 2 +- doc/puppet_classes/cd_nagios_3A_3Aparams.html | 37 ++- .../cd_nagios_3A_3Aselinux_3A_3Aconfig.html | 2 +- ..._nagios_3A_3Aserver_3A_3Aaccess_rules.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Afiles.html | 2 +- doc/puppet_defined_type_list.html | 11 +- ...Anagios_3A_3Aobjects_3A_3Aadd_contact.html | 2 +- ...s_3A_3Aobjects_3A_3Aadd_contactgroups.html | 2 +- ...gios_3A_3Aobjects_3A_3Aadd_hostgroups.html | 2 +- ...s_3A_3Aobjects_3A_3Aadd_servicegroups.html | 238 +++++++++++++++++ ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html | 2 +- .../cd_nagios_3A_3Aserver_3A_3Aaccess.html | 2 +- doc/top-level-namespace.html | 2 +- 37 files changed, 867 insertions(+), 86 deletions(-) create mode 100644 doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroup_rules.html create mode 100644 doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aservicegroups.html create mode 100644 doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroups.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 7580d37..d401a02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ Changelog of Git Changelog.

    No issue

    +dd4d061fe556bfb Jenkins Server 2017-07-27 12:47:24 +

    +

    recommit for updates in build 115

    + +

    +25a31ffc1bc0790 Arne Teuke 2017-07-27 12:46:46 +

    +

    edited README and fixed template

    + +

    5193e6a8d2dedc5 Jenkins Server 2017-07-27 12:33:19

    recommit for updates in build 114

    diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md index 646eb7f..22736c6 100644 --- a/REPOSTRUCTURE.md +++ b/REPOSTRUCTURE.md @@ -65,11 +65,14 @@ | | |-- add_contact_rules.pp | | |-- add_hostgroup_rules.pp | | |-- add_hostgroups.pp +| | |-- add_servicegroup_rules.pp +| | |-- add_servicegroups.pp | | |-- commands.pp | | |-- config.pp | | |-- contactgroups.pp | | |-- contacts.pp | | |-- hostgroups.pp +| | |-- servicegroups.pp | | |-- template_rules.pp | | `-- templates.pp | |-- selinux @@ -101,6 +104,8 @@ | | |-- hostgroups_cfg_rule.erb | | |-- htpasswd_rule.erb | | |-- nagios_cfg.erb +| | |-- svcgroups_cfg_head.erb +| | |-- svcgroups_cfg_rule.erb | | |-- templates_cfg_head.erb | | `-- templates_cfg_rule.erb | `-- selinux @@ -116,4 +121,4 @@ |-- README.md `-- REPOSTRUCTURE.md -20 directories, 96 files +20 directories, 101 files diff --git a/doc/_index.html b/doc/_index.html index 38e887d..2e4ee8d 100644 --- a/doc/_index.html +++ b/doc/_index.html @@ -123,6 +123,11 @@ +
  • + cd_nagios::nagios::objects::add_servicegroup_rules + +
    • +
  • cd_nagios::nagios::objects::commands @@ -148,6 +153,11 @@
    • +
  • + cd_nagios::nagios::objects::servicegroups + +
    • +
  • cd_nagios::nagios::objects::template_rules @@ -208,6 +218,11 @@
    • +
  • + cd_nagios::nagios::objects::add_servicegroups + +
    • +
  • cd_nagios::nagios::objects::templates @@ -246,7 +261,7 @@ diff --git a/doc/file.README.html b/doc/file.README.html index 3ff9e43..3bc23eb 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -161,15 +161,18 @@ the module code. * manage Nagios main hostgroups through Puppet exports. Additional host groups can be created through external Puppet rules via define, to avoid having to alter the module code. -* configure NRPE on -clients (optional) -* configure firewall (optional) -* configure selinux -policies (optional) -* configure forwarding http to https including accesing -the /nagios url directly (optional) -* manage TLS certificates through -certbot (optional)

    +* manage Nagios main +servicegroups through Puppet exports. Additional service groups can be +created through external Puppet rules via define, to avoid having to alter +the module code. +* configure NRPE on clients (optional) +* configure +firewall (optional) +* configure selinux policies (optional) +* configure +forwarding http to https including accesing the /nagios url directly +(optional) +* manage TLS certificates through certbot (optional)

    Service * manage Nagios service on server @@ -369,7 +372,7 @@ environments.

    diff --git a/doc/index.html b/doc/index.html index e40e30e..b625eb3 100644 --- a/doc/index.html +++ b/doc/index.html @@ -161,15 +161,18 @@ the module code. * manage Nagios main hostgroups through Puppet exports. Additional host groups can be created through external Puppet rules via define, to avoid having to alter the module code. -* configure NRPE on -clients (optional) -* configure firewall (optional) -* configure selinux -policies (optional) -* configure forwarding http to https including accesing -the /nagios url directly (optional) -* manage TLS certificates through -certbot (optional)

    +* manage Nagios main +servicegroups through Puppet exports. Additional service groups can be +created through external Puppet rules via define, to avoid having to alter +the module code. +* configure NRPE on clients (optional) +* configure +firewall (optional) +* configure selinux policies (optional) +* configure +forwarding http to https including accesing the /nagios url directly +(optional) +* manage TLS certificates through certbot (optional)

    Service * manage Nagios service on server @@ -369,7 +372,7 @@ environments.

    diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html index ab5ffd0..2527771 100644 --- a/doc/puppet_class_list.html +++ b/doc/puppet_class_list.html @@ -117,41 +117,55 @@
    • -
  • +
  • +
    + cd_nagios::nagios::objects::add_servicegroup_rules +
    +
    • + + +
  • cd_nagios::nagios::objects::commands
    • -
  • +
  • cd_nagios::nagios::objects::config
    • -
  • +
  • cd_nagios::nagios::objects::contactgroups
    • -
  • +
  • cd_nagios::nagios::objects::contacts
    • -
  • +
  • cd_nagios::nagios::objects::hostgroups
    • +
  • +
    + cd_nagios::nagios::objects::servicegroups +
    +
    • + +
  • cd_nagios::nagios::objects::template_rules diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html index 4f37d5e..4634e87 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 c764caf..681e9ac 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 52ad594..0aac8c2 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 15c2e0f..1c5b3ad 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 96feebe..43d8107 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 a280cfd..330f965 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 5430040..b59cb2b 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 4c91db8..8051f8e 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 e3bed8f..29c8eb7 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 5e03412..74e0b99 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 @@ -172,13 +172,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    57 58 59 -60 -61 -62 -63 -64 -65 -66 +60 
    • # File 'manifests/nagios/objects/add_contactgroups_rules.pp', line 30
@@ -212,12 +206,6 @@ class cd_nagios::nagios::objects::add_contactgroups_rules (
       content   =>  template($ng_cntctgrps_head_erb),
       order     =>  '000',
     }
-
-    cd_nagios::nagios::objects::add_contactgroups { 'example_group':
-      ng_contactgroup_name      =>  'example_group',
-      ng_contactgroup_alias     =>  'Example Group',
-      ng_contactgroup_register  =>  '1',
-    }
   }
 }
    		 
    # File 'manifests/nagios/objects/add_hostgroup_rules.pp', line 29
@@ -210,11 +205,6 @@ class cd_nagios::nagios::objects::add_hostgroup_rules (
       content   =>  template($ng_tgt_hostgrp_head_erb),
       order     =>  '000',
     }
-
-   cd_nagios::nagios::objects::add_hostgroups { 'example_hostgroup':
-     ng_hostgroup_name   =>  'example_hostgroup',
-     ng_hostgroup_alias  =>  'Example Hostgroup',
-   }
   }
 }
    + + + + +
    + 
    +
+
+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
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
    +     		+ 
    # File 'manifests/nagios/objects/add_servicegroup_rules.pp', line 29
+
+class cd_nagios::nagios::objects::add_servicegroup_rules (
+
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    # manage /etc/nagios_conf.d/nagios_servicegroups_add.cfg
+
+    concat { $ng_tgt_servicegroup_add:
+      ensure    =>  present,
+      path      =>  $ng_tgt_servicegroup_add,
+      owner     =>  $ng_user,
+      group     =>  $ng_user,
+      mode      =>  '0640',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  nagios_etc_t,
+      seluser   =>  system_u,
+      notify    =>  Service[$ng_service],
+    }
+
+    # manage file header
+
+    concat::fragment { 'servicegroups_header':
+      target    =>  $ng_tgt_servicegroup_add,
+      content   =>  template($ng_tgt_svcgrp_head_erb),
+      order     =>  '000',
+    }
+
+    cd_nagios::nagios::objects::add_servicegroups { 'example_servicegroup':
+      ng_servicegroup_name   =>  'example_servicegroup',
+      ng_servicegroup_alias  =>  'Example Servicegroup',
+    }
+  }
+}
    +
    +
    +
    + + + + + + \ No newline at end of file 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 00daa5e..22fad75 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 4745345..a8456d2 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 @@ -145,7 +145,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.

    36 37 38 -39 +39 +40 
    # File 'manifests/nagios/objects/config.pp', line 23
@@ -164,7 +165,8 @@ class cd_nagios::nagios::objects::config (
     require cd_nagios::nagios::objects::add_contactgroups_rules
     require cd_nagios::nagios::objects::hostgroups
     require cd_nagios::nagios::objects::add_hostgroup_rules
-
+    require cd_nagios::nagios::objects::servicegroups
+    require cd_nagios::nagios::objects::add_servicegroup_rules
   }
 }
    @@ -174,7 +176,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 d1f4323..115c9bf 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 073adf7..3ccb8af 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 6b09e8c..aea194b 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 new file mode 100644 index 0000000..7bd236f --- /dev/null +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aservicegroups.html @@ -0,0 +1,245 @@ + + + + + + + Puppet Class: cd_nagios::nagios::objects::servicegroups + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    + + +

    Puppet Class: cd_nagios::nagios::objects::servicegroups

    +
    + +
    +
    Inherits:
    +
    cd_nagios::params
    +
    + + +
    +
    Defined in:
    +
    + manifests/nagios/objects/servicegroups.pp +
    +
    +
    + +

    Summary

    + Class manages basic hostgroups known to NAGIOS through Puppet +exports, and populates /etc/nagios/conf.d/nagios_base_hostgroups.cfg. + +

    Overview

    +
    +
    + +

    cd_nagios::nagios::objects::servicegroups.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/.

    + +
    +
    +
    + + +
    + + + + + +
    + 
    +
+
+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
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
    +     		+ 
    # File 'manifests/nagios/objects/servicegroups.pp', line 24
+
+class cd_nagios::nagios::objects::servicegroups (
+
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    # network services
+
+    @@nagios_servicegroup { 'network-services':
+      ensure            =>  present,
+      servicegroup_name =>  'network-services',
+      alias             =>  'Network Services',
+      owner             =>  $ng_user,
+      group             =>  $ng_user,
+      mode              =>  '0640',
+      register          =>  '1',
+      target            =>  $ng_target_svcgrp_base,
+    }
+
+    # linux services
+
+    @@nagios_servicegroup { 'linux-services':
+      ensure            =>  present,
+      servicegroup_name =>  'linux-services',
+      alias             =>  'Linux Services',
+      owner             =>  $ng_user,
+      group             =>  $ng_user,
+      mode              =>  '0640',
+      register          =>  '1',
+      target            =>  $ng_target_svcgrp_base,
+    }
+
+    # database services
+
+    @@nagios_servicegroup { 'database-services':
+      ensure            =>  present,
+      servicegroup_name =>  'database-services',
+      alias             =>  'Database Services',
+      owner             =>  $ng_user,
+      group             =>  $ng_user,
+      mode              =>  '0640',
+      register          =>  '1',
+      target            =>  $ng_target_svcgrp_base,
+    }
+  }
+}
    +
    +
    +
    + + + +
    + + \ No newline at end of file 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 7469bb9..98c2e9c 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 7ad9ba4..f15e624 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -97,12 +97,16 @@ cd_nagios::nagios::objects::contactgroups
    + cd_nagios::nagios::objects::servicegroups
    + cd_nagios::nagios::objects::template_rules
    cd_nagios::nagios::objects::add_contact_rules
    cd_nagios::nagios::objects::add_hostgroup_rules
    + cd_nagios::nagios::objects::add_servicegroup_rules
    + cd_nagios::nagios::objects::add_contactgroups_rules
    @@ -4865,6 +4869,19 @@ up

    • +
  • + + ng_nagios_service_cmd + + + (Any) + + + (defaults to: 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios') + + +
    • + @@ -5228,7 +5245,12 @@ up

    989 990 991 -992 +992 +993 +994 +995 +996 +997 
    # File 'manifests/params.pp', line 646
@@ -5482,6 +5504,8 @@ $ng_check_workers           = '',
 $ng_host_down_svc_checks    = '0',
 $ng_enable_load_ctl_options = false,
 $ng_loadctl_options         = 'jobs_max=100;backoff_limit=10;rampup_change=5',
+$ng_nagios_service_cmd      = 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios',
+
 ) {
 
 # installation section
@@ -5563,9 +5587,12 @@ $ng_target_hostdep        = "${ng_conf_d_dir}/nagios_hostdependency.cfg&quo
 $ng_target_hostesc        = "${ng_conf_d_dir}/nagios_hostescalation.cfg"
 $ng_target_hostext        = "${ng_conf_d_dir}/nagios_hostextinfo.cfg"
 $ng_target_service        = "${ng_conf_d_dir}/nagios_service.cfg"
-$ng_target_servicegroup   = "${ng_conf_d_dir}/nagios_servicegroup.cfg"
-$ng_target_base_contact   = "${ng_conf_d_dir}/nagios_base_contact.cfg"
-$ng_target_add_contact    = "${ng_conf_d_dir}/nagios_add_contact.cfg"
+$ng_target_svcgrp_base    = "${ng_conf_d_dir}/nagios_servicegroups_base.cfg"
+$ng_tgt_servicegroup_add  = "${ng_conf_d_dir}/nagios_servicegroups_add.cfg"
+$ng_tgt_svcgrp_head_erb   = 'cd_nagios/nagios/svcgroups_cfg_head.erb'
+$ng_tgt_hostgrp_rule_erb  = 'cd_nagios/nagios/svcgroups_cfg_rule.erb'
+$ng_target_base_contact   = "${ng_conf_d_dir}/nagios_contact_base.cfg"
+$ng_target_add_contact    = "${ng_conf_d_dir}/nagios_contact_add.cfg"
 $ng_contacts_head_erb     = 'cd_nagios/nagios/contacts_cfg_head.erb'
 $ng_contacts_rule_erb     = 'cd_nagios/nagios/contacts_cfg_rule.erb'
 $ng_tgt_contactgroup_base = "${ng_conf_d_dir}/nagios_contactgroup_base.cfg"
@@ -5587,7 +5614,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 66f0e95..f7977dd 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 f3ca109..8d021c4 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 64d217b..40a3ccf 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_defined_type_list.html b/doc/puppet_defined_type_list.html
index 55929ba..746539a 100644
--- a/doc/puppet_defined_type_list.html
+++ b/doc/puppet_defined_type_list.html
@@ -61,14 +61,21 @@
     
     
 
-    
  • 
+    
  • 
+      
    
+        cd_nagios::nagios::objects::add_servicegroups
+      
    
+    
    • 
+    
+
+    
  • 
       
    
         cd_nagios::nagios::objects::templates
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::server::access
       
    
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 d3d416b..29adf7c 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
@@ -260,7 +260,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 608e58b..10e0078 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 18a5a9c..833a6c0 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
new file mode 100644
index 0000000..fe23f8e
--- /dev/null
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_servicegroups.html
@@ -0,0 +1,238 @@
+
+
+  
+    
+
+
+  Defined Type: cd_nagios::nagios::objects::add_servicegroups
+  
+    — Documentation by YARD 0.9.9
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Defined Type: cd_nagios::nagios::objects::add_servicegroups
    
+
    
+  
    
+    
    Defined in:
    
+    
    
+      manifests/nagios/objects/add_servicegroups.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  define populates /etc/nagios/conf.d/nagios_servicegroups_add through
+extermal Puppet rules.
+
+
    Overview
    
+
    
+  
    
+    
+
    cd_nagios::nagios::objects::add_servicegroups.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/
    
+
+  
    
+
    
+
    
+  
+  
    
+    
    Examples:
    
+    
+      
+      
    cd_nagios::nagios::objects::add_servicegroups { 'example_servicegroup':
+  ng_servicegroup_name   =>  'example_servicegroup',
+  ng_servicegroup_alias  =>  'Example servicegroup',
+}
    
+    
+  
    
+
    Parameters:
    
+
      
+  
+    
    • 
+      
+        ng_servicegroup_name
+      
+      
+        (Any)
+      
+      
+        (defaults to: undef)
+      
+      
+    
      • 
+  
+    
    • 
+      
+        ng_servicegroup_alias
+      
+      
+        (Any)
+      
+      
+        (defaults to: undef)
+      
+      
+    
      • 
+  
+    
    • 
+      
+        ng_servicegroup_register
+      
+      
+        (Any)
+      
+      
+        (defaults to: '1')
+      
+      
+    
      • 
+  
+
    
+
+
+
    
+  
+    
+      
+      
+    
+  
    
+        
    +
+
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
    
+          		
+        
    # File 'manifests/nagios/objects/add_servicegroups.pp', line 29
+
+define cd_nagios::nagios::objects::add_servicegroups (
+
+$ng_servicegroup_name      = undef,
+$ng_servicegroup_alias     = undef,
+$ng_servicegroup_register  = '1',
+
+) {
+
+$ng_nagios_server         = $::cd_nagios::params::ng_nagios_server
+$ng_tgt_servicegroup_add  = $::cd_nagios::params::ng_tgt_servicegroup_add
+$ng_tgt_svcgrp_rule_erb   = $::cd_nagios::params::ng_tgt_svcgrp_rule_erb
+
+  if $::fqdn == $ng_nagios_server {
+
+    concat::fragment { $name:
+      target    =>  $ng_tgt_servicegroup_add,
+      content   =>  template($ng_tgt_svcgrp_rule_erb),
+    }
+  }
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file
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 291de3d..6452b21 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
@@ -935,7 +935,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 8e1ed8c..9183481 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 cfa9172..077ffa6 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From cba65ddb7cb64cf79f887f7a7ae50c0515b1e521 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Thu, 27 Jul 2017 15:33:36 +0200
Subject: [PATCH 23/25] 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 @@
 
 
       

From 137753dafe03b7a6203f0baf50ab975fb3c6a317 Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Thu, 27 Jul 2017 16:29:05 +0200
Subject: [PATCH 24/25] recommit for updates in build 120

---
 CHANGELOG.md                                  |  10 +
 REPOSTRUCTURE.md                              |  11 +-
 doc/_index.html                               |  17 +-
 doc/file.README.html                          |  22 +-
 doc/index.html                                |  22 +-
 doc/puppet_class_list.html                    |  28 +-
 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_3Aobjects_3A_3Aadd_timeperiod_rules.html | 248 +++++++++++
 ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html | 402 ++++++++---------
 ..._3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html |   8 +-
 ...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 +-
 ...Anagios_3A_3Aobjects_3A_3Atimeperiods.html | 295 ++++++++++++
 doc/puppet_classes/cd_nagios_3A_3Aparams.html |  16 +-
 .../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 +-
 doc/puppet_defined_type_list.html             |  11 +-
 ...Anagios_3A_3Aobjects_3A_3Aadd_contact.html |   2 +-
 ...s_3A_3Aobjects_3A_3Aadd_contactgroups.html |   2 +-
 ...gios_3A_3Aobjects_3A_3Aadd_hostgroups.html |   2 +-
 ...s_3A_3Aobjects_3A_3Aadd_servicegroups.html |   2 +-
 ...ios_3A_3Aobjects_3A_3Aadd_timeperiods.html | 418 ++++++++++++++++++
 ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html |   2 +-
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |   2 +-
 doc/top-level-namespace.html                  |   2 +-
 41 files changed, 1299 insertions(+), 265 deletions(-)
 create mode 100644 doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiod_rules.html
 create mode 100644 doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atimeperiods.html
 create mode 100644 doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiods.html

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de2d9b9..42f892e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,16 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+cba65ddb7cb64cf Jenkins Server 2017-07-27 13:33:36
+
    
+
    recommit for updates in build 117
    
+
+
    
+645cb4255af90d5 Arne Teuke 2017-07-27 13:33:00
+
    
+
    added parameter documentation
    
+
+
    
 83782a592f1fe78 Jenkins Server 2017-07-27 13:22:48
 
    
 
    recommit for updates in build 116
    
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index 16fea34..726b6c3 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -70,6 +70,8 @@
 |   |       |-- add_hostgroups.pp
 |   |       |-- add_servicegroup_rules.pp
 |   |       |-- add_servicegroups.pp
+|   |       |-- add_timeperiod_rules.pp
+|   |       |-- add_timeperiods.pp
 |   |       |-- commands.pp
 |   |       |-- config.pp
 |   |       |-- contactgroups.pp
@@ -77,7 +79,8 @@
 |   |       |-- hostgroups.pp
 |   |       |-- servicegroups.pp
 |   |       |-- template_rules.pp
-|   |       `-- templates.pp
+|   |       |-- templates.pp
+|   |       `-- timeperiods.pp
 |   |-- selinux
 |   |   `-- config.pp
 |   |-- server
@@ -110,7 +113,9 @@
 |   |   |-- svcgroups_cfg_head.erb
 |   |   |-- svcgroups_cfg_rule.erb
 |   |   |-- templates_cfg_head.erb
-|   |   `-- templates_cfg_rule.erb
+|   |   |-- templates_cfg_rule.erb
+|   |   |-- timeperiods_cfg_head.erb
+|   |   `-- timeperiods_cfg_rule.erb
 |   `-- selinux
 |       |-- statuscgi.erb
 |       `-- taccgi.erb
@@ -124,4 +129,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-20 directories, 104 files
+20 directories, 109 files
diff --git a/doc/_index.html b/doc/_index.html
index e04a99c..f08a580 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -128,6 +128,11 @@
       
             
     
+            
  • 
+      cd_nagios::nagios::objects::add_timeperiod_rules
+      
+            
    • 
+    
             
  • 
       cd_nagios::nagios::objects::commands
       
@@ -163,6 +168,11 @@
       
             
    • 
     
+            
  • 
+      cd_nagios::nagios::objects::timeperiods
+      
+            
    • 
+    
             
  • 
       cd_nagios::params
       
@@ -228,6 +238,11 @@
       
             
    • 
     
+            
  • 
+      cd_nagios::nagios::objects::add_timeperiods
+      
+            
    • 
+    
             
  • 
       cd_nagios::nagios::objects::templates
       
@@ -266,7 +281,7 @@
 
 
       
diff --git a/doc/file.README.html b/doc/file.README.html
index 739db06..06ff9bd 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -165,14 +165,18 @@ define, to avoid having to alter the module code.
 servicegroups through Puppet exports. Additional service groups can be
 created through external Puppet rules via define, to avoid having to alter
 the module code.
-* configure NRPE on clients (optional)
-* configure
-firewall (optional)
-* configure selinux policies (optional)
-* configure
-forwarding http to https including accesing the /nagios url directly
-(optional)
-* manage TLS certificates through certbot (optional)
    
+* manage Nagios main timeperiods through Puppet exports.
+Additional timeperiods can be created through external Puppet rules via
+define, to avoid having to alter the module code.
+* configure NRPE on
+clients (optional)
+* configure firewall (optional)
+* configure selinux
+policies (optional)
+* configure forwarding http to https including accesing
+the /nagios url directly (optional)
+* manage TLS certificates through
+certbot (optional)
    
 
 
    Service
 * manage Nagios service on server
@@ -372,7 +376,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index 1c72e24..d8bc10e 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -165,14 +165,18 @@ define, to avoid having to alter the module code.
 servicegroups through Puppet exports. Additional service groups can be
 created through external Puppet rules via define, to avoid having to alter
 the module code.
-* configure NRPE on clients (optional)
-* configure
-firewall (optional)
-* configure selinux policies (optional)
-* configure
-forwarding http to https including accesing the /nagios url directly
-(optional)
-* manage TLS certificates through certbot (optional)
    
+* manage Nagios main timeperiods through Puppet exports.
+Additional timeperiods can be created through external Puppet rules via
+define, to avoid having to alter the module code.
+* configure NRPE on
+clients (optional)
+* configure firewall (optional)
+* configure selinux
+policies (optional)
+* configure forwarding http to https including accesing
+the /nagios url directly (optional)
+* manage TLS certificates through
+certbot (optional)
    
 
 
    Service
 * manage Nagios service on server
@@ -372,7 +376,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html
index 893113f..eddf87d 100644
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -124,55 +124,69 @@
     
    • 
     
 
-    
  • 
+    
  • 
+      
    
+        cd_nagios::nagios::objects::add_timeperiod_rules
+      
    
+    
    • 
+    
+
+    
  • 
       
    
         cd_nagios::nagios::objects::commands
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::nagios::objects::config
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::nagios::objects::contactgroups
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::nagios::objects::contacts
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::nagios::objects::hostgroups
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::nagios::objects::servicegroups
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::nagios::objects::template_rules
       
    
     
    • 
     
 
+    
  • 
+      
    
+        cd_nagios::nagios::objects::timeperiods
+      
    
+    
    • 
+    
+
     
  • 
       
    
         cd_nagios::params
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index 04d0f94..ed25839 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 40a59e1..7651f58 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 8fc0cce..dd52d1e 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 6515a8a..0c2b034 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 da866b5..a382212 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 dc96209..c00c0f2 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 95038ab..8bab28c 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 9f5c4a0..79f60da 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 e15ce47..aa27297 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 8175481..4c308eb 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 6e2e1fc..45fa6b2 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 2fa5adb..bef0613 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
new file mode 100644
index 0000000..41548f5
--- /dev/null
+++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiod_rules.html
@@ -0,0 +1,248 @@
+
+
+  
+    
+
+
+  Puppet Class: cd_nagios::nagios::objects::add_timeperiod_rules
+  
+    — Documentation by YARD 0.9.9
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Puppet Class: cd_nagios::nagios::objects::add_timeperiod_rules
    
+
    
+  
+  
    
+    
    Inherits:
    
+    
    cd_nagios::params
    
+  
    
+  
+  
+  
    
+    
    Defined in:
    
+    
    
+      manifests/nagios/objects/add_timeperiod_rules.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  Class manages /etc/nagios/conf.d/nagios_timeperiods_add.cfg. incl.
+additional timeperiods via define.
+cd_nagios::nagios::objects::add_timeperiods { 'example_timeperiod':
+  ng_timeperiod_name   => 'example_timeperiod',
+  ng_timeperiod_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',
+}
+
+
    Overview
    
+
    
+  
    
+    
+
    cd_nagios::nagios::objects::add_timeperiod_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/.
    
+
+  
    
+
    
+
    
+  
+
+
    
+  
+    
+      
+      
+    
+  
    
+        
    +
+
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+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
    
+          		
+        
    # File 'manifests/nagios/objects/add_timeperiod_rules.pp', line 35
+
+class cd_nagios::nagios::objects::add_timeperiod_rules (
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    # manage /etc/nagios/conf.d/nagios_timeperiods_add.cfg
+
+    concat { $ng_tgt_timeperiods_add:
+      ensure    =>  present,
+      path      =>  $ng_tgt_timeperiods_add,
+      owner     =>  $ng_user,
+      group     =>  $ng_user,
+      mode      =>  '0640',
+      selrange  =>  s0,
+      selrole   =>  object_r,
+      seltype   =>  nagios_etc_t,
+      seluser   =>  system_u,
+      notify    =>  Service[$ng_service],
+    }
+
+    # manage file header
+
+    concat::fragment { 'timeperiods_header':
+      target    =>  $ng_tgt_timeperiods_add,
+      content   =>  template($ng_tgt_timep_head_erb),
+      order     =>  '000',
+    }
+
+    # example rule
+   cd_nagios::nagios::objects::add_timeperiods { 'example_timeperiod':
+     ng_timeperiod_name   => 'example_timeperiod',
+     ng_timeperiod_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',
+   }
+  }
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file
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 e3f0876..83f51d3 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
@@ -356,7 +356,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 247
 248
 249
-250
    • 
+250
+251
    
       
       
         
    # File 'manifests/nagios/objects/commands.pp', line 24
@@ -365,227 +366,228 @@ class cd_nagios::nagios::objects::commands (
 
 ) inherits cd_nagios::params {
 
-  require cd_nagios::main::install
+  if $::fqdn == $ng_nagios_server {
 
-  @@nagios_command { 'notify-host-by-email':
-    ensure        =>  present,
-    command_name  =>  'notify-host-by-email',
-    command_line  =>  '/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTADDRESS$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /bin/mail -s "** $NOTIFICATIONTYPE$ Host Alert: $HOSTADDRESS$ is $HOSTSTATE$ **" $CONTACTEMAIL$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'notify-host-by-email':
+      ensure        =>  present,
+      command_name  =>  'notify-host-by-email',
+      command_line  =>  '/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTADDRESS$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /bin/mail -s "** $NOTIFICATIONTYPE$ Host Alert: $HOSTADDRESS$ is $HOSTSTATE$ **" $CONTACTEMAIL$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command { 'notify-service-by-email':
-    ensure        =>  present,
-    command_name  =>  'notify-service-by-email',
-    command_line  =>  '/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$\n" | /bin/mail -s "** $NOTIFICATIONTYPE$ Service Alert: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'notify-service-by-email':
+      ensure        =>  present,
+      command_name  =>  'notify-service-by-email',
+      command_line  =>  '/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$\n" | /bin/mail -s "** $NOTIFICATIONTYPE$ Service Alert: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command { 'check-host-alive':
-    ensure        =>  present,
-    command_name  =>  'check-host-alive',
-    command_line  =>  '$USER1$/check_ping -H $HOSTADDRESS$ -w 3000.0,80% -c 5000.0,100% -p 5',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'check-host-alive':
+      ensure        =>  present,
+      command_name  =>  'check-host-alive',
+      command_line  =>  '$USER1$/check_ping -H $HOSTADDRESS$ -w 3000.0,80% -c 5000.0,100% -p 5',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command { 'check_disk':
-    ensure        =>  present,
-    command_name  =>  'check_disk',
-    command_line  =>  '$USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'check_disk':
+      ensure        =>  present,
+      command_name  =>  'check_disk',
+      command_line  =>  '$USER1$/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command { 'check_local_load':
-    ensure        =>  present,
-    command_name  =>  'check_local_load',
-    command_line  =>  '$USER1$/check_load -w $ARG1$ -c $ARG2$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'check_local_load':
+      ensure        =>  present,
+      command_name  =>  'check_local_load',
+      command_line  =>  '$USER1$/check_load -w $ARG1$ -c $ARG2$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command { 'check_local_procs':
-    ensure        =>  present,
-    command_name  =>  'check_local_procs',
-    command_line  =>  '$USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'check_local_procs':
+      ensure        =>  present,
+      command_name  =>  'check_local_procs',
+      command_line  =>  '$USER1$/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command { 'check_local_users':
-    ensure        =>  present,
-    command_name  =>  'check_local_users',
-    command_line  =>  '$USER1$/check_users -w $ARG1$ -c $ARG2$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'check_local_users':
+      ensure        =>  present,
+      command_name  =>  'check_local_users',
+      command_line  =>  '$USER1$/check_users -w $ARG1$ -c $ARG2$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command { 'check_local_swap':
-    ensure        =>  present,
-    command_name  =>  'check_local_swap',
-    command_line  =>  '$USER1$/check_swap -w $ARG1$ -c $ARG2$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'check_local_swap':
+      ensure        =>  present,
+      command_name  =>  'check_local_swap',
+      command_line  =>  '$USER1$/check_swap -w $ARG1$ -c $ARG2$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command { 'check_ftp':
-    ensure        =>  present,
-    command_name  =>  'check_ftp',
-    command_line  =>  '$USER1$/check_ftp -H $HOSTADDRESS$ $ARG1$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'check_ftp':
+      ensure        =>  present,
+      command_name  =>  'check_ftp',
+      command_line  =>  '$USER1$/check_ftp -H $HOSTADDRESS$ $ARG1$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command { 'check_snmp':
-    ensure        =>  present,
-    command_name  =>  'check_snmp',
-    command_line  =>  '$USER1$/check_snmp -H $HOSTADDRESS$ $ARG1$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'check_snmp':
+      ensure        =>  present,
+      command_name  =>  'check_snmp',
+      command_line  =>  '$USER1$/check_snmp -H $HOSTADDRESS$ $ARG1$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command { 'check_http':
-    ensure        =>  present,
-    command_name  =>  'check_http',
-    command_line  =>  '$USER1$/check_http -I $HOSTADDRESS$ $ARG1$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'check_http':
+      ensure        =>  present,
+      command_name  =>  'check_http',
+      command_line  =>  '$USER1$/check_http -I $HOSTADDRESS$ $ARG1$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command { 'check_ssh':
-    ensure        =>  present,
-    command_name  =>  'check_ssh',
-    command_line  =>  '$USER1$/check_ssh $ARG1$ $HOSTADDRESS$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'check_ssh':
+      ensure        =>  present,
+      command_name  =>  'check_ssh',
+      command_line  =>  '$USER1$/check_ssh $ARG1$ $HOSTADDRESS$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command { 'check_ping':
-    ensure        =>  present,
-    command_name  =>  'check_ping',
-    command_line  =>  '$USER1$/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'check_ping':
+      ensure        =>  present,
+      command_name  =>  'check_ping',
+      command_line  =>  '$USER1$/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command { 'check_tcp':
-    ensure        =>  present,
-    command_name  =>  'check_tcp',
-    command_line  =>  '$USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'check_tcp':
+      ensure        =>  present,
+      command_name  =>  'check_tcp',
+      command_line  =>  '$USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command { 'check_udp':
-    ensure        =>  present,
-    command_name  =>  'check_udp',
-    command_line  =>  '$USER1$/check_udp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'check_udp':
+      ensure        =>  present,
+      command_name  =>  'check_udp',
+      command_line  =>  '$USER1$/check_udp -H $HOSTADDRESS$ -p $ARG1$ $ARG2$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command { 'check_nrpe':
-    ensure        =>  present,
-    command_name  =>  'check_nrpe',
-    command_line  =>  '$USER1$/check_nrpe -t 30 -H $HOSTADDRESS$ -c $ARG1$  -a $ARG2$ $ARG3$ $ARG4$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'check_nrpe':
+      ensure        =>  present,
+      command_name  =>  'check_nrpe',
+      command_line  =>  '$USER1$/check_nrpe -t 30 -H $HOSTADDRESS$ -c $ARG1$  -a $ARG2$ $ARG3$ $ARG4$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command { 'check_nagios':
-    ensure        =>  present,
-    command_name  =>  'check_nagios',
-    command_line  =>  '$USER1$/check_nagios -F $ARG1$ -e $ARG2$ -C $ARG3$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'check_nagios':
+      ensure        =>  present,
+      command_name  =>  'check_nagios',
+      command_line  =>  '$USER1$/check_nagios -F $ARG1$ -e $ARG2$ -C $ARG3$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command { 'check_bandwidth':
-    ensure        =>  present,
-    command_name  =>  'check_bandwidth',
-    command_line  =>  '$USER1$/check_bandwidth.sh -t 30 -H $HOSTADDRESS$ linux  $ARG1$  $ARG2$ $ARG3$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'check_bandwidth':
+      ensure        =>  present,
+      command_name  =>  'check_bandwidth',
+      command_line  =>  '$USER1$/check_bandwidth.sh -t 30 -H $HOSTADDRESS$ linux  $ARG1$  $ARG2$ $ARG3$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command  { 'check_jenkins_api':
-    ensure        =>  present,
-    command_name  =>  'check_jenkins_api',
-    command_line  =>  '$USER1$/check_http -H $HOSTADDRESS$ -u /api/xml?depth=0 -R quietingDown.false $ARG1$ $ARG2$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command  { 'check_jenkins_api':
+      ensure        =>  present,
+      command_name  =>  'check_jenkins_api',
+      command_line  =>  '$USER1$/check_http -H $HOSTADDRESS$ -u /api/xml?depth=0 -R quietingDown.false $ARG1$ $ARG2$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
 
-  @@nagios_command { 'process-service-perfdata-file':
-    ensure        =>  present,
-    command_name  =>  'process-service-perfdata-file',
-    command_line  =>  '/bin/mv /var/log/pnp4nagios/service-perfdata /var/spool/pnp4nagios/service-perfdata.$TIMET$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'process-service-perfdata-file':
+      ensure        =>  present,
+      command_name  =>  'process-service-perfdata-file',
+      command_line  =>  '/bin/mv /var/log/pnp4nagios/service-perfdata /var/spool/pnp4nagios/service-perfdata.$TIMET$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command { 'process-host-perfdata-file':
-    ensure        =>  present,
-    command_name  =>  'process-host-perfdata-file',
-    command_line  =>  '/bin/mv /var/log/pnp4nagios/host-perfdata /var/spool/pnp4nagios/host-perfdata.$TIMET$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
-  }
+    @@nagios_command { 'process-host-perfdata-file':
+      ensure        =>  present,
+      command_name  =>  'process-host-perfdata-file',
+      command_line  =>  '/bin/mv /var/log/pnp4nagios/host-perfdata /var/spool/pnp4nagios/host-perfdata.$TIMET$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
 
-  @@nagios_command {  'check_ntp_time':
-    ensure        =>  present,
-    command_name  =>  'check_ntp_time',
-    command_line  =>  '$USER1$/check_ntp_time -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$',
-    owner         =>  'nagios',
-    group         =>  'nagios',
-    mode          =>  '0640',
-    target        =>  $ng_target_command,
+    @@nagios_command {  'check_ntp_time':
+      ensure        =>  present,
+      command_name  =>  'check_ntp_time',
+      command_line  =>  '$USER1$/check_ntp_time -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$',
+      owner         =>  'nagios',
+      group         =>  'nagios',
+      mode          =>  '0640',
+      target        =>  $ng_target_command,
+    }
   }
 }
    
       
@@ -595,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 d690809..9014130 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
@@ -147,7 +147,8 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/.
    
 38
 39
 40
-41
    +41 +42 
    # File 'manifests/nagios/objects/config.pp', line 23
@@ -168,7 +169,8 @@ 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
-
+    require cd_nagios::nagios::objects::timeperiods
+    require cd_nagios::nagios::objects::add_timeperiod_rules
   }
 }
    @@ -178,7 +180,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 ff75798..8ba118f 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 a52aac3..911b44d 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 0d8927f..2c57117 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 ab119cd..cfd2e44 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 6ac95b1..ea78e2d 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 new file mode 100644 index 0000000..5076557 --- /dev/null +++ b/doc/puppet_classes/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atimeperiods.html @@ -0,0 +1,295 @@ + + + + + + + Puppet Class: cd_nagios::nagios::objects::timeperiods + + — Documentation by YARD 0.9.9 + + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    + + +

    Puppet Class: cd_nagios::nagios::objects::timeperiods

    +
    + +
    +
    Inherits:
    +
    cd_nagios::params
    +
    + + +
    +
    Defined in:
    +
    + manifests/nagios/objects/timeperiods.pp +
    +
    +
    + +

    Summary

    + Class manages main timeperiods for NAGIOS through Puppet exports, +and populates /etc/nagios/conf.d/nagios_timeperiods_base.cfg. + +

    Overview

    +
    +
    + +

    cd_nagios::nagios::objects::timeperiods.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/.

    + +
    +
    +
    + + +
    + + + + + +
    + 
    +
+
+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
+49
+50
+51
+52
+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
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
    +     		+ 
    # File 'manifests/nagios/objects/timeperiods.pp', line 24
+
+class cd_nagios::nagios::objects::timeperiods (
+
+) inherits cd_nagios::params {
+
+  if $::fqdn == $ng_nagios_server {
+
+    @@nagios_timeperiod { '24x7':
+      ensure          =>  present,
+      timeperiod_name =>  '24x7',
+      alias           =>  '24 Hours A Day, 7 Days A Week',
+      monday          =>  '00:00-24:00',
+      tuesday         =>  '00:00-24:00',
+      wednesday       =>  '00:00-24:00',
+      thursday        =>  '00:00-24:00',
+      friday          =>  '00:00-24:00',
+      saturday        =>  '00:00-24:00',
+      sunday          =>  '00:00-24:00',
+      owner           =>  $ng_user,
+      group           =>  $ng_user,
+      mode            =>  '0640',
+      register        =>  '1',
+      target          =>  $ng_tgt_timeperiods_base,
+    }
+
+    @@nagios_timeperiod { 'office_hours':
+      ensure          =>  present,
+      timeperiod_name =>  'office_hours',
+      alias           =>  'Office hours only, 5 Days A Week 09-05',
+      monday          =>  '09:00-17:00',
+      tuesday         =>  '09:00-17:00',
+      wednesday       =>  '09:00-17:00',
+      thursday        =>  '09:00-17:00',
+      friday          =>  '09:00-17:00',
+      saturday        =>  '00:00-00:00',
+      sunday          =>  '00:00-00:00',
+      owner           =>  $ng_user,
+      group           =>  $ng_user,
+      mode            =>  '0640',
+      register        =>  '1',
+      target          =>  $ng_tgt_timeperiods_base,
+    }
+
+    @@nagios_timeperiod { 'out_of_hours':
+      ensure          =>  present,
+      timeperiod_name =>  'out_of_hours',
+      alias           =>  'Outside Office hours only',
+      monday          =>  '17:00-09:00',
+      tuesday         =>  '17:00-09:00',
+      wednesday       =>  '17:00-09:00',
+      thursday        =>  '17:00-09:00',
+      friday          =>  '17:00-09:00',
+      saturday        =>  '00:00-24:00',
+      sunday          =>  '00:00-24:00',
+      owner           =>  $ng_user,
+      group           =>  $ng_user,
+      mode            =>  '0640',
+      register        =>  '1',
+      target          =>  $ng_tgt_timeperiods_base,
+    }
+
+    @@nagios_timeperiod { 'none':
+      ensure          =>  present,
+      timeperiod_name =>  'none',
+      alias           =>  'No Time Is A Good Time',
+      owner           =>  $ng_user,
+      group           =>  $ng_user,
+      mode            =>  '0640',
+      register        =>  '1',
+      target          =>  $ng_tgt_timeperiods_base,
+    }
+  }
+}
    +
    +
    +
    + + + +
    + + \ 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 d5b8e33..34508d7 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -97,6 +97,8 @@ cd_nagios::nagios::objects::hostgroups
    + cd_nagios::nagios::objects::timeperiods
    + cd_nagios::nagios::objects::contactgroups
    cd_nagios::nagios::objects::servicegroups
    @@ -107,6 +109,8 @@ cd_nagios::nagios::objects::add_hostgroup_rules
    + cd_nagios::nagios::objects::add_timeperiod_rules
    + cd_nagios::nagios::objects::add_servicegroup_rules
    cd_nagios::nagios::objects::add_contactgroups_rules
    @@ -5252,7 +5256,10 @@ up

    994 995 996 -997 +997 +998 +999 +1000 
    # File 'manifests/params.pp', line 646
@@ -5578,7 +5585,10 @@ $ng_certbot_live          = "${ng_certbot_main_dir}/live"
 $ng_target_templates      = "${ng_conf_d_dir}/nagios_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_tgt_timeperiods_base  = "${ng_conf_d_dir}/nagios_timeperiods.cfg"
+$ng_tgt_timeperiods_add   = "${ng_conf_d_dir}/nagios_timeperiods_add.cfg"
+$ng_tgt_timep_head_erb    = 'cd_nagios/nagios/timeperiods_cfg_head.erb'
+$ng_tgt_timep_rule_erb    = 'cd_nagios/nagios/timeperiods_cfg_rule.erb'
 $ng_target_localhost      = "${ng_conf_d_dir}/nagios_localhost.cfg"
 $ng_target_host           = "${ng_conf_d_dir}/nagios_host.cfg"
 $ng_target_hostgroup_base = "${ng_conf_d_dir}/nagios_hostgroups_base.cfg"
@@ -5616,7 +5626,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 cc626dc..2f3b673 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 a0ab7e5..ba9d359 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 4af1ac7..50c8465 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 0c1ae9b..f29e227 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -304,7 +304,7 @@ class cd_nagios::server::service (
 
 
       
diff --git a/doc/puppet_defined_type_list.html b/doc/puppet_defined_type_list.html
index 746539a..c239511 100644
--- a/doc/puppet_defined_type_list.html
+++ b/doc/puppet_defined_type_list.html
@@ -68,14 +68,21 @@
     
     
 
-    
  • 
+    
  • 
+      
    
+        cd_nagios::nagios::objects::add_timeperiods
+      
    
+    
    • 
+    
+
+    
  • 
       
    
         cd_nagios::nagios::objects::templates
       
    
     
    • 
     
 
-    
  • 
+    
  • 
       
    
         cd_nagios::server::access
       
    
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 c38197e..d11a5cc 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 b3b674e..a882faf 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 63b44d7..8735d80 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 2d1fb1a..72a89ee 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
new file mode 100644
index 0000000..60437a0
--- /dev/null
+++ b/doc/puppet_defined_types/cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_timeperiods.html
@@ -0,0 +1,418 @@
+
+
+  
+    
+
+
+  Defined Type: cd_nagios::nagios::objects::add_timeperiods
+  
+    — Documentation by YARD 0.9.9
+  
+
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+  
+    
    
+      
+      
    
+    
    
+
+    
    
+      
+
+      
    Defined Type: cd_nagios::nagios::objects::add_timeperiods
    
+
    
+  
    
+    
    Defined in:
    
+    
    
+      manifests/nagios/objects/add_timeperiods.pp
+    
    
+  
    
+
    
+
+  
    Summary
    
+  define populates /etc/nagios/conf.d/nagios_timeperiods_add through
+extermal Puppet rules.
+
+
    Overview
    
+
    
+  
    
+    
+
    cd_nagios::nagios::objects::add_timeperiods.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/
    
+
+  
    
+
    
+
    
+  
+  
    
+    
    Examples:
    
+    
+      
+      
    cd_nagios::nagios::objects::add_timeperiods { 'example_timeperiod':
+  ng_timeperiod_name   =>  'example_timeperiod',
+  ng_timeperiod_alias  =>  'Example timeperiod',
+}
    
+    
+  
    
+
    Parameters:
    
+
      
+  
+    
    • 
+      
+        ng_timep_name
+      
+      
+        (string)
+      
+      
+        (defaults to: undef)
+      
+      
+        —
+        
      
+
      Specify the timeperiod short name.
      
+
      
+      
+    
      • 
+  
+    
    • 
+      
+        ng_timep_alias
+      
+      
+        (string)
+      
+      
+        (defaults to: undef)
+      
+      
+        —
+        
      
+
      Specify the timeperiod alias (long name)
      
+
      
+      
+    
      • 
+  
+    
    • 
+      
+        ng_timep_monday
+      
+      
+        (string)
+      
+      
+        (defaults to: '00:00-00:00')
+      
+      
+        —
+        
      
+
      Specify the desired hours for Monday
      
+
      
+      
+    
      • 
+  
+    
    • 
+      
+        ng_timep_tuesday
+      
+      
+        (string)
+      
+      
+        (defaults to: '00:00-00:00')
+      
+      
+        —
+        
      
+
      Specify the desired hours for Tuesday
      
+
      
+      
+    
      • 
+  
+    
    • 
+      
+        ng_timep_wednesday
+      
+      
+        (string)
+      
+      
+        (defaults to: '00:00-00:00')
+      
+      
+        —
+        
      
+
      Specify the desired hours for Wednesday.
      
+
      
+      
+    
      • 
+  
+    
    • 
+      
+        ng_timep_thursday
+      
+      
+        (string)
+      
+      
+        (defaults to: '00:00-00:00')
+      
+      
+        —
+        
      
+
      Specify the desired hours for Thursday
      
+
      
+      
+    
      • 
+  
+    
    • 
+      
+        ng_timep_friday
+      
+      
+        (string)
+      
+      
+        (defaults to: '00:00-00:00')
+      
+      
+        —
+        
      
+
      Specify the desired hours for Friday
      
+
      
+      
+    
      • 
+  
+    
    • 
+      
+        ng_timep_saturday
+      
+      
+        (string)
+      
+      
+        (defaults to: '00:00-00:00')
+      
+      
+        —
+        
      
+
      Specify the desired hours for Saturday
      
+
      
+      
+    
      • 
+  
+    
    • 
+      
+        ng_timep_sunday
+      
+      
+        (string)
+      
+      
+        (defaults to: '00:00-00:00')
+      
+      
+        —
+        
      
+
      Specify the desired hours for Sunday.
      
+
      
+      
+    
      • 
+  
+    
    • 
+      
+        ng_timep_special_01
+      
+      
+        (string)
+      
+      
+        (defaults to: undef)
+      
+      
+        —
+        
      
+
      Specify a special date as key parameter
+for
+ng_timep_special_02. See Nagios documentation for format
+details.
      
+
      
+      
+    
      • 
+  
+    
    • 
+      
+        ng_timep_special_02
+      
+      
+        (string)
+      
+      
+        (defaults to: '00:00-00:00')
+      
+      
+        —
+        
      
+
      Specify desired hours as value parameter
+for
+g_timep_special_01.
      
+
      
+      
+    
      • 
+  
+
    
+
+
+
    
+  
+    
+      
+      
+    
+  
    
+        
    +
+
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
    
+          		
+        
    # File 'manifests/nagios/objects/add_timeperiods.pp', line 42
+
+define cd_nagios::nagios::objects::add_timeperiods (
+
+$ng_timep_name        = undef,
+$ng_timep_alias       = undef,
+$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',
+$ng_timep_special_01  = undef,
+$ng_timep_special_02  = '00:00-00:00',
+
+) {
+
+$ng_nagios_server         = $::cd_nagios::params::ng_nagios_server
+$ng_tgt_timep_add         = $::cd_nagios::params::ng_tgt_timeperiod_add
+$ng_tgt_timep_rule_erb    = $::cd_nagios::params::ng_tgt_timep_rule_erb
+
+  if $::fqdn == $ng_nagios_server {
+
+    concat::fragment { $name:
+      target    =>  $ng_tgt_timep_add,
+      content   =>  template($ng_tgt_timep_rule_erb),
+    }
+  }
+}
    
+      
    
+
    
+
    
+
+      
+
+    
    
+  
+
\ No newline at end of file
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 29d934c..710ca44 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
@@ -917,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 6dd27fa..7f789c1 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 6341e94..25a8fcf 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@
 
 
       

From f8d19b46fdae2fb0a10dbd4c5d26b490b46773bc Mon Sep 17 00:00:00 2001
From: Jenkins Server 
Date: Thu, 27 Jul 2017 16:44:56 +0200
Subject: [PATCH 25/25] recommit for updates in build 123

---
 CHANGELOG.md                                  |  25 +++
 REPOSTRUCTURE.md                              |   5 +-
 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 +-
 ...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_3Aobjects_3A_3Aadd_timeperiod_rules.html |  60 ++++---
 ...A_3Anagios_3A_3Aobjects_3A_3Acommands.html |   2 +-
 ..._3A_3Anagios_3A_3Aobjects_3A_3Aconfig.html |   2 +-
 ...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 +-
 ...Anagios_3A_3Aobjects_3A_3Atimeperiods.html |   2 +-
 doc/puppet_classes/cd_nagios_3A_3Aparams.html | 161 ++++++++----------
 .../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 +-
 ...Anagios_3A_3Aobjects_3A_3Aadd_contact.html |   2 +-
 ...s_3A_3Aobjects_3A_3Aadd_contactgroups.html |   2 +-
 ...gios_3A_3Aobjects_3A_3Aadd_hostgroups.html |  33 +++-
 ...s_3A_3Aobjects_3A_3Aadd_servicegroups.html |   2 +-
 ...ios_3A_3Aobjects_3A_3Aadd_timeperiods.html |  31 ++--
 ..._3Anagios_3A_3Aobjects_3A_3Atemplates.html |  19 +--
 .../cd_nagios_3A_3Aserver_3A_3Aaccess.html    |   2 +-
 doc/top-level-namespace.html                  |   2 +-
 39 files changed, 215 insertions(+), 183 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42f892e..aa7faf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,31 @@ Changelog of Git Changelog.
 
     No issue 
    
 
 
+137753dafe03b7a Jenkins Server 2017-07-27 14:29:05
+
    
+
    recommit for updates in build 120
    
+
+
    
+e76e4f857c4baf8 Arne Teuke 2017-07-27 14:28:21
+
    
+
    added and linked add_timeperiods
    
+
+
    
+82aee3bacd72ce0 Arne Teuke 2017-07-27 13:50:07
+
    
+
    added timeperiod
    
+
+
    
+45682bbc67ffc7e Arne Teuke 2017-07-27 13:46:49
+
    
+
    added timeperiod
    
+
+
    
+65e0a0d20e19245 Arne Teuke 2017-07-27 13:42:38
+
    
+
    added timeperiods
    
+
+
    
 cba65ddb7cb64cf Jenkins Server 2017-07-27 13:33:36
 
    
 
    recommit for updates in build 117
    
diff --git a/REPOSTRUCTURE.md b/REPOSTRUCTURE.md
index 726b6c3..e49ae41 100644
--- a/REPOSTRUCTURE.md
+++ b/REPOSTRUCTURE.md
@@ -21,6 +21,7 @@
 |   |   |-- 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_3Aadd_timeperiod_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
@@ -28,6 +29,7 @@
 |   |   |-- 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_3Anagios_3A_3Aobjects_3A_3Atimeperiods.html
 |   |   |-- cd_nagios_3A_3Aparams.html
 |   |   |-- cd_nagios_3A_3Aselinux_3A_3Aconfig.html
 |   |   |-- cd_nagios_3A_3Aserver_3A_3Aaccess_rules.html
@@ -39,6 +41,7 @@
 |   |   |-- 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_3Aadd_timeperiods.html
 |   |   |-- cd_nagios_3A_3Anagios_3A_3Aobjects_3A_3Atemplates.html
 |   |   `-- cd_nagios_3A_3Aserver_3A_3Aaccess.html
 |   |-- file.README.html
@@ -129,4 +132,4 @@
 |-- README.md
 `-- REPOSTRUCTURE.md
 
-20 directories, 109 files
+20 directories, 112 files
diff --git a/doc/_index.html b/doc/_index.html
index f08a580..7553126 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 06ff9bd..307c53a 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -376,7 +376,7 @@ environments.
    
 
 
       
diff --git a/doc/index.html b/doc/index.html
index d8bc10e..0345887 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -376,7 +376,7 @@ environments.
    
 
 
       
diff --git a/doc/puppet_classes/cd_nagios.html b/doc/puppet_classes/cd_nagios.html
index ed25839..f64498a 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 7651f58..d0e553c 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 dd52d1e..d9e3436 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 0c2b034..0b4df58 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 a382212..eec0dac 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 c00c0f2..5decab1 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 8bab28c..677d858 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 79f60da..a986a81 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 aa27297..88e94a3 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 4c308eb..5134095 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 45fa6b2..3cfed5d 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 bef0613..96c5fe3 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 41548f5..5a95090 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
@@ -77,19 +77,8 @@
 
 
   
    Summary
    
-  Class manages /etc/nagios/conf.d/nagios_timeperiods_add.cfg. incl.
-additional timeperiods via define.
-cd_nagios::nagios::objects::add_timeperiods { 'example_timeperiod':
-  ng_timeperiod_name   => 'example_timeperiod',
-  ng_timeperiod_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',
-}
+  Class manages /etc/nagios_conf.d/nagios_timeperiods_add.cfg and
+add. hostgroups through external Puppet rules via define.
 
 
    Overview
    
 
    
@@ -127,7 +116,26 @@ 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/.
+
+cd_nagios::nagios::objects::add_timeperiods {
+'example_timeperiod':
+ ng_timeperiod_name =>
+'example_timeperiod',
+ ng_timeperiod_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',
+ }
    
 
   
    
 
@@ -218,17 +226,17 @@ class cd_nagios::nagios::objects::add_timeperiod_rules (
     }
 
     # example rule
-   cd_nagios::nagios::objects::add_timeperiods { 'example_timeperiod':
-     ng_timeperiod_name   => 'example_timeperiod',
-     ng_timeperiod_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',
-   }
+    cd_nagios::nagios::objects::add_timeperiods { 'example_timeperiod':
+      ng_timeperiod_name   => 'example_timeperiod',
+      ng_timeperiod_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',
+    }
   }
 }
    • @@ -238,7 +246,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 83f51d3..f4294ed 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 9014130..d8e0b0e 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 @@ -180,7 +180,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 8ba118f..0845e93 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 911b44d..b385b90 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 2c57117..9a8f5b6 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 cfd2e44..77a0747 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 ea78e2d..63b10c7 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 5076557..54c3db0 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 34508d7..8c968ac 100644 --- a/doc/puppet_classes/cd_nagios_3A_3Aparams.html +++ b/doc/puppet_classes/cd_nagios_3A_3Aparams.html @@ -4875,19 +4875,6 @@ up

    -
  • - - ng_nagios_service_cmd - - - (Any) - - - (defaults to: 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios') - - -
    • - @@ -5258,8 +5245,7 @@ up

    996 997 998 -999 -1000 +999 
    # File 'manifests/params.pp', line 646
@@ -5513,7 +5499,6 @@ $ng_check_workers           = '',
 $ng_host_down_svc_checks    = '0',
 $ng_enable_load_ctl_options = false,
 $ng_loadctl_options         = 'jobs_max=100;backoff_limit=10;rampup_change=5',
-$ng_nagios_service_cmd      = 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios',
 
 ) {
 
@@ -5534,85 +5519,85 @@ $ng_nagios_service_cmd      = 'check_nagios!/var/log/nagios/status.dat!5!/us
   }
 
 # service
-$ng_service               = 'nagios'
-$ae_service               = 'httpd'
+$ng_service                 = 'nagios'
+$ae_service                 = 'httpd'
 
 # directories
-$ng_main_dir              = '/etc/nagios'
-$ng_conf_d_dir            = "${ng_main_dir}/conf.d"
-$ng_objects_dir           = "${ng_main_dir}/objects"
-$ng_private_dir           = "${ng_main_dir}/private"
-$ng_usr_incl              = '/usr/include/nagios'
-$ng_lib_dir               = '/usr/lib64/nagios'
-$ng_log_dir               = '/var/log/nagios'
-$ng_log_archives          = "${ng_log_dir}/archives"
-$ng_spool_dir             = '/var/spool/nagios'
-$ng_usr_share             = '/usr/share/nagios'
-$ng_share_html            = "${ng_usr_share}/html"
+$ng_main_dir                = '/etc/nagios'
+$ng_conf_d_dir              = "${ng_main_dir}/conf.d"
+$ng_objects_dir             = "${ng_main_dir}/objects"
+$ng_private_dir             = "${ng_main_dir}/private"
+$ng_usr_incl                = '/usr/include/nagios'
+$ng_lib_dir                 = '/usr/lib64/nagios'
+$ng_log_dir                 = '/var/log/nagios'
+$ng_log_archives            = "${ng_log_dir}/archives"
+$ng_spool_dir               = '/var/spool/nagios'
+$ng_usr_share               = '/usr/share/nagios'
+$ng_share_html              = "${ng_usr_share}/html"
 
 # files
-$ng_main_config           = "${ng_main_dir}/nagios.cfg"
-$ng_cgi_cfg_file          = "${ng_main_dir}/cgi.cfg"
-$ng_cgi_cfg_erb           = 'cd_nagios/nagios/cgi_cfg.erb'
-$ng_htpasswd_file         = "${ng_main_dir}/passwd"
-$ng_htpasswd_head         = 'cd_nagios/nagios/htpasswd_head.erb'
-$ng_htpasswd_rule         = 'cd_nagios/nagios/htpasswd_rule.erb'
-$ng_taccgi_erb            = 'cd_nagios/selinux/taccgi.erb'
-$ng_statcgi_erb           = 'cd_nagios/selinux/statuscgi.erb'
-$ng_nagios_conf           = '/etc/httpd/conf.d/nagios.conf'
-$ng_nagios_conf_erb       = 'cd_nagios/httpd/nagios_conf.erb'
-$ng_welcome_conf          = '/etc/httpd/conf.d/welcome.conf'
-$ng_welcome_conf_erb      = 'cd_nagios/httpd/welcome_conf.erb'
-$ng_forward_conf          = '/etc/httpd/conf.d/nagios_forward.conf'
-$ng_forward_conf_erb      = 'cd_nagios/httpd/forward_conf.erb'
-$ng_get_cert_erb          = 'cd_nagios/certbot/get_cert.erb'
-$ng_unless_get_cert       = 'cd_nagios/certbot/unless_get_cert.erb'
-$ng_unless_renew_erb      = 'cd_nagios/certbot/unless_renew_cert.erb'
-$ng_index_html_file       = '/var/www/html/index.html'
-$ng_index_html_erb        = 'cd_nagios/httpd/index_html.erb'
-$ng_ssl_vhost_file        = '/etc/httpd/conf.d/nagios_ssl.conf'
-$ng_ssl_vhost_erb         = 'cd_nagios/httpd/nagios_ssl_vhost.erb'
-$ng_nagios_cfg_file       = "${ng_main_dir}/nagios.cfg"
-$ng_nagios_cfg_erb        = 'cd_nagios/nagios/nagios_cfg.erb'
+$ng_main_config             = "${ng_main_dir}/nagios.cfg"
+$ng_cgi_cfg_file            = "${ng_main_dir}/cgi.cfg"
+$ng_cgi_cfg_erb             = 'cd_nagios/nagios/cgi_cfg.erb'
+$ng_htpasswd_file           = "${ng_main_dir}/passwd"
+$ng_htpasswd_head           = 'cd_nagios/nagios/htpasswd_head.erb'
+$ng_htpasswd_rule           = 'cd_nagios/nagios/htpasswd_rule.erb'
+$ng_taccgi_erb              = 'cd_nagios/selinux/taccgi.erb'
+$ng_statcgi_erb             = 'cd_nagios/selinux/statuscgi.erb'
+$ng_nagios_conf             = '/etc/httpd/conf.d/nagios.conf'
+$ng_nagios_conf_erb         = 'cd_nagios/httpd/nagios_conf.erb'
+$ng_welcome_conf            = '/etc/httpd/conf.d/welcome.conf'
+$ng_welcome_conf_erb        = 'cd_nagios/httpd/welcome_conf.erb'
+$ng_forward_conf            = '/etc/httpd/conf.d/nagios_forward.conf'
+$ng_forward_conf_erb        = 'cd_nagios/httpd/forward_conf.erb'
+$ng_get_cert_erb            = 'cd_nagios/certbot/get_cert.erb'
+$ng_unless_get_cert         = 'cd_nagios/certbot/unless_get_cert.erb'
+$ng_unless_renew_erb        = 'cd_nagios/certbot/unless_renew_cert.erb'
+$ng_index_html_file         = '/var/www/html/index.html'
+$ng_index_html_erb          = 'cd_nagios/httpd/index_html.erb'
+$ng_ssl_vhost_file          = '/etc/httpd/conf.d/nagios_ssl.conf'
+$ng_ssl_vhost_erb           = 'cd_nagios/httpd/nagios_ssl_vhost.erb'
+$ng_nagios_cfg_file         = "${ng_main_dir}/nagios.cfg"
+$ng_nagios_cfg_erb          = 'cd_nagios/nagios/nagios_cfg.erb'
 
 # certbot
-$ng_certbot_main_dir      = '/etc/letsencrypt'
-$ng_certbot_archive       = "${ng_certbot_main_dir}/archive"
-$ng_certbot_check         = "${ng_certbot_archive}/${ng_webserver_name}/cert1.pem"
-$ng_certbot_live          = "${ng_certbot_main_dir}/live"
+$ng_certbot_main_dir        = '/etc/letsencrypt'
+$ng_certbot_archive         = "${ng_certbot_main_dir}/archive"
+$ng_certbot_check           = "${ng_certbot_archive}/${ng_webserver_name}/cert1.pem"
+$ng_certbot_live            = "${ng_certbot_main_dir}/live"
 
 # nagios
-$ng_target_templates      = "${ng_conf_d_dir}/nagios_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_tgt_timeperiods_base  = "${ng_conf_d_dir}/nagios_timeperiods.cfg"
-$ng_tgt_timeperiods_add   = "${ng_conf_d_dir}/nagios_timeperiods_add.cfg"
-$ng_tgt_timep_head_erb    = 'cd_nagios/nagios/timeperiods_cfg_head.erb'
-$ng_tgt_timep_rule_erb    = 'cd_nagios/nagios/timeperiods_cfg_rule.erb'
-$ng_target_localhost      = "${ng_conf_d_dir}/nagios_localhost.cfg"
-$ng_target_host           = "${ng_conf_d_dir}/nagios_host.cfg"
-$ng_target_hostgroup_base = "${ng_conf_d_dir}/nagios_hostgroups_base.cfg"
-$ng_tgt_hostgroup_add     = "${ng_conf_d_dir}/nagios_hostgroups_add.cfg"
-$ng_tgt_hostgrp_head_erb  = 'cd_nagios/nagios/hostgroups_cfg_head.erb'
-$ng_tgt_hostgrp_rule_erb  = 'cd_nagios/nagios/hostgroups_cfg_rule.erb'
-$ng_target_hostdep        = "${ng_conf_d_dir}/nagios_hostdependency.cfg"
-$ng_target_hostesc        = "${ng_conf_d_dir}/nagios_hostescalation.cfg"
-$ng_target_hostext        = "${ng_conf_d_dir}/nagios_hostextinfo.cfg"
-$ng_target_service        = "${ng_conf_d_dir}/nagios_service.cfg"
-$ng_target_svcgrp_base    = "${ng_conf_d_dir}/nagios_servicegroups_base.cfg"
-$ng_tgt_servicegroup_add  = "${ng_conf_d_dir}/nagios_servicegroups_add.cfg"
-$ng_tgt_svcgrp_head_erb   = 'cd_nagios/nagios/svcgroups_cfg_head.erb'
-$ng_tgt_hostgrp_rule_erb  = 'cd_nagios/nagios/svcgroups_cfg_rule.erb'
-$ng_target_base_contact   = "${ng_conf_d_dir}/nagios_contact_base.cfg"
-$ng_target_add_contact    = "${ng_conf_d_dir}/nagios_contact_add.cfg"
-$ng_contacts_head_erb     = 'cd_nagios/nagios/contacts_cfg_head.erb'
-$ng_contacts_rule_erb     = 'cd_nagios/nagios/contacts_cfg_rule.erb'
-$ng_tgt_contactgroup_base = "${ng_conf_d_dir}/nagios_contactgroup_base.cfg"
-$ng_tgt_contactgroup_add  = "${ng_conf_d_dir}/nagios_contactgroup_add.cfg"
-$ng_cntctgrps_head_erb    = 'cd_nagios/nagios/contactgroups_cfg_head.erb'
-$ng_cntctgrps_rule_erb    = 'cd_nagios/nagios/contactgroups_cfg_rule.erb'
-$ng_target_command        = "${ng_conf_d_dir}/nagios_commands_base.cfg"
-
+$ng_target_templates        = "${ng_conf_d_dir}/nagios_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_tgt_timeperiods_base    = "${ng_conf_d_dir}/nagios_timeperiods.cfg"
+$ng_tgt_timeperiods_add     = "${ng_conf_d_dir}/nagios_timeperiods_add.cfg"
+$ng_tgt_timep_head_erb      = 'cd_nagios/nagios/timeperiods_cfg_head.erb'
+$ng_tgt_timep_rule_erb      = 'cd_nagios/nagios/timeperiods_cfg_rule.erb'
+$ng_target_localhost        = "${ng_conf_d_dir}/nagios_localhost.cfg"
+$ng_target_host             = "${ng_conf_d_dir}/nagios_host.cfg"
+$ng_target_hostgroup_base   = "${ng_conf_d_dir}/nagios_hostgroups_base.cfg"
+$ng_tgt_hostgroup_add       = "${ng_conf_d_dir}/nagios_hostgroups_add.cfg"
+$ng_tgt_hostgrp_head_erb    = 'cd_nagios/nagios/hostgroups_cfg_head.erb'
+$ng_tgt_hostgrp_rule_erb    = 'cd_nagios/nagios/hostgroups_cfg_rule.erb'
+$ng_target_hostdep          = "${ng_conf_d_dir}/nagios_hostdependency.cfg"
+$ng_target_hostesc          = "${ng_conf_d_dir}/nagios_hostescalation.cfg"
+$ng_target_hostext          = "${ng_conf_d_dir}/nagios_hostextinfo.cfg"
+$ng_target_service          = "${ng_conf_d_dir}/nagios_service.cfg"
+$ng_target_svcgrp_base      = "${ng_conf_d_dir}/nagios_servicegroups_base.cfg"
+$ng_tgt_servicegroup_add    = "${ng_conf_d_dir}/nagios_servicegroups_add.cfg"
+$ng_tgt_svcgrp_head_erb     = 'cd_nagios/nagios/svcgroups_cfg_head.erb'
+$ng_tgt_svcgrp_rule_erb     = 'cd_nagios/nagios/svcgroups_cfg_rule.erb'
+$ng_target_base_contact     = "${ng_conf_d_dir}/nagios_contact_base.cfg"
+$ng_target_add_contact      = "${ng_conf_d_dir}/nagios_contact_add.cfg"
+$ng_contacts_head_erb       = 'cd_nagios/nagios/contacts_cfg_head.erb'
+$ng_contacts_rule_erb       = 'cd_nagios/nagios/contacts_cfg_rule.erb'
+$ng_tgt_contactgroup_base   = "${ng_conf_d_dir}/nagios_contactgroup_base.cfg"
+$ng_tgt_contactgroup_add    = "${ng_conf_d_dir}/nagios_contactgroup_add.cfg"
+$ng_cntctgrps_head_erb      = 'cd_nagios/nagios/contactgroups_cfg_head.erb'
+$ng_cntctgrps_rule_erb      = 'cd_nagios/nagios/contactgroups_cfg_rule.erb'
+$ng_target_command          = "${ng_conf_d_dir}/nagios_commands_base.cfg"
+$ng_nagios_service_cmd      = 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios'
 
 # includes must be last
 
@@ -5626,7 +5611,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 2f3b673..20e5f0d 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 ba9d359..06ec56f 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 50c8465..9e6ebc1 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 f29e227..b57abe8 100644
--- a/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/cd_nagios_3A_3Aserver_3A_3Aservice.html
@@ -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 d11a5cc..2162eb7 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 a882faf..f56811b 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 8735d80..12112de 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
@@ -133,12 +133,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/
    
         ng_hostgroup_name
       
       
-        (Any)
+        (string)
       
       
         (defaults to: undef)
       
       
+        —
+        
    
+
    Specify the hostgroup short name.
    
+
    
+      
     
   
     
  • 
@@ -146,12 +151,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/
    
         ng_hostgroup_alias
       
       
-        (Any)
+        (string)
       
       
         (defaults to: undef)
       
       
+        —
+        
    
+
    Specify the hostgroup alias (long name).
    
+
    
+      
     
    • 
   
     
  • 
@@ -159,12 +169,17 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/
    
         ng_hostgroup_register
       
       
-        (Any)
+        (string)
       
       
         (defaults to: '1')
       
       
+        —
+        
    
+
    Whether to register the hostgroup.
    
+
    
+      
     
    • 
   
 
@@ -177,9 +192,6 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/
    
         
     
 
-29
-30
-31
 32
 33
 34
@@ -197,10 +209,13 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/
    
 46
 47
 48
-49
    
+49
+50
+51
+52
    - 
    # File 'manifests/nagios/objects/add_hostgroups.pp', line 29
+        
    # File 'manifests/nagios/objects/add_hostgroups.pp', line 32
 
 define cd_nagios::nagios::objects::add_hostgroups (
 
@@ -230,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 72a89ee..4b2968e 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 60437a0..3a55f0b 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
@@ -120,8 +120,15 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses/
    
     
       
       
    cd_nagios::nagios::objects::add_timeperiods { 'example_timeperiod':
-  ng_timeperiod_name   =>  'example_timeperiod',
-  ng_timeperiod_alias  =>  'Example timeperiod',
+  ng_timeperiod_name   => 'example_timeperiod',
+  ng_timeperiod_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',
 }
    
     
   
@@ -341,13 +348,6 @@ for
         
     
 
-42
-43
-44
-45
-46
-47
-48
 49
 50
 51
@@ -368,10 +368,17 @@ for
 66
 67
 68
-69
    
+69
+70
+71
+72
+73
+74
+75
+76
    
       
       
-        
    # File 'manifests/nagios/objects/add_timeperiods.pp', line 42
+        
    # File 'manifests/nagios/objects/add_timeperiods.pp', line 49
 
 define cd_nagios::nagios::objects::add_timeperiods (
 
@@ -408,7 +415,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 710ca44..9f168d8 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
@@ -787,17 +787,6 @@ until a hard state can be determined.
    
       
     
   
-    
  • 
-      
-        
-      
-      
-        (string)
-      
-      
-      
-    
    • 
-  
 
 
 
@@ -808,6 +797,7 @@ until a hard state can be determined.
    
         
     
 
+100
 101
 102
 103
@@ -855,11 +845,10 @@ until a hard state can be determined.
    
 145
 146
 147
-148
-149
    
+148
    
       
       
-        
    # File 'manifests/nagios/objects/templates.pp', line 101
+        
    # File 'manifests/nagios/objects/templates.pp', line 100
 
 define cd_nagios::nagios::objects::templates (
 $ng_template_object               = undef,
@@ -917,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 7f789c1..ace01a5 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 25a8fcf..cfc2987 100644
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -90,7 +90,7 @@