Clean-up Vars (#1291)

changelogs/fragments/fix_vars.yml

@@ -0,0 +1,9 @@
+breaking_changes:
+  - Agent Role - Remove support for `zabbix_sender_package` variable.
+  - Agent Role - Remove support for `zabbix_get_package` variable.
+  - Agent Role - Remove support for `zabbix_agent_zabbix_alias`.
+  - Agent Role - Remove support for all `zabbix_agent2_*` variables.
+minor_changes:
+  - Agent Role - Updated defaults to be inline with Zabbix defaults.
+  - All Roles - Updated include option to include all .conf files.
+  - All Roles - Updated all Zabbix configuration bool variables to be `true`/`false`.

docs/ZABBIX_AGENT_ROLE.md

@@ -288,45 +288,46 @@ The following table lists all variables that are exposed to modify the configura
 |-----------|------------------|--------|--------|
 | Alias | zabbix_agent_aliases |  | Can be a string or list |
 | AllowKey | zabbix_agent_allowkeys |  |  |
-| AllowRoot | zabbix_agent_allowroot |  | Linux Systems Only |
+| AllowRoot | zabbix_agent_allowroot | `False` | `True`/`False` Agent Linux Systems Only |
 | BufferSend | zabbix_agent_buffersend | 5 |  |
 | BufferSize | zabbix_agent_buffersize | 100 |  |
 | ControlSocket | zabbix_agent_controlsocket | /tmp/agent.sock | Agent 2 Only |
 | DebugLevel | zabbix_agent_debuglevel | 3 |  |
 | DenyKey | zabbix_agent_denykeys |  | Can be a string or a list |
-| EnableRemoteCommands | zabbix_agent_enableremotecommands | 0 | Agent Only |
-| ForceActiveChecksOnStart | zabbix_agent_forceactivechecksonstart |  | Agent 2 Only |
-| HeartbeatFrequency | zabbix_agent_heartbeatfrequency | 60 | Version >= 6.2 |
+| EnablePersistentBuffer | zabbix_agent_enablepersistentbuffer | `False` | `True`/`False` Agent 2 Only |
+| EnableRemoteCommands | zabbix_agent_enableremotecommands | `False` | `True`/`False` Agent Only |
+| ForceActiveChecksOnStart | zabbix_agent_forceactivechecksonstart | `False` | `True`/`False` Agent 2 Only |
+| HeartbeatFrequency | zabbix_agent_heartbeatfrequency | 60 | Version >= 6.4 |
 | HostInterface | zabbix_agent_hostinterface |  |  |
 | HostInterfaceItem | zabbix_agent_hostinterfaceitem |  |  |
 | HostMetadata | zabbix_agent_hostmetadata |  |  |
 | HostMetadataItem | zabbix_agent_hostmetadataitem |  |  |
 | Hostname | zabbix_agent_hostname |  | `{{ inventory_hostname }}` |
 | HostnameItem | zabbix_agent_hostnameitem |  |  |
-| Include | zabbix_agent_include | /etc/zabbix/`{ agent version specific }`.d |  |
+| Include | zabbix_agent_include | /etc/zabbix/`{ agent version specific }`.d/*.conf |  |
 | ListenBacklog | zabbix_agent_listenbacklog |  | Agent Only |
-| ListenIP | zabbix_agent_listenip |  | list of IPs |
+| ListenIP | zabbix_agent_listenip | 0.0.0.0  |  |
 | ListenPort | zabbix_agent_listenport | 10050 |  |
 | LoadModule | zabbix_agent_loadmodule |  | Agent On Linux Only |
 | LoadModulePath | zabbix_agent_loadmodulepath |  | Agent On Linux Only |
 | LogFile | zabbix_agent_logfile | /var/log/zabbix/`{ agent version specific }`.log |  |
 | LogFileSize | zabbix_agent_logfilesize | 100 |  |
-| LogRemoteCommands | zabbix_agent_logremotecommands |  | Agent Only |
+| LogRemoteCommands | zabbix_agent_logremotecommands | `False` | `True`/`False` Agent Only |
 | LogType | zabbix_agent_logtype | file |  |
-| MaxLinesPerSecond | zabbix_agent_maxlinespersecond |  | Agent Only |
+| MaxLinesPerSecond | zabbix_agent_maxlinespersecond | 20 | Agent Only |
 | PerfCounter | zabbix_agent_perfcounter |  | Agent Only |
 | PerfCounterEn | zabbix_agent_perfcounteren |  | Agent Only |
 | PersistentBufferFile | zabbix_agent_persistentbufferfile |  | Agent 2 Only |
 | PersistentBufferPeriod | zabbix_agent_persistentbufferperiod | 1h | Agent 2 Only |
 | PidFile | zabbix_agent_pidfile | /var/run/zabbix/`{ agent version specific }`.pid | Linux Systems Only |
 | Plugin | zabbix_agent_plugins |  |  |
-| PluginSocket | zabbix_agent_pluginsocket |  |  |
-| PluginTimeout | zabbix_agent_plugintimeout |  |  |
-| RefreshActiveChecks | zabbix_agent_refreshactivechecks | 120 |  |
+| PluginSocket | zabbix_agent_pluginsocket | /tmp/agent.plugin.sock | Agent 2 Only  |
+| PluginTimeout | zabbix_agent_plugintimeout | 3 | Agent 2 Only |
+| RefreshActiveChecks | zabbix_agent_refreshactivechecks |  |  |
 | Server | zabbix_agent_server |  |  |
 | ServerActive | zabbix_agent_serveractive |  |  |
 | SourceIP | zabbix_agent_sourceip |  |  |
-| StartAgents | zabbix_agent_startagents |  | Agent Only |
+| StartAgents | zabbix_agent_startagents | 3 | Agent Only |
 | StatusPort | zabbix_agent_statusport | 9999 | Agent 2 Only |
 | Timeout | zabbix_agent_timeout | 3 |  |
 | TLSAccept | zabbix_agent_tlsconnect |  |  |
@@ -345,9 +346,10 @@ The following table lists all variables that are exposed to modify the configura
 | TLSPSKIdentity | zabbix_agent_tlspskidentity |  |  |
 | TLSServerCertIssuer | zabbix_agent_tlsservercertissuer |  |  |
 | TLSServerCertSubject | zabbix_agent_tlsservercertsubject |  |  |
-| UnsafeUserParameters | zabbix_agent_unsafeuserparameters |  |  |
-| User | zabbix_agent_runas_user |  | Agent on Linux Only |
-| UserParameter | zabbix_agent_userparamater | 0 |  |
+| UnsafeUserParameters | zabbix_agent_unsafeuserparameters | `False` | `True`/`False`  |
+| User | zabbix_agent_runas_user | zabbix | Agent on Linux Only |
+| UserParameter | zabbix_agent_userparamater | | |
+| UserParameterDir | zabbix_agent_userparamaterdir |  |  |
 
 
 ## proxy

docs/ZABBIX_PROXY_ROLE.md

@@ -298,14 +298,15 @@ The following table lists all variables that are exposed to modify the configura
 
 | Zabbix Name | Variable Name | Default Value |Notes |
 |-----------|------------------|--------|--------|
-| AllowRoot | zabbix_proxy_allowroot |0| |
-| AllowUnsupportedDBVersions | zabbix_proxy_allowunsupporteddbversions |0| |
-| CacheSize | zabbix_proxy_cachesize | 8M| |
-| ConfigFrequency | zabbix_proxy_configfrequency |3600| |
-| DataSenderFrequency | zabbix_proxy_datasenderfrequency |1| |
+| AllowRoot | zabbix_proxy_allowroot | `False` | `True`/`False` |
+| AllowUnsupportedDBVersions | zabbix_proxy_allowunsupporteddbversions | `False` | `True`/`False` |
+| CacheSize | zabbix_proxy_cachesize | 32M | |
+| ConfigFrequency | zabbix_proxy_configfrequency | 3600 | |
+| DataSenderFrequency | zabbix_proxy_datasenderfrequency | 1 | |
 | DBHost | zabbix_proxy_dbhost | localhost| |
 | DBName | zabbix_proxy_dbname | zabbix_proxy| |
 | DBPassword | zabbix_proxy_dbpassword | zabbix_proxy| |
+| DBPort | zabbix_proxy_dbport | Varies by database | |
 | DBSchema | zabbix_proxy_dbschema || |
 | DBSocket | zabbix_proxy_dbsocket || |
 | DBTLSCAFile | zabbix_proxy_dbtlscafile || |
@@ -316,62 +317,64 @@ The following table lists all variables that are exposed to modify the configura
 | DBTLSKeyFile | zabbix_proxy_dbtlskeyfile || |
 | DBUser | zabbix_proxy_dbuser | zabbix_proxy| |
 | DebugLevel | zabbix_proxy_debuglevel |3| |
-| EnableRemoteCommands | zabbix_proxy_enableremotecommands |0| |
+| EnableRemoteCommands | zabbix_proxy_enableremotecommands | `False` | `True`/`False` |
 | ExternalScripts | zabbix_proxy_externalscripts | /usr/lib/zabbix/externalscripts| |
 | Fping6Location | zabbix_proxy_fping6location | OS Specific Value | |
 | FpingLocation | zabbix_proxy_fpinglocation | OS Specific Value | |
-| HeartbeatFrequency | zabbix_proxy_heartbeatfrequency |60| Version 6.2 or Lower|
-| HistoryCacheSize | zabbix_proxy_historycachesize | 8M| |
+| HeartbeatFrequency | zabbix_proxy_heartbeatfrequency |60| Version 6.0 |
+| HistoryCacheSize | zabbix_proxy_historycachesize | 16M| |
 | HistoryIndexCacheSize | zabbix_proxy_historyindexcachesize | 4M| |
 | Hostname | zabbix_proxy_hostname | "{{ inventory_hostname }}"| |
 | HostnameItem | zabbix_proxy_hostnameitem || |
 | HousekeepingFrequency | zabbix_proxy_housekeepingfrequency |1| |
-| Include | zabbix_proxy_include | /etc/zabbix/zabbix_proxy.conf.d| |
+| Include | zabbix_proxy_include | /etc/zabbix/zabbix_proxy.conf.d/*.conf | |
 | JavaGateway | zabbix_proxy_javagateway || |
 | JavaGatewayPort | zabbix_proxy_javagatewayport |10052| |
 | ListenBacklog | zabbix_proxy_listenbacklog || |
-| ListenIP | zabbix_proxy_listenip || |
+| ListenIP | zabbix_proxy_listenip |0.0.0.0 | |
 | ListenPort | zabbix_proxy_listenport |10051| |
 | LoadModule | zabbix_proxy_loadmodule || |
 | LoadModulePath | zabbix_proxy_loadmodulepath | /usr/lib/zabbix/modules| |
 | LogFile | zabbix_proxy_logfile | /var/log/zabbix/zabbix_proxy.log| |
 | LogFileSize | zabbix_proxy_logfilesize |10| |
-| LogRemoteCommands | zabbix_proxy_logremotecommands || |
-| LogSlowQueries | zabbix_proxy_logslowqueries || |
+| LogRemoteCommands | zabbix_proxy_logremotecommands | `False` | `True`/`False` |
+| LogSlowQueries | zabbix_proxy_logslowqueries | 0 | |
 | LogType | zabbix_proxy_logtype | file| |
-| MaxConcurrentChecksPerPoller | zabbix_proxy_maxconcurrentchecksperpoller | | Version 7.0 or Greater |
+| MaxConcurrentChecksPerPoller | zabbix_proxy_maxconcurrentchecksperpoller | 1000 | Version 7.0 or Greater |
 | PidFile | zabbix_proxy_pidfile | /var/run/zabbix/zabbix_proxy.pid| |
-| ProxyBufferMode | zabbix_proxy_proxybuffermode | | Version 7.0 or Greater |
+| ProxyBufferMode | zabbix_proxy_proxybuffermode | disk | Version 7.0 or Greater |
+| ProxyConfigFrequency | zabbix_proxy_proxyconfigfrequency | 10 | Version 6.4 or Lower |
 | ProxyLocalBuffer | zabbix_proxy_proxylocalbuffer |0| |
-| ProxyMemoryBufferAge | zabbix_proxy_proxymemorybufferage || Version 7.0 or Greater |
-| ProxyMemoryBufferSize | zabbix_proxy_proxymemorybuffersize || Version 7.0 or Greater |
-| ProxyMode | zabbix_proxy_proxymode || |
-| ProxyOfflineBuffer | zabbix_proxy_proxyofflinebuffer |1| |
+| ProxyMemoryBufferAge | zabbix_proxy_proxymemorybufferage | 0 | Version 7.0 or Greater |
+| ProxyMemoryBufferSize | zabbix_proxy_proxymemorybuffersize | 0 | Version 7.0 or Greater |
+| ProxyMode | zabbix_proxy_proxymode | 0 | `0`: Active `1`: Passive |
+| ProxyOfflineBuffer | zabbix_proxy_proxyofflinebuffer | 1 | |
 | Server | zabbix_proxy_server | 192.168.1.1| |
-| SNMPTrapperFile | zabbix_proxy_snmptrapperfile | /tmp/zabbix_traps.tmp| |
-| SocketDir | zabbix_proxy_socketdir | /var/run/zabbix| |
+| SNMPTrapperFile | zabbix_proxy_snmptrapperfile | /tmp/zabbix_traps.tmp | |
+| SocketDir | zabbix_proxy_socketdir | /var/run/zabbix | |
 | SourceIP | zabbix_proxy_sourceip || |
 | SSHKeyLocation | zabbix_proxy_sshkeylocation || |
 | SSLCALocation | zabbix_proxy_sslcalocation || |
 | SSLCertLocation | zabbix_proxy_sslcertlocation || |
 | SSLKeyLocation | zabbix_proxy_sslkeylocation || |
-| StartAgentPollers | zabbix_proxy_startagentpollers || Version 7.0 or Greater |
-| StartBrowserPollers | zabbix_proxy_startbrowserpollers || Version 7.0 or Greater |
+| StartAgentPollers | zabbix_proxy_startagentpollers | 1 | Version 7.0 or Greater |
+| StartBrowserPollers | zabbix_proxy_startbrowserpollers | 1 | Version 7.0 or Greater |
 | StartDBSyncers | zabbix_proxy_startdbsyncers |4| |
 | StartDiscoverers | zabbix_proxy_startdiscoverers |1| |
-| StartHTTPAgentPollers | zabbix_proxy_httpagentpollers | | Version 7.0 or Greater |
+| StartHistoryPollers | zabbix_proxy_starthistorypollers | 1 | Version 6.0 |
+| StartHTTPAgentPollers | zabbix_proxy_starthttpagentpollers | 1 | Version 7.0 or Greater |
 | StartHTTPPollers | zabbix_proxy_starthttppollers |1| |
 | StartIPMIPollers | zabbix_proxy_startipmipollers |0| |
-| StartJavaPollers | zabbix_proxy_startjavapollers || |
+| StartJavaPollers | zabbix_proxy_startjavapollers |0 | |
 | StartODBCPollers | zabbix_proxy_startodbcpollers |1| |
 | StartPingers | zabbix_proxy_startpingers |1| |
 | StartPollers | zabbix_proxy_startpollers |5| |
 | StartPollersUnreachable | zabbix_proxy_startpollersunreachable |1| |
 | StartPreprocessors | zabbix_proxy_startpreprocessors |3| |
-| StartSNMPPollers | zabbix_proxy_startsnmppollers | | Version 7.0 or Greater |
-| StartSNMPTrapper | zabbix_proxy_startsnmptrapper || |
+| StartSNMPPollers | zabbix_proxy_startsnmppollers | 1 | Version 7.0 or Greater |
+| StartSNMPTrapper | zabbix_proxy_startsnmptrapper | 0 | |
 | StartTrappers | zabbix_proxy_starttrappers |5| |
-| StartVMwareCollectors | zabbix_proxy_startvmwarecollectors || |
+| StartVMwareCollectors | zabbix_proxy_startvmwarecollectors | 0 | |
 | StatsAllowedIP | zabbix_proxy_statsallowedip | "127.0.0.1"| |
 | Timeout | zabbix_proxy_timeout |3| |
 | TLSAccept | zabbix_proxy_tlsaccept || |
@@ -392,10 +395,10 @@ The following table lists all variables that are exposed to modify the configura
 | TLSServerCertSubject | zabbix_proxy_tlsservercertsubject || |
 | TmpDir | zabbix_proxy_tmpdir | /tmp| |
 | TrapperTimeout | zabbix_proxy_trappertimeout |300| |
-| UnavailableDelay | zabbix_proxy_unavailabledelay || |
-| UnreachableDelay | zabbix_proxy_unreachabledelay || |
-| UnreachablePeriod | zabbix_proxy_unreachableperiod |45| |
-| User | zabbix_proxy_user || |
+| UnavailableDelay | zabbix_proxy_unavailabledelay | 60| |
+| UnreachableDelay | zabbix_proxy_unreachabledelay | 15 | |
+| UnreachablePeriod | zabbix_proxy_unreachableperiod | 45| |
+| User | zabbix_proxy_user | zabbix | |
 | Vault | zabbix_proxy_vault || Version 6.2 or Greater |
 | VaultDBPath | zabbix_proxy_vaultdbpath || |
 | VaultPrefix | zabbix_proxy_vaultprefix || Version 7.0 or Greater |
@@ -405,8 +408,8 @@ The following table lists all variables that are exposed to modify the configura
 | VaultURL | zabbix_proxy_vaulturl |https://127.0.0.1:8200| |
 | VMwareCacheSize | zabbix_proxy_vmwarecachesize | 8M| |
 | VMwareFrequency | zabbix_proxy_vmwarefrequency |60| |
-| VMwarePerfFrequency | zabbix_proxy_vmwareperffrequency | | |
-| VMwareTimeout | zabbix_proxy_vmwaretimeout | | |
+| VMwarePerfFrequency | zabbix_proxy_vmwareperffrequency | 60 | |
+| VMwareTimeout | zabbix_proxy_vmwaretimeout | 10 | |
 | WebDriverURL | zabbix_proxy_webdriverurl | | Version 7.0 or Greater |
 
 ## Tags