aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/zabbix-agent/zabbix-agent.xml263
-rw-r--r--config/zabbix-proxy/zabbix-proxy.xml250
-rw-r--r--pkg_config.8.xml40
-rw-r--r--pkg_config.8.xml.amd6440
4 files changed, 0 insertions, 593 deletions
diff --git a/config/zabbix-agent/zabbix-agent.xml b/config/zabbix-agent/zabbix-agent.xml
deleted file mode 100644
index 885a54e3..00000000
--- a/config/zabbix-agent/zabbix-agent.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packagegui>
- <name>zabbixagent</name>
- <title>Services: Zabbix Agent</title>
- <category>Monitoring</category>
- <version>1.1</version>
- <addedit_string>Zabbix Agent has been created/modified.</addedit_string>
- <delete_string>Zabbix Agent has been deleted.</delete_string>
- <restart_command>/usr/local/etc/rc.d/zabbix_agentd.sh restart</restart_command>
- <menu>
- <name>Zabbix Agent</name>
- <tooltiptext>Setup Zabbix Agent specific settings</tooltiptext>
- <section>Services</section>
- <url>/pkg_edit.php?xml=zabbix-agent.xml&amp;id=0</url>
- </menu>
- <service>
- <name>zabbix_agentd</name>
- <rcfile>zabbix_agentd.sh</rcfile>
- <executable>zabbix_agentd</executable>
- <description>Zabbix Agent host monitor daemon</description>
- </service>
- <tabs>
- <tab>
- <text>Settings</text>
- <url>/pkg_edit.php?xml=zabbix-agent.xml&amp;id=0</url>
- <active />
- </tab>
- </tabs>
- <fields>
- <field>
- <fielddescr>Server</fielddescr>
- <fieldname>server</fieldname>
- <description>List of comma delimited IP addresses (or hostnames) of ZABBIX servers</description>
- <value>127.0.0.1</value>
- <type>input</type>
- <size>60</size>
- <required>true</required>
- </field>
- <field>
- <fielddescr>Server Port</fielddescr>
- <fieldname>serverport</fieldname>
- <description>Server port for sending active check (generally 10051)</description>
- <value>10051</value>
- <type>input</type>
- <size>60</size>
- <required>true</required>
- </field>
- <field>
- <fielddescr>Hostname</fielddescr>
- <fieldname>hostname</fieldname>
- <description>Unique hostname. Required for active checks and must match hostname as configured on the Zabbix server (case sensitive).</description>
- <value>localhost</value>
- <type>input</type>
- <size>60</size>
- <required>true</required>
- </field>
- <field>
- <fielddescr>Listen IP</fielddescr>
- <fieldname>listenip</fieldname>
- <value>0.0.0.0</value>
- <type>input</type>
- <size>60</size>
- <required>true</required>
- <description>Listen IP for connections from the server (generally 0.0.0.0 for all interfaces)</description>
- </field>
- <field>
- <fielddescr>Listen Port</fielddescr>
- <fieldname>listenport</fieldname>
- <value>10050</value>
- <type>input</type>
- <size>60</size>
- <required>true</required>
- <description>Listen port for connections from the server (generally 10050)</description>
- </field>
- <field>
- <fielddescr>Refresh Active Checks</fielddescr>
- <fieldname>refreshactchecks</fieldname>
- <value>120</value>
- <type>input</type>
- <size>60</size>
- <required>false</required>
- <description>The agent will refresh list of active checks once per 120 (default) seconds.</description>
- </field>
- <field>
- <fielddescr>Timeout</fielddescr>
- <fieldname>timeout</fieldname>
- <value>3</value>
- <type>input</type>
- <size>60</size>
- <required>true</required>
- <description>Timeout (default 3). Do not spend more that Timeout seconds on getting requested value (1-255). The agent does not kill timeouted User Parameters processes!</description>
- </field>
- <field>
- <fielddescr>Disable active checks</fielddescr>
- <fieldname>disableactive</fieldname>
- <type>checkbox</type>
- <description>The agent will work only in passive mode listening for server. (generally net set)</description>
- </field>
- <field>
- <fielddescr>Disable passive checks</fielddescr>
- <fieldname>disablepassive</fieldname>
- <type>checkbox</type>
- <description>The agent will not listen on any TCP port. Only active checks will be processed. (generally not set)</description>
- </field>
- <field>
- <fielddescr>User Parameters</fielddescr>
- <fieldname>userparams</fieldname>
- <encoding>base64</encoding>
- <value></value>
- <type>textarea</type>
- <rows>5</rows>
- <cols>50</cols>
- <required>false</required>
- <description>User-defined parameter to monitor. There can be several user-defined parameters. Value has form, example: UserParameter=users,who|wc -l &lt;br&gt;&lt;a href="https://www.zabbix.com/documentation/1.8/manual/tutorials/extending_agent" target="_new"&gt;See zabbix documentation for more information&lt;a&gt;</description>
- </field>
- </fields>
- <custom_php_install_command>
- <![CDATA[
- global $config, $g;
-
- $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
- switch ($pfs_version) {
- case "1.2":
- case "2.0":
- define('ZABBIX_AGENT_BASE','/usr/local');
- break;
- default:
- define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix-agent-' . php_uname("m"));
- }
-
- mwexec("mkdir -p /var/log/zabbix/");
- mwexec("mkdir -p /var/run/zabbix/");
-
- conf_mount_rw();
-
- /* create a few directories and ensure the sample files are in place */
- exec("/bin/mkdir -p " . ZABBIX_AGENT_BASE . "/etc/zabbix");
- exec("/bin/mkdir -p /var/log/zabbix");
- exec("/bin/mkdir -p /var/run/zabbix");
-
- exec("/bin/rm -f " . ZABBIX_AGENT_BASE . "/etc/rc.d/zabbix_agentd");
-
- $start = "/bin/mkdir -p /var/log/zabbix\n";
- $start .= "/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix\n";
-
- $start .= "/bin/mkdir -p /var/run/zabbix\n";
- $start .= "/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix\n";
-
- $start .= "echo \"Starting Zabbix Agent\"...\n";
-
- /* start zabbix agent */
- $start .= ZABBIX_AGENT_BASE . "/sbin/zabbix_agentd\n";
-
- $stop = "echo \"Stopping Zabbix Agent\"\n";
- $stop .= "/usr/bin/killall zabbix_agentd\n";
- /* write out rc.d start/stop file */
- write_rcfile(array(
- "file" => "zabbix_agentd.sh",
- "start" => "{$start}",
- "restart" => "$stop\n" . "sleep 5\n" . "{$start}",
- "stop" => "$stop"
- )
- );
-
- conf_mount_ro();
- ]]>
- </custom_php_install_command>
- <custom_php_command_before_form></custom_php_command_before_form>
- <custom_php_after_head_command></custom_php_after_head_command>
- <custom_php_after_form_command></custom_php_after_form_command>
- <custom_php_validation_command>
- <![CDATA[
- global $_POST;
- $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
- switch ($pfs_version) {
- case "1.2":
- case "2.0":
- define('ZABBIX_AGENT_BASE','/usr/local');
- break;
- default:
- define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix-agent-' . php_uname("m"));
- }
-
- $ListenIP=$_POST['listenip'];
- if (!preg_match("/^(?:\d{1,3}\.){3}\d{1,3}$/", $ListenIP)) {
- $input_errors[]='Listen IP is not an IP address.';
- }
-
- $ListenPort=$_POST['listenport'];
- if (!preg_match("/^\d+$/", $ListenPort)) {
- $input_errors[]='Listen Port is not numeric.';
- }
-
- $ServerPort=$_POST['serverport'];
- if (!preg_match("/^\d+$/", $ServerPort)) {
- $input_errors[]='Server Port is not numeric.';
- }
-
- $RefreshActiveChecks=$_POST['refreshactchecks'];
- if (!preg_match("/^\d+$/", $RefreshActiveChecks)) {
- $input_errors[]='Refresh Active Checks is not numeric.';
- }
-
- $Timeout=$_POST['timeout'];
- if (!preg_match("/^\d+$/", $Timeout)) {
- $input_errors[]='Timeout is not numeric.';
- }
- ]]>
- </custom_php_validation_command>
- <custom_add_php_command></custom_add_php_command>
- <custom_php_resync_config_command>
- <![CDATA[
- conf_mount_rw();
- global $config;
- global $g;
-
- $Server=$config['installedpackages']['zabbixagent']['config'][0]['server'];
- $ServerPort=$config['installedpackages']['zabbixagent']['config'][0]['serverport'];
- $Hostname=$config['installedpackages']['zabbixagent']['config'][0]['hostname'];
- $ListenIP=$config['installedpackages']['zabbixagent']['config'][0]['listenip'];
- $ListenPort=$config['installedpackages']['zabbixagent']['config'][0]['listenport'];
- $RefreshActChecks=$config['installedpackages']['zabbixagent']['config'][0]['refreshactchecks'];
- $Timeout=$config['installedpackages']['zabbixagent']['config'][0]['timeout'];
- $DisableActive=$config['installedpackages']['zabbixagent']['config'][0]['disableactive'];
- $DisablePassive=$config['installedpackages']['zabbixagent']['config'][0]['disablepassive'];
- $UserParams=base64_decode($config['installedpackages']['zabbixagent']['config'][0]['userparams']);
-
- $conf = "Server=$Server\n";
- $conf .= "ServerPort=$ServerPort\n";
- $conf .= "Hostname=$Hostname\n";
- $conf .= "ListenIP=$ListenIP\n";
- $conf .= "ListenPort=$ListenPort\n";
- $conf .= "StartAgents=5\n";
- $conf .= "RefreshActiveChecks=$RefreshActChecks\n";
- $conf .= "DebugLevel=3\n";
- $conf .= "PidFile=/var/run/zabbix/zabbix_agentd.pid\n";
- $conf .= "LogFile=/var/log/zabbix/zabbix_agentd.log\n";
- $conf .= "LogFileSize=1\n";
- $conf .= "Timeout=$Timeout\n";
- if (isset($DisableActive) && ($DisableActive == "on")) {
- $conf .= "DisableActive=1\n";
- }
- if (isset($DisablePassive) && ($DisablePassive == "on")) {
- $conf .= "DisablePassive=1\n";
- }
- $conf .= "$UserParams\n";
-
- file_put_contents(ZABBIX_AGENT_BASE . "/etc/zabbix/zabbix_agentd.conf", $conf);
- conf_mount_ro();
-
- ]]>
- </custom_php_resync_config_command>
- <custom_php_deinstall_command>
- <![CDATA[
- exec("/usr/bin/killall zabbix_agentd");
-
- exec("/bin/rm " . ZABBIX_AGENT_BASE . "/etc/rc.d/zabbix_agentd.sh");
-
- exec("/bin/rm -r /var/log/zabbix/");
- exec("/bin/rm -r /var/run/zabbix/");
- ]]>
- </custom_php_deinstall_command>
-</packagegui>
diff --git a/config/zabbix-proxy/zabbix-proxy.xml b/config/zabbix-proxy/zabbix-proxy.xml
deleted file mode 100644
index 19930b49..00000000
--- a/config/zabbix-proxy/zabbix-proxy.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packagegui>
- <name>zabbixproxy</name>
- <title>Services: Zabbix Proxy</title>
- <category>Monitoring</category>
- <version>1.1</version>
- <addedit_string>Zabbix Proxy has been created/modified.</addedit_string>
- <delete_string>Zabbix Proxy has been deleted.</delete_string>
- <restart_command>/usr/local/etc/rc.d/zabbix_proxy.sh restart</restart_command>
- <menu>
- <name>Zabbix Proxy</name>
- <tooltiptext>Setup Zabbix Proxy specific settings</tooltiptext>
- <section>Services</section>
- <url>/pkg_edit.php?xml=zabbix-proxy.xml&amp;id=0</url>
- </menu>
- <service>
- <name>zabbix-proxy</name>
- <rcfile>zabbix-proxy.sh</rcfile>
- <executable>zabbix_proxy</executable>
- <description>Zabbix proxy collection daemon</description>
- </service>
- <tabs>
- <tab>
- <text>Settings</text>
- <url>/pkg_edit.php?xml=zabbix-proxy.xml&amp;id=0</url>
- <active />
- </tab>
- </tabs>
- <fields>
- <field>
- <fielddescr>Server</fielddescr>
- <fieldname>server</fieldname>
- <description>List of comma delimited IP addresses (or hostnames) of ZABBIX servers</description>
- <default_value>127.0.0.1</default_value>
- <type>input</type>
- <size>100</size>
- <required>true</required>
- </field>
- <field>
- <fielddescr>Server Port</fielddescr>
- <fieldname>serverport</fieldname>
- <description>Server port (generally 10051)</description>
- <default_value>10051</default_value>
- <type>input</type>
- <size>6</size>
- <required>true</required>
- </field>
- <field>
- <fielddescr>Hostname</fielddescr>
- <fieldname>hostname</fieldname>
- <description>Unique, case-sensitive proxy name. Make sure the proxy name is known to the server</description>
- <default_value>localhost</default_value>
- <type>input</type>
- <size>100</size>
- <required>true</required>
- </field>
- <field>
- <fielddescr>Active Mode</fielddescr>
- <fieldname>activemode</fieldname>
- <description>Check to run Zabbix proxy in active mode (default)</description>
- <default_value>on</default_value>
- <type>checkbox</type>
- <required>true</required>
- </field>
- <field>
- <fielddescr>Config Frequency</fielddescr>
- <fieldname>configfrequency</fieldname>
- <description>How often the proxy retrieves configuration data from the Zabbix server in seconds. Ignored if the proxy runs in passive mode.</description>
- <default_value>3600</default_value>
- <type>input</type>
- <size>10</size>
- <required>true</required>
- </field>
- </fields>
- <custom_php_install_command>
- <![CDATA[
- global $config, $g;
-
- $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
- switch ($pfs_version) {
- case "1.2":
- case "2.0":
- define('ZABBIX_PROXY_BASE', '/usr/local');
- break;
- default:
- define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix-proxy-' . php_uname("m"));
- }
-
- mwexec("mkdir -p /var/log/zabbix/");
- mwexec("mkdir -p /var/run/zabbix/");
- mwexec("mkdir -p /var/db/zabbix/");
-
- conf_mount_rw();
-
- /* create a few directories and ensure the sample files are in place */
- exec("/bin/mkdir -p " . ZABBIX_PROXY_BASE . "/etc/zabbix");
- exec("/bin/mkdir -p /var/log/zabbix");
- exec("/bin/mkdir -p /var/run/zabbix");
- exec("/bin/mkdir -p /var/db/zabbix");
-
- exec("/bin/rm -f " . ZABBIX_PROXY_BASE . "/etc/rc.d/zabbix_proxy");
-
- $start = "/bin/mkdir -p /var/log/zabbix\n";
- $start .= "/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix\n";
-
- $start .= "/bin/mkdir -p /var/run/zabbix\n";
- $start .= "/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix\n";
-
- $start .= "/bin/mkdir -p /var/db/zabbix\n";
- $start .= "/usr/sbin/chown -R zabbix:zabbix /var/db/zabbix\n";
-
- $start .= "echo \"Starting Zabbix Proxy\"...\n";
-
- /* start zabbix proxy */
- $start .= ZABBIX_PROXY_BASE . "/sbin/zabbix_proxy\n";
-
- $stop = "echo \"Stopping Zabbix Proxy\"\n";
- $stop .= "kill `cat /var/run/zabbix/zabbix_proxy.pid`\n";
- /* write out rc.d start/stop file */
- write_rcfile(array(
- "file" => "zabbix_proxy.sh",
- "start" => "{$start}",
- "restart" => "$stop\n" . "sleep 5\n" . "{$start}",
- "stop" => "$stop"
- )
- );
-
- conf_mount_ro();
- ]]>
- </custom_php_install_command>
- <custom_php_command_before_form></custom_php_command_before_form>
- <custom_php_after_head_command></custom_php_after_head_command>
- <custom_php_after_form_command></custom_php_after_form_command>
- <custom_php_validation_command>
- <![CDATA[
- global $_POST;
-
- $ServerPort=$_POST['serverport'];
- if (!preg_match("/^\d+$/", $ServerPort)) {
- $input_errors[]='Server Port is not numeric.';
- }
-
- $ConfigFrequency=$_POST['configfrequency'];
- if (!preg_match("/^\d+$/", $ConfigFrequency)) {
- $input_errors[]='Config Frequency is not numeric.';
- }
- ]]>
- </custom_php_validation_command>
- <custom_add_php_command></custom_add_php_command>
- <custom_php_resync_config_command>
- <![CDATA[
- conf_mount_rw();
- global $config, $g;
-
- $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3);
- switch ($pfs_version) {
- case "1.2":
- case "2.0":
- define('ZABBIX_PROXY_BASE', '/usr/local');
- break;
- default:
- define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix-proxy-' . php_uname("m"));
- }
-
- $zabbixproxy_config = $config['installedpackages']['zabbixproxy']['config'][0];
-
- $Server=$zabbixproxy_config['server'];
- $ServerPort=$zabbixproxy_config['serverport'];
- $Hostname=$zabbixproxy_config['hostname'];
- $ListenPort=$zabbixproxy_config['listenport'];
- $ConfigFrequency=$zabbixproxy_config['configfrequency'];
- if(isset($zabbixproxy_config['activemode'])) {
- $Mode="0"; /* active */
- } else {
- $Mode="1"; /* passive */
- }
-
- $conf = "Server=$Server\n";
- $conf .= "ServerPort=$ServerPort\n";
- $conf .= "Hostname=$Hostname\n";
- $conf .= "PidFile=/var/run/zabbix/zabbix_proxy.pid\n";
- $conf .= "DBName=/var/db/zabbix/proxy.db\n";
- $conf .= "LogFile=/var/log/zabbix/zabbix_proxy.log\n";
- $conf .= "ConfigFrequency=$ConfigFrequency\n";
- $conf .= "FpingLocation=/usr/local/sbin/fping\n";
- /* there's currently no fping6 (IPv6) dependency in the package, but if there was, the binary would likely also be in /usr/local/sbin */
- $conf .= "Fping6Location=/usr/local/sbin/fping6\n";
- $conf .= "ProxyMode=$Mode\n";
-
- file_put_contents(ZABBIX_PROXY_BASE . "/etc/zabbix/zabbix_proxy.conf", $conf);
-
- $want_sysctls = array(
- 'kern.ipc.shmall' => '2097152',
- 'kern.ipc.shmmax' => '2147483648',
- 'kern.ipc.semmsl' => '250'
- );
- $sysctls = array();
- if (file_exists("/etc/sysctl.conf")) {
- $sc = file_get_contents("/etc/sysctl.conf");
- $sc = explode("\n", $sc);
- foreach ($sc as $num => $line) {
- list($sysctl, $val) = explode("=", $line, 2);
- if (array_key_exists($sysctl, $want_sysctls) || empty($sysctl))
- unset($sc[$num]);
- }
- }
- foreach ($want_sysctls as $ws => $wv) {
- $sc[] = "{$ws}={$wv}";
- exec("/sbin/sysctl {$ws}={$wv}");
- }
- file_put_contents("/etc/sysctl.conf", implode("\n", $sc) . "\n");
-
- $want_tunables = array(
- 'kern.ipc.semopm' => '100',
- 'kern.ipc.semmni' => '128',
- 'kern.ipc.semmns' => '32000',
- 'kern.ipc.shmmni' => '4096'
- );
- $tunables = array();
- if (file_exists("/boot/loader.conf")) {
- $lt = file_get_contents("/boot/loader.conf");
- $lt = explode("\n", $lt);
- foreach ($lt as $num => $line) {
- list($tunable, $val) = explode("=", $line, 2);
- if (array_key_exists($tunable, $want_tunables) || empty($tunable))
- unset($lt[$num]);
- }
- }
- foreach ($want_tunables as $wt => $wv) {
- $lt[] = "{$wt}={$wv}";
- }
- file_put_contents("/boot/loader.conf", implode("\n", $lt) . "\n");
- chmod("/var/log/zabbix", 0755);
- chmod("/var/run/zabbix", 0755);
- conf_mount_ro();
-
- ]]>
- </custom_php_resync_config_command>
- <custom_php_deinstall_command>
- <![CDATA[
- exec("kill `cat /var/run/zabbix/zabbix_proxy.pid`");
-
- exec("/bin/rm " . ZABBIX_PROXY_BASE . "/etc/rc.d/zabbix_proxy.sh");
-
- exec("/bin/rm -r /var/log/zabbix/");
- exec("/bin/rm -r /var/run/zabbix/");
- exec("/bin/rm -r /var/db/zabbix/");
- ]]>
- </custom_php_deinstall_command>
-</packagegui> \ No newline at end of file
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 31405ed1..77d621d2 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1312,46 +1312,6 @@
<configurationfile>squidguard.xml</configurationfile>
</package>
<package>
- <name>Zabbix Agent</name>
- <descr>Monitoring agent.</descr>
- <category>Services</category>
- <config_file>https://packages.pfsense.org/packages/config/zabbix-agent/zabbix-agent.xml</config_file>
- <version>1.8.10,2 pkg v1.1</version>
- <status>FINAL</status>
- <required_version>1.2.3</required_version>
- <configurationfile>zabbix-agent.xml</configurationfile>
- <maintainer>remco.verhoef@redfive.biz</maintainer>
- <build_port_path>/usr/ports/net-mgmt/zabbix-agent</build_port_path>
- <build_pbi>
- <custom_name>zabbix-agent</custom_name>
- <port>net-mgmt/zabbix-agent</port>
- </build_pbi>
- <build_options>ca_root_nss_UNSET_FORCE=ETCSYMLINK;zabbix22_SET=LDAP SSH SQLITE;zabbix22_UNSET_FORCE=MYSQL</build_options>
- <depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
- <depends_on_package>zabbix-agent-1.8.10,2.tbz</depends_on_package>
- <depends_on_package_pbi>zabbix-agent-1.8.13-i386.pbi</depends_on_package_pbi>
- </package>
- <package>
- <name>Zabbix Proxy</name>
- <descr>Monitoring agent proxy.</descr>
- <category>Services</category>
- <config_file>https://packages.pfsense.org/packages/config/zabbix-proxy/zabbix-proxy.xml</config_file>
- <version>1.8.8,2 pkg v1.1</version>
- <status>FINAL</status>
- <required_version>1.2.3</required_version>
- <configurationfile>zabbix-proxy.xml</configurationfile>
- <maintainer>cmb@pfsense.org</maintainer>
- <build_port_path>/usr/ports/net-mgmt/zabbix-proxy</build_port_path>
- <build_pbi>
- <custom_name>zabbix-proxy</custom_name>
- <port>net-mgmt/zabbix-proxy</port>
- </build_pbi>
- <build_options>ca_root_nss_UNSET_FORCE=ETCSYMLINK;zabbix22_SET=LDAP SSH SQLITE;zabbix22_UNSET_FORCE=MYSQL</build_options>
- <depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
- <depends_on_package>zabbix-proxy-1.8.8,2.tbz</depends_on_package>
- <depends_on_package_pbi>zabbix-proxy-1.8.13-i386.pbi</depends_on_package_pbi>
- </package>
- <package>
<name>OpenVPN Client Export Utility</name>
<descr>Allows a pre-configured OpenVPN Windows Client or Mac OS X's Viscosity configuration bundle to be exported directly from pfSense.</descr>
<category>Security</category>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 675f2061..b96ee100 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1299,46 +1299,6 @@
<configurationfile>squidguard.xml</configurationfile>
</package>
<package>
- <name>Zabbix Agent</name>
- <descr>Monitoring agent.</descr>
- <category>Services</category>
- <config_file>https://packages.pfsense.org/packages/config/zabbix-agent/zabbix-agent.xml</config_file>
- <version>1.8.10,2 pkg v1.1</version>
- <status>FINAL</status>
- <required_version>1.2.3</required_version>
- <configurationfile>zabbix-agent.xml</configurationfile>
- <maintainer>remco.verhoef@redfive.biz</maintainer>
- <build_port_path>/usr/ports/net-mgmt/zabbix-agent</build_port_path>
- <build_pbi>
- <custom_name>zabbix-agent</custom_name>
- <port>net-mgmt/zabbix-agent</port>
- </build_pbi>
- <build_options>ca_root_nss_UNSET_FORCE=ETCSYMLINK;zabbix22_SET=LDAP SSH SQLITE;zabbix22_UNSET_FORCE=MYSQL</build_options>
- <depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
- <depends_on_package>zabbix-agent-1.8.10,2.tbz</depends_on_package>
- <depends_on_package_pbi>zabbix-agent-1.8.13-amd64.pbi</depends_on_package_pbi>
- </package>
- <package>
- <name>Zabbix Proxy</name>
- <descr>Monitoring agent proxy.</descr>
- <category>Services</category>
- <config_file>https://packages.pfsense.org/packages/config/zabbix-proxy/zabbix-proxy.xml</config_file>
- <version>1.8.8,2 pkg v1.1</version>
- <status>FINAL</status>
- <required_version>1.2.3</required_version>
- <configurationfile>zabbix-proxy.xml</configurationfile>
- <maintainer>cmb@pfsense.org</maintainer>
- <build_port_path>/usr/ports/net-mgmt/zabbix-proxy</build_port_path>
- <build_pbi>
- <custom_name>zabbix-proxy</custom_name>
- <port>net-mgmt/zabbix-proxy</port>
- </build_pbi>
- <build_options>ca_root_nss_UNSET_FORCE=ETCSYMLINK;zabbix22_SET=LDAP SSH SQLITE;zabbix22_UNSET_FORCE=MYSQL</build_options>
- <depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
- <depends_on_package>zabbix-proxy-1.8.8,2.tbz</depends_on_package>
- <depends_on_package_pbi>zabbix-proxy-1.8.13-amd64.pbi</depends_on_package_pbi>
- </package>
- <package>
<name>OpenVPN Client Export Utility</name>
<descr>Allows a pre-configured OpenVPN Windows Client or Mac OSX's Viscosity configuration bundle to be exported directly from pfSense.</descr>
<category>Security</category>