-
-
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.
* Add param binary_location for specify zabbix agent binary (only for systemd) * 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 templates/zabbix_agentd.conf.erb
- Loading branch information
Showing
11 changed files
with
127 additions
and
12 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
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 |
---|---|---|
|
@@ -199,18 +199,31 @@ | |
# @param saml_sp_cert The location of the SAML Service Provider Certificate. | ||
# @param saml_idp_cert The location of the SAML Identity Provider Certificate. | ||
# @param saml_settings A hash of additional SAML SSO settings. | ||
# | ||
# @example Single host setup: | ||
# class { 'zabbix': | ||
# zabbix_url => 'zabbix.dj-wasabi.nl', | ||
# } | ||
# | ||
# | ||
# @example This assumes that you want to use the postgresql database. If not and you want to supply your own database crendentials: | ||
# class { 'zabbix': | ||
# zabbix_url => 'zabbix.dj-wasabi.nl', | ||
# database_type => 'mysql', | ||
# database_user => 'zabbix', | ||
# database_password => 'ThisIsVeryDifficult.nl', | ||
# } | ||
# | ||
# @example Using Zabbix Agent 2 | ||
# class { 'zabbix::agent': | ||
# package_name => 'zabbix-agent2', | ||
# agent_configfile_path => '/etc/zabbix/zabbix_agent2.d', | ||
# pidfile => '/var/run/zabbix/zabbix_agentd2.pid', | ||
# servicename => 'zabbix-agent2', | ||
# zabbix_package_agent => 'zabbix-agent2', | ||
# binary_location => '/usr/sbin/zabbix_agent2' | ||
# } | ||
# | ||
# @author Werner Dijkerman [email protected] | ||
class zabbix ( | ||
$zabbix_url = '', | ||
|
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
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