OP#436 add members

This commit is contained in:
2026-03-01 17:17:00 +01:00
parent 88d8acc093
commit 59b78b2194
5 changed files with 9 additions and 12 deletions

View File

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

View File

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

View File

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

View File

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

View File

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