From ab8b3878e7d76a3b79120421e4574581ef2dfcd8 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 27 Jul 2017 14:22:11 +0100 Subject: [PATCH 1/2] added servicegroup control --- README.md | 1 + .../nagios/objects/add_contactgroups_rules.pp | 6 -- .../nagios/objects/add_hostgroup_rules.pp | 5 -- .../nagios/objects/add_servicegroup_rules.pp | 64 +++++++++++++++++ manifests/nagios/objects/add_servicegroups.pp | 48 +++++++++++++ manifests/nagios/objects/config.pp | 3 +- manifests/nagios/objects/servicegroups.pp | 70 +++++++++++++++++++ manifests/params.pp | 11 ++- manifests/server/service.pp | 8 +-- templates/nagios/svcgroups_cfg_head.erb | 5 ++ templates/nagios/svcgroups_cfg_rule.erb | 6 ++ 11 files changed, 208 insertions(+), 19 deletions(-) create mode 100644 manifests/nagios/objects/add_servicegroup_rules.pp create mode 100644 manifests/nagios/objects/add_servicegroups.pp create mode 100644 manifests/nagios/objects/servicegroups.pp create mode 100644 templates/nagios/svcgroups_cfg_head.erb create mode 100644 templates/nagios/svcgroups_cfg_rule.erb diff --git a/README.md b/README.md index d5cdefa..525768a 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,7 @@ Configuration * 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. * 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. * 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. +* 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) diff --git a/manifests/nagios/objects/add_contactgroups_rules.pp b/manifests/nagios/objects/add_contactgroups_rules.pp index a1d83fc..418a40c 100644 --- a/manifests/nagios/objects/add_contactgroups_rules.pp +++ b/manifests/nagios/objects/add_contactgroups_rules.pp @@ -56,11 +56,5 @@ 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', - } } } diff --git a/manifests/nagios/objects/add_hostgroup_rules.pp b/manifests/nagios/objects/add_hostgroup_rules.pp index 8f884a3..740c1bb 100644 --- a/manifests/nagios/objects/add_hostgroup_rules.pp +++ b/manifests/nagios/objects/add_hostgroup_rules.pp @@ -55,10 +55,5 @@ 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', - } } } diff --git a/manifests/nagios/objects/add_servicegroup_rules.pp b/manifests/nagios/objects/add_servicegroup_rules.pp new file mode 100644 index 0000000..208286e --- /dev/null +++ b/manifests/nagios/objects/add_servicegroup_rules.pp @@ -0,0 +1,64 @@ +## 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 . +# @summary Class manages /etc/nagios_conf.d/nagios_servicegroups_add.cfg and +# additional servicegroups through external Puppet rules via define. +# @example +# cd_nagios::nagios::objects::add_servicegroups { 'example_servicegroup': +# ng_servicegroup_name => 'example_servicegroup', +# ng_servicegroup_alias => 'Example Servicegroup', +# } +################################################################################ +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', + } + } +} diff --git a/manifests/nagios/objects/add_servicegroups.pp b/manifests/nagios/objects/add_servicegroups.pp new file mode 100644 index 0000000..77f9314 --- /dev/null +++ b/manifests/nagios/objects/add_servicegroups.pp @@ -0,0 +1,48 @@ +## 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 +# @summary define populates /etc/nagios/conf.d/nagios_servicegroups_add through +# extermal Puppet rules. +# @example +# cd_nagios::nagios::objects::add_servicegroups { 'example_servicegroup': +# ng_servicegroup_name => 'example_servicegroup', +# ng_servicegroup_alias => 'Example servicegroup', +# } +############################################################################### +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), + } + } +} diff --git a/manifests/nagios/objects/config.pp b/manifests/nagios/objects/config.pp index 31713ce..ff1953b 100644 --- a/manifests/nagios/objects/config.pp +++ b/manifests/nagios/objects/config.pp @@ -34,6 +34,7 @@ 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 } } diff --git a/manifests/nagios/objects/servicegroups.pp b/manifests/nagios/objects/servicegroups.pp new file mode 100644 index 0000000..a73f0e2 --- /dev/null +++ b/manifests/nagios/objects/servicegroups.pp @@ -0,0 +1,70 @@ +## 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 . +# @summary Class manages basic hostgroups known to NAGIOS through Puppet +# exports, and populates /etc/nagios/conf.d/nagios_base_hostgroups.cfg. +################################################################################ +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, + } + } +} diff --git a/manifests/params.pp b/manifests/params.pp index 4e33fd5..b5832b4 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -892,6 +892,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 @@ -973,9 +975,12 @@ $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_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" diff --git a/manifests/server/service.pp b/manifests/server/service.pp index 6df3ab6..949d951 100644 --- a/manifests/server/service.pp +++ b/manifests/server/service.pp @@ -54,13 +54,13 @@ class cd_nagios::server::service ( notify => Service ['nagios'], } - @@nagios_service { "check_nagios_localhost": - check_command => 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios', + @@nagios_service { 'check_nagios_localhost': + check_command => $ng_nagios_service_cmd, use => 'generic-service', host_name => 'localhost', notification_period => '24x7', - service_description => 'localhost_nagios_service', - target => $ng_target_service, + service_description => 'localhost_nagios_service', + target => $ng_target_service, owner => $ng_user, group => $ng_user, mode => '0640', diff --git a/templates/nagios/svcgroups_cfg_head.erb b/templates/nagios/svcgroups_cfg_head.erb new file mode 100644 index 0000000..7612129 --- /dev/null +++ b/templates/nagios/svcgroups_cfg_head.erb @@ -0,0 +1,5 @@ +############################################################################### +########## nagios_servicegroups_add.cfg created by Puppet ########## +########## manual changes are overwritten! ########## +############################################################################### +# rules are created below by external puppet rules. diff --git a/templates/nagios/svcgroups_cfg_rule.erb b/templates/nagios/svcgroups_cfg_rule.erb new file mode 100644 index 0000000..4d5e62b --- /dev/null +++ b/templates/nagios/svcgroups_cfg_rule.erb @@ -0,0 +1,6 @@ + +define servicegroup { + servicegroup_name <%= @ng_servicegroup_name %> + alias <%= @ng_servicegroup_alias %> + register <%= @ng_servicegroup_register %> + } From 83782a592f1fe78a4a54b64af36b10c466e4806d Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 27 Jul 2017 15:22:48 +0200 Subject: [PATCH 2/2] 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',
-    }
   }
 }
    @@ -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 
    # 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',
-   }
   }
 }
    @@ -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',
+}
    + +
    + + +
    + + + + + +
    + 
    +
+
+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 @@