From f223081789b9d324a3f34988150891ea0a8e2a1b Mon Sep 17 00:00:00 2001 From: "Danilo G. Baio (dbaio)" Date: Thu, 14 May 2015 11:05:37 -0300 Subject: zabbix_lts - separate directories between agent and proxy --- config/zabbix-agent-lts/zabbix-agent-lts.inc | 362 +++++++++++++++++++++++++++ config/zabbix-agent-lts/zabbix-agent-lts.xml | 179 +++++++++++++ config/zabbix-lts/zabbix-agent-lts.xml | 179 ------------- config/zabbix-lts/zabbix-lts.inc | 362 --------------------------- config/zabbix-lts/zabbix-proxy-lts.xml | 150 ----------- config/zabbix-proxy-lts/zabbix-proxy-lts.inc | 362 +++++++++++++++++++++++++++ config/zabbix-proxy-lts/zabbix-proxy-lts.xml | 150 +++++++++++ 7 files changed, 1053 insertions(+), 691 deletions(-) create mode 100644 config/zabbix-agent-lts/zabbix-agent-lts.inc create mode 100644 config/zabbix-agent-lts/zabbix-agent-lts.xml delete mode 100644 config/zabbix-lts/zabbix-agent-lts.xml delete mode 100644 config/zabbix-lts/zabbix-lts.inc delete mode 100644 config/zabbix-lts/zabbix-proxy-lts.xml create mode 100644 config/zabbix-proxy-lts/zabbix-proxy-lts.inc create mode 100644 config/zabbix-proxy-lts/zabbix-proxy-lts.xml (limited to 'config') diff --git a/config/zabbix-agent-lts/zabbix-agent-lts.inc b/config/zabbix-agent-lts/zabbix-agent-lts.inc new file mode 100644 index 00000000..af446261 --- /dev/null +++ b/config/zabbix-agent-lts/zabbix-agent-lts.inc @@ -0,0 +1,362 @@ + 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\''; + } + } + + 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\''; + } + } + + 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\''; + } + } + + 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\''; + } + } + } +} + +function sync_package_zabbix_lts(){ + global $config, $g; + + conf_mount_rw(); + + #check zabbix proxy config + if (is_array($config['installedpackages']['zabbixproxylts'])){ + $zbproxy_config = $config['installedpackages']['zabbixproxylts']['config'][0]; + 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']} +Hostname={$zbproxy_config['hostname']} +PidFile=/var/run/zabbix-lts/zabbix_proxy_lts.pid +DBName=/var/db/zabbix-lts/proxy.db +LogFile=/var/log/zabbix-lts/zabbix_proxy_lts.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 +Fping6Location=/usr/local/sbin/fping6 +ProxyMode={$Mode} +{$AdvancedParams} + +EOF; + file_put_contents(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy.conf", strtr($zbproxy_conf_file, array("\r" => ""))); + } + } + /* check zabbix agent settings*/ + if (is_array($config['installedpackages']['zabbixagentlts'])){ + $zbagent_config = $config['installedpackages']['zabbixagentlts']['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"); + + $zbagent_conf_file = <<< EOF +Server={$zbagent_config['server']} +ServerActive={$zbagent_config['serveractive']} +Hostname={$zbagent_config['hostname']} +ListenIP={$ListenIp} +ListenPort={$ListenPort} +RefreshActiveChecks={$RefreshActChecks} +DebugLevel=3 +PidFile=/var/run/zabbix-lts/zabbix_agentd_lts.pid +LogFile=/var/log/zabbix-lts/zabbix_agentd_lts.log +LogFileSize=1 +Timeout={$TimeOut} +BufferSend={$BufferSend} +BufferSize={$BufferSize} +StartAgents={$StartAgents} +{$UserParams} + +EOF; + file_put_contents(ZABBIX_AGENT_BASE . "/etc/zabbix22/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 + $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; + } + } + foreach ($want_sysctls as $ws=> $wv) { + $sc_file .= "{$ws}={$wv}\n"; + exec("/sbin/sysctl {$ws}={$wv}"); + } + file_put_contents("/etc/sysctl.conf", $sc_file); + + #check bootloader values + $lt_file=""; + $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("/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; + } + } + foreach ($want_tunables as $wt => $wv) { + $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/zabbix22")) + exec("/bin/mkdir -p " . ZABBIX_PROXY_BASE . "/etc/zabbix22"); + + $dir_checks = <<< EOF +if [ ! -d /var/log/zabbix-lts ] + then + /bin/mkdir -p /var/log/zabbix-lts + /usr/sbin/chmod 755 /var/log/zabbix-lts + fi +/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix-lts + +if [ ! -d /var/run/zabbix-lts ] + then + /bin/mkdir -p /var/run/zabbix-lts + /usr/sbin/chmod 755 /var/run/zabbix-lts + fi +/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix-lts + +if [ ! -d /var/db/zabbix-lts ] + then + /bin/mkdir -p /var/db/zabbix-lts + /usr/sbin/chmod 755 /var/db/zabbix-lts + fi +/usr/sbin/chown -R zabbix:zabbix /var/db/zabbix-lts + +EOF; + + $zproxy_rcfile="/usr/local/etc/rc.d/zabbix_proxy_lts.sh"; + if (is_array($zbproxy_config) && $zbproxy_config['proxyenabled']=="on"){ + $zproxy_start= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Proxy LTS\"...\n"; + /* start zabbix proxy */ + $zproxy_start .= ZABBIX_PROXY_BASE . "/sbin/zabbix_proxy\n"; + + $zproxy_stop = "echo \"Stopping Zabbix Proxy LTS\"\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" => "zabbix_proxy_lts.sh", + "start" => $zproxy_start, + "stop" => $zproxy_stop + ) + ); + mwexec("{$zproxy_rcfile} restart"); + }else{ + if (file_exists($zproxy_rcfile)){ + mwexec("{$zproxy_rcfile} stop"); + unlink($zproxy_rcfile); + } + } + + $zagent_rcfile="/usr/local/etc/rc.d/zabbix_agentd_lts.sh"; + if (is_array($zbagent_config) && $zbagent_config['agentenabled']=="on"){ + $zagent_start .= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Agent LTS...\"\n"; + $zagent_start .= ZABBIX_AGENT_BASE . "/sbin/zabbix_agentd\n"; + + $zagent_stop = "echo \"Stopping Zabbix Agent LTS...\"\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" => "zabbix_agentd_lts.sh", + "start" => "$zagent_start", + "stop" => "$zagent_stop" + ) + ); + mwexec("{$zagent_rcfile} restart"); + }else{ + if (file_exists($zagent_rcfile)){ + mwexec("{$zagent_rcfile} stop"); + unlink($zagent_rcfile); + } + } + + conf_mount_ro(); +} + +?> diff --git a/config/zabbix-agent-lts/zabbix-agent-lts.xml b/config/zabbix-agent-lts/zabbix-agent-lts.xml new file mode 100644 index 00000000..b098eb62 --- /dev/null +++ b/config/zabbix-agent-lts/zabbix-agent-lts.xml @@ -0,0 +1,179 @@ + + + + + + zabbixagentlts + Services: Zabbix Agent LTS + Monitoring + 0.8.3 + /usr/local/pkg/zabbix-lts.inc + Zabbix Agent LTS has been created/modified. + Zabbix Agent LTS has been deleted. + /usr/local/etc/rc.d/zabbix_agentd_lts.sh restart + + https://packages.pfsense.org/packages/config/zabbix-lts/zabbix-lts.inc + /usr/local/pkg/ + 0755 + + + Zabbix Agent LTS + Setup Zabbix Agent specific settings +
Services
+ /pkg_edit.php?xml=zabbix-agent-lts.xml&id=0 +
+ + zabbix_agentd_lts + zabbix_agentd_lts.sh + zabbix_agentd + Zabbix Agent LTS host monitor daemon + + + + Agent + /pkg_edit.php?xml=zabbix-agent-lts.xml&id=0 + + + + + + Zabbix Agent LTS Settings + listtopic + + + Enable + agentenabled + Enable Zabbix Agent LTS service + checkbox + + + Server + server + 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 + input + 60 + + + Hostname + hostname + Unique hostname. Required for active checks and must match hostname as configured on the Zabbix server (case sensitive). + input + 60 + + + Listen IP + listenip + 0.0.0.0 + input + 60 + Listen IP for connections from the server (default 0.0.0.0 for all interfaces) + + + Listen Port + listenport + 10050 + input + 5 + Listen port for connections from the server (default 10050) + + + Refresh Active Checks + refreshactchecks + 120 + input + 5 + The agent will refresh list of active checks once per 120 (default) seconds. + + + Timeout + timeout + 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! + + + Buffer Send + buffersend + 5 + input + 5 + Buffer Send (default 5). Do not keep data longer than N seconds in buffer (1-3600). + + + Buffer Size + buffersize + 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. + + + Start Agents + startagents + 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. + + + User Parameters + userparams + base64 + textarea + 5 + 50 + User-defined parameter to monitor. There can be several user-defined parameters. Value has form, example: UserParameter=users,who|wc -l + + + sync_package_zabbix_lts(); + + + + validate_input_zabbix_lts($_POST, $input_errors); + + sync_package_zabbix_lts(); + php_deinstall_zabbix_agent_lts(); +
diff --git a/config/zabbix-lts/zabbix-agent-lts.xml b/config/zabbix-lts/zabbix-agent-lts.xml deleted file mode 100644 index b098eb62..00000000 --- a/config/zabbix-lts/zabbix-agent-lts.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - zabbixagentlts - Services: Zabbix Agent LTS - Monitoring - 0.8.3 - /usr/local/pkg/zabbix-lts.inc - Zabbix Agent LTS has been created/modified. - Zabbix Agent LTS has been deleted. - /usr/local/etc/rc.d/zabbix_agentd_lts.sh restart - - https://packages.pfsense.org/packages/config/zabbix-lts/zabbix-lts.inc - /usr/local/pkg/ - 0755 - - - Zabbix Agent LTS - Setup Zabbix Agent specific settings -
Services
- /pkg_edit.php?xml=zabbix-agent-lts.xml&id=0 -
- - zabbix_agentd_lts - zabbix_agentd_lts.sh - zabbix_agentd - Zabbix Agent LTS host monitor daemon - - - - Agent - /pkg_edit.php?xml=zabbix-agent-lts.xml&id=0 - - - - - - Zabbix Agent LTS Settings - listtopic - - - Enable - agentenabled - Enable Zabbix Agent LTS service - checkbox - - - Server - server - 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 - input - 60 - - - Hostname - hostname - Unique hostname. Required for active checks and must match hostname as configured on the Zabbix server (case sensitive). - input - 60 - - - Listen IP - listenip - 0.0.0.0 - input - 60 - Listen IP for connections from the server (default 0.0.0.0 for all interfaces) - - - Listen Port - listenport - 10050 - input - 5 - Listen port for connections from the server (default 10050) - - - Refresh Active Checks - refreshactchecks - 120 - input - 5 - The agent will refresh list of active checks once per 120 (default) seconds. - - - Timeout - timeout - 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! - - - Buffer Send - buffersend - 5 - input - 5 - Buffer Send (default 5). Do not keep data longer than N seconds in buffer (1-3600). - - - Buffer Size - buffersize - 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. - - - Start Agents - startagents - 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. - - - User Parameters - userparams - base64 - textarea - 5 - 50 - User-defined parameter to monitor. There can be several user-defined parameters. Value has form, example: UserParameter=users,who|wc -l - - - sync_package_zabbix_lts(); - - - - validate_input_zabbix_lts($_POST, $input_errors); - - sync_package_zabbix_lts(); - php_deinstall_zabbix_agent_lts(); -
diff --git a/config/zabbix-lts/zabbix-lts.inc b/config/zabbix-lts/zabbix-lts.inc deleted file mode 100644 index af446261..00000000 --- a/config/zabbix-lts/zabbix-lts.inc +++ /dev/null @@ -1,362 +0,0 @@ - 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\''; - } - } - - 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\''; - } - } - - 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\''; - } - } - - 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\''; - } - } - } -} - -function sync_package_zabbix_lts(){ - global $config, $g; - - conf_mount_rw(); - - #check zabbix proxy config - if (is_array($config['installedpackages']['zabbixproxylts'])){ - $zbproxy_config = $config['installedpackages']['zabbixproxylts']['config'][0]; - 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']} -Hostname={$zbproxy_config['hostname']} -PidFile=/var/run/zabbix-lts/zabbix_proxy_lts.pid -DBName=/var/db/zabbix-lts/proxy.db -LogFile=/var/log/zabbix-lts/zabbix_proxy_lts.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 -Fping6Location=/usr/local/sbin/fping6 -ProxyMode={$Mode} -{$AdvancedParams} - -EOF; - file_put_contents(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy.conf", strtr($zbproxy_conf_file, array("\r" => ""))); - } - } - /* check zabbix agent settings*/ - if (is_array($config['installedpackages']['zabbixagentlts'])){ - $zbagent_config = $config['installedpackages']['zabbixagentlts']['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"); - - $zbagent_conf_file = <<< EOF -Server={$zbagent_config['server']} -ServerActive={$zbagent_config['serveractive']} -Hostname={$zbagent_config['hostname']} -ListenIP={$ListenIp} -ListenPort={$ListenPort} -RefreshActiveChecks={$RefreshActChecks} -DebugLevel=3 -PidFile=/var/run/zabbix-lts/zabbix_agentd_lts.pid -LogFile=/var/log/zabbix-lts/zabbix_agentd_lts.log -LogFileSize=1 -Timeout={$TimeOut} -BufferSend={$BufferSend} -BufferSize={$BufferSize} -StartAgents={$StartAgents} -{$UserParams} - -EOF; - file_put_contents(ZABBIX_AGENT_BASE . "/etc/zabbix22/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 - $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; - } - } - foreach ($want_sysctls as $ws=> $wv) { - $sc_file .= "{$ws}={$wv}\n"; - exec("/sbin/sysctl {$ws}={$wv}"); - } - file_put_contents("/etc/sysctl.conf", $sc_file); - - #check bootloader values - $lt_file=""; - $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("/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; - } - } - foreach ($want_tunables as $wt => $wv) { - $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/zabbix22")) - exec("/bin/mkdir -p " . ZABBIX_PROXY_BASE . "/etc/zabbix22"); - - $dir_checks = <<< EOF -if [ ! -d /var/log/zabbix-lts ] - then - /bin/mkdir -p /var/log/zabbix-lts - /usr/sbin/chmod 755 /var/log/zabbix-lts - fi -/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix-lts - -if [ ! -d /var/run/zabbix-lts ] - then - /bin/mkdir -p /var/run/zabbix-lts - /usr/sbin/chmod 755 /var/run/zabbix-lts - fi -/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix-lts - -if [ ! -d /var/db/zabbix-lts ] - then - /bin/mkdir -p /var/db/zabbix-lts - /usr/sbin/chmod 755 /var/db/zabbix-lts - fi -/usr/sbin/chown -R zabbix:zabbix /var/db/zabbix-lts - -EOF; - - $zproxy_rcfile="/usr/local/etc/rc.d/zabbix_proxy_lts.sh"; - if (is_array($zbproxy_config) && $zbproxy_config['proxyenabled']=="on"){ - $zproxy_start= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Proxy LTS\"...\n"; - /* start zabbix proxy */ - $zproxy_start .= ZABBIX_PROXY_BASE . "/sbin/zabbix_proxy\n"; - - $zproxy_stop = "echo \"Stopping Zabbix Proxy LTS\"\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" => "zabbix_proxy_lts.sh", - "start" => $zproxy_start, - "stop" => $zproxy_stop - ) - ); - mwexec("{$zproxy_rcfile} restart"); - }else{ - if (file_exists($zproxy_rcfile)){ - mwexec("{$zproxy_rcfile} stop"); - unlink($zproxy_rcfile); - } - } - - $zagent_rcfile="/usr/local/etc/rc.d/zabbix_agentd_lts.sh"; - if (is_array($zbagent_config) && $zbagent_config['agentenabled']=="on"){ - $zagent_start .= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Agent LTS...\"\n"; - $zagent_start .= ZABBIX_AGENT_BASE . "/sbin/zabbix_agentd\n"; - - $zagent_stop = "echo \"Stopping Zabbix Agent LTS...\"\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" => "zabbix_agentd_lts.sh", - "start" => "$zagent_start", - "stop" => "$zagent_stop" - ) - ); - mwexec("{$zagent_rcfile} restart"); - }else{ - if (file_exists($zagent_rcfile)){ - mwexec("{$zagent_rcfile} stop"); - unlink($zagent_rcfile); - } - } - - conf_mount_ro(); -} - -?> diff --git a/config/zabbix-lts/zabbix-proxy-lts.xml b/config/zabbix-lts/zabbix-proxy-lts.xml deleted file mode 100644 index de9f1e1c..00000000 --- a/config/zabbix-lts/zabbix-proxy-lts.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - zabbixproxylts - Services: Zabbix Proxy LTS - Monitoring - 0.8.3 - /usr/local/pkg/zabbix-lts.inc - Zabbix Proxy has been created/modified. - Zabbix Proxy has been deleted. - /usr/local/etc/rc.d/zabbix_proxy_lts.sh restart - - https://packages.pfsense.org/packages/config/zabbix-lts/zabbix-lts.inc - /usr/local/pkg/ - 0755 - - - Zabbix Proxy LTS - Setup Zabbix Proxy LTS specific settings -
Services
- /pkg_edit.php?xml=zabbix-proxy-lts.xml&id=0 -
- - zabbix_proxy_lts - zabbix_proxy_lts.sh - zabbix_proxy - Zabbix Proxy LTS collection daemon - - - - Proxy - /pkg_edit.php?xml=zabbix-proxy-lts.xml&id=0 - - - - - - Zabbix Proxy LTS Settings - listtopic - - - Enable - proxyenabled - Enable Zabbix Proxy LTS service - checkbox - - - Server - server - 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 - - - Hostname - hostname - Unique, case-sensitive proxy name. Make sure the proxy name is known to the server - localhost - input - 50 - true - - - Proxy Mode - proxymode - Select Zabbix proxy mode (Active is default) - select - 0 - - - - - true - - - Config Frequency - configfrequency - How often the proxy retrieves configuration data from the Zabbix server in seconds. Ignored if the proxy runs in passive mode. - 3600 - input - 10 - true - - - Advanced Parameters - advancedparams - base64 - textarea - 5 - 50 - Advanced parameters. There are some rarely used parameters that sometimes need to be defined. Value has form, example: StartDiscoverers=10 - - - sync_package_zabbix_lts(); - - - - validate_input_zabbix_lts($_POST, $input_errors); - - sync_package_zabbix_lts(); - php_deinstall_zabbix_proxy_lts(); -
diff --git a/config/zabbix-proxy-lts/zabbix-proxy-lts.inc b/config/zabbix-proxy-lts/zabbix-proxy-lts.inc new file mode 100644 index 00000000..af446261 --- /dev/null +++ b/config/zabbix-proxy-lts/zabbix-proxy-lts.inc @@ -0,0 +1,362 @@ + 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\''; + } + } + + 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\''; + } + } + + 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\''; + } + } + + 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\''; + } + } + } +} + +function sync_package_zabbix_lts(){ + global $config, $g; + + conf_mount_rw(); + + #check zabbix proxy config + if (is_array($config['installedpackages']['zabbixproxylts'])){ + $zbproxy_config = $config['installedpackages']['zabbixproxylts']['config'][0]; + 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']} +Hostname={$zbproxy_config['hostname']} +PidFile=/var/run/zabbix-lts/zabbix_proxy_lts.pid +DBName=/var/db/zabbix-lts/proxy.db +LogFile=/var/log/zabbix-lts/zabbix_proxy_lts.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 +Fping6Location=/usr/local/sbin/fping6 +ProxyMode={$Mode} +{$AdvancedParams} + +EOF; + file_put_contents(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy.conf", strtr($zbproxy_conf_file, array("\r" => ""))); + } + } + /* check zabbix agent settings*/ + if (is_array($config['installedpackages']['zabbixagentlts'])){ + $zbagent_config = $config['installedpackages']['zabbixagentlts']['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"); + + $zbagent_conf_file = <<< EOF +Server={$zbagent_config['server']} +ServerActive={$zbagent_config['serveractive']} +Hostname={$zbagent_config['hostname']} +ListenIP={$ListenIp} +ListenPort={$ListenPort} +RefreshActiveChecks={$RefreshActChecks} +DebugLevel=3 +PidFile=/var/run/zabbix-lts/zabbix_agentd_lts.pid +LogFile=/var/log/zabbix-lts/zabbix_agentd_lts.log +LogFileSize=1 +Timeout={$TimeOut} +BufferSend={$BufferSend} +BufferSize={$BufferSize} +StartAgents={$StartAgents} +{$UserParams} + +EOF; + file_put_contents(ZABBIX_AGENT_BASE . "/etc/zabbix22/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 + $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; + } + } + foreach ($want_sysctls as $ws=> $wv) { + $sc_file .= "{$ws}={$wv}\n"; + exec("/sbin/sysctl {$ws}={$wv}"); + } + file_put_contents("/etc/sysctl.conf", $sc_file); + + #check bootloader values + $lt_file=""; + $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("/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; + } + } + foreach ($want_tunables as $wt => $wv) { + $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/zabbix22")) + exec("/bin/mkdir -p " . ZABBIX_PROXY_BASE . "/etc/zabbix22"); + + $dir_checks = <<< EOF +if [ ! -d /var/log/zabbix-lts ] + then + /bin/mkdir -p /var/log/zabbix-lts + /usr/sbin/chmod 755 /var/log/zabbix-lts + fi +/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix-lts + +if [ ! -d /var/run/zabbix-lts ] + then + /bin/mkdir -p /var/run/zabbix-lts + /usr/sbin/chmod 755 /var/run/zabbix-lts + fi +/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix-lts + +if [ ! -d /var/db/zabbix-lts ] + then + /bin/mkdir -p /var/db/zabbix-lts + /usr/sbin/chmod 755 /var/db/zabbix-lts + fi +/usr/sbin/chown -R zabbix:zabbix /var/db/zabbix-lts + +EOF; + + $zproxy_rcfile="/usr/local/etc/rc.d/zabbix_proxy_lts.sh"; + if (is_array($zbproxy_config) && $zbproxy_config['proxyenabled']=="on"){ + $zproxy_start= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Proxy LTS\"...\n"; + /* start zabbix proxy */ + $zproxy_start .= ZABBIX_PROXY_BASE . "/sbin/zabbix_proxy\n"; + + $zproxy_stop = "echo \"Stopping Zabbix Proxy LTS\"\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" => "zabbix_proxy_lts.sh", + "start" => $zproxy_start, + "stop" => $zproxy_stop + ) + ); + mwexec("{$zproxy_rcfile} restart"); + }else{ + if (file_exists($zproxy_rcfile)){ + mwexec("{$zproxy_rcfile} stop"); + unlink($zproxy_rcfile); + } + } + + $zagent_rcfile="/usr/local/etc/rc.d/zabbix_agentd_lts.sh"; + if (is_array($zbagent_config) && $zbagent_config['agentenabled']=="on"){ + $zagent_start .= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Agent LTS...\"\n"; + $zagent_start .= ZABBIX_AGENT_BASE . "/sbin/zabbix_agentd\n"; + + $zagent_stop = "echo \"Stopping Zabbix Agent LTS...\"\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" => "zabbix_agentd_lts.sh", + "start" => "$zagent_start", + "stop" => "$zagent_stop" + ) + ); + mwexec("{$zagent_rcfile} restart"); + }else{ + if (file_exists($zagent_rcfile)){ + mwexec("{$zagent_rcfile} stop"); + unlink($zagent_rcfile); + } + } + + conf_mount_ro(); +} + +?> diff --git a/config/zabbix-proxy-lts/zabbix-proxy-lts.xml b/config/zabbix-proxy-lts/zabbix-proxy-lts.xml new file mode 100644 index 00000000..de9f1e1c --- /dev/null +++ b/config/zabbix-proxy-lts/zabbix-proxy-lts.xml @@ -0,0 +1,150 @@ + + + + + + zabbixproxylts + Services: Zabbix Proxy LTS + Monitoring + 0.8.3 + /usr/local/pkg/zabbix-lts.inc + Zabbix Proxy has been created/modified. + Zabbix Proxy has been deleted. + /usr/local/etc/rc.d/zabbix_proxy_lts.sh restart + + https://packages.pfsense.org/packages/config/zabbix-lts/zabbix-lts.inc + /usr/local/pkg/ + 0755 + + + Zabbix Proxy LTS + Setup Zabbix Proxy LTS specific settings +
Services
+ /pkg_edit.php?xml=zabbix-proxy-lts.xml&id=0 +
+ + zabbix_proxy_lts + zabbix_proxy_lts.sh + zabbix_proxy + Zabbix Proxy LTS collection daemon + + + + Proxy + /pkg_edit.php?xml=zabbix-proxy-lts.xml&id=0 + + + + + + Zabbix Proxy LTS Settings + listtopic + + + Enable + proxyenabled + Enable Zabbix Proxy LTS service + checkbox + + + Server + server + 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 + + + Hostname + hostname + Unique, case-sensitive proxy name. Make sure the proxy name is known to the server + localhost + input + 50 + true + + + Proxy Mode + proxymode + Select Zabbix proxy mode (Active is default) + select + 0 + + + + + true + + + Config Frequency + configfrequency + How often the proxy retrieves configuration data from the Zabbix server in seconds. Ignored if the proxy runs in passive mode. + 3600 + input + 10 + true + + + Advanced Parameters + advancedparams + base64 + textarea + 5 + 50 + Advanced parameters. There are some rarely used parameters that sometimes need to be defined. Value has form, example: StartDiscoverers=10 + + + sync_package_zabbix_lts(); + + + + validate_input_zabbix_lts($_POST, $input_errors); + + sync_package_zabbix_lts(); + php_deinstall_zabbix_proxy_lts(); +
-- cgit v1.2.3 From 20ef8140d13c5ca6bc5b32485407d0390276a9bb Mon Sep 17 00:00:00 2001 From: "Danilo G. Baio (dbaio)" Date: Thu, 14 May 2015 13:03:10 -0300 Subject: zabbix_agent_lts - separate structure from old shared .inc --- config/zabbix-agent-lts/zabbix-agent-lts.inc | 147 +++++---------------------- config/zabbix-agent-lts/zabbix-agent-lts.xml | 10 +- 2 files changed, 33 insertions(+), 124 deletions(-) (limited to 'config') diff --git a/config/zabbix-agent-lts/zabbix-agent-lts.inc b/config/zabbix-agent-lts/zabbix-agent-lts.inc index af446261..e3e5570c 100644 --- a/config/zabbix-agent-lts/zabbix-agent-lts.inc +++ b/config/zabbix-agent-lts/zabbix-agent-lts.inc @@ -2,7 +2,7 @@ /* $Id$ */ /* ========================================================================== */ /* - zabbix-lts.inc + zabbix-agent-lts.inc part of the Zabbix package for pfSense Copyright (C) 2013 Danilo G. Baio Copyright (C) 2013 Marcello Coutinho @@ -41,14 +41,12 @@ require_once("globals.inc"); $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); if ($pf_version == "2.1" || $pf_version == "2.2") { define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix22-agent-' . php_uname("m")); - define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix22-proxy-' . php_uname("m")); } else { define('ZABBIX_AGENT_BASE', '/usr/local'); - define('ZABBIX_AGENT_BASE', '/usr/local'); } -function php_install_zabbix_lts(){ - sync_package_zabbix_lts(); +function php_install_zabbix_agent_lts(){ + sync_package_zabbix_agent_lts(); } function php_deinstall_zabbix_agent_lts(){ @@ -59,62 +57,30 @@ function php_deinstall_zabbix_agent_lts(){ exec("/usr/bin/killall zabbix_agentd"); unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/rc.d/zabbix_agentd_lts.sh"); unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/zabbix22/zabbix_agentd.conf"); - unlink_if_exists("/var/log/zabbix-lts/zabbix_agentd_lts.log"); - unlink_if_exists("/var/run/zabbix-lts/zabbix_agentd_lts.pid"); - - if (!is_array($config['installedpackages']['zabbixproxylts'])){ - if (is_dir("/var/log/zabbix-lts")) - exec("/bin/rm -r /var/log/zabbix-lts/"); - if (is_dir("/var/run/zabbix-lts")) - exec("/bin/rm -r /var/run/zabbix-lts/"); - } - - conf_mount_ro(); -} - -function php_deinstall_zabbix_proxy_lts(){ - global $config, $g; - - conf_mount_rw(); + unlink_if_exists("/var/log/zabbix-agent-lts/zabbix_agentd_lts.log"); + unlink_if_exists("/var/run/zabbix-agent-lts/zabbix_agentd_lts.pid"); - exec("/usr/bin/killall zabbix_proxy"); - unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/rc.d/zabbix_proxy_lts.sh"); - unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy.conf"); - unlink_if_exists("/var/log/zabbix-lts/zabbix_proxy_lts.log"); - unlink_if_exists("/var/run/zabbix-lts/zabbix_proxy_lts.pid"); - - if (!is_array($config['installedpackages']['zabbixagentlts'])){ - if (is_dir("/var/log/zabbix-lts")) - exec("/bin/rm -r /var/log/zabbix-lts/"); - if (is_dir("/var/run/zabbix-lts")) - exec("/bin/rm -r /var/run/zabbix-lts/"); - } + if (is_dir("/var/log/zabbix-agent-lts")) { + exec("/bin/rm -r /var/log/zabbix-agent-lts/"); + } - if (is_dir("/var/db/zabbix-lts")) - exec("/bin/rm -r /var/db/zabbix-lts/"); + if (is_dir("/var/run/zabbix-agent-lts")) { + exec("/bin/rm -r /var/run/zabbix-agent-lts/"); + } conf_mount_ro(); } -function validate_input_zabbix_lts($post, &$input_errors){ +function validate_input_zabbix_agent_lts($post, &$input_errors){ - if (isset($post['proxyenabled'])){ - if (!is_numericint($post['serverport'])) { - $input_errors[]='Server Port is not numeric.'.$ServerPort; - } - - if (!is_numericint($post['configfrequency'])) { - $input_errors[]='Config Frequency is not numeric.'; - } - } - if (isset($post['agentenabled'])){ + if (isset($post['agentenabled'])) { if (!preg_match("/\w+/", $post['server'])) { $input_errors[]='Server field is required.'; - } + } if (!preg_match("/\w+/", $post['hostname'])) { $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'])) { @@ -170,36 +136,11 @@ function validate_input_zabbix_lts($post, &$input_errors){ } } -function sync_package_zabbix_lts(){ +function sync_package_zabbix_agent_lts(){ global $config, $g; conf_mount_rw(); - #check zabbix proxy config - if (is_array($config['installedpackages']['zabbixproxylts'])){ - $zbproxy_config = $config['installedpackages']['zabbixproxylts']['config'][0]; - 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']} -Hostname={$zbproxy_config['hostname']} -PidFile=/var/run/zabbix-lts/zabbix_proxy_lts.pid -DBName=/var/db/zabbix-lts/proxy.db -LogFile=/var/log/zabbix-lts/zabbix_proxy_lts.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 -Fping6Location=/usr/local/sbin/fping6 -ProxyMode={$Mode} -{$AdvancedParams} - -EOF; - file_put_contents(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy.conf", strtr($zbproxy_conf_file, array("\r" => ""))); - } - } /* check zabbix agent settings*/ if (is_array($config['installedpackages']['zabbixagentlts'])){ $zbagent_config = $config['installedpackages']['zabbixagentlts']['config'][0]; @@ -221,8 +162,8 @@ ListenIP={$ListenIp} ListenPort={$ListenPort} RefreshActiveChecks={$RefreshActChecks} DebugLevel=3 -PidFile=/var/run/zabbix-lts/zabbix_agentd_lts.pid -LogFile=/var/log/zabbix-lts/zabbix_agentd_lts.log +PidFile=/var/run/zabbix-agent-lts/zabbix_agentd_lts.pid +LogFile=/var/log/zabbix-agent-lts/zabbix_agentd_lts.log LogFileSize=1 Timeout={$TimeOut} BufferSend={$BufferSend} @@ -280,58 +221,26 @@ EOF; /*check startup script files*/ /* create a few directories and ensure the sample files are in place */ - if (!is_dir(ZABBIX_PROXY_BASE . "/etc/zabbix22")) - exec("/bin/mkdir -p " . ZABBIX_PROXY_BASE . "/etc/zabbix22"); + if (!is_dir(ZABBIX_AGENT_BASE . "/etc/zabbix22")) + exec("/bin/mkdir -p " . ZABBIX_AGENT_BASE . "/etc/zabbix22"); $dir_checks = <<< EOF -if [ ! -d /var/log/zabbix-lts ] - then - /bin/mkdir -p /var/log/zabbix-lts - /usr/sbin/chmod 755 /var/log/zabbix-lts - fi -/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix-lts - -if [ ! -d /var/run/zabbix-lts ] +if [ ! -d /var/log/zabbix-agent-lts ] then - /bin/mkdir -p /var/run/zabbix-lts - /usr/sbin/chmod 755 /var/run/zabbix-lts + /bin/mkdir -p /var/log/zabbix-agent-lts + /usr/sbin/chmod 755 /var/log/zabbix-agent-lts fi -/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix-lts +/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix-agent-lts -if [ ! -d /var/db/zabbix-lts ] +if [ ! -d /var/run/zabbix-agent-lts ] then - /bin/mkdir -p /var/db/zabbix-lts - /usr/sbin/chmod 755 /var/db/zabbix-lts + /bin/mkdir -p /var/run/zabbix-agent-lts + /usr/sbin/chmod 755 /var/run/zabbix-agent-lts fi -/usr/sbin/chown -R zabbix:zabbix /var/db/zabbix-lts +/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix-agent-lts EOF; - $zproxy_rcfile="/usr/local/etc/rc.d/zabbix_proxy_lts.sh"; - if (is_array($zbproxy_config) && $zbproxy_config['proxyenabled']=="on"){ - $zproxy_start= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Proxy LTS\"...\n"; - /* start zabbix proxy */ - $zproxy_start .= ZABBIX_PROXY_BASE . "/sbin/zabbix_proxy\n"; - - $zproxy_stop = "echo \"Stopping Zabbix Proxy LTS\"\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" => "zabbix_proxy_lts.sh", - "start" => $zproxy_start, - "stop" => $zproxy_stop - ) - ); - mwexec("{$zproxy_rcfile} restart"); - }else{ - if (file_exists($zproxy_rcfile)){ - mwexec("{$zproxy_rcfile} stop"); - unlink($zproxy_rcfile); - } - } - $zagent_rcfile="/usr/local/etc/rc.d/zabbix_agentd_lts.sh"; if (is_array($zbagent_config) && $zbagent_config['agentenabled']=="on"){ $zagent_start .= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Agent LTS...\"\n"; diff --git a/config/zabbix-agent-lts/zabbix-agent-lts.xml b/config/zabbix-agent-lts/zabbix-agent-lts.xml index b098eb62..d49c79db 100644 --- a/config/zabbix-agent-lts/zabbix-agent-lts.xml +++ b/config/zabbix-agent-lts/zabbix-agent-lts.xml @@ -42,12 +42,12 @@ Services: Zabbix Agent LTS Monitoring 0.8.3 - /usr/local/pkg/zabbix-lts.inc + /usr/local/pkg/zabbix-agent-lts.inc Zabbix Agent LTS has been created/modified. Zabbix Agent LTS has been deleted. /usr/local/etc/rc.d/zabbix_agentd_lts.sh restart - https://packages.pfsense.org/packages/config/zabbix-lts/zabbix-lts.inc + https://packages.pfsense.org/packages/config/zabbix-agent-lts/zabbix-agent-lts.inc /usr/local/pkg/ 0755 @@ -168,12 +168,12 @@ User-defined parameter to monitor. There can be several user-defined parameters. Value has form, example: UserParameter=users,who|wc -l - sync_package_zabbix_lts(); + sync_package_zabbix_agent_lts(); - validate_input_zabbix_lts($_POST, $input_errors); + validate_input_zabbix_agent_lts($_POST, $input_errors); - sync_package_zabbix_lts(); + sync_package_zabbix_agent_lts(); php_deinstall_zabbix_agent_lts(); -- cgit v1.2.3 From fe5d10e5125b3dbdade3daed2cd8e9443559059c Mon Sep 17 00:00:00 2001 From: "Danilo G. Baio (dbaio)" Date: Thu, 14 May 2015 14:09:41 -0300 Subject: zabbix_proxy_lts - separate structure from old shared .inc --- config/zabbix-proxy-lts/zabbix-proxy-lts.inc | 216 +++++---------------------- config/zabbix-proxy-lts/zabbix-proxy-lts.xml | 10 +- 2 files changed, 46 insertions(+), 180 deletions(-) (limited to 'config') diff --git a/config/zabbix-proxy-lts/zabbix-proxy-lts.inc b/config/zabbix-proxy-lts/zabbix-proxy-lts.inc index af446261..3fc71a84 100644 --- a/config/zabbix-proxy-lts/zabbix-proxy-lts.inc +++ b/config/zabbix-proxy-lts/zabbix-proxy-lts.inc @@ -2,7 +2,7 @@ /* $Id$ */ /* ========================================================================== */ /* - zabbix-lts.inc + zabbix-proxy-lts.inc part of the Zabbix package for pfSense Copyright (C) 2013 Danilo G. Baio Copyright (C) 2013 Marcello Coutinho @@ -40,36 +40,13 @@ require_once("globals.inc"); $pf_version=substr(trim(file_get_contents("/etc/version")),0,3); if ($pf_version == "2.1" || $pf_version == "2.2") { - define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix22-agent-' . php_uname("m")); define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix22-proxy-' . php_uname("m")); } else { - define('ZABBIX_AGENT_BASE', '/usr/local'); - define('ZABBIX_AGENT_BASE', '/usr/local'); + define('ZABBIX_PROXY_BASE', '/usr/local'); } -function php_install_zabbix_lts(){ - sync_package_zabbix_lts(); -} - -function php_deinstall_zabbix_agent_lts(){ - global $config, $g; - - conf_mount_rw(); - - exec("/usr/bin/killall zabbix_agentd"); - unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/rc.d/zabbix_agentd_lts.sh"); - unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/zabbix22/zabbix_agentd.conf"); - unlink_if_exists("/var/log/zabbix-lts/zabbix_agentd_lts.log"); - unlink_if_exists("/var/run/zabbix-lts/zabbix_agentd_lts.pid"); - - if (!is_array($config['installedpackages']['zabbixproxylts'])){ - if (is_dir("/var/log/zabbix-lts")) - exec("/bin/rm -r /var/log/zabbix-lts/"); - if (is_dir("/var/run/zabbix-lts")) - exec("/bin/rm -r /var/run/zabbix-lts/"); - } - - conf_mount_ro(); +function php_install_zabbix_proxy_lts(){ + sync_package_zabbix_proxy_lts(); } function php_deinstall_zabbix_proxy_lts(){ @@ -79,98 +56,44 @@ function php_deinstall_zabbix_proxy_lts(){ exec("/usr/bin/killall zabbix_proxy"); unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/rc.d/zabbix_proxy_lts.sh"); - unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy.conf"); - unlink_if_exists("/var/log/zabbix-lts/zabbix_proxy_lts.log"); - unlink_if_exists("/var/run/zabbix-lts/zabbix_proxy_lts.pid"); - - if (!is_array($config['installedpackages']['zabbixagentlts'])){ - if (is_dir("/var/log/zabbix-lts")) - exec("/bin/rm -r /var/log/zabbix-lts/"); - if (is_dir("/var/run/zabbix-lts")) - exec("/bin/rm -r /var/run/zabbix-lts/"); - } + unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy_lts.conf"); + unlink_if_exists("/var/log/zabbix-proxy-lts/zabbix_proxy_lts.log"); + unlink_if_exists("/var/run/zabbix-proxy-lts/zabbix_proxy_lts.pid"); - if (is_dir("/var/db/zabbix-lts")) - exec("/bin/rm -r /var/db/zabbix-lts/"); + if (is_dir("/var/log/zabbix-proxy-lts")) { + exec("/bin/rm -r /var/log/zabbix-proxy-lts/"); + } + if (is_dir("/var/run/zabbix-proxy-lts")) { + exec("/bin/rm -r /var/run/zabbix-proxy-lts/"); + } + if (is_dir("/var/db/zabbix-proxy-lts")) { + exec("/bin/rm -r /var/db/zabbix-proxy-lts/"); + } conf_mount_ro(); } -function validate_input_zabbix_lts($post, &$input_errors){ - - if (isset($post['proxyenabled'])){ - if (!is_numericint($post['serverport'])) { - $input_errors[]='Server Port is not numeric.'.$ServerPort; - } - - if (!is_numericint($post['configfrequency'])) { - $input_errors[]='Config Frequency is not numeric.'; - } - } - if (isset($post['agentenabled'])){ +function validate_input_zabbix_proxy_lts($post, &$input_errors){ + if (isset($post['proxyenabled'])) { if (!preg_match("/\w+/", $post['server'])) { $input_errors[]='Server field is required.'; - } - - if (!preg_match("/\w+/", $post['hostname'])) { - $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 ($post['listenport'] != '') { - if (!preg_match("/^\d+$/", $post['listenport'])) { - $input_errors[]='Listen Port is not numeric.'; - } + if (!is_numericint($post['serverport'])) { + $input_errors[]='Server Port is not numeric.'.$ServerPort; } - 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 (!preg_match("/\w+/", $post['hostname'])) { + $input_errors[]='Hostname field is required.'; } - 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\''; - } - } - - 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\''; - } - } - - 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\''; - } - } - - 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\''; - } + if (!is_numericint($post['configfrequency'])) { + $input_errors[]='Config Frequency is not numeric.'; } - } + } } -function sync_package_zabbix_lts(){ +function sync_package_zabbix_proxy_lts(){ global $config, $g; conf_mount_rw(); @@ -186,9 +109,9 @@ function sync_package_zabbix_lts(){ Server={$zbproxy_config['server']} ServerPort={$zbproxy_config['serverport']} Hostname={$zbproxy_config['hostname']} -PidFile=/var/run/zabbix-lts/zabbix_proxy_lts.pid -DBName=/var/db/zabbix-lts/proxy.db -LogFile=/var/log/zabbix-lts/zabbix_proxy_lts.log +PidFile=/var/run/zabbix-proxy-lts/zabbix_proxy_lts.pid +DBName=/var/db/zabbix-proxy-lts/proxy.db +LogFile=/var/log/zabbix-proxy-lts/zabbix_proxy_lts.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 @@ -200,40 +123,7 @@ EOF; file_put_contents(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy.conf", strtr($zbproxy_conf_file, array("\r" => ""))); } } - /* check zabbix agent settings*/ - if (is_array($config['installedpackages']['zabbixagentlts'])){ - $zbagent_config = $config['installedpackages']['zabbixagentlts']['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"); - - $zbagent_conf_file = <<< EOF -Server={$zbagent_config['server']} -ServerActive={$zbagent_config['serveractive']} -Hostname={$zbagent_config['hostname']} -ListenIP={$ListenIp} -ListenPort={$ListenPort} -RefreshActiveChecks={$RefreshActChecks} -DebugLevel=3 -PidFile=/var/run/zabbix-lts/zabbix_agentd_lts.pid -LogFile=/var/log/zabbix-lts/zabbix_agentd_lts.log -LogFileSize=1 -Timeout={$TimeOut} -BufferSend={$BufferSend} -BufferSize={$BufferSize} -StartAgents={$StartAgents} -{$UserParams} -EOF; - file_put_contents(ZABBIX_AGENT_BASE . "/etc/zabbix22/zabbix_agentd.conf", strtr($zbagent_conf_file, array("\r" => ""))); - } - } $want_sysctls = array( 'kern.ipc.shmall' => '2097152', 'kern.ipc.shmmax' => '2147483648', @@ -284,26 +174,26 @@ EOF; exec("/bin/mkdir -p " . ZABBIX_PROXY_BASE . "/etc/zabbix22"); $dir_checks = <<< EOF -if [ ! -d /var/log/zabbix-lts ] +if [ ! -d /var/log/zabbix-proxy-lts ] then - /bin/mkdir -p /var/log/zabbix-lts - /usr/sbin/chmod 755 /var/log/zabbix-lts + /bin/mkdir -p /var/log/zabbix-proxy-lts + /usr/sbin/chmod 755 /var/log/zabbix-proxy-lts fi -/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix-lts +/usr/sbin/chown -R zabbix:zabbix /var/log/zabbix-proxy-lts -if [ ! -d /var/run/zabbix-lts ] +if [ ! -d /var/run/zabbix-proxy-lts ] then - /bin/mkdir -p /var/run/zabbix-lts - /usr/sbin/chmod 755 /var/run/zabbix-lts + /bin/mkdir -p /var/run/zabbix-proxy-lts + /usr/sbin/chmod 755 /var/run/zabbix-proxy-lts fi -/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix-lts +/usr/sbin/chown -R zabbix:zabbix /var/run/zabbix-proxy-lts -if [ ! -d /var/db/zabbix-lts ] +if [ ! -d /var/db/zabbix-proxy-lts ] then - /bin/mkdir -p /var/db/zabbix-lts - /usr/sbin/chmod 755 /var/db/zabbix-lts + /bin/mkdir -p /var/db/zabbix-proxy-lts + /usr/sbin/chmod 755 /var/db/zabbix-proxy-lts fi -/usr/sbin/chown -R zabbix:zabbix /var/db/zabbix-lts +/usr/sbin/chown -R zabbix:zabbix /var/db/zabbix-proxy-lts EOF; @@ -332,30 +222,6 @@ EOF; } } - $zagent_rcfile="/usr/local/etc/rc.d/zabbix_agentd_lts.sh"; - if (is_array($zbagent_config) && $zbagent_config['agentenabled']=="on"){ - $zagent_start .= strtr($dir_checks, array("\r" => "")). "\necho \"Starting Zabbix Agent LTS...\"\n"; - $zagent_start .= ZABBIX_AGENT_BASE . "/sbin/zabbix_agentd\n"; - - $zagent_stop = "echo \"Stopping Zabbix Agent LTS...\"\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" => "zabbix_agentd_lts.sh", - "start" => "$zagent_start", - "stop" => "$zagent_stop" - ) - ); - mwexec("{$zagent_rcfile} restart"); - }else{ - if (file_exists($zagent_rcfile)){ - mwexec("{$zagent_rcfile} stop"); - unlink($zagent_rcfile); - } - } - conf_mount_ro(); } diff --git a/config/zabbix-proxy-lts/zabbix-proxy-lts.xml b/config/zabbix-proxy-lts/zabbix-proxy-lts.xml index de9f1e1c..5454cf6d 100644 --- a/config/zabbix-proxy-lts/zabbix-proxy-lts.xml +++ b/config/zabbix-proxy-lts/zabbix-proxy-lts.xml @@ -42,12 +42,12 @@ Services: Zabbix Proxy LTS Monitoring 0.8.3 - /usr/local/pkg/zabbix-lts.inc + /usr/local/pkg/zabbix-proxy-lts.inc Zabbix Proxy has been created/modified. Zabbix Proxy has been deleted. /usr/local/etc/rc.d/zabbix_proxy_lts.sh restart - https://packages.pfsense.org/packages/config/zabbix-lts/zabbix-lts.inc + https://packages.pfsense.org/packages/config/zabbix-proxy-lts/zabbix-proxy-lts.inc /usr/local/pkg/ 0755 @@ -139,12 +139,12 @@ Advanced parameters. There are some rarely used parameters that sometimes need to be defined. Value has form, example: StartDiscoverers=10 - sync_package_zabbix_lts(); + sync_package_zabbix_proxy_lts(); - validate_input_zabbix_lts($_POST, $input_errors); + validate_input_zabbix_proxy_lts($_POST, $input_errors); - sync_package_zabbix_lts(); + sync_package_zabbix_proxy_lts(); php_deinstall_zabbix_proxy_lts(); -- cgit v1.2.3 From 1e06b33de75c9445463e23fa3d858ca9d2bcb415 Mon Sep 17 00:00:00 2001 From: "Danilo G. Baio (dbaio)" Date: Thu, 14 May 2015 16:17:51 -0300 Subject: zabbix_lts - bump version --- config/zabbix-agent-lts/zabbix-agent-lts.xml | 2 +- config/zabbix-proxy-lts/zabbix-proxy-lts.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/zabbix-agent-lts/zabbix-agent-lts.xml b/config/zabbix-agent-lts/zabbix-agent-lts.xml index d49c79db..b24e2aa2 100644 --- a/config/zabbix-agent-lts/zabbix-agent-lts.xml +++ b/config/zabbix-agent-lts/zabbix-agent-lts.xml @@ -41,7 +41,7 @@ zabbixagentlts Services: Zabbix Agent LTS Monitoring - 0.8.3 + 0.8.4 /usr/local/pkg/zabbix-agent-lts.inc Zabbix Agent LTS has been created/modified. Zabbix Agent LTS has been deleted. diff --git a/config/zabbix-proxy-lts/zabbix-proxy-lts.xml b/config/zabbix-proxy-lts/zabbix-proxy-lts.xml index 5454cf6d..089ccb0a 100644 --- a/config/zabbix-proxy-lts/zabbix-proxy-lts.xml +++ b/config/zabbix-proxy-lts/zabbix-proxy-lts.xml @@ -41,7 +41,7 @@ zabbixproxylts Services: Zabbix Proxy LTS Monitoring - 0.8.3 + 0.8.4 /usr/local/pkg/zabbix-proxy-lts.inc Zabbix Proxy has been created/modified. Zabbix Proxy has been deleted. -- cgit v1.2.3