From b4b3de53a39ef006355c372187f8c75b4deda894 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Tue, 25 Jul 2017 16:48:58 +0200 Subject: [PATCH 1/3] 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 2/3] 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 @@