-
-
Notifications
You must be signed in to change notification settings - Fork 227
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Remove some parameters in zabbix agent configuration if it's zabbix agent2 package * LogRemoteCommands * StartAgents * MaxLinesPerSecond * AllowRoot * User * LoadModulePath * Fix EnableRemoteCommands still use on zabbix agentd > 5 but remove on agent2 Conflicts: manifests/agent.pp spec/classes/agent_spec.rb spec/acceptance/agent_spec.rb templates/zabbix_agentd.conf.erb
- Loading branch information
Showing
7 changed files
with
208 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -134,6 +134,17 @@ | |
# monitored_by_proxy => 'my_proxy_host', | ||
# server => '192.168.1.1', | ||
# } | ||
# | ||
# @example Using Zabbix Agent 2 | ||
# class { 'zabbix::agent': | ||
# agent_configfile_path => '/etc/zabbix/zabbix_agent2.conf', | ||
# include_dir => '/etc/zabbix/zabbix_agent2.d', | ||
# include_dir_purge => false, | ||
# zabbix_package_agent => 'zabbix-agent2', | ||
# servicename => 'zabbix-agent2', | ||
# manage_startup_script => false, | ||
# } | ||
# | ||
# @author Werner Dijkerman [email protected] | ||
class zabbix::agent ( | ||
$zabbix_version = $zabbix::params::zabbix_version, | ||
|
@@ -219,6 +230,8 @@ | |
String $service_type = $zabbix::params::service_type, | ||
Boolean $manage_startup_script = $zabbix::params::manage_startup_script, | ||
) inherits zabbix::params { | ||
$agent2 = $zabbix_package_agent == 'zabbix-agent2' | ||
|
||
# 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 | ||
# can find the ipaddress of this specific interface if listenip | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters