From d718cdc1ca6c82016398c45f5a64b15303759174 Mon Sep 17 00:00:00 2001 From: Troy W Date: Sat, 28 Oct 2023 13:24:32 -0400 Subject: [PATCH] Added new Vars --- .github/workflows/proxy.yml | 2 ++ docs/ZABBIX_PROXY_ROLE.md | 7 +++++++ docs/ZABBIX_SERVER_ROLE.md | 4 ++++ .../templates/zabbix_proxy.conf.j2 | 19 +++++++++++++++++++ .../templates/zabbix_server.conf.j2 | 9 +++++++++ 5 files changed, 41 insertions(+) diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml index a86ee8f4e..8d4bc94e8 100644 --- a/.github/workflows/proxy.yml +++ b/.github/workflows/proxy.yml @@ -46,6 +46,8 @@ jobs: version: v62 - container: centos7 version: v65 + - container: debian10 + version: v65 steps: - name: Check out code uses: actions/checkout@v4 diff --git a/docs/ZABBIX_PROXY_ROLE.md b/docs/ZABBIX_PROXY_ROLE.md index 341fc1984..02b42fdef 100644 --- a/docs/ZABBIX_PROXY_ROLE.md +++ b/docs/ZABBIX_PROXY_ROLE.md @@ -332,8 +332,12 @@ The following table lists all variables that are exposed to modify the configura | LogRemoteCommands | zabbix_proxy_logremotecommands || | | LogSlowQueries | zabbix_proxy_logslowqueries || | | LogType | zabbix_proxy_logtype | file| | +| MaxConcurrentChecksPerPoller | zabbix_proxy_maxconcurrentchecksperpoller || | | PidFile | zabbix_proxy_pidfile | /var/run/zabbix/zabbix_proxy.pid| | +| ProxyBufferMode | zabbix_proxy_proxybuffermode || | | ProxyLocalBuffer | zabbix_proxy_proxylocalbuffer |0| | +| ProxyMemoryBufferAge | zabbix_proxy_proxymemorybufferage || | +| ProxyMemoryBufferSize | zabbix_proxy_proxymemorybuffersize || | | ProxyMode | zabbix_proxy_proxymode || | | ProxyOfflineBuffer | zabbix_proxy_proxyofflinebuffer |1| | | Server | zabbix_proxy_server | 192.168.1.1| | @@ -342,10 +346,12 @@ The following table lists all variables that are exposed to modify the configura | SourceIP | zabbix_proxy_sourceip || | | SSHKeyLocation | zabbix_proxy_sshkeylocation || | | SSLCALocation | zabbix_proxy_sslcalocation || | +| StartAgentPollers | zabbix_proxy_startagentpollers || | | SSLCertLocation | zabbix_proxy_sslcertlocation || | | SSLKeyLocation | zabbix_proxy_sslkeylocation || | | StartDBSyncers | zabbix_proxy_startdbsyncers |4| | | StartDiscoverers | zabbix_proxy_startdiscoverers |1| | +| StartHTTPAgentPollers | zabbix_proxy_starthttpagentpollers || | | StartHTTPPollers | zabbix_proxy_starthttppollers |1| | | StartIPMIPollers | zabbix_proxy_startipmipollers |0| | | StartJavaPollers | zabbix_proxy_startjavapollers || | @@ -354,6 +360,7 @@ The following table lists all variables that are exposed to modify the configura | StartPollers | zabbix_proxy_startpollers |5| | | StartPollersUnreachable | zabbix_proxy_startpollersunreachable |1| | | StartPreprocessors | zabbix_proxy_startpreprocessors |3| | +| StartSNMPPollers | zabbix_proxy_startsnmppollers || | | StartSNMPTrapper | zabbix_proxy_startsnmptrapper || | | StartTrappers | zabbix_proxy_starttrappers |5| | | StartVMwareCollectors | zabbix_proxy_startvmwarecollectors || | diff --git a/docs/ZABBIX_SERVER_ROLE.md b/docs/ZABBIX_SERVER_ROLE.md index 22ecd0f56..dc2977d38 100644 --- a/docs/ZABBIX_SERVER_ROLE.md +++ b/docs/ZABBIX_SERVER_ROLE.md @@ -337,6 +337,7 @@ The following table lists all variables that are exposed to modify the configura |SSHKeyLocation | zabbix_server_sshkeylocation | | | |SSLCALocation | zabbix_server_sslcalocation | | | |SSLCertLocation | zabbix_server_sslcertlocation | ${datadir}/zabbix/ssl/certs | | +|StartAgentPollers | zabbix_server_startagentpollers | | | |SSLKeyLocation | zabbix_server_sslkeylocation | ${datadir}/zabbix/ssl/keys | | |StartAlerters | zabbix_server_startalerters | | | |StartConnectors | zabbix_server_connectors | | Version 6.4 or later | @@ -344,7 +345,9 @@ The following table lists all variables that are exposed to modify the configura |StartDiscoverers | zabbix_server_startdiscoverers | 1 | | |StartEscalators | zabbix_server_startescalators | 1 | | |StartHistoryPollers | zabbix_server_starthistorypollers | | | +|StartHTTPAgentPollers | zabbix_server_starthttpagentpollers | | | |StartHTTPPollers | zabbix_server_starthttppollers | 1 | | +|StartHTTPAgentPollers | zabbix_server_starthttpagentpollers | | | |StartIPMIPollers | zabbix_server_startipmipollers | 0 | | |StartJavaPollers | zabbix_server_startjavapollers | 0 | | |StartLLDProcessors | zabbix_server_startlldprocessors | | | @@ -355,6 +358,7 @@ The following table lists all variables that are exposed to modify the configura |StartPreprocessors | zabbix_server_startpreprocessors | | | |StartProxyPollers | zabbix_server_startproxypollers | | | |StartReportWriters | zabbix_server_startreportwriters | 0 | | +|StartSNMMPAgentPollers | zabbix_server_startsnmpagentpollers | | | |StartSNMPTrapper | zabbix_server_startsnmptrapper | 0 | | |StartTimers | zabbix_server_starttimers | 1 | | |StartTrappers | zabbix_server_starttrappers | 5 | | diff --git a/roles/zabbix_proxy/templates/zabbix_proxy.conf.j2 b/roles/zabbix_proxy/templates/zabbix_proxy.conf.j2 index 797f779df..edabb7e1f 100644 --- a/roles/zabbix_proxy/templates/zabbix_proxy.conf.j2 +++ b/roles/zabbix_proxy/templates/zabbix_proxy.conf.j2 @@ -49,8 +49,18 @@ {{ (zabbix_proxy_logremotecommands is defined and zabbix_proxy_logremotecommands is not none) | ternary('','# ') }}LogRemoteCommands={{ zabbix_proxy_logremotecommands | default('') }} {{ (zabbix_proxy_logslowqueries is defined and zabbix_proxy_logslowqueries is not none) | ternary('','# ') }}LogSlowQueries={{ zabbix_proxy_logslowqueries | default('') }} {{ (zabbix_proxy_logtype is defined and zabbix_proxy_logtype is not none) | ternary('','# ') }}LogType={{ zabbix_proxy_logtype | default('') }} +{% if zabbix_proxy_version is version('6.4', '>') %} +{{ (zabbix_proxy_maxconcurrentchecksperpoller is defined and zabbix_proxy_maxconcurrentchecksperpoller is not none) | ternary('','# ') }}MaxConcurrentChecksPerPoller={{ zabbix_proxy_maxconcurrentchecksperpoller | default('') }} +{% endif %} {{ (zabbix_proxy_pidfile is defined and zabbix_proxy_pidfile is not none) | ternary('','# ') }}PidFile={{ zabbix_proxy_pidfile | default('') }} +{% if zabbix_proxy_version is version('6.4', '>') %} +{{ (zabbix_proxy_proxybuffermode is defined and zabbix_proxy_proxybuffermode is not none) | ternary('','# ') }}ProxyBufferMode={{ zabbix_proxy_proxybuffermode | default('') }} +{% endif %} {{ (zabbix_proxy_proxylocalbuffer is defined and zabbix_proxy_proxylocalbuffer is not none) | ternary('','# ') }}ProxyLocalBuffer={{ zabbix_proxy_proxylocalbuffer | default('') }} +{% if zabbix_proxy_version is version('6.4', '>') %} +{{ (zabbix_proxy_proxymemorybufferage is defined and zabbix_proxy_proxymemorybufferage is not none) | ternary('','# ') }}ProxyMemoryBufferAge={{ zabbix_proxy_proxymemorybufferage | default('') }} +{{ (zabbix_proxy_proxymemorybuffersize is defined and zabbix_proxy_proxymemorybuffersize is not none) | ternary('','# ') }}ProxyMemoryBufferSize={{ zabbix_proxy_proxymemorybuffersize | default('') }} +{% endif %} {{ (zabbix_proxy_proxymode is defined and zabbix_proxy_proxymode is not none) | ternary('','# ') }}ProxyMode={{ zabbix_proxy_proxymode | default('') }} {{ (zabbix_proxy_proxyofflinebuffer is defined and zabbix_proxy_proxyofflinebuffer is not none) | ternary('','# ') }}ProxyOfflineBuffer={{ zabbix_proxy_proxyofflinebuffer | default('') }} {{ (zabbix_proxy_server is defined and zabbix_proxy_server is not none) | ternary('','# ') }}Server={{ zabbix_proxy_server | default('') }} @@ -59,10 +69,16 @@ {{ (zabbix_proxy_sourceip is defined and zabbix_proxy_sourceip is not none) | ternary('','# ') }}SourceIP={{ zabbix_proxy_sourceip | default('') }} {{ (zabbix_proxy_sshkeylocation is defined and zabbix_proxy_sshkeylocation is not none) | ternary('','# ') }}SSHKeyLocation={{ zabbix_proxy_sshkeylocation | default('') }} {{ (zabbix_proxy_sslcalocation is defined and zabbix_proxy_sslcalocation is not none) | ternary('','# ') }}SSLCALocation={{ zabbix_proxy_sslcalocation | default('') }} +{% if zabbix_proxy_version is version('6.4', '>') %} +{{ (zabbix_proxy_startagentpollers is defined and zabbix_proxy_startagentpollers is not none) | ternary('','# ') }}StartAgentPollers={{ zabbix_proxy_startagentpollers | default('') }} +{% endif %} {{ (zabbix_proxy_sslcertlocation is defined and zabbix_proxy_sslcertlocation is not none) | ternary('','# ') }}SSLCertLocation={{ zabbix_proxy_sslcertlocation | default('') }} {{ (zabbix_proxy_sslkeylocation is defined and zabbix_proxy_sslkeylocation is not none) | ternary('','# ') }}SSLKeyLocation={{ zabbix_proxy_sslkeylocation | default('') }} {{ (zabbix_proxy_startdbsyncers is defined and zabbix_proxy_startdbsyncers is not none) | ternary('','# ') }}StartDBSyncers={{ zabbix_proxy_startdbsyncers | default('') }} {{ (zabbix_proxy_startdiscoverers is defined and zabbix_proxy_startdiscoverers is not none) | ternary('','# ') }}StartDiscoverers={{ zabbix_proxy_startdiscoverers | default('') }} +{% if zabbix_proxy_version is version('6.4', '>') %} +{{ (zabbix_proxy_starthttpagentpollers is defined and zabbix_proxy_starthttpagentpollers is not none) | ternary('','# ') }}StartHTTPAgentPollers={{ zabbix_proxy_starthttpagentpollers | default('') }} +{% endif %} {% if zabbix_proxy_version is version('6.0', '==') %} {{ (zabbix_proxy_starthistorypollers is defined and zabbix_proxy_starthistorypollers is not none) | ternary('','# ') }}={{ zabbix_proxy_starthistorypollers | default('') }} {% endif %} @@ -74,6 +90,9 @@ {{ (zabbix_proxy_startpollers is defined and zabbix_proxy_startpollers is not none) | ternary('','# ') }}StartPollers={{ zabbix_proxy_startpollers | default('') }} {{ (zabbix_proxy_startpollersunreachable is defined and zabbix_proxy_startpollersunreachable is not none) | ternary('','# ') }}StartPollersUnreachable={{ zabbix_proxy_startpollersunreachable | default('') }} {{ (zabbix_proxy_startpreprocessors is defined and zabbix_proxy_startpreprocessors is not none) | ternary('','# ') }}StartPreprocessors={{ zabbix_proxy_startpreprocessors | default('') }} +{% if zabbix_proxy_version is version('6.4', '>') %} +{{ (zabbix_proxy_startsnmppollers is defined and zabbix_proxy_startsnmppollers is not none) | ternary('','# ') }}StartSNMPPollers={{ zabbix_proxy_startsnmppollers | default('') }} +{% endif %} {{ (zabbix_proxy_startsnmptrapper is defined and zabbix_proxy_startsnmptrapper is not none) | ternary('','# ') }}StartSNMPTrapper={{ zabbix_proxy_startsnmptrapper | default('') }} {{ (zabbix_proxy_starttrappers is defined and zabbix_proxy_starttrappers is not none) | ternary('','# ') }}StartTrappers={{ zabbix_proxy_starttrappers | default('') }} {{ (zabbix_proxy_startvmwarecollectors is defined and zabbix_proxy_startvmwarecollectors is not none) | ternary('','# ') }}StartVMwareCollectors={{ zabbix_proxy_startvmwarecollectors | default('') }} diff --git a/roles/zabbix_server/templates/zabbix_server.conf.j2 b/roles/zabbix_server/templates/zabbix_server.conf.j2 index 9473e81cf..b8f0509ca 100644 --- a/roles/zabbix_server/templates/zabbix_server.conf.j2 +++ b/roles/zabbix_server/templates/zabbix_server.conf.j2 @@ -60,6 +60,9 @@ {{ (zabbix_server_sourceip is defined and zabbix_server_sourceip is not none) | ternary('', '# ') }}SourceIP={{ zabbix_server_sourceip | default('') }} {{ (zabbix_server_sshkeylocation is defined and zabbix_server_sshkeylocation is not none) | ternary('', '# ') }}SSHKeyLocation={{ zabbix_server_sshkeylocation | default('') }} {{ (zabbix_server_sslcalocation is defined and zabbix_server_sslcalocation is not none) | ternary('', '# ') }}SSLCALocation={{ zabbix_server_sslcalocation | default('') }} +{% if zabbix_server_version is version('6.4', '>') %} +{{ (zabbix_server_startagentpollers is defined and zabbix_server_startagentpollers is not none) | ternary('', '# ') }}StartAgentPollers={{ zabbix_server_startagentpollers | default('') }} +{% endif %} {{ (zabbix_server_sslcertlocation is defined and zabbix_server_sslcertlocation is not none) | ternary('', '# ') }}SSLCertLocation={{ zabbix_server_sslcertlocation | default('') }} {{ (zabbix_server_sslkeylocation is defined and zabbix_server_sslkeylocation is not none) | ternary('', '# ') }}SSLKeyLocation={{ zabbix_server_sslkeylocation | default('') }} {{ (zabbix_server_startalerters is defined and zabbix_server_startalerters is not none) | ternary('', '# ') }}StartAlerters={{ zabbix_server_startalerters | default('') }} @@ -67,6 +70,9 @@ {{ (zabbix_server_startdiscoverers is defined and zabbix_server_startdiscoverers is not none) | ternary('', '# ') }}StartDiscoverers={{ zabbix_server_startdiscoverers | default('') }} {{ (zabbix_server_startescalators is defined and zabbix_server_startescalators is not none) | ternary('', '# ') }}StartEscalators={{ zabbix_server_startescalators | default('') }} {{ (zabbix_server_starthistorypollers is defined and zabbix_server_starthistorypollers is not none) | ternary('', '# ') }}StartHistoryPollers={{ zabbix_server_starthistorypollers | default('') }} +{% if zabbix_server_version is version('6.4', '>') %} +{{ (zabbix_server_starthttpagentpollers is defined and zabbix_server_starthttpagentpollers is not none) | ternary('', '# ') }}StartHTTPAgentPollers={{ zabbix_server_starthttpagentpollers | default('') }} +{% endif %} {{ (zabbix_server_starthttppollers is defined and zabbix_server_starthttppollers is not none) | ternary('', '# ') }}StartHTTPPollers={{ zabbix_server_starthttppollers | default('') }} {{ (zabbix_server_startipmipollers is defined and zabbix_server_startipmipollers is not none) | ternary('', '# ') }}StartIPMIPollers={{ zabbix_server_startipmipollers | default('') }} {{ (zabbix_server_startjavapollers is defined and zabbix_server_startjavapollers is not none) | ternary('', '# ') }}StartJavaPollers={{ zabbix_server_startjavapollers | default('') }} @@ -78,6 +84,9 @@ {{ (zabbix_server_startpreprocessors is defined and zabbix_server_startpreprocessors is not none) | ternary('', '# ') }}StartPreprocessors={{ zabbix_server_startpreprocessors | default('') }} {{ (zabbix_server_startproxypollers is defined and zabbix_server_startproxypollers is not none) | ternary('', '# ') }}StartProxyPollers={{ zabbix_server_startproxypollers | default('') }} {{ (zabbix_server_startreportwriters is defined and zabbix_server_startreportwriters is not none) | ternary('', '# ') }}StartReportWriters={{ zabbix_server_startreportwriters | default('') }} +{% if zabbix_server_version is version('6.4', '>') %} +{{ (zabbix_server_startsnmpagentpollers is defined and zabbix_server_startsnmpagentpollers is not none) | ternary('', '# ') }}StartSNMMPAgentPollers={{ zabbix_server_startsnmpagentpollers | default('') }} +{% endif %} {{ (zabbix_server_startsnmptrapper is defined and zabbix_server_startsnmptrapper is not none) | ternary('', '# ') }}StartSNMPTrapper={{ zabbix_server_startsnmptrapper | default('') }} {{ (zabbix_server_starttimers is defined and zabbix_server_starttimers is not none) | ternary('', '# ') }}StartTimers={{ zabbix_server_starttimers | default('') }} {{ (zabbix_server_starttrappers is defined and zabbix_server_starttrappers is not none) | ternary('', '# ') }}StartTrappers={{ zabbix_server_starttrappers | default('') }}