From 5b728a28cc59cccf7e5beaf89da22bf912553321 Mon Sep 17 00:00:00 2001 From: "Danilo G. Baio (dbaio)" Date: Wed, 18 Feb 2015 09:42:06 -0200 Subject: zabbix - create structure for LTS version --- config/zabbix-lts/zabbix-agent-lts.xml | 179 ++++++++++++++++ config/zabbix-lts/zabbix-lts.inc | 360 +++++++++++++++++++++++++++++++++ config/zabbix-lts/zabbix-proxy-lts.xml | 150 ++++++++++++++ 3 files changed, 689 insertions(+) create mode 100644 config/zabbix-lts/zabbix-agent-lts.xml create mode 100644 config/zabbix-lts/zabbix-lts.inc create mode 100644 config/zabbix-lts/zabbix-proxy-lts.xml (limited to 'config') diff --git a/config/zabbix-lts/zabbix-agent-lts.xml b/config/zabbix-lts/zabbix-agent-lts.xml new file mode 100644 index 00000000..b098eb62 --- /dev/null +++ b/config/zabbix-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-lts.inc b/config/zabbix-lts/zabbix-lts.inc new file mode 100644 index 00000000..8f2a708d --- /dev/null +++ b/config/zabbix-lts/zabbix-lts.inc @@ -0,0 +1,360 @@ + 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(); + + define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix-agent-lts-' . php_uname("m")); + define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix-proxy-lts-' . php_uname("m")); + + #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']['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"); + + $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 new file mode 100644 index 00000000..de9f1e1c --- /dev/null +++ b/config/zabbix-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 22ab5415000130a28403d6efe93d2ea3249b676c Mon Sep 17 00:00:00 2001 From: "Danilo G. Baio (dbaio)" Date: Wed, 18 Feb 2015 12:19:28 -0200 Subject: zabbix - rename PBI custom_name --- config/zabbix-lts/zabbix-lts.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'config') diff --git a/config/zabbix-lts/zabbix-lts.inc b/config/zabbix-lts/zabbix-lts.inc index 8f2a708d..47ea39c5 100644 --- a/config/zabbix-lts/zabbix-lts.inc +++ b/config/zabbix-lts/zabbix-lts.inc @@ -47,7 +47,7 @@ function php_deinstall_zabbix_agent_lts(){ conf_mount_rw(); - define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix-agent-lts-' . php_uname("m")); + define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix22-agent-' . php_uname("m")); exec("/usr/bin/killall zabbix_agentd"); unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/rc.d/zabbix_agentd_lts.sh"); @@ -70,7 +70,7 @@ function php_deinstall_zabbix_proxy_lts(){ conf_mount_rw(); - define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix-proxy-lts-' . php_uname("m")); + define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix22-proxy-' . php_uname("m")); exec("/usr/bin/killall zabbix_proxy"); unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/rc.d/zabbix_proxy_lts.sh"); @@ -170,8 +170,8 @@ function sync_package_zabbix_lts(){ conf_mount_rw(); - define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix-agent-lts-' . php_uname("m")); - define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix-proxy-lts-' . php_uname("m")); + define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix22-agent-' . php_uname("m")); + define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix22-proxy-' . php_uname("m")); #check zabbix proxy config if (is_array($config['installedpackages']['zabbixproxylts'])){ -- cgit v1.2.3