Merge branch 'main' into stable

files/boot/config/plugins/zabbix_agent/zabbix_agentd.conf

@@ -19,6 +19,8 @@ AllowKey=vfs.fs.*[*]
 AllowKey=vm.memory.size[*]
 AllowKey=unraid.*
 AllowKey=unraid.*[*]
+AllowKey=custom.*
+AllowKey=custom.*[*]
 
 DenyKey=*
 
@@ -29,3 +31,5 @@ UserParameter=unraid.qemu.discovery,/usr/local/emhttp/plugins/zabbix_agent/scrip
 UserParameter=unraid.qemu[*],/usr/local/emhttp/plugins/zabbix_agent/scripts/qemu.sh "$1"
 UserParameter=unraid.temperatures,/usr/local/emhttp/plugins/zabbix_agent/scripts/temperatures.sh
 UserParameter=unraid.ups,/usr/local/emhttp/plugins/zabbix_agent/scripts/ups.sh
+
+Include=/boot/config/plugins/zabbix_agent/*.custom.conf

zabbix_agent.plg

@@ -6,10 +6,10 @@
 <!ENTITY plgauthor           "fabianonline">
 <!ENTITY baseURL             "https://git.schle.nz/fabian/unraid-zabbix_agent/raw/branch/stable">
 <!ENTITY pluginURL           "&baseURL;/zabbix_agent.plg">
-<!ENTITY version             "2020.10.31.1">
+<!ENTITY version             "2020.11.25.1">
 <!ENTITY packageName         "zabbix_agent-&version;-x86_64-1.txz">
 <!ENTITY packageURL          "&baseURL;/&packageName;">
-<!ENTITY packageMD5          "33d8467dcd13471cc08e0f56e4b611df">
+<!ENTITY packageMD5          "461b54aefdcad0e23d9da9c0047cb6c7">
 ]>
 
 <PLUGIN name="&name;" author="&author;" version="&version;" pluginURL="&pluginURL;" packageMD5="&packageMD5;">
@@ -17,6 +17,14 @@
 <CHANGES>
 ## &name;
 
+### &version;
+- You can now add a custom zabbix agent configuration file at /boot/config/plugins/zabbix_agent/zabbix_agentd.custom.conf.
+  It won't be overwritten by a future update of this plugin. Please note that the list of usable keys is heavily restricted
+  in zabbix_agentd.conf. To have your custom UserParameters accessible, you can either:
+  - Name them custom.$whatever.
+  - Add the key to the whitelist via AllowKey.
+- Updated zabbix_agentd from 5.0.3 to 5.2.1.
+
 ### 2010.10.31.1
 - Updated zabbix_agentd from 5.0.2 to 5.0.3
 - Download updated plugins from stable instead of main.