diff options
| author | Scott Ullrich <sullrich@sullrich-MacBookPro.local> | 2009-02-20 11:52:50 -0500 |
|---|---|---|
| committer | Scott Ullrich <sullrich@sullrich-MacBookPro.local> | 2009-02-20 11:52:50 -0500 |
| commit | 381b144ea40eee27d0796b1208b3cc37201b96dd (patch) | |
| tree | 672daed886bef51eb9d4e1db4a5f8fafc3189ad2 | |
| parent | d8ed83fbcee42bbb7b045a9453cc968749ccac34 (diff) | |
| parent | 6d9c4778752ae5d85d84edae9fecc56a85da770a (diff) | |
| download | pfsense-packages-381b144ea40eee27d0796b1208b3cc37201b96dd.tar.gz pfsense-packages-381b144ea40eee27d0796b1208b3cc37201b96dd.tar.bz2 pfsense-packages-381b144ea40eee27d0796b1208b3cc37201b96dd.zip | |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense-packages/mainline
| -rw-r--r-- | config/imspector/services_imspector_logs.php | 14 | ||||
| -rw-r--r-- | config/zabbix-agent/zabbix-agent.xml (renamed from config/zabbix-agent.xml) | 0 | ||||
| -rw-r--r-- | pkg_config.7.xml | 10 |
3 files changed, 16 insertions, 8 deletions
diff --git a/config/imspector/services_imspector_logs.php b/config/imspector/services_imspector_logs.php index 6da86d47..fce9b892 100644 --- a/config/imspector/services_imspector_logs.php +++ b/config/imspector/services_imspector_logs.php @@ -101,15 +101,21 @@ if ($_POST['mode'] == "render") { while (!feof($fd)) { $line = fgets($fd); if(feof($fd)) continue; - - preg_match('/([^,]*),([^,]*),([^,]*),([^,]*),([^,]*),(|.*),(.*)/', $line, $matches); + $new_format = '([^,]*),([^,]*),([^,]*),([^,]*),([^,]*),([^,]*),(.*)'; + $old_format = '([^,]*),([^,]*),([^,]*),([^,]*),([^,]*),(.*)'; + preg_match("/${new_format}|${old_format}/", $line, $matches); $address = $matches[1]; $timestamp = $matches[2]; $direction = $matches[3]; $type = $matches[4]; $filtered = $matches[5]; - $category = $matches[6]; - $data = $matches[7]; + if(count($matches) == 8) { + $category = $matches[6]; + $data = $matches[7]; + } else { + $category = ""; + $data = $matches[6]; + } if($direction == '0') { $bgcolor = $convo_remote_bgcolor; diff --git a/config/zabbix-agent.xml b/config/zabbix-agent/zabbix-agent.xml index 54184b32..54184b32 100644 --- a/config/zabbix-agent.xml +++ b/config/zabbix-agent/zabbix-agent.xml diff --git a/pkg_config.7.xml b/pkg_config.7.xml index b2d96ef9..53a1550b 100644 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -320,7 +320,7 @@ <website>http://www.imspector.org/</website> <category>Network Management</category> <maintainer>billm@pfsense.org</maintainer> - <version>0.8-0</version> + <version>0.8-5</version> <required_version>1.2.1</required_version> <status>BETA</status> <pkginfolink>http://doc.pfsense.org/index.php/IMSpector_package</pkginfolink> @@ -329,6 +329,8 @@ <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url> <depends_on_package>imspector-0.8.tbz</depends_on_package> <depends_on_package>libiconv-1.11_1.tbz</depends_on_package> + <depends_on_package>mysql-client-5.1.30.tbz</depends_on_package> + <depends_on_package>sqlite3-3.5.6.tbz</depends_on_package> </package> <package> <name>nut</name> @@ -567,13 +569,13 @@ <name>Zabbix Agent</name> <descr>Monitoring agent.</descr> <category>Services</category> - <config_file>http://www.pfsense.com/packages/config/zabbix-agent.xml</config_file> + <config_file>http://www.pfsense.com/packages/config/zabbix-agent/zabbix-agent.xml</config_file> <version>0.22</version> <status>FINAL</status> - <required_version>1.2.1</required_version> + <required_version>1.2.3</required_version> <configurationfile>zabbix-agent.xml</configurationfile> <maintainer>remco.verhoef@redfive.biz</maintainer> - <depends_on_package_base_url>ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-6-stable/net-mgmt/</depends_on_package_base_url> + <depends_on_package_base_url>http://www.pfsense.com/packages/config/zabbix-agent/bin/</depends_on_package_base_url> <depends_on_package>zabbix-agent-1.4.5,2.tbz</depends_on_package> </package> <package> |