From 8937d88d7c9a95823ec6418209be4db1b0183c49 Mon Sep 17 00:00:00 2001 From: Riccardo Bicelli Date: Sun, 26 Feb 2023 13:11:06 +0100 Subject: [PATCH] Start working on pfSense Plus releases --- .gitignore | 1 + README.md | 6 +- pfsense_zbx.php => pfsense_zbx_legacy.php | 0 .../template_pfsense_active.xml | 335 +++++++----------- .../template_pfsense_active_ipsec.xml | 23 +- .../template_pfsense_active_ovpn_user.xml | 10 + .../template_pfsense_active_speedtest.xml | 0 7 files changed, 159 insertions(+), 216 deletions(-) rename pfsense_zbx.php => pfsense_zbx_legacy.php (100%) rename template_pfsense_active.xml => zabbix5/template_pfsense_active.xml (88%) rename template_pfsense_active_ipsec.xml => zabbix5/template_pfsense_active_ipsec.xml (95%) rename template_pfsense_active_ovpn_user.xml => zabbix5/template_pfsense_active_ovpn_user.xml (94%) rename template_pfsense_active_speedtest.xml => zabbix5/template_pfsense_active_speedtest.xml (100%) diff --git a/.gitignore b/.gitignore index c190512..6a9b375 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.backup +*.orig diff --git a/README.md b/README.md index a882af9..6eea024 100644 --- a/README.md +++ b/README.md @@ -43,12 +43,11 @@ First copy the file pfsense_zbx.php to your pfsense box (e.g. to /root/scripts). From **Diagnostics/Command Prompt** input this one-liner: ```bash -curl --create-dirs -o /root/scripts/pfsense_zbx.php https://raw.githubusercontent.com/rbicelli/pfsense-zabbix-template/master/pfsense_zbx.php +curl --create-dirs -o /root/scripts/pfsense_zbx.php https://raw.githubusercontent.com/rbicelli/pfsense-zabbix-template/master/pfsense_zbx_legacy.php ``` -Then install package "Zabbix Agent 4" on your pfSense Box -Then install package "Zabbix Agent 5" (or "Zabbix Agent 4") on your pfSense Box +Then install package "Zabbix Agent 5" (or "Zabbix Agent 6") on your pfSense Box In Advanced Features-> User Parameters @@ -111,6 +110,7 @@ Speedtest template creates a cron job and check for entry everytime Zabbix reque /url/local/bin/php /root/scripts/pfsense_zbx.php cron_cleanup ``` + ## Credits [Keenton Zabbix Template](https://github.com/keentonsas/zabbix-template-pfsense) for Zabbix Agent freeBSD part. diff --git a/pfsense_zbx.php b/pfsense_zbx_legacy.php similarity index 100% rename from pfsense_zbx.php rename to pfsense_zbx_legacy.php diff --git a/template_pfsense_active.xml b/zabbix5/template_pfsense_active.xml similarity index 88% rename from template_pfsense_active.xml rename to zabbix5/template_pfsense_active.xml index 9a8d79e..3568b05 100644 --- a/template_pfsense_active.xml +++ b/zabbix5/template_pfsense_active.xml @@ -1,7 +1,7 @@ 5.0 - 2021-11-09T21:44:28Z + 2021-07-12T10:35:24Z Templates/Network Devices @@ -21,9 +21,6 @@ https://github.com/rbicelli/pfsense-zabbix-template - - Certificate Manager - CPU @@ -40,7 +37,7 @@ https://github.com/rbicelli/pfsense-zabbix-template Memory - Network Interfaces + Network interfaces Network Limits @@ -69,7 +66,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Maximum number of opened files ZABBIX_ACTIVE kernel.maxfiles - 1h + 3600 + 27d It could be increased by using sysctrl utility or modifying file /etc/sysctl.conf. @@ -88,7 +86,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Maximum number of processes ZABBIX_ACTIVE kernel.maxproc - 1h + 3600 + 27d It could be increased by using sysctrl utility or modifying file /etc/sysctl.conf. @@ -107,6 +106,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Used memory (calc) CALCULATED kt.mem.used + 60 + 28d B last(vm.memory.size[total]) - last(vm.memory.size[available]) @@ -135,6 +136,8 @@ https://github.com/rbicelli/pfsense-zabbix-template MBUF Cache ZABBIX_ACTIVE pfsense.mbuf.cache + 60 + 27d Network Limits @@ -145,6 +148,8 @@ https://github.com/rbicelli/pfsense-zabbix-template MBUF Current ZABBIX_ACTIVE pfsense.mbuf.current + 60 + 27d Network Limits @@ -155,7 +160,8 @@ https://github.com/rbicelli/pfsense-zabbix-template MBUF Max ZABBIX_ACTIVE pfsense.mbuf.max - 10m + 600 + 27d Network Limits @@ -166,6 +172,8 @@ https://github.com/rbicelli/pfsense-zabbix-template MBUF Total Used (percent) CALCULATED pfsense.mbuf.ptotal + 60 + 28d FLOAT % ((last(pfsense.mbuf.current) + last(pfsense.mbuf.cache)) * 100) / last(pfsense.mbuf.max) @@ -191,6 +199,8 @@ https://github.com/rbicelli/pfsense-zabbix-template States Table Current ZABBIX_ACTIVE pfsense.states.current + 60 + 27d Network Limits @@ -201,7 +211,8 @@ https://github.com/rbicelli/pfsense-zabbix-template States Table Max ZABBIX_ACTIVE pfsense.states.max - 10m + 600 + 27d Network Limits @@ -212,6 +223,8 @@ https://github.com/rbicelli/pfsense-zabbix-template States Table Current (percent) CALCULATED pfsense.states.pused + 60 + 28d FLOAT % (last(pfsense.states.current) * 100) / last(pfsense.states.max) @@ -250,7 +263,7 @@ https://github.com/rbicelli/pfsense-zabbix-template {last()}>2 - CARP Problems on {HOST.NAME} + CARP Problems on {HOST.NAME} HIGH CARP Problems @@ -263,92 +276,11 @@ https://github.com/rbicelli/pfsense-zabbix-template - - Certificates Manager: latest "validFrom" - ZABBIX_ACTIVE - pfsense.value[cert_date,validFrom.max] - unixtime - This item will return will return the latest date "validFrom" from all the certificates (including CA). This is used to find new/renewed certificates. - - - Certificate Manager - - - - - DISCARD_UNCHANGED_HEARTBEAT - 1d - - - - - ({now()}-{last()})<1d - One or more certificates have been renewed in the past 24h - Latest "Valid From": {ITEM.LASTVALUE1} - INFO - YES - - - - - Certificates Manager: earliest "validTo" - ZABBIX_ACTIVE - pfsense.value[cert_date,validTo.min] - unixtime - This item will return will return the earliest date "validTo" from all the certificates (including CA). This is used to find expiring certificates. - - - Certificate Manager - - - - - DISCARD_UNCHANGED_HEARTBEAT - 1d - - - - - {last()}<{now()} - One or more certificates are expired - Earliest "Valid To": {ITEM.LASTVALUE1} - HIGH - - - ({last()}-{now()})<{$PFSENSE_CERT_EXPIRATION.AVERAGE} - One or more certificates are expiring less than {$PFSENSE_CERT_EXPIRATION.AVERAGE} - Earliest "Valid To": {ITEM.LASTVALUE1} - AVERAGE - - - One or more certificates are expired - {Template pfSense Active:pfsense.value[cert_date,validTo.min].last()}<{Template pfSense Active:pfsense.value[cert_date,validTo.min].now()} - - - - - ({last()}-{now()})<{$PFSENSE_CERT_EXPIRATION.WARN} - One or more certificates are expiring less than {$PFSENSE_CERT_EXPIRATION.WARN} - Earliest "Valid To": {ITEM.LASTVALUE1} - WARNING - - - One or more certificates are expired - {Template pfSense Active:pfsense.value[cert_date,validTo.min].last()}<{Template pfSense Active:pfsense.value[cert_date,validTo.min].now()} - - - One or more certificates are expiring less than {$PFSENSE_CERT_EXPIRATION.AVERAGE} - ({Template pfSense Active:pfsense.value[cert_date,validTo.min].last()}-{Template pfSense Active:pfsense.value[cert_date,validTo.min].now()})<{$PFSENSE_CERT_EXPIRATION.AVERAGE} - - - - - DHCP Failover Pool Problems ZABBIX_ACTIVE pfsense.value[dhcp,failover] - 2m + 120s This value indicates, in a HA scenario, if DHCP failover pool partners are out of sync. @@ -360,6 +292,7 @@ https://github.com/rbicelli/pfsense-zabbix-template Gateway Status Raw ZABBIX_ACTIVE pfsense.value[gw_status] + 60s 0 TEXT Gateway Status Raw @@ -380,29 +313,6 @@ https://github.com/rbicelli/pfsense-zabbix-template - - SMART Status - ZABBIX_ACTIVE - pfsense.value[smart_status] - 30m - pfSense SMART Status - - - System - - - - pfSense SMART Status - - - - {last()}=1 - SMART Errors on {HOST.NAME} - HIGH - pfSense has detected SMART Problems on one or more drives. - - - pfSense Installed Version ZABBIX_ACTIVE @@ -454,7 +364,6 @@ https://github.com/rbicelli/pfsense-zabbix-template {last()}>0 Packages Update Available on {HOST.NAME} - {ITEM.LASTVALUE} INFO New version of packages are available @@ -477,6 +386,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Number of running processes ZABBIX_ACTIVE proc.num[,,run] + 60 + 27d Number of processes in running state. @@ -495,6 +406,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Number of processes ZABBIX_ACTIVE proc.num[] + 60 + 27d Total number of processes in any state. @@ -513,7 +426,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Host boot time ZABBIX_ACTIVE system.boottime - 10m + 600 + 27d unixtime @@ -525,6 +439,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Interrupts per second ZABBIX_ACTIVE system.cpu.intr + 60 + 27d ips @@ -542,6 +458,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Processor load (1min/core) ZABBIX_ACTIVE system.cpu.load[percpu,avg1] + 60 + 27d FLOAT The processor load is calculated as system CPU load divided by number of CPU cores. @@ -561,6 +479,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Processor load (5min/core) ZABBIX_ACTIVE system.cpu.load[percpu,avg5] + 60 + 27d FLOAT The processor load is calculated as system CPU load divided by number of CPU cores. @@ -573,6 +493,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Processor load (15min/core) ZABBIX_ACTIVE system.cpu.load[percpu,avg15] + 60 + 27d FLOAT The processor load is calculated as system CPU load divided by number of CPU cores. @@ -585,6 +507,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Context switches per second ZABBIX_ACTIVE system.cpu.switches + 60 + 27d sps @@ -602,6 +526,8 @@ https://github.com/rbicelli/pfsense-zabbix-template CPU $2 time ZABBIX_ACTIVE system.cpu.util[,idle] + 60 + 27d FLOAT % The time the CPU has spent doing nothing. @@ -615,6 +541,8 @@ https://github.com/rbicelli/pfsense-zabbix-template CPU $2 time ZABBIX_ACTIVE system.cpu.util[,interrupt] + 60 + 27d FLOAT % The amount of time the CPU has been servicing hardware interrupts. @@ -628,6 +556,8 @@ https://github.com/rbicelli/pfsense-zabbix-template CPU $2 time ZABBIX_ACTIVE system.cpu.util[,nice] + 60 + 27d FLOAT % The time the CPU has spent running users' processes that have been niced. @@ -641,6 +571,8 @@ https://github.com/rbicelli/pfsense-zabbix-template CPU $2 time ZABBIX_ACTIVE system.cpu.util[,system] + 60 + 27d FLOAT % The time the CPU has spent running the kernel and its processes. @@ -654,6 +586,8 @@ https://github.com/rbicelli/pfsense-zabbix-template CPU $2 time ZABBIX_ACTIVE system.cpu.util[,user] + 60 + 27d FLOAT % The time the CPU has spent running users' processes that are not niced. @@ -667,7 +601,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Host name ZABBIX_ACTIVE system.hostname - 1h + 3600 + 27d 0 CHAR System host name. @@ -689,6 +624,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Host local time ZABBIX_ACTIVE system.localtime + 60 + 27d unixtime @@ -700,6 +637,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Free swap space ZABBIX_ACTIVE system.swap.size[,free] + 60 + 27d B @@ -711,6 +650,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Free swap space in % ZABBIX_ACTIVE system.swap.size[,pfree] + 60 + 27d FLOAT % @@ -731,7 +672,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Total swap space ZABBIX_ACTIVE system.swap.size[,total] - 1h + 3600 + 27d B @@ -743,6 +685,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Used swap space ZABBIX_ACTIVE system.swap.size[,used] + 60 + 27d B @@ -754,7 +698,8 @@ https://github.com/rbicelli/pfsense-zabbix-template System information ZABBIX_ACTIVE system.uname - 1h + 3600 + 27d 0 CHAR The information as normally returned by 'uname -a'. @@ -776,7 +721,8 @@ https://github.com/rbicelli/pfsense-zabbix-template System uptime ZABBIX_ACTIVE system.uptime - 10m + 600 + 27d uptime @@ -795,6 +741,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Number of logged in users ZABBIX_ACTIVE system.users.num + 60 + 27d Number of users who are currently logged in. @@ -806,7 +754,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Checksum of $1 ZABBIX_ACTIVE vfs.file.cksum[/etc/passwd] - 1h + 3600 + 27d OS @@ -824,6 +773,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Active memory ZABBIX_ACTIVE vm.memory.size[active] + 60 + 28d B Memory used by processes @@ -836,6 +787,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Available memory ZABBIX_ACTIVE vm.memory.size[available] + 60 + 27d B Available memory is defined as free+cached+buffers memory. @@ -855,6 +808,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Buffered memory ZABBIX_ACTIVE vm.memory.size[buffers] + 60 + 28d DISABLED B Cache d'entrées des IO disque. @@ -870,6 +825,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Cached memory ZABBIX_ACTIVE vm.memory.size[cached] + 60 + 28d B amount of memory used to cache data @@ -882,6 +839,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Free memory ZABBIX_ACTIVE vm.memory.size[free] + 60 + 28d B amount of memory completely free and ready to be used directly. @@ -894,6 +853,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Inactive memory ZABBIX_ACTIVE vm.memory.size[inactive] + 60 + 28d B amount of memory that contains data that is no longer used (can be directly freed if needed) @@ -906,6 +867,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Available memory (percent) ZABBIX_ACTIVE vm.memory.size[pavailable] + 60 + 28d FLOAT % Available memory is defined as free+cached+buffers memory. @@ -925,6 +888,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Shared memory ZABBIX_ACTIVE vm.memory.size[shared] + 60 + 28d DISABLED B quantité de mémoire partagée entre plusieurs processus @@ -940,7 +905,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Total memory ZABBIX_ACTIVE vm.memory.size[total] - 1h + 3600 + 27d B quantité de mémoire totale @@ -953,6 +919,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Used memory ZABBIX_ACTIVE vm.memory.size[used] + 60 + 28d DISABLED B Item désactivé car non utilisé @@ -966,6 +934,8 @@ https://github.com/rbicelli/pfsense-zabbix-template Wired memory ZABBIX_ACTIVE vm.memory.size[wired] + 60 + 28d B amount of memory used by the kernel, can neither be unloaded in swap, nor compressed. @@ -980,7 +950,7 @@ https://github.com/rbicelli/pfsense-zabbix-template Gateways Discovery ZABBIX_ACTIVE pfsense.discovery[gw] - 5m + 300s Gateway Discovery @@ -1132,7 +1102,7 @@ https://github.com/rbicelli/pfsense-zabbix-template Network interface discovery ZABBIX_ACTIVE pfsense.discovery[interfaces] - 1h + 3600s @@ -1149,10 +1119,11 @@ https://github.com/rbicelli/pfsense-zabbix-template Incoming Errors on {#IFDESCR} ZABBIX_ACTIVE net.if.in[{#IFNAME},errors] + 60 7d - Network Interfaces + Network interfaces @@ -1160,11 +1131,12 @@ https://github.com/rbicelli/pfsense-zabbix-template Incoming network traffic on {#IFDESCR} ZABBIX_ACTIVE net.if.in[{#IFNAME}] + 60 7d bps - Network Interfaces + Network interfaces @@ -1182,10 +1154,11 @@ https://github.com/rbicelli/pfsense-zabbix-template Outgoing errors on {#IFDESCR} ZABBIX_ACTIVE net.if.out[{#IFNAME},errors] + 60 7d - Network Interfaces + Network interfaces @@ -1193,11 +1166,12 @@ https://github.com/rbicelli/pfsense-zabbix-template Outgoing network traffic on {#IFDESCR} ZABBIX_ACTIVE net.if.out[{#IFNAME}] + 60 7d bps - Network Interfaces + Network interfaces @@ -1244,13 +1218,14 @@ https://github.com/rbicelli/pfsense-zabbix-template OpenVPN Client Discovery ZABBIX_ACTIVE pfsense.discovery[openvpn_client] - 5m + 300s OpenVPN Client Discovery OpenVPN Client {#NAME} Tunnel Status ZABBIX_ACTIVE pfsense.value[openvpn_clientvalue,{#CLIENT},status] + 60s OpenVPN Client @@ -1274,12 +1249,13 @@ https://github.com/rbicelli/pfsense-zabbix-template OpenVPN Server Discovery ZABBIX_ACTIVE pfsense.discovery[openvpn_server] - 5m + 300s OpenVPN Server {#NAME} Clients Connected ZABBIX_ACTIVE pfsense.value[openvpn_servervalue,{#SERVER},conns] + 60s OpenVPN Server @@ -1290,7 +1266,7 @@ https://github.com/rbicelli/pfsense-zabbix-template OpenVPN Server {#NAME} Mode ZABBIX_ACTIVE pfsense.value[openvpn_servervalue,{#SERVER},mode] - 5m + 300s OpenVPN Server @@ -1304,7 +1280,7 @@ https://github.com/rbicelli/pfsense-zabbix-template OpenVPN Server {#NAME} Port ZABBIX_ACTIVE pfsense.value[openvpn_servervalue,{#SERVER},port] - 5m + 300s OpenVPN Server @@ -1315,7 +1291,8 @@ https://github.com/rbicelli/pfsense-zabbix-template OpenVPN Server {#NAME} Tunnel Status ZABBIX_ACTIVE pfsense.value[openvpn_servervalue,{#SERVER},status] - + 60s + OpenVPN Server @@ -1338,13 +1315,22 @@ https://github.com/rbicelli/pfsense-zabbix-template Services Discovery ZABBIX_ACTIVE pfsense.discovery[services] - 5m + 300s + + + + {#SERVICE} + @pfSense service names for discovery + A + + + - Service {#DESCRIPTION} enabled on CARP Slave + Service {#DESCRIPTION} enabled on CARP Slave ZABBIX_ACTIVE pfsense.value[service_value,{#SERVICE},run_on_carp_slave] - 10m + 600s Services @@ -1358,6 +1344,7 @@ https://github.com/rbicelli/pfsense-zabbix-template Service {#DESCRIPTION} Status ZABBIX_ACTIVE pfsense.value[service_value,{#SERVICE},status] + 60s Services @@ -1370,8 +1357,7 @@ https://github.com/rbicelli/pfsense-zabbix-template - {Template pfSense Active:pfsense.value[service_value,{#SERVICE},status].last()}=0 -and {$PFSENSE_SRVC_MONITORING:"{#SERVICE}"}=1 and ( + {Template pfSense Active:pfsense.value[service_value,{#SERVICE},status].last()}=0 and ( ({Template pfSense Active:pfsense.value[service_value,{#SERVICE},run_on_carp_slave].last()}=1 and {Template pfSense Active:pfsense.value[carp_status].last()}=2) @@ -1386,26 +1372,7 @@ or ) Service {#DESCRIPTION} is not running HIGH - Service is not running - -If you want to skip the trigger for this service, add the macro $PFSENSE_SRVC_MONITORING:"{#SERVICE}"=0 - -0 = Service monitoring disabled -1 = Service monitoring check if running -2 = Service monitoring check if not running - - - {Template pfSense Active:pfsense.value[service_value,{#SERVICE},status].last()}=1 and {$PFSENSE_SRVC_MONITORING:"{#SERVICE}"}=2 and (({Template pfSense Active:pfsense.value[service_value,{#SERVICE},run_on_carp_slave].last()}=1 and {Template pfSense Active:pfsense.value[carp_status].last()}=2) or {Template pfSense Active:pfsense.value[carp_status].last()}=1 or {Template pfSense Active:pfsense.value[carp_status].last()}=0) - Service {#DESCRIPTION} is running - HIGH - Service is running - -If you want to skip the trigger for this service, remove the macro $PFSENSE_SRVC_MONITORING:"{#SERVICE}"=2 -Alternatively you can also set the macro to 1 or 0. - -0 = Service monitoring disabled -1 = Service monitoring check if running -2 = Service monitoring check if not running + Service is not running @@ -1413,7 +1380,7 @@ Alternatively you can also set the macro to 1 or 0. Mounted filesystem discovery ZABBIX_ACTIVE vfs.fs.discovery - 1h + 3600 @@ -1430,6 +1397,7 @@ Alternatively you can also set the macro to 1 or 0. Free inodes on $1 (percentage) ZABBIX_ACTIVE vfs.fs.inode[{#FSNAME},pfree] + 60 7d FLOAT % @@ -1450,6 +1418,7 @@ Alternatively you can also set the macro to 1 or 0. Free disk space on $1 ZABBIX_ACTIVE vfs.fs.size[{#FSNAME},free] + 60 7d B @@ -1462,6 +1431,7 @@ Alternatively you can also set the macro to 1 or 0. Free disk space on $1 (percentage) ZABBIX_ACTIVE vfs.fs.size[{#FSNAME},pfree] + 60 7d FLOAT % @@ -1482,7 +1452,7 @@ Alternatively you can also set the macro to 1 or 0. Total disk space on $1 ZABBIX_ACTIVE vfs.fs.size[{#FSNAME},total] - 1h + 3600 7d B @@ -1495,6 +1465,7 @@ Alternatively you can also set the macro to 1 or 0. Used disk space on $1 ZABBIX_ACTIVE vfs.fs.size[{#FSNAME},used] + 60 7d B @@ -1561,29 +1532,6 @@ Alternatively you can also set the macro to 1 or 0. {$EXPECTED_CARP_STATUS} 0 - - {$PFSENSE_CERT_EXPIRATION.AVERAGE} - 48h - - - {$PFSENSE_CERT_EXPIRATION.WARN} - 10d - - - {$PFSENSE_SRVC_MONITORING} - 1 - Enable monitoring of Services - - - {$PFSENSE_SRVC_MONITORING:"iperf"} - 0 - Disable monitoring of Service iperf Network Performance Testing Daemon/Client - - - {$PFSENSE_SRVC_MONITORING:"pcscd"} - 2 - Enable monitoring of PC/SC Smart Card Daemon (check if NOT running) https://redmine.pfsense.org/issues/12095 - @@ -1695,7 +1643,7 @@ Alternatively you can also set the macro to 1 or 0. ({Template pfSense Active:pfsense.value[system,version].last()}<>{Template pfSense Active:pfsense.value[system,installed_version].last()})=1 New Version Available on {HOST.NAME} INFO - Notify of new version of pfsense available + Noify of new version of pfsense available @@ -2185,23 +2133,6 @@ Alternatively you can also set the macro to 1 or 0. - - pfSense SMART Status - - - 0 - OK - - - 1 - Error - - - 2 - Unknown - - - Service state diff --git a/template_pfsense_active_ipsec.xml b/zabbix5/template_pfsense_active_ipsec.xml similarity index 95% rename from template_pfsense_active_ipsec.xml rename to zabbix5/template_pfsense_active_ipsec.xml index ae17b1b..094d9da 100644 --- a/template_pfsense_active_ipsec.xml +++ b/zabbix5/template_pfsense_active_ipsec.xml @@ -33,14 +33,14 @@ https://github.com/rbicelli/pfsense-zabbix-template IPsec Phase 1 Discovery ZABBIX_ACTIVE pfsense.discovery[ipsec_ph1] - 20m + 1200s Discovery of IPsec Phase 1 IPsec Tunnel {#IKEID} {#NAME} Tunnel Enabled ZABBIX_ACTIVE pfsense.value[ipsec_ph1,{#IKEID},disabled] - 2m + 120s IPsec Phase 1 Tunnel Mode @@ -55,7 +55,7 @@ https://github.com/rbicelli/pfsense-zabbix-template IPsec Tunnel {#IKEID} {#NAME} IKE Type ZABBIX_ACTIVE pfsense.value[ipsec_ph1,{#IKEID},iketype] - 10m + 600s IPsec Phase 1 IKE Type @@ -70,7 +70,7 @@ https://github.com/rbicelli/pfsense-zabbix-template IPsec Tunnel {#IKEID} {#NAME} Tunnel Mode ZABBIX_ACTIVE pfsense.value[ipsec_ph1,{#IKEID},mode] - 10m + 600s IPsec Phase 1 Tunnel Mode @@ -85,7 +85,7 @@ https://github.com/rbicelli/pfsense-zabbix-template IPsec Tunnel {#IKEID} {#NAME} Protocol ZABBIX_ACTIVE pfsense.value[ipsec_ph1,{#IKEID},protocol] - 10m + 600s IPsec Phase 1 Protocol @@ -100,7 +100,7 @@ https://github.com/rbicelli/pfsense-zabbix-template IPsec Tunnel {#IKEID} {#NAME} Remote Gateway ZABBIX_ACTIVE pfsense.value[ipsec_ph1,{#IKEID},remote-gateway] - 10m + 600s 0 TEXT IPsec Phase 1 Remote Gateway @@ -114,6 +114,7 @@ https://github.com/rbicelli/pfsense-zabbix-template IPsec Tunnel {#IKEID} {#NAME} Phase 1 Status ZABBIX_ACTIVE pfsense.value[ipsec_ph1,{#IKEID},status] + 60s IPsec Phase 1 Tunnel Mode @@ -138,14 +139,14 @@ https://github.com/rbicelli/pfsense-zabbix-template IPsec Phase 2 Discovery ZABBIX_ACTIVE pfsense.discovery[ipsec_ph2] - 20m + 1200s Discovery of IPsec Phase 2 IPsec Tunnel {#IKEID}.{#REQID} {#NAME} Phase 2 Enabled ZABBIX_ACTIVE pfsense.value[ipsec_ph2,{#UNIQID},disabled] - 2m + 120s IPsec Tunnel Phase 2 Protocol @@ -160,7 +161,7 @@ https://github.com/rbicelli/pfsense-zabbix-template IPsec Tunnel {#IKEID}.{#REQID} {#NAME} Phase 2 Life Time ZABBIX_ACTIVE pfsense.value[ipsec_ph2,{#UNIQID},lifetime] - 10m + 600s s IPsec Tunnel Phase 2 Life Time @@ -173,7 +174,7 @@ https://github.com/rbicelli/pfsense-zabbix-template IPsec Tunnel {#IKEID}.{#REQID} {#NAME} Phase 2 Mode ZABBIX_ACTIVE pfsense.value[ipsec_ph2,{#UNIQID},mode] - 10m + 600s IPsec Tunnel Phase 2 Mode @@ -185,7 +186,7 @@ https://github.com/rbicelli/pfsense-zabbix-template IPsec Tunnel {#IKEID}.{#REQID} {#NAME} Phase 2 Protocol ZABBIX_ACTIVE pfsense.value[ipsec_ph2,{#UNIQID},protocol] - 10m + 600s IPsec Tunnel Phase 2 Protocol diff --git a/template_pfsense_active_ovpn_user.xml b/zabbix5/template_pfsense_active_ovpn_user.xml similarity index 94% rename from template_pfsense_active_ovpn_user.xml rename to zabbix5/template_pfsense_active_ovpn_user.xml index 70dd7eb..cc07a0f 100644 --- a/template_pfsense_active_ovpn_user.xml +++ b/zabbix5/template_pfsense_active_ovpn_user.xml @@ -33,12 +33,14 @@ https://github.com/rbicelli/pfsense-zabbix-template OpenVPN User Auth Connected Clients Discovery ZABBIX_ACTIVE pfsense.discovery[openvpn_server_user] + 60s Discovery of clients connected to OpenVPN Server in User Auth Mode OpenVPN Server {#SERVERNAME}, Client {#USERID}: Bytes Received ZABBIX_ACTIVE pfsense.value[openvpn_server_uservalue,{#UNIQUEID},bytes_recv] + 60s 0 bytes Client Bytes Received @@ -52,6 +54,7 @@ https://github.com/rbicelli/pfsense-zabbix-template OpenVPN Server {#SERVERNAME}, Client {#USERID}: Bytes Sent ZABBIX_ACTIVE pfsense.value[openvpn_server_uservalue,{#UNIQUEID},bytes_sent] + 60s 0 bytes Client Bytes Sent @@ -65,6 +68,7 @@ https://github.com/rbicelli/pfsense-zabbix-template OpenVPN Server {#SERVERNAME}, Client {#USERID}: Connection Time ZABBIX_ACTIVE pfsense.value[openvpn_server_uservalue,{#UNIQUEID},connect_time_unix] + 60s 0 unixtime Client Connect Time @@ -78,6 +82,7 @@ https://github.com/rbicelli/pfsense-zabbix-template OpenVPN Server {#SERVERNAME}, Client {#USERID}: Remote Host ZABBIX_ACTIVE pfsense.value[openvpn_server_uservalue,{#UNIQUEID},remote_host] + 60s 0 TEXT Remote Host @@ -91,6 +96,7 @@ https://github.com/rbicelli/pfsense-zabbix-template OpenVPN Server {#SERVERNAME}, Client {#USERID}: User Name ZABBIX_ACTIVE pfsense.value[openvpn_server_uservalue,{#UNIQUEID},user_name] + 60s 0 TEXT Client User Name @@ -104,6 +110,7 @@ https://github.com/rbicelli/pfsense-zabbix-template OpenVPN Server {#SERVERNAME}, Client {#USERID}: Virtual IP Address (IPv6) ZABBIX_ACTIVE pfsense.value[openvpn_server_uservalue,{#UNIQUEID},virtual_addr6] + 60s 0 TEXT IPv6 Address assigned from OpenVPN Server @@ -117,6 +124,7 @@ https://github.com/rbicelli/pfsense-zabbix-template OpenVPN Server {#SERVERNAME}, Client {#USERID}: Virtual IP Address ZABBIX_ACTIVE pfsense.value[openvpn_server_uservalue,{#UNIQUEID},virtual_addr] + 60s 0 TEXT IP Address assigned from OpenVPN Server @@ -130,6 +138,7 @@ https://github.com/rbicelli/pfsense-zabbix-template OpenVPN Server {#SERVERNAME}, Client {#USERID}: Client ID ZABBIX_ACTIVE pfsense.value[openvpn_server_uservalue_numeric,{#UNIQUEID},client_id] + 60s 0 Client ID @@ -142,6 +151,7 @@ https://github.com/rbicelli/pfsense-zabbix-template OpenVPN Server {#SERVERNAME}, Client {#USERID}: Peer ID ZABBIX_ACTIVE pfsense.value[openvpn_server_uservalue_numeric,{#UNIQUEID},peer_id] + 60s 0 Peer ID diff --git a/template_pfsense_active_speedtest.xml b/zabbix5/template_pfsense_active_speedtest.xml similarity index 100% rename from template_pfsense_active_speedtest.xml rename to zabbix5/template_pfsense_active_speedtest.xml