OP#436 add members

manifests/nagios/objects/add_contactgroups.pp

@@ -9,11 +9,14 @@
 #   contact group
 # @param [string] ng_contactgroup_register Specify whether the contact group
 #   should be registered in Nagios.
+# @param [string] ng_contactgroup_members Specify the members of the contact 
+#   group.
 ################################################################################
 define confdroid_nagios::nagios::objects::add_contactgroups (
 
   Optional[String] $ng_contactgroup_name     = undef,
   Optional[String] $ng_contactgroup_alias    = undef,
+  String $ng_contactgroup_members            = 'admins',
   String $ng_contactgroup_register           = '1',
 
 ) {

manifests/nagios/objects/add_contactgroups_rules.pp

@@ -41,7 +41,7 @@ class confdroid_nagios::nagios::objects::add_contactgroups_rules (
     confdroid_nagios::nagios::objects::add_contactgroups { $ng_contactgroup_name:
       ng_contactgroup_name    => $ng_contactgroup_name,
       ng_contactgroup_alias   => $ng_contactgroup_alias,
-      ng_contactgroup_ensure => $ng_contactgroup_ensure,
+      ng_contactgroup_members => $ng_contactgroup_members,
     }
   }
 }

manifests/nagios/objects/add_hostgroup_rules.pp

@@ -40,7 +40,6 @@ class confdroid_nagios::nagios::objects::add_hostgroup_rules (
     confdroid_nagios::nagios::objects::add_hostgroups { $ng_hostgroup_name:
       ng_hostgroup_name  => $ng_hostgroup_name,
       ng_hostgroup_alias => $ng_hostgroup_alias,
-      ng_hostgroup_ensure => $ng_hostgroup_ensure,
     }
   }
 }

manifests/params.pp

@@ -77,8 +77,6 @@
 #   Default is 'admins'.
 # @param [String] ng_contactgroup_alias The alias of the default contact group.
 #   Default is 'Nagios Administrators'.
-# @param [String] ng_contactgroup_ensure The ensure value for the default
-#   contact group. Default is 'present'.
 # @param [String] ng_contact_name The name of the default contact. Default is
 #   'nagiosadmin'.
 # @param [String] ng_contact_alias The alias of the default contact. Default is
@@ -91,8 +89,6 @@
 #   is 'linux-servers'.
 # @param [String] ng_hostgroup_alias The alias of the default host group. Default
 #   is 'Linux Servers'.
-# @param [String] ng_hostgroup_ensure The ensure value for the default host group
-#   Default is 'present'.
 # @param [String] ng_max_check_attempts The maximum number of check attempts 
 #   before a host or service is considered down. Default is '10'.
 # @param [Boolean] ng_enable_swap_check Whether to enable the check_swap 
@@ -119,7 +115,6 @@ class confdroid_nagios::params (
 # contact groups
   String $ng_contactgroup_name       = 'admins',
   String $ng_contactgroup_alias      = 'Nagios Administrators',
-  String $ng_contactgroup_ensure     = 'present',
 
 # contacts
   String $ng_contact_name            = 'nagiosadmin',
@@ -130,7 +125,6 @@ class confdroid_nagios::params (
 # hostgroups
   String $ng_hostgroup_name         = 'linux-servers',
   String $ng_hostgroup_alias        = 'Linux Servers',
-  String $ng_hostgroup_ensure       = 'present',
 
 # nagios.cfg
   String $ng_log_file               = '/var/log/nagios/nagios.log',

templates/nagios/contactgroups_cfg_rule.erb

@@ -2,5 +2,6 @@
 define contactgroup {
   contactgroup_name   <%= @ng_contactgroup_name %>
   alias               <%= @ng_contactgroup_alias %>
+  members             <%= @ng_contactgroup_members %>
   register            <%= @ng_contactgroup_register %>
   }