diff --git a/doc/_index.html b/doc/_index.html
index 52b17c2..edba91e 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -103,6 +103,11 @@
+
+ confdroid_nagios::nagios::objects::add_contactgroups_rules
+
+
+
confdroid_nagios::nagios::objects::commands
@@ -164,6 +169,11 @@
+
+ confdroid_nagios::nagios::objects::add_contactgroups
+
+
+
confdroid_nagios::nagios::resources::resource_df
diff --git a/doc/file.README.html b/doc/file.README.html
index d520bfb..b745af5 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -70,9 +70,13 @@
Features
Repo Documentation
@@ -119,7 +123,7 @@
if ng_include_nrpeis set to true, the confdroid_nrpe module is automatically applied on clients (confdroid_nrpe must be in the catalogue then)
-configuring user access
+configuring UI user access
Main access to the user interface requires defining an administrative user and password via ng_main_user and ng_main_password. The password should be encrypted like this:
@@ -135,7 +139,7 @@ Re-type new password:
Use that value to override the default password in ENC or Hiera, if you use it.
-Additional users
+Additional UI users
The main user is automatically created. If you want to add more users, this should be done via the define confdroid_nagios::server::access. In your control repo, site.pp etc. address the access define like this:
@@ -145,6 +149,31 @@ Re-type new password:
}
+
+
+In order to add contacts for the notifications, address the define confdroid_nagios::nagios::objects::add_contact in your config repo, site.pp etc. like this:
+
+confdroid_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',
+ }
+
+
+This requires the contact groups to be in place as well.
+
+
+
+In order to add contact groups for the notifications, address the define confdroid_nagios::nagios::objects::add_contactgroups in your config repo, site.pp etc. like this:
+
+confdroid_nagios::nagios::objects::add_contactgroups { 'example_group':
+ ng_contactgroup_name => 'example_group',
+ ng_contactgroup_alias => 'Example Group',
+ ng_contactgroup_register => '1',
+ }
+
+
Repo Documentation
See the full Puppet documentation including parameters in docs/index.html
diff --git a/doc/index.html b/doc/index.html
index 9acdd5b..57b1dc8 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -70,9 +70,13 @@
Features
Repo Documentation
@@ -119,7 +123,7 @@
if ng_include_nrpeis set to true, the confdroid_nrpe module is automatically applied on clients (confdroid_nrpe must be in the catalogue then)
-configuring user access
+configuring UI user access
Main access to the user interface requires defining an administrative user and password via ng_main_user and ng_main_password. The password should be encrypted like this:
@@ -135,7 +139,7 @@ Re-type new password:
Use that value to override the default password in ENC or Hiera, if you use it.
-Additional users
+Additional UI users
The main user is automatically created. If you want to add more users, this should be done via the define confdroid_nagios::server::access. In your control repo, site.pp etc. address the access define like this:
@@ -145,6 +149,31 @@ Re-type new password:
}
+
+
+In order to add contacts for the notifications, address the define confdroid_nagios::nagios::objects::add_contact in your config repo, site.pp etc. like this:
+
+confdroid_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',
+ }
+
+
+This requires the contact groups to be in place as well.
+
+
+
+In order to add contact groups for the notifications, address the define confdroid_nagios::nagios::objects::add_contactgroups in your config repo, site.pp etc. like this:
+
+confdroid_nagios::nagios::objects::add_contactgroups { 'example_group':
+ ng_contactgroup_name => 'example_group',
+ ng_contactgroup_alias => 'Example Group',
+ ng_contactgroup_register => '1',
+ }
+
+
Repo Documentation
See the full Puppet documentation including parameters in docs/index.html
diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html
index 2f2f959..ff899a1 100644
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -89,49 +89,56 @@
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aconfig.html b/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aconfig.html
index 00be593..60bf023 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aconfig.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aconfig.html
@@ -130,10 +130,10 @@ class confdroid_nagios::nagios::config (
if $ng_nagios_server == $fqdn {
require confdroid_nagios::nagios::objects::commands
#require confdroid_nagios::nagios::objects::template_rules
- #require confdroid_nagios::nagios::objects::contacts
+ require confdroid_nagios::nagios::objects::contacts
require confdroid_nagios::nagios::objects::add_contact_rules
- #require confdroid_nagios::nagios::objects::contactgroups
- #require confdroid_nagios::nagios::objects::add_contactgroups_rules
+ require confdroid_nagios::nagios::objects::contactgroups
+ require confdroid_nagios::nagios::objects::add_contactgroups_rules
#require confdroid_nagios::nagios::objects::hostgroups
#require confdroid_nagios::nagios::objects::add_hostgroup_rules
#require confdroid_nagios::nagios::objects::servicegroups
diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html b/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html
new file mode 100644
index 0000000..8f5d384
--- /dev/null
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups_rules.html
@@ -0,0 +1,189 @@
+
+
+
+
+
+
+ Puppet Class: confdroid_nagios::nagios::objects::add_contactgroups_rules
+
+ — Documentation by YARD 0.9.36
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Puppet Class: confdroid_nagios::nagios::objects::add_contactgroups_rules
+
+
+
+ Inherits:
+ confdroid_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
+
+
+
+
confdroid_nagios::nagios::objects::add_contactgroups_rules.pp Module name: confdroid_nagios Author: 12ww1160 (12ww1160@confdroid.com)
+
+
+
+
+
+
+
+
+
+
+
+
+
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+
+
+ # File 'manifests/nagios/objects/add_contactgroups_rules.pp', line 13
+
+class confdroid_nagios::nagios::objects::add_contactgroups_rules (
+
+) inherits confdroid_nagios::params {
+ if $ng_nagios_server == $fqdn {
+ # 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',
+ }
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html
index 96f7112..3c61e99 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html
@@ -91,6 +91,8 @@
confdroid_nagios::nagios::objects::add_contact_rules
+ confdroid_nagios::nagios::objects::add_contactgroups_rules
+
@@ -301,6 +303,305 @@ inherited by all classes except defines.
+
+
+ ng_ping_warn
+
+
+ (String )
+
+
+ (defaults to: '100.0,20%' )
+
+
+
+
+
+
+ ng_ping_crit
+
+
+ (String )
+
+
+ (defaults to: '500.0,60%' )
+
+
+
+
+
+
+ ng_ping_ensure
+
+
+ (String )
+
+
+ (defaults to: 'present' )
+
+
+
+
+
+
+ ng_disk_warn
+
+
+ (String )
+
+
+ (defaults to: '20%' )
+
+
+
+
+
+
+ ng_disk_crit
+
+
+ (String )
+
+
+ (defaults to: '10%' )
+
+
+
+
+
+
+ ng_disk_ensure
+
+
+ (String )
+
+
+ (defaults to: 'present' )
+
+
+
+
+
+
+ ng_swap_warn
+
+
+ (String )
+
+
+ (defaults to: '20' )
+
+
+
+
+
+
+ ng_swap_crit
+
+
+ (String )
+
+
+ (defaults to: '10' )
+
+
+
+
+
+
+ ng_swap_ensure
+
+
+ (String )
+
+
+ (defaults to: 'present' )
+
+
+
+
+
+
+ ng_users_warn
+
+
+ (String )
+
+
+ (defaults to: '20' )
+
+
+
+
+
+
+ ng_users_crit
+
+
+ (String )
+
+
+ (defaults to: '50' )
+
+
+
+
+
+
+ ng_users_ensure
+
+
+ (String )
+
+
+ (defaults to: 'present' )
+
+
+
+
+
+
+ ng_procs_tot_warn
+
+
+ (String )
+
+
+ (defaults to: '330' )
+
+
+
+
+
+
+ ng_procs_tot_crit
+
+
+ (String )
+
+
+ (defaults to: '400' )
+
+
+
+
+
+
+ ng_procs_tot_param
+
+
+ (String )
+
+
+ (defaults to: 'RDST' )
+
+
+
+
+
+
+ ng_procs_tot_ens
+
+
+ (String )
+
+
+ (defaults to: 'present' )
+
+
+
+
+
+
+ ng_procs_z_warn
+
+
+ (String )
+
+
+ (defaults to: '10' )
+
+
+
+
+
+
+ ng_procs_z_crit
+
+
+ (String )
+
+
+ (defaults to: '30' )
+
+
+
+
+
+
+ ng_procs_z_param
+
+
+ (String )
+
+
+ (defaults to: 'Z' )
+
+
+
+
+
+
+ ng_procs_z_ensure
+
+
+ (String )
+
+
+ (defaults to: 'present' )
+
+
+
+
+
+
+ ng_load_warn
+
+
+ (String )
+
+
+ (defaults to: '5.00,4.00,3.00' )
+
+
+
+
+
+
+ ng_load_crit
+
+
+ (String )
+
+
+ (defaults to: '10.00,6.00,4.00' )
+
+
+
+
+
+
+ ng_load_ensure
+
+
+ (String )
+
+
+ (defaults to: 'present' )
+
+
+
+
@@ -425,7 +726,40 @@ inherited by all classes except defines.
141
142
143
-144
+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
# File 'manifests/params.pp', line 31
@@ -450,6 +784,39 @@ class confdroid_nagios::params (
# httpd
Boolean $ng_use_https = false,
+# check command parameters
+## ping
+ String $ng_ping_warn = '100.0,20%',
+ String $ng_ping_crit = '500.0,60%',
+ String $ng_ping_ensure = 'present',
+## disk
+ String $ng_disk_warn = '20%',
+ String $ng_disk_crit = '10%' ,
+ String $ng_disk_ensure = 'present',
+# swap
+ String $ng_swap_warn = '20',
+ String $ng_swap_crit = '10',
+ String $ng_swap_ensure = 'present',
+# users
+ String $ng_users_warn = '20',
+ String $ng_users_crit = '50',
+ String $ng_users_ensure = 'present',
+#total procs
+ String $ng_procs_tot_warn = '330',
+ String $ng_procs_tot_crit = '400',
+ String $ng_procs_tot_param = 'RDST',
+ String $ng_procs_tot_ens = 'present',
+# zombie procs
+ String $ng_procs_z_warn = '10',
+ String $ng_procs_z_crit = '30',
+ String $ng_procs_z_param = 'Z',
+ String $ng_procs_z_ensure = 'present',
+# load
+ String $ng_load_warn = '5.00,4.00,3.00',
+ String $ng_load_crit = '10.00,6.00,4.00',
+ String $ng_load_ensure = 'present',
+
+
) {
# Default facts
$fqdn = $facts['networking']['fqdn']
diff --git a/doc/puppet_defined_type_list.html b/doc/puppet_defined_type_list.html
index 1c3897a..3a5a817 100644
--- a/doc/puppet_defined_type_list.html
+++ b/doc/puppet_defined_type_list.html
@@ -47,14 +47,21 @@
-
+
+
+
+
+
+
-
+
diff --git a/doc/puppet_defined_types/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html b/doc/puppet_defined_types/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html
new file mode 100644
index 0000000..809124c
--- /dev/null
+++ b/doc/puppet_defined_types/confdroid_nagios_3A_3Anagios_3A_3Aobjects_3A_3Aadd_contactgroups.html
@@ -0,0 +1,208 @@
+
+
+
+
+
+
+ Defined Type: confdroid_nagios::nagios::objects::add_contactgroups
+
+ — Documentation by YARD 0.9.36
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Defined Type: confdroid_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
+
+
+
+
confdroid_nagios::nagios::objects::add_contactgroups.pp Module name: confdroid_nagios Author: 12ww1160 (12ww1160@confdroid.com)
+
+
+
+
+
+
+
+
+
+
+
+
+
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+
+
+ # File 'manifests/nagios/objects/add_contactgroups.pp', line 13
+
+define confdroid_nagios::nagios::objects::add_contactgroups (
+
+ Optional[String] $ng_contactgroup_name = undef,
+ Optional[String] $ng_contactgroup_alias = undef,
+ String $ng_contactgroup_register = '1',
+
+) {
+ $ng_nagios_server = $confdroid_nagios::params::ng_nagios_server
+ $ng_tgt_contactgroup_add = $confdroid_nagios::params::ng_tgt_contactgroup_add
+ $ng_cntctgrps_rule_erb = $confdroid_nagios::params::ng_cntctgrps_rule_erb
+
+ if $ng_nagios_server == $fqdn {
+ concat::fragment { $name:
+ target => $ng_tgt_contactgroup_add,
+ content => template($ng_cntctgrps_rule_erb),
+ }
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file