From a135197cdb549ac9969f1aab77599ff7ac30ed24 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sat, 24 Oct 2015 12:28:42 +0200 Subject: zabbix2-agent - code style cleanup - Fix copyright header - Fix file permissions - Nuke unused/useless tags - Improve some descriptions. - Move User Parameters to advancedfield. --- config/zabbix2/zabbix2-agent.xml | 138 ++++++++++++++++++++++++--------------- 1 file changed, 87 insertions(+), 51 deletions(-) diff --git a/config/zabbix2/zabbix2-agent.xml b/config/zabbix2/zabbix2-agent.xml index 3d2400ad..d59f99f2 100644 --- a/config/zabbix2/zabbix2-agent.xml +++ b/config/zabbix2/zabbix2-agent.xml @@ -1,47 +1,51 @@ + + - + zabbixagent Services: Zabbix-2 Agent Monitoring - 0.8.3 + 0.8.4 /usr/local/pkg/zabbix2.inc Zabbix Agent has been created/modified. Zabbix Agent has been deleted. @@ -49,7 +53,6 @@ https://packages.pfsense.org/packages/config/zabbix2/zabbix2.inc /usr/local/pkg/ - 0755 Zabbix-2 Agent @@ -61,7 +64,7 @@ zabbix_agentd zabbix2_agentd.sh zabbix_agentd - Zabbix Agent host monitor daemon + Zabbix Agent Host Monitor Daemon @@ -70,6 +73,7 @@ + enabled Zabbix2 Agent Settings @@ -78,27 +82,27 @@ Enable agentenabled - Enable Zabbix2 Agent service + Enable Zabbix2 Agent service. checkbox Server server - List of comma delimited IP addresses (or hostnames) of ZABBIX servers + List of comma delimited IP addresses (or hostnames) of Zabbix servers. input 60 Server Active serveractive - List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks + List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks. input 60 Hostname hostname - Unique hostname. Required for active checks and must match hostname as configured on the Zabbix server (case sensitive). + Unique, case sensitive hostname. Required for active checks and must match hostname as configured on the Zabbix server. input 60 @@ -108,7 +112,7 @@ 0.0.0.0 input 60 - Listen IP for connections from the server (default 0.0.0.0 for all interfaces) + Listen IP for connections from the server. (Default: 0.0.0.0 - all interfaces) Listen Port @@ -116,7 +120,7 @@ 10050 input 5 - Listen port for connections from the server (default 10050) + Listen port for connections from the server. (Default: 10050) Refresh Active Checks @@ -124,7 +128,7 @@ 120 input 5 - The agent will refresh list of active checks once per 120 (default) seconds. + The agent will refresh list of active checks once per this number of seconds. (Default: 120) Timeout @@ -132,7 +136,13 @@ 3 input 5 - Timeout (default 3). Do not spend more that Timeout seconds on getting requested value (1-30). The agent does not kill timeouted User Parameters processes! + + + Note: The agent does not kill timeouted User Parameters processes!
+ (Default: 3. Valid range: 1-30) + ]]> + Buffer Send @@ -140,7 +150,12 @@ 5 input 5 - Buffer Send (default 5). Do not keep data longer than N seconds in buffer (1-3600). + + + (Default: 5. Valid range: 1-3600) + ]]> + Buffer Size @@ -148,7 +163,12 @@ 100 input 5 - Buffer Size (default 100). Maximum number of values in a memory buffer (2-65535). The agent will send all collected data to Zabbix server or proxy if the buffer is full. + + + (Default: 100. Valid range: 2-65535) + ]]> + Start Agents @@ -156,7 +176,13 @@ 3 input 5 - Start Agents (default 3). Number of pre-forked instances of zabbix_agentd that process passive checks (0-100).If set to 0, disables passive checks and the agent will not listen on any TCP port. + + + Note: Setting to 0 disables passive checks and the agent will not listen on any TCP port.
+ (Default: 3. Valid range: 0-100) + ]]> + User Parameters @@ -165,15 +191,25 @@ textarea 5 50 - User-defined parameter to monitor. There can be several user-defined parameters. Value has form, example: UserParameter=users,who|wc -l + + + Example: UserParameter=users,who|wc -l + ]]> + + - sync_package_zabbix2(); - - - - validate_input_zabbix2($_POST, $input_errors); - - sync_package_zabbix2(); - php_deinstall_zabbix2_agent(); + + sync_package_zabbix2(); + + + validate_input_zabbix2($_POST, $input_errors); + + + sync_package_zabbix2(); + + + php_deinstall_zabbix2_agent(); + -- cgit v1.2.3 From 1c2f5fcd4b446c31b9194d415cdc394c022353ae Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sat, 24 Oct 2015 12:33:26 +0200 Subject: zabbix2-proxy - code style cleanup - Fix copyright header - Fix file permissions - Nuke unused/useless tags - Improve some descriptions - Move Advanced Parameters to advancedfield --- config/zabbix2/zabbix2-proxy.xml | 113 +++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 52 deletions(-) diff --git a/config/zabbix2/zabbix2-proxy.xml b/config/zabbix2/zabbix2-proxy.xml index 00d9b106..ec86f525 100644 --- a/config/zabbix2/zabbix2-proxy.xml +++ b/config/zabbix2/zabbix2-proxy.xml @@ -1,47 +1,51 @@ + + - + zabbixproxy Services: Zabbix-2 Proxy Monitoring - 0.8.3 + 0.8.4 /usr/local/pkg/zabbix2.inc Zabbix Proxy has been created/modified. Zabbix Proxy has been deleted. @@ -49,7 +53,6 @@ https://packages.pfsense.org/packages/config/zabbix2/zabbix2.inc /usr/local/pkg/ - 0755 Zabbix-2 Proxy @@ -61,7 +64,7 @@ zabbix_proxy zabbix2_proxy.sh zabbix_proxy - Zabbix proxy collection daemon + Zabbix Proxy Collection Daemon @@ -70,6 +73,7 @@ + enabled Zabbix2 Proxy Settings @@ -78,31 +82,31 @@ Enable proxyenabled - Enable Zabbix2 Proxy service + Enable Zabbix2 Proxy service. checkbox Server server - List of comma delimited IP addresses (or hostnames) of ZABBIX servers + List of comma delimited IP addresses (or hostnames) of Zabbix servers. 127.0.0.1 input 60 true - Server Port - serverport - Port of Zabbix trapper on Zabbix server. default value 10051 - 10051 - input - 6 - true + Server Port + serverport + Port of Zabbix trapper on Zabbix server. (Default: 10051) + 10051 + input + 6 + true Hostname hostname - Unique, case-sensitive proxy name. Make sure the proxy name is known to the server + Unique, case-sensitive proxy name. Make sure the proxy name is known to the server. localhost input 50 @@ -111,7 +115,7 @@ Proxy Mode proxymode - Select Zabbix proxy mode (Active is default) + Select Zabbix proxy mode. (Default: Active) select 0 @@ -136,15 +140,20 @@ textarea 5 50 - Advanced parameters. There are some rarely used parameters that sometimes need to be defined. Value has form, example: StartDiscoverers=10 + Advanced parameters. There are some rarely used parameters that sometimes need to be defined. Example: StartDiscoverers=10 + - sync_package_zabbix2(); - - - - validate_input_zabbix2($_POST, $input_errors); - - sync_package_zabbix2(); - php_deinstall_zabbix2_proxy(); + + sync_package_zabbix2(); + + + validate_input_zabbix2($_POST, $input_errors); + + + sync_package_zabbix2(); + + + php_deinstall_zabbix2_proxy(); + -- cgit v1.2.3 From 805a1552c2d4900eae790b0015585b0bf2a2957b Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sat, 24 Oct 2015 13:51:40 +0200 Subject: zabbix2-agent/zabbix2-proxy - code style cleanup - Fix copyright header - Code style and allignment fixes - Remove unused php_install_zabbix2() function - Use stop_service()/restart_service() - Use mwexec() instead of exec() - Improve some input validations --- config/zabbix2/zabbix2.inc | 448 ++++++++++++++++++++++----------------------- 1 file changed, 220 insertions(+), 228 deletions(-) diff --git a/config/zabbix2/zabbix2.inc b/config/zabbix2/zabbix2.inc index 77f1d6e1..9b5f3ed3 100644 --- a/config/zabbix2/zabbix2.inc +++ b/config/zabbix2/zabbix2.inc @@ -1,205 +1,213 @@ 2.0){ - define('ZABBIX_AGENT_BASE', '/usr/pbi/' . $zabbix2_pkg_base . '-agent-' . php_uname("m")); - } else { - define('ZABBIX_AGENT_BASE', '/usr/local'); - } - - exec("/usr/bin/killall zabbix_agentd"); - unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/rc.d/zabbix2_agentd.sh"); - unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/" . $zabbix2_pkg_base . "/zabbix_agentd.conf"); - unlink_if_exists("/var/log/zabbix2/zabbix2_agentd.log"); - unlink_if_exists("/var/run/zabbix2/zabbix2_agentd.pid"); - - if (!is_array($config['installedpackages']['zabbixproxy'])){ - if (is_dir("/var/log/zabbix2")) - exec("/bin/rm -r /var/log/zabbix2/"); - if (is_dir("/var/run/zabbix2")) - exec("/bin/rm -r /var/run/zabbix2/"); - } - - conf_mount_ro(); +function php_zabbix2_pkg_base($pfs_version) { + if ($pfs_version >= 2.2) { + // pfSense 2.2 with zabbix 2.4 + $zabbix2_pkg_base = "zabbix24"; + } else { + // pfSense 2.1 with zabbix 2.2 + $zabbix2_pkg_base = "zabbix22"; + } + return $zabbix2_pkg_base; } -function php_deinstall_zabbix2_proxy(){ - global $config, $g; - - conf_mount_rw(); - $pfs_version = php_zabbix2_pfs_version(); - $zabbix2_pkg_base = php_zabbix2_pkg_base($pfs_version); +function php_deinstall_zabbix2_agent() { + global $config, $g; - if ($pfs_version > 2.0){ - define('ZABBIX_PROXY_BASE', '/usr/pbi/' . $zabbix2_pkg_base . '-proxy-' . php_uname("m")); - } else { - define('ZABBIX_PROXY_BASE', '/usr/local'); - } + $pfs_version = php_zabbix2_pfs_version(); + $zabbix2_pkg_base = php_zabbix2_pkg_base($pfs_version); - exec("/usr/bin/killall zabbix_proxy"); - unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/rc.d/zabbix2_proxy.sh"); - unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/" . $zabbix2_pkg_base . "/zabbix_proxy.conf"); - unlink_if_exists("/var/log/zabbix2/zabbix_proxy.log"); - unlink_if_exists("/var/run/zabbix2/zabbix2_proxy.pid"); + if ($pfs_version == "2.1" || $pfs_version == "2.2") { + define('ZABBIX_AGENT_BASE', '/usr/pbi/' . $zabbix2_pkg_base . '-agent-' . php_uname("m")); + } else { + define('ZABBIX_AGENT_BASE', '/usr/local'); + } - if (!is_array($config['installedpackages']['zabbixagent'])){ - if (is_dir("/var/log/zabbix2")) - exec("/bin/rm -r /var/log/zabbix2/"); - if (is_dir("/var/run/zabbix2")) - exec("/bin/rm -r /var/run/zabbix2/"); - } + mwexec("/usr/bin/killall zabbix_agentd"); - if (is_dir("/var/db/zabbix2")) - exec("/bin/rm -r /var/db/zabbix2/"); + unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/" . $zabbix2_pkg_base . "/zabbix_agentd.conf"); + unlink_if_exists("/var/log/zabbix2/zabbix2_agentd.log"); + unlink_if_exists("/var/run/zabbix2/zabbix2_agentd.pid"); - conf_mount_ro(); + if (!is_array($config['installedpackages']['zabbixproxy'])) { + if (is_dir("/var/log/zabbix2")) { + mwexec("/bin/rm -rf /var/log/zabbix2/"); + } + if (is_dir("/var/run/zabbix2")) { + mwexec("/bin/rm -rf /var/run/zabbix2/"); + } + } } -function validate_input_zabbix2($post, &$input_errors){ +function php_deinstall_zabbix2_proxy() { + global $config, $g; + + $pfs_version = php_zabbix2_pfs_version(); + $zabbix2_pkg_base = php_zabbix2_pkg_base($pfs_version); + + if ($pfs_version == "2.1" || $pfs_version == "2.2") { + define('ZABBIX_PROXY_BASE', '/usr/pbi/' . $zabbix2_pkg_base . '-proxy-' . php_uname("m")); + } else { + define('ZABBIX_PROXY_BASE', '/usr/local'); + } + + exec("/usr/bin/killall zabbix_proxy"); + unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/" . $zabbix2_pkg_base . "/zabbix_proxy.conf"); + unlink_if_exists("/var/log/zabbix2/zabbix_proxy.log"); + unlink_if_exists("/var/run/zabbix2/zabbix2_proxy.pid"); + + if (!is_array($config['installedpackages']['zabbixagent'])) { + if (is_dir("/var/log/zabbix2")) { + exec("/bin/rm -r /var/log/zabbix2/"); + } + if (is_dir("/var/run/zabbix2")) { + exec("/bin/rm -r /var/run/zabbix2/"); + } + } - if (isset($post['proxyenabled'])){ + if (is_dir("/var/db/zabbix2")) { + exec("/bin/rm -r /var/db/zabbix2/"); + } +} + +function validate_input_zabbix2($post, &$input_errors) { + if (isset($post['proxyenabled'])) { if (!is_numericint($post['serverport'])) { - $input_errors[]='Server Port is not numeric.'.$ServerPort; - } - + $input_errors[] = "'Server Port' value is not numeric."; + } elseif ($post['serverport'] < 1 || $post['serverport'] > 65535) { + $input_errors[] = "You must enter a valid value for 'Server Port'."; + } + if (!is_numericint($post['configfrequency'])) { - $input_errors[]='Config Frequency is not numeric.'; - } + $input_errors[] = "'Config Frequency' value is not numeric."; } - if (isset($post['agentenabled'])){ + } + + if (isset($post['agentenabled'])) { if (!preg_match("/\w+/", $post['server'])) { - $input_errors[]='Server field is required.'; - } - + $input_errors[] = "Server field is required."; + } + if (!preg_match("/\w+/", $post['hostname'])) { - $input_errors[]='Hostname field is required.'; - } - + $input_errors[] = "Hostname field is required."; + } + if ($post['listenip'] != '') { - if (!is_ipaddr_configured($post['listenip']) && !preg_match("/(127.0.0.1|0.0.0.0)/",$post['listenip'])) { - $input_errors[]='Listen IP is not a configured IP address.'; + if (!is_ipaddr_configured($post['listenip']) && !preg_match("/(127.0.0.1|0.0.0.0)/", $post['listenip'])) { + $input_errors[] = "'Listen IP' is not a configured IP address."; } } if ($post['listenport'] != '') { - if (!preg_match("/^\d+$/", $post['listenport'])) { - $input_errors[]='Listen Port is not numeric.'; - } + if (!is_numericint($post['listenport'])) { + $input_errors[] = "'Listen Port' value is not numeric."; + } elseif ($post['listenport'] < 1 || $post['listenport'] > 65535) { + $input_errors[] = "You must enter a valid value for 'Listen Port'."; + } } if ($post['refreshactchecks'] != '') { - if (!preg_match("/^\d+$/", $post['refreshactchecks'])) { - $input_errors[]='Refresh Active Checks is not numeric.'; - } elseif ( $post['refreshactchecks'] < 60 || $post['refreshactchecks'] > 3600 ) { - $input_errors[]='You must enter a valid value for \'Refresh Active Checks\''; + if (!is_numericint($post['refreshactchecks'])) { + $input_errors[] = "'Refresh Active Checks' value is not numeric."; + } elseif ($post['refreshactchecks'] < 60 || $post['refreshactchecks'] > 3600) { + $input_errors[] = "You must enter a valid value for 'Refresh Active Checks'."; } } if ($post['timeout'] != '') { if (!is_numericint($post['timeout'])) { - $input_errors[]='Timeout is not numeric.'; - } elseif ( $post['timeout'] < 1 || $post['timeout'] > 30 ) { - $input_errors[]='You must enter a valid value for \'Timeout\''; + $input_errors[] = "Timeout value is not numeric."; + } elseif ($post['timeout'] < 1 || $post['timeout'] > 30) { + $input_errors[] = "You must enter a valid value for 'Timeout'."; } } - + if ($post['buffersend'] != '') { if (!is_numericint($post['buffersend'])) { - $input_errors[]='Buffer Send is not numeric.'; - } elseif ( $post['buffersend'] < 1 || $post['buffersend'] > 3600 ) { - $input_errors[]='You must enter a valid value for \'Buffer Send\''; + $input_errors[] = "'Buffer Send' value is not numeric."; + } elseif ($post['buffersend'] < 1 || $post['buffersend'] > 3600) { + $input_errors[] = "You must enter a valid value for 'Buffer Send'."; } } - + if ($post['buffersize'] != '') { if (!is_numericint($post['buffersize'])) { - $input_errors[]='Bufer Size is not numeric.'; - } elseif ( $post['buffersize'] < 2 || $post['buffersize'] > 65535 ) { - $input_errors[]='You must enter a valid value for \'Buffer Size\''; + $input_errors[] = "'Buffer Size' value is not numeric."; + } elseif ($post['buffersize'] < 2 || $post['buffersize'] > 65535) { + $input_errors[] = "You must enter a valid value for 'Buffer Size'."; } } - + if ($post['startagents'] != '') { if (!is_numericint($post['startagents'])) { $input_errors[]='Start Agents is not numeric.'; - } elseif ( $post['startagents'] < 0 || $post['startagents'] > 100 ) { - $input_errors[]='You must enter a valid value for \'Start Agents\''; + } elseif ($post['startagents'] < 0 || $post['startagents'] > 100) { + $input_errors[] = "You must enter a valid value for 'Start Agents'."; } } - } + } } -function sync_package_zabbix2(){ +function sync_package_zabbix2() { global $config, $g; conf_mount_rw(); $pfs_version = php_zabbix2_pfs_version(); $zabbix2_pkg_base = php_zabbix2_pkg_base($pfs_version); - if ($pfs_version > 2.0){ + if ($pfs_version == "2.1" || $pfs_version == "2.2") { define('ZABBIX_AGENT_BASE', '/usr/pbi/' . $zabbix2_pkg_base . '-agent-' . php_uname("m")); define('ZABBIX_PROXY_BASE', '/usr/pbi/' . $zabbix2_pkg_base . '-proxy-' . php_uname("m")); - } - else { + } else { define('ZABBIX_AGENT_BASE', '/usr/local'); define('ZABBIX_PROXY_BASE', '/usr/local'); } - #check zabbix proxy config - if (is_array($config['installedpackages']['zabbixproxy'])){ + // Check zabbix proxy config + if (is_array($config['installedpackages']['zabbixproxy'])) { $zbproxy_config = $config['installedpackages']['zabbixproxy']['config'][0]; - if ($zbproxy_config['proxyenabled']=="on"){ - $Mode=(is_numericint($zbproxy_config['proxymode'])?$zbproxy_config['proxymode'] : 0); - $AdvancedParams=base64_decode($zbproxy_config['advancedparams']); - + if ($zbproxy_config['proxyenabled'] == "on") { + $Mode = (is_numericint($zbproxy_config['proxymode']) ? $zbproxy_config['proxymode'] : 0); + $AdvancedParams = base64_decode($zbproxy_config['advancedparams']); + $zbproxy_conf_file = <<< EOF Server={$zbproxy_config['server']} ServerPort={$zbproxy_config['serverport']} @@ -209,7 +217,8 @@ DBName=/var/db/zabbix2/proxy.db LogFile=/var/log/zabbix2/zabbix_proxy.log ConfigFrequency={$zbproxy_config['configfrequency']} FpingLocation=/usr/local/sbin/fping -#there's currently no fping6 (IPv6) dependency in the package, but if there was, the binary would likely also be in /usr/local/sbin +# There's currently no fping6 (IPv6) dependency in the package, +# but if there was, the binary would likely also be in /usr/local/sbin. Fping6Location=/usr/local/sbin/fping6 ProxyMode={$Mode} {$AdvancedParams} @@ -218,19 +227,19 @@ EOF; file_put_contents(ZABBIX_PROXY_BASE . "/etc/" . $zabbix2_pkg_base . "/zabbix_proxy.conf", strtr($zbproxy_conf_file, array("\r" => ""))); } } - /* check zabbix agent settings*/ - if (is_array($config['installedpackages']['zabbixagent'])){ + // Check zabbix agent settings + if (is_array($config['installedpackages']['zabbixagent'])) { $zbagent_config = $config['installedpackages']['zabbixagent']['config'][0]; - if ($zbagent_config['agentenabled']=="on"){ - $RefreshActChecks=(preg_match("/(\d+)/",$zbagent_config['refreshactchecks'],$matches)? $matches[1] : "120"); - $BufferSend=(preg_match("/(\d+)/",$zbagent_config['buffersend'],$matches)? $matches[1] : "5" ); - $BufferSize=(preg_match("/(\d+)/",$zbagent_config['buffersize'],$matches)? $matches[1] : "100"); - $StartAgents=(preg_match("/(\d+)/",$zbagent_config['startagents'],$matches)? $matches[1] :"3" ); - $UserParams=base64_decode($zbagent_config['userparams']); - $ListenIp=($zbagent_config['listenip'] != ''? $zbagent_config['listenip'] : "0.0.0.0"); - $ListenPort=($zbagent_config['listenport'] != ''? $zbagent_config['listenport'] : "10050"); - $TimeOut=($zbagent_config['timeout'] != ''? $zbagent_config['timeout'] : "3"); - + if ($zbagent_config['agentenabled'] == "on") { + $RefreshActChecks = (preg_match("/(\d+)/", $zbagent_config['refreshactchecks'], $matches) ? $matches[1] : "120"); + $BufferSend = (preg_match("/(\d+)/", $zbagent_config['buffersend'], $matches) ? $matches[1] : "5"); + $BufferSize = (preg_match("/(\d+)/", $zbagent_config['buffersize'], $matches) ? $matches[1] : "100"); + $StartAgents = (preg_match("/(\d+)/", $zbagent_config['startagents'], $matches) ? $matches[1] : "3"); + $UserParams = base64_decode($zbagent_config['userparams']); + $ListenIp = $zbagent_config['listenip'] ?: "0.0.0.0"; + $ListenPort = $zbagent_config['listenport'] ?: "10050"; + $TimeOut = $zbagent_config['timeout'] ?: "3"; + $zbagent_conf_file = <<< EOF Server={$zbagent_config['server']} ServerActive={$zbagent_config['serveractive']} @@ -249,33 +258,35 @@ StartAgents={$StartAgents} {$UserParams} EOF; - file_put_contents(ZABBIX_AGENT_BASE . "/etc/" . $zabbix2_pkg_base . "/zabbix_agentd.conf", strtr($zbagent_conf_file, array("\r" => ""))); + file_put_contents(ZABBIX_AGENT_BASE . "/etc/" . $zabbix2_pkg_base . "/zabbix_agentd.conf", strtr($zbagent_conf_file, array("\r" => ""))); } } + $want_sysctls = array( 'kern.ipc.shmall' => '2097152', 'kern.ipc.shmmax' => '2147483648', 'kern.ipc.semmsl' => '250' ); $sysctls = array(); - #check sysctl file values + // Check sysctl file values $sc_file=""; if (file_exists("/etc/sysctl.conf")) { $sc = file("/etc/sysctl.conf"); foreach ($sc as $line) { list($sysk, $sysv) = explode("=", $line, 2); - if (preg_match("/\w/",$line) && !array_key_exists($sysk, $want_sysctls)) - $sc_file.=$line; + if (preg_match("/\w/", $line) && !array_key_exists($sysk, $want_sysctls)) { + $sc_file .= $line; } + } } - foreach ($want_sysctls as $ws=> $wv) { + foreach ($want_sysctls as $ws => $wv) { $sc_file .= "{$ws}={$wv}\n"; - exec("/sbin/sysctl {$ws}={$wv}"); + mwexec("/sbin/sysctl {$ws}={$wv}"); } file_put_contents("/etc/sysctl.conf", $sc_file); - #check bootloader values - $lt_file=""; + // Check bootloader values + $lt_file = ""; $want_tunables = array( 'kern.ipc.semopm' => '100', 'kern.ipc.semmni' => '128', @@ -287,110 +298,91 @@ EOF; $lt = file("/boot/loader.conf"); foreach ($lt as $line) { list($tunable, $val) = explode("=", $line, 2); - if (preg_match("/\w/",$line) && !array_key_exists($tunable, $want_tunables)) - $lt_file.=$line; + if (preg_match("/\w/", $line) && !array_key_exists($tunable, $want_tunables)) { + $lt_file .= $line; + } } } foreach ($want_tunables as $wt => $wv) { - $lt_file.= "{$wt}={$wv}\n"; + $lt_file .= "{$wt}={$wv}\n"; } file_put_contents("/boot/loader.conf", $lt_file); - /*check startup script files*/ - /* create a few directories and ensure the sample files are in place */ - if (!is_dir(ZABBIX_PROXY_BASE . "/etc/" . $zabbix2_pkg_base)) - exec("/bin/mkdir -p " . ZABBIX_PROXY_BASE . "/etc/" . $zabbix2_pkg_base); - - $dir_checks = <<< EOF -if [ ! -d /var/log/zabbix2 ] - then - /bin/mkdir -p /var/log/zabbix2 - /usr/sbin/chmod 755 /var/log/zabbix2 - fi -/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix2 - -if [ ! -d /var/run/zabbix2 ] - then - /bin/mkdir -p /var/run/zabbix2 - /usr/sbin/chmod 755 /var/run/zabbix2 - fi -/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix2 - -if [ ! -d /var/db/zabbix2 ] - then - /bin/mkdir -p /var/db/zabbix2 - /usr/sbin/chmod 755 /var/db/zabbix2 - fi -/usr/sbin/chown -R zabbix:zabbix /var/db/zabbix2 + // Check startup script files + // Create a few directories and ensure the sample files are in place + if (!is_dir(ZABBIX_PROXY_BASE . "/etc/" . $zabbix2_pkg_base)) { + mwexec("/bin/mkdir -p " . ZABBIX_PROXY_BASE . "/etc/" . $zabbix2_pkg_base); + } + + $dir_checks = <<< EOF + + if [ ! -d /var/log/zabbix2 ]; then + /bin/mkdir -p /var/log/zabbix2 + /usr/sbin/chmod 755 /var/log/zabbix2 + fi + /usr/sbin/chown -R zabbix:zabbix /var/log/zabbix2 + + if [ ! -d /var/run/zabbix2 ]; then + /bin/mkdir -p /var/run/zabbix2 + /usr/sbin/chmod 755 /var/run/zabbix2 + fi + /usr/sbin/chown -R zabbix:zabbix /var/run/zabbix2 + + if [ ! -d /var/db/zabbix2 ]; then + /bin/mkdir -p /var/db/zabbix2 + /usr/sbin/chmod 755 /var/db/zabbix2 + fi + /usr/sbin/chown -R zabbix:zabbix /var/db/zabbix2 EOF; - - $zproxy_rcfile="/usr/local/etc/rc.d/zabbix2_proxy.sh"; - if (is_array($zbproxy_config) && $zbproxy_config['proxyenabled']=="on"){ - $zproxy_start= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Proxy\"...\n"; - /* start zabbix proxy */ + + $zproxy_rcfile = "/usr/local/etc/rc.d/zabbix2_proxy.sh"; + if (is_array($zbproxy_config) && $zbproxy_config['proxyenabled'] == "on") { + $zproxy_start = strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Proxy\"...\n"; $zproxy_start .= ZABBIX_PROXY_BASE . "/sbin/zabbix_proxy\n"; - + $zproxy_stop = "echo \"Stopping Zabbix Proxy\"\n"; $zproxy_stop .= "/usr/bin/killall zabbix_proxy\n"; $zproxy_stop .= "/bin/sleep 5\n"; - /* write out rc.d start/stop file */ write_rcfile(array( "file" => "zabbix2_proxy.sh", "start" => $zproxy_start, "stop" => $zproxy_stop ) ); - mwexec("{$zproxy_rcfile} restart"); - }else{ - if (file_exists($zproxy_rcfile)){ - mwexec("{$zproxy_rcfile} stop"); - unlink($zproxy_rcfile); + restart_service("zabbix_proxy"); + } else { + if (is_service_running("zabbix_proxy")) { + stop_service("zabbix_proxy"); } + unlink_if_exists($zproxy_rcfile); } - + $zagent_rcfile="/usr/local/etc/rc.d/zabbix2_agentd.sh"; - if (is_array($zbagent_config) && $zbagent_config['agentenabled']=="on"){ + if (is_array($zbagent_config) && $zbagent_config['agentenabled']=="on") { $zagent_start .= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Agent...\"\n"; $zagent_start .= ZABBIX_AGENT_BASE . "/sbin/zabbix_agentd\n"; - + $zagent_stop = "echo \"Stopping Zabbix Agent...\"\n"; $zagent_stop .= "/usr/bin/killall zabbix_agentd\n"; $zagent_stop .= "/bin/sleep 5\n"; - - /* write out rc.d start/stop file */ + write_rcfile(array( - "file" => "zabbix2_agentd.sh", - "start" => "$zagent_start", - "stop" => "$zagent_stop" - ) + "file" => "zabbix2_agentd.sh", + "start" => $zagent_start, + "stop" => $zagent_stop + ) ); - mwexec("{$zagent_rcfile} restart"); - }else{ - if (file_exists($zagent_rcfile)){ - mwexec("{$zagent_rcfile} stop"); - unlink($zagent_rcfile); + restart_service("zabbix_agentd"); + } else { + if (is_service_running("zabbix_agentd")) { + stop_service("zabbix_agentd"); } + unlink_if_exists($zagent_rcfile); } - - conf_mount_ro(); -} -function php_zabbix2_pfs_version(){ - $pfs_version = substr(trim(file_get_contents("/etc/version")),0,3); - return $pfs_version; -} - -function php_zabbix2_pkg_base($pfs_version){ - if ($pfs_version >= 2.2){ - // pfSense 2.2 with zabbix 2.4 - $zabbix2_pkg_base = "zabbix24"; - }else{ - // pfSense 2.1 with zabbix 2.2 - $zabbix2_pkg_base = "zabbix22"; - } - return $zabbix2_pkg_base; + conf_mount_ro(); } ?> -- cgit v1.2.3 From 01ab1e61d47392f08f26375c069ea5e2ccfd1444 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sat, 24 Oct 2015 13:56:42 +0200 Subject: Sanitize and bump zabbix2-agent/zabbix2-proxy package versions --- pkg_config.10.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg_config.10.xml b/pkg_config.10.xml index e45aee77..acdd4171 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1580,7 +1580,7 @@ http://www.zabbix.com/product.php Services https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml - zabbix24-agent-2.4.3 pkg v0.8.3 + 0.8.4 BETA 2.2 zabbix2-agent.xml @@ -1605,7 +1605,7 @@ http://www.zabbix.com/product.php Services https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml - zabbix24-proxy-2.4.3 pkg v0.8.3 + 0.8.4 BETA 2.2 zabbix2-proxy.xml -- cgit v1.2.3 From c0f0f9046a73ca5b925bc21d069a0f62392e65b2 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sat, 24 Oct 2015 13:59:55 +0200 Subject: Sanitize and bump zabbix2-agent/zabbix2-proxy package versions --- pkg_config.8.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg_config.8.xml b/pkg_config.8.xml index b0999759..31405ed1 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1716,7 +1716,7 @@ Monitoring agent. Services https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml - zabbix2-agent-2.2.5 pkg v0.8.3 + zabbix2-agent-2.2.5 pkg v0.8.4 BETA 2.0 zabbix2-agent.xml @@ -1734,7 +1734,7 @@ Monitoring agent proxy. Services https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml - zabbix2-proxy-2.2.5 pkg v0.8.3 + zabbix2-proxy-2.2.5 pkg v0.8.4 BETA 2.0 zabbix2-proxy.xml -- cgit v1.2.3 From 7ecf0faf826cc21b0894f248c41d24dcbda9b38d Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sat, 24 Oct 2015 14:00:56 +0200 Subject: Sanitize and bump zabbix2-agent/zabbix2-proxy package versions --- pkg_config.8.xml.amd64 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 06660716..675f2061 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1703,7 +1703,7 @@ Monitoring agent. Services https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml - zabbix2-agent-2.2.5 pkg v0.8.3 + zabbix2-agent-2.2.5 pkg v0.8.4 BETA 2.0 zabbix2-agent.xml @@ -1721,7 +1721,7 @@ Monitoring agent proxy. Services https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml - zabbix2-proxy-2.2.5 pkg v0.8.3 + zabbix2-proxy-2.2.5 pkg v0.8.4 BETA 2.0 zabbix2-proxy.xml -- cgit v1.2.3 From b35add371cc0c92850980ced834a48339ae5aaf9 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sat, 24 Oct 2015 16:04:39 +0200 Subject: Add privileges configuration to zabbix2-agent package --- config/zabbix2/zabbix2-agent.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/zabbix2/zabbix2-agent.xml b/config/zabbix2/zabbix2-agent.xml index d59f99f2..e02caefc 100644 --- a/config/zabbix2/zabbix2-agent.xml +++ b/config/zabbix2/zabbix2-agent.xml @@ -54,6 +54,10 @@ https://packages.pfsense.org/packages/config/zabbix2/zabbix2.inc /usr/local/pkg/ + + https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.priv.inc + /etc/inc/priv/ + Zabbix-2 Agent Setup Zabbix Agent specific settings -- cgit v1.2.3 From ed6b4de678bf5d0653bf6075be355cfd6f52450b Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sat, 24 Oct 2015 16:05:36 +0200 Subject: Add privileges configuration to zabbix2-proxy package --- config/zabbix2/zabbix2-proxy.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/zabbix2/zabbix2-proxy.xml b/config/zabbix2/zabbix2-proxy.xml index ec86f525..398c3df4 100644 --- a/config/zabbix2/zabbix2-proxy.xml +++ b/config/zabbix2/zabbix2-proxy.xml @@ -54,6 +54,10 @@ https://packages.pfsense.org/packages/config/zabbix2/zabbix2.inc /usr/local/pkg/ + + https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.priv.inc + /etc/inc/priv/ + Zabbix-2 Proxy Setup Zabbix Proxy specific settings -- cgit v1.2.3 From 2d0d3873cafe2ec63d4f2af5d2f3e07982dea8fd Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sat, 24 Oct 2015 16:07:21 +0200 Subject: Add privileges configuration to zabbix2-agent package --- config/zabbix2/zabbix2-agent.priv.inc | 38 +++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 config/zabbix2/zabbix2-agent.priv.inc diff --git a/config/zabbix2/zabbix2-agent.priv.inc b/config/zabbix2/zabbix2-agent.priv.inc new file mode 100644 index 00000000..bdd3543d --- /dev/null +++ b/config/zabbix2/zabbix2-agent.priv.inc @@ -0,0 +1,38 @@ + -- cgit v1.2.3 From 457f01d21333dfa9235509a59ddafc99df00b2a7 Mon Sep 17 00:00:00 2001 From: doktornotor Date: Sat, 24 Oct 2015 16:08:23 +0200 Subject: Add privileges configuration to zabbix2-proxy package --- config/zabbix2/zabbix2-proxy.priv.inc | 38 +++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 config/zabbix2/zabbix2-proxy.priv.inc diff --git a/config/zabbix2/zabbix2-proxy.priv.inc b/config/zabbix2/zabbix2-proxy.priv.inc new file mode 100644 index 00000000..f3bfc5e1 --- /dev/null +++ b/config/zabbix2/zabbix2-proxy.priv.inc @@ -0,0 +1,38 @@ + -- cgit v1.2.3