Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace all validate functions with datatypes #362

Merged
merged 1 commit into from
Mar 3, 2017
Merged

replace all validate functions with datatypes #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions manifests/agent.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,9 @@
$zabbix_version = $zabbix::params::zabbix_version,
$zabbix_package_state = $zabbix::params::zabbix_package_state,
$zabbix_package_agent = $zabbix::params::zabbix_package_agent,
$manage_firewall = $zabbix::params::manage_firewall,
$manage_repo = $zabbix::params::manage_repo,
$manage_resources = $zabbix::params::manage_resources,
Boolean $manage_firewall = $zabbix::params::manage_firewall,
Boolean $manage_repo = $zabbix::params::manage_repo,
Boolean $manage_resources = $zabbix::params::manage_resources,
$monitored_by_proxy = $zabbix::params::monitored_by_proxy,
$agent_use_ip = $zabbix::params::agent_use_ip,
$zbx_group = $zabbix::params::agent_zbx_group,
Expand Down Expand Up @@ -255,9 +255,6 @@
$tlsservercertissuer = $zabbix::params::agent_tlsservercertissuer,
$tlsservercertsubject = $zabbix::params::agent_tlsservercertsubject,) inherits zabbix::params {
# Check some if they are boolean
validate_bool($manage_firewall)
validate_bool($manage_repo)
validate_bool($manage_resources)

# Find if listenip is set. If not, we can set to specific ip or
# to network name. If more than 1 interfaces are available, we
Expand Down
22 changes: 9 additions & 13 deletions manifests/javagateway.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,21 +51,17 @@
# Copyright 2014 Werner Dijkerman
#
class zabbix::javagateway(
$zabbix_version = $zabbix::params::zabbix_version,
$zabbix_package_state = $zabbix::params::zabbix_package_state,
$manage_firewall = $zabbix::params::manage_firewall,
$manage_repo = $zabbix::params::manage_repo,
$pidfile = $zabbix::params::javagateway_pidfile,
$listenip = $zabbix::params::javagateway_listenip,
$listenport = $zabbix::params::javagateway_listenport,
$startpollers = $zabbix::params::javagateway_startpollers,
$timeout = $zabbix::params::javagateway_timeout,
$zabbix_version = $zabbix::params::zabbix_version,
$zabbix_package_state = $zabbix::params::zabbix_package_state,
Boolean $manage_firewall = $zabbix::params::manage_firewall,
Boolean $manage_repo = $zabbix::params::manage_repo,
$pidfile = $zabbix::params::javagateway_pidfile,
$listenip = $zabbix::params::javagateway_listenip,
$listenport = $zabbix::params::javagateway_listenport,
$startpollers = $zabbix::params::javagateway_startpollers,
$timeout = $zabbix::params::javagateway_timeout,
) inherits zabbix::params {

# Check some if they are boolean
validate_bool($manage_firewall)
validate_bool($manage_repo)

# Only include the repo class if it has not yet been included
unless defined(Class['Zabbix::Repo']) {
class { '::zabbix::repo':
Expand Down
180 changes: 88 additions & 92 deletions manifests/proxy.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,98 +326,94 @@
# Copyright 2014 Werner Dijkerman
#
class zabbix::proxy (
$database_type = $zabbix::params::database_type,
$database_path = $zabbix::params::database_path,
$zabbix_version = $zabbix::params::zabbix_version,
$zabbix_package_state = $zabbix::params::zabbix_package_state,
$manage_database = $zabbix::params::manage_database,
$manage_firewall = $zabbix::params::manage_firewall,
$manage_repo = $zabbix::params::manage_repo,
$manage_resources = $zabbix::params::manage_resources,
$zabbix_proxy = $zabbix::params::zabbix_proxy,
$zabbix_proxy_ip = $zabbix::params::zabbix_proxy_ip,
$use_ip = $zabbix::params::proxy_use_ip,
$zbx_templates = $zabbix::params::proxy_zbx_templates,
$proxy_configfile_path = $zabbix::params::proxy_configfile_path,
$proxy_service_name = $zabbix::params::proxy_service_name,
$mode = $zabbix::params::proxy_mode,
$zabbix_server_host = $zabbix::params::proxy_zabbix_server_host,
$zabbix_server_port = $zabbix::params::proxy_zabbix_server_port,
$hostname = $zabbix::params::proxy_hostname,
$listenport = $zabbix::params::proxy_listenport,
$sourceip = $zabbix::params::proxy_sourceip,
$logfile = $zabbix::params::proxy_logfile,
$logfilesize = $zabbix::params::proxy_logfilesize,
$debuglevel = $zabbix::params::proxy_debuglevel,
$pidfile = $zabbix::params::proxy_pidfile,
$database_schema_path = $zabbix::params::database_schema_path,
$database_host = $zabbix::params::proxy_database_host,
$database_name = $zabbix::params::proxy_database_name,
$database_schema = $zabbix::params::proxy_database_schema,
$database_user = $zabbix::params::proxy_database_user,
$database_password = $zabbix::params::proxy_database_password,
$database_socket = $zabbix::params::proxy_database_socket,
$database_port = $zabbix::params::proxy_database_port,
$localbuffer = $zabbix::params::proxy_localbuffer,
$offlinebuffer = $zabbix::params::proxy_offlinebuffer,
$heartbeatfrequency = $zabbix::params::proxy_heartbeatfrequency,
$configfrequency = $zabbix::params::proxy_configfrequency,
$datasenderfrequency = $zabbix::params::proxy_datasenderfrequency,
$startpollers = $zabbix::params::proxy_startpollers,
$startipmipollers = $zabbix::params::proxy_startipmipollers,
$startpollersunreachable = $zabbix::params::proxy_startpollersunreachable,
$starttrappers = $zabbix::params::proxy_starttrappers,
$startpingers = $zabbix::params::proxy_startpingers,
$startdiscoverers = $zabbix::params::proxy_startdiscoverers,
$starthttppollers = $zabbix::params::proxy_starthttppollers,
$javagateway = $zabbix::params::proxy_javagateway,
$javagatewayport = $zabbix::params::proxy_javagatewayport,
$startjavapollers = $zabbix::params::proxy_startjavapollers,
$startvmwarecollectors = $zabbix::params::proxy_startvmwarecollectors,
$vmwarefrequency = $zabbix::params::proxy_vmwarefrequency,
$vmwareperffrequency = $zabbix::params::proxy_vmwareperffrequency,
$vmwarecachesize = $zabbix::params::proxy_vmwarecachesize,
$vmwaretimeout = $zabbix::params::proxy_vmwaretimeout,
$enablesnmpbulkrequests = $zabbix::params::proxy_enablesnmpbulkrequests,
$snmptrapperfile = $zabbix::params::proxy_snmptrapperfile,
$snmptrapper = $zabbix::params::proxy_snmptrapper,
$listenip = $zabbix::params::proxy_listenip,
$housekeepingfrequency = $zabbix::params::proxy_housekeepingfrequency,
$cachesize = $zabbix::params::proxy_cachesize,
$startdbsyncers = $zabbix::params::proxy_startdbsyncers,
$historycachesize = $zabbix::params::proxy_historycachesize,
$historyindexcachesize = $zabbix::params::proxy_historyindexcachesize,
$historytextcachesize = $zabbix::params::proxy_historytextcachesize,
$timeout = $zabbix::params::proxy_timeout,
$tlsaccept = $zabbix::params::proxy_tlsaccept,
$tlscafile = $zabbix::params::proxy_tlscafile,
$tlscertfile = $zabbix::params::proxy_tlscertfile,
$tlsconnect = $zabbix::params::proxy_tlsconnect,
$tlscrlfile = $zabbix::params::proxy_tlscrlfile,
$tlskeyfile = $zabbix::params::proxy_tlskeyfile,
$tlspskfile = $zabbix::params::proxy_tlspskfile,
$tlspskidentity = $zabbix::params::proxy_tlspskidentity,
$tlsservercertissuer = $zabbix::params::proxy_tlsservercertissuer,
$tlsservercertsubject = $zabbix::params::proxy_tlsservercertsubject,
$trappertimeout = $zabbix::params::proxy_trappertimeout,
$unreachableperiod = $zabbix::params::proxy_unreachableperiod,
$unavaliabledelay = $zabbix::params::proxy_unavaliabledelay,
$unreachabedelay = $zabbix::params::proxy_unreachabedelay,
$externalscripts = $zabbix::params::proxy_externalscripts,
$fpinglocation = $zabbix::params::proxy_fpinglocation,
$fping6location = $zabbix::params::proxy_fping6location,
$sshkeylocation = $zabbix::params::proxy_sshkeylocation,
$logslowqueries = $zabbix::params::proxy_logslowqueries,
$tmpdir = $zabbix::params::proxy_tmpdir,
$allowroot = $zabbix::params::proxy_allowroot,
$include_dir = $zabbix::params::proxy_include,
$loadmodulepath = $zabbix::params::proxy_loadmodulepath,
$loadmodule = $zabbix::params::proxy_loadmodule,) inherits zabbix::params {
# Check some if they are boolean
validate_bool($manage_database)
validate_bool($manage_firewall)
validate_bool($manage_repo)
validate_bool($manage_resources)
$database_type = $zabbix::params::database_type,
$database_path = $zabbix::params::database_path,
$zabbix_version = $zabbix::params::zabbix_version,
$zabbix_package_state = $zabbix::params::zabbix_package_state,
Boolean $manage_database = $zabbix::params::manage_database,
Boolean $manage_firewall = $zabbix::params::manage_firewall,
Boolean $manage_repo = $zabbix::params::manage_repo,
Boolean $manage_resources = $zabbix::params::manage_resources,
$zabbix_proxy = $zabbix::params::zabbix_proxy,
$zabbix_proxy_ip = $zabbix::params::zabbix_proxy_ip,
$use_ip = $zabbix::params::proxy_use_ip,
$zbx_templates = $zabbix::params::proxy_zbx_templates,
$proxy_configfile_path = $zabbix::params::proxy_configfile_path,
$proxy_service_name = $zabbix::params::proxy_service_name,
$mode = $zabbix::params::proxy_mode,
$zabbix_server_host = $zabbix::params::proxy_zabbix_server_host,
$zabbix_server_port = $zabbix::params::proxy_zabbix_server_port,
$hostname = $zabbix::params::proxy_hostname,
$listenport = $zabbix::params::proxy_listenport,
$sourceip = $zabbix::params::proxy_sourceip,
$logfile = $zabbix::params::proxy_logfile,
$logfilesize = $zabbix::params::proxy_logfilesize,
$debuglevel = $zabbix::params::proxy_debuglevel,
$pidfile = $zabbix::params::proxy_pidfile,
$database_schema_path = $zabbix::params::database_schema_path,
$database_host = $zabbix::params::proxy_database_host,
$database_name = $zabbix::params::proxy_database_name,
$database_schema = $zabbix::params::proxy_database_schema,
$database_user = $zabbix::params::proxy_database_user,
$database_password = $zabbix::params::proxy_database_password,
$database_socket = $zabbix::params::proxy_database_socket,
$database_port = $zabbix::params::proxy_database_port,
$localbuffer = $zabbix::params::proxy_localbuffer,
$offlinebuffer = $zabbix::params::proxy_offlinebuffer,
$heartbeatfrequency = $zabbix::params::proxy_heartbeatfrequency,
$configfrequency = $zabbix::params::proxy_configfrequency,
$datasenderfrequency = $zabbix::params::proxy_datasenderfrequency,
$startpollers = $zabbix::params::proxy_startpollers,
$startipmipollers = $zabbix::params::proxy_startipmipollers,
$startpollersunreachable = $zabbix::params::proxy_startpollersunreachable,
$starttrappers = $zabbix::params::proxy_starttrappers,
$startpingers = $zabbix::params::proxy_startpingers,
$startdiscoverers = $zabbix::params::proxy_startdiscoverers,
$starthttppollers = $zabbix::params::proxy_starthttppollers,
$javagateway = $zabbix::params::proxy_javagateway,
$javagatewayport = $zabbix::params::proxy_javagatewayport,
$startjavapollers = $zabbix::params::proxy_startjavapollers,
$startvmwarecollectors = $zabbix::params::proxy_startvmwarecollectors,
$vmwarefrequency = $zabbix::params::proxy_vmwarefrequency,
$vmwareperffrequency = $zabbix::params::proxy_vmwareperffrequency,
$vmwarecachesize = $zabbix::params::proxy_vmwarecachesize,
$vmwaretimeout = $zabbix::params::proxy_vmwaretimeout,
$enablesnmpbulkrequests = $zabbix::params::proxy_enablesnmpbulkrequests,
$snmptrapperfile = $zabbix::params::proxy_snmptrapperfile,
$snmptrapper = $zabbix::params::proxy_snmptrapper,
$listenip = $zabbix::params::proxy_listenip,
$housekeepingfrequency = $zabbix::params::proxy_housekeepingfrequency,
$cachesize = $zabbix::params::proxy_cachesize,
$startdbsyncers = $zabbix::params::proxy_startdbsyncers,
$historycachesize = $zabbix::params::proxy_historycachesize,
$historyindexcachesize = $zabbix::params::proxy_historyindexcachesize,
$historytextcachesize = $zabbix::params::proxy_historytextcachesize,
$timeout = $zabbix::params::proxy_timeout,
$tlsaccept = $zabbix::params::proxy_tlsaccept,
$tlscafile = $zabbix::params::proxy_tlscafile,
$tlscertfile = $zabbix::params::proxy_tlscertfile,
$tlsconnect = $zabbix::params::proxy_tlsconnect,
$tlscrlfile = $zabbix::params::proxy_tlscrlfile,
$tlskeyfile = $zabbix::params::proxy_tlskeyfile,
$tlspskfile = $zabbix::params::proxy_tlspskfile,
$tlspskidentity = $zabbix::params::proxy_tlspskidentity,
$tlsservercertissuer = $zabbix::params::proxy_tlsservercertissuer,
$tlsservercertsubject = $zabbix::params::proxy_tlsservercertsubject,
$trappertimeout = $zabbix::params::proxy_trappertimeout,
$unreachableperiod = $zabbix::params::proxy_unreachableperiod,
$unavaliabledelay = $zabbix::params::proxy_unavaliabledelay,
$unreachabedelay = $zabbix::params::proxy_unreachabedelay,
$externalscripts = $zabbix::params::proxy_externalscripts,
$fpinglocation = $zabbix::params::proxy_fpinglocation,
$fping6location = $zabbix::params::proxy_fping6location,
$sshkeylocation = $zabbix::params::proxy_sshkeylocation,
$logslowqueries = $zabbix::params::proxy_logslowqueries,
$tmpdir = $zabbix::params::proxy_tmpdir,
$allowroot = $zabbix::params::proxy_allowroot,
$include_dir = $zabbix::params::proxy_include,
$loadmodulepath = $zabbix::params::proxy_loadmodulepath,
$loadmodule = $zabbix::params::proxy_loadmodule,
) inherits zabbix::params {

# Find if listenip is set. If not, we can set to specific ip or
# to network name. If more than 1 interfaces are available, we
Expand Down
18 changes: 8 additions & 10 deletions manifests/server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,10 @@
$database_path = $zabbix::params::database_path,
$zabbix_version = $zabbix::params::zabbix_version,
$zabbix_package_state = $zabbix::params::zabbix_package_state,
$manage_firewall = $zabbix::params::manage_firewall,
$manage_repo = $zabbix::params::manage_repo,
$manage_database = $zabbix::params::manage_database,
$manage_service = $zabbix::params::manage_service,
Boolean $manage_firewall = $zabbix::params::manage_firewall,
Boolean $manage_repo = $zabbix::params::manage_repo,
Boolean $manage_database = $zabbix::params::manage_database,
Boolean $manage_service = $zabbix::params::manage_service,
$server_configfile_path = $zabbix::params::server_configfile_path,
$server_config_owner = $zabbix::params::server_config_owner,
$server_config_group = $zabbix::params::server_config_group,
Expand Down Expand Up @@ -370,7 +370,8 @@
$loadmodulepath = $zabbix::params::server_loadmodulepath,
$loadmodule = $zabbix::params::server_loadmodule,
$sslcertlocation_dir = $zabbix::params::server_sslcertlocation,
$sslkeylocation_dir = $zabbix::params::server_sslkeylocation,) inherits zabbix::params {
$sslkeylocation_dir = $zabbix::params::server_sslkeylocation,
) inherits zabbix::params {
# Only include the repo class if it has not yet been included
unless defined(Class['Zabbix::Repo']) {
class { '::zabbix::repo':
Expand All @@ -379,17 +380,14 @@
}
}

# Check some if they are boolean
validate_bool($manage_firewall)

# Get the correct database_type. We need this for installing the
# correct package and loading the sql files.

case $database_type {
'postgresql' : {
$db = 'pgsql'

if $manage_database == true {
if $manage_database {
# Execute the postgresql scripts
class { '::zabbix::database::postgresql':
zabbix_type => 'server',
Expand All @@ -407,7 +405,7 @@
'mysql' : {
$db = 'mysql'

if $manage_database == true {
if $manage_database {
# Execute the mysql scripts
class { '::zabbix::database::mysql':
zabbix_type => 'server',
Expand Down
5 changes: 2 additions & 3 deletions manifests/userparameter.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@
#

class zabbix::userparameter (
$data = {},
Hash $data = {},
) {
$_data = hiera_hash('zabbix::userparameter::data', $data)
validate_hash($_data)
create_resources('zabbix::userparameters', $_data)
}
}
4 changes: 1 addition & 3 deletions manifests/zapache.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,8 @@

# Check if apache_status is true, installs Zapache scripts. Defaults to false.
class zabbix::zapache (
$apache_status = $zabbix::params::apache_status,
Boolean $apache_status = $zabbix::params::apache_status,
) inherits zabbix::params {
# Check if apache_status is boolean
validate_bool($apache_status)

if $apache_status {
file { [ '/var/lib/zabbixsrv/','/var/lib/zabbixsrv/externalscripts/']:
Expand Down