zabbix_server: update zabbix_server configuration

Update zabbix-agentd.conf
Update vars
Disable cron

Signed-off-by: David Kirwan <dkirwan@redhat.com>

roles/zabbix/zabbix_agent/defaults/main.yml

@@ -1,8 +1,10 @@
 # Defaults variables for role zabbix-agent
-zabbix_server: zabbix01.stg.iad2.fedoraproject.org
+zabbix_server: "zabbix01{{env_suffix}}.iad2.fedoraproject.org"
+zabbix_agent_hostname: "{{ ansible_hostname }}"
 
 # TLS/PSK settings to encrypt between agent and proxy/server
-zabbix_agent_tls: False
+zabbix_tls_connect: "psk"
-zabbix_agent_tls_psk:           # gen with `openssl rand -hex 32` and also known by zabbix server
+zabbix_tls_accept: "psk"
-zabbix_agent_tls_psk_identity:  # Whatever makes sense to you and known by zabbix server
+zabbix_tls_psk_identity: "Fedora" # OVERRIDEME
+zabbix_tls_psk_file: "/etc/zabbix/fedora.psk" # `openssl rand -hex 32` Overridden in ansible private repo
 

roles/zabbix/zabbix_agent/tasks/tools.yml

@@ -16,6 +16,7 @@
     minute: "*/30"
     job: "/usr/lib/zabbix/{{ item }}"
     user: root
+    state: absent
   with_items:
     - zabbix-hw-raid-check.sh
     - zabbix-mdstat-check.sh

roles/zabbix/zabbix_agent/templates/zabbix_agentd.conf.j2

@@ -1,19 +1,13 @@
+PidFile=/var/run/zabbix/zabbix_agentd.pid
+LogFile=/var/log/zabbix/zabbix_agentd.log
+LogFileSize=1
 Hostname={{ inventory_hostname }}
 Server={{ zabbix_server }}
 ServerActive={{ zabbix_server }}
-PidFile=/var/run/zabbix/zabbix_agentd.pid
+ListenPort=10050
-LogFile=/var/log/zabbix/zabbix_agentd.log
+StartAgents=3
-LogFileSize=10
+Include=/etc/zabbix/zabbix_agentd.d/*.conf
-EnableRemoteCommands=0
+TLSConnect={{ zabbix_tls_connect }}
-Include=/etc/zabbix/zabbix_agentd.d/
+TLSAccept=psk{{ zabbix_tls_accept }}
-RefreshActiveChecks=180
+TLSPSKIdentity={{ zabbix_tls_psk_identity }}
-BufferSend=5
+TLSPSKFile=/etc/zabbix/fedora.psk
-BufferSize=100
-{% if zabbix_agent_tls %}
-# Settings for TLS/PSK between agent and proxy/server
-TLSAccept=psk
-TLSConnect=psk
-TLSPSKIdentity={{ zabbix_agent_tls_psk_identity }}
-TLSPSKFile=/etc/zabbix/zabbix_agent.psk
-{% endif %}
-

roles/zabbix/zabbix_agent/vars/CentOS-9.yml

@@ -0,0 +1,12 @@
+pkgs_list:
+  - policycoreutils-python-utils
+
+zabbix_pkgs_list:
+  - zabbix-agent
+  - zabbix-sender
+  - bc
+  - ncurses-compat-libs  # Needed for some megacli tools and raid monitoring checks through zabbix_sender
+
+zabbix_agentd: /etc/zabbix/zabbix_agentd.conf
+
+zabbix_agentd_dir: /etc/zabbix/zabbix_agentd.d

roles/zabbix/zabbix_agent/vars/Fedora.yml

@@ -8,6 +8,6 @@ zabbix_pkgs_list:
   - bc
   - ncurses-compat-libs  # Needed for some megacli tools and raid monitoring checks through zabbix_sender
 
-zabbix_agentd: /etc/zabbix/zabbix_agentd.conf
+zabbix_agentd: /etc/zabbix_agentd.conf
 
-zabbix_agentd_dir: /etc/zabbix/zabbix_agentd.d
+zabbix_agentd_dir: /etc/zabbix/zabbix_agentd.d

roles/zabbix/zabbix_agent/vars/RedHat-9.yml

@@ -0,0 +1 @@
+CentOS-9.yml

roles/zabbix/zabbix_server/templates/zabbix_server.conf.j2

@@ -511,8 +511,7 @@ SNMPTrapperFile=/var/log/snmptrap/snmptrap.log
 # Range: 1-30
 # Default:
 # Timeout=3
-
+Timeout=30
-Timeout=4
 
 ### Option: TrapperTimeout
 #	Specifies how many seconds trapper may spend processing new data.
@@ -520,7 +519,7 @@ Timeout=4
 # Mandatory: no
 # Range: 1-300
 # Default:
-# TrapperTimeout=300
+TrapperTimeout=300
 
 ### Option: UnreachablePeriod
 #	After how many seconds of unreachability treat a host as unavailable.
@@ -528,7 +527,7 @@ Timeout=4
 # Mandatory: no
 # Range: 1-3600
 # Default:
-# UnreachablePeriod=45
+UnreachablePeriod=45
 
 ### Option: UnavailableDelay
 #	How often host is checked for availability during the unavailability period, in seconds.
@@ -536,7 +535,7 @@ Timeout=4
 # Mandatory: no
 # Range: 1-3600
 # Default:
-# UnavailableDelay=60
+UnavailableDelay=60
 
 ### Option: UnreachableDelay
 #	How often host is checked for availability during the unreachability period, in seconds.
@@ -544,7 +543,7 @@ Timeout=4
 # Mandatory: no
 # Range: 1-3600
 # Default:
-# UnreachableDelay=15
+UnreachableDelay=15
 
 ### Option: AlertScriptsPath
 #	Full path to location of custom alert scripts.