Merge pull request #473 from individual-it/master

added posibility to use external postgreSQL database to store results of bandwidthd

5 files changed, 71 insertions, 5 deletions

diff --git a/config/bandwidthd/bandwidthd.inc b/config/bandwidthd/bandwidthd.inc
index 829cdf59..00e3cd28 100644
--- a/config/bandwidthd/bandwidthd.inc
+++ b/config/bandwidthd/bandwidthd.inc
@@ -85,6 +85,27 @@ function bandwidthd_install_config() {
 		$output_cdf_string = "output_cdf true\n";
 	else
 		$output_cdf_string = "";
+
+	$output_postgresql = $bandwidthd_config['outputpostgresql'];
+	$postgresql_host = $bandwidthd_config['postgresqlhost'];
+	$postgresql_database = $bandwidthd_config['postgresqldatabase'];
+	$postgresql_username = $bandwidthd_config['postgresqlusername'];
+	$postgresql_password = $bandwidthd_config['postgresqlpassword'];
+	$postgresql_string = "";
+	if($output_postgresql) {
+		if ($postgresql_host && $postgresql_username && $postgresql_database && $postgresql_password)
+			$postgresql_string = "pgsql_connect_string \"user = $postgresql_username dbname = $postgresql_database password = $postgresql_password host = $postgresql_host\"\n";
+		else
+		  	log_error("You have to specify the postgreSQL Host, Database, Username and Password. Exiting.");
+	}
+
+	$sensor_id = $bandwidthd_config['sensorid'];
+
+	if($sensor_id)
+		$sensor_id_string = "sensor_id \"$sensor_id\"";
+	else
+		$sensor_id_string = "";
+
 	$promiscuous = $bandwidthd_config['promiscuous'];
 	if($promiscuous)
 		$promiscuous = "promiscuous true\n";
@@ -190,6 +211,14 @@ $output_cdf_string
 #Read back the cdf file on startup
 $recover_cdf
 
+# Standard postgres connect string, just like php, see postgres docs for
+# details
+$postgresql_string
+
+# Arbitrary sensor name, I recommend the sensors fully qualified domain
+# name
+$sensor_id_string
+
 #Libpcap format filter string used to control what bandwidthd sees
 #Please always include "ip" in the string to avoid strange problems
 $filter_text
diff --git a/config/bandwidthd/bandwidthd.xml b/config/bandwidthd/bandwidthd.xml
index f306546a..6aaf30ff 100644
--- a/config/bandwidthd/bandwidthd.xml
+++ b/config/bandwidthd/bandwidthd.xml
@@ -46,7 +46,7 @@
 	<requirements>Describe your package requirements here</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>bandwidthd</name>
-	<version>2.0.1.4</version>
+	<version>2.0.1_5 pkg v.0.1</version>
 	<title>Bandwidthd</title>
 	<aftersaveredirect>/pkg_edit.php?xml=bandwidthd.xml&amp;id=0</aftersaveredirect>
 	<include_file>/usr/local/pkg/bandwidthd.inc</include_file>
@@ -131,6 +131,43 @@
 			<type>checkbox</type>
 		</field>
 		<field>
+			<fielddescr>output PostgreSQL</fielddescr>
+			<fieldname>outputpostgresql</fieldname>
+			<description>Log data to a PostgreSQL database.&lt;br&gt;
+			Get the postgreSQL schema and PHP files to display the results from: https://github.com/individual-it/bandwidthd-pSQL-frontend</description>
+			<type>checkbox</type>
+		</field>
+		<field>
+			<fielddescr>Database host</fielddescr>
+			<fieldname>postgresqlhost</fieldname>
+			<description>Hostname of the postgreSQL database server.</description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Database name</fielddescr>
+			<fieldname>postgresqldatabase</fieldname>
+			<description>Database on the postgreSQL database server.</description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Database Username</fielddescr>
+			<fieldname>postgresqlusername</fieldname>
+			<description>Username of the postgreSQL database server.</description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Database Password</fielddescr>
+			<fieldname>postgresqlpassword</fieldname>
+			<description>Password of the postgreSQL database server.</description>
+			<type>password</type>
+		</field>
+		<field>
+			<fielddescr>sensor_id</fielddescr>
+			<fieldname>sensorid</fieldname>
+			<description>Arbitrary sensor name, I recommend the sensors fully qualified domain name.</description>
+			<type>input</type>
+		</field>
+		<field>
 			<fielddescr>Filter</fielddescr>
 			<fieldname>filter</fieldname>
 			<description>Libpcap format filter string used to control what bandwidthd sees.  Please always include "ip" in the string to avoid strange problems.</description>
diff --git a/config/zabbix-agent/zabbix-agent.xml b/config/zabbix-agent/zabbix-agent.xml
index 5a862496..02147989 100644
--- a/config/zabbix-agent/zabbix-agent.xml
+++ b/config/zabbix-agent/zabbix-agent.xml
@@ -111,7 +111,7 @@
 			<rows>5</rows>
 			<cols>50</cols>
 			<required>false</required>
-			<description>User-defined parameter to monitor. There can be several user-defined parameters. Value has form, example: UserParameter=users,who|wc -l</description>
+			<description>User-defined parameter to monitor. There can be several user-defined parameters. Value has form, example: UserParameter=users,who|wc -l &lt;br&gt;&lt;a href="https://www.zabbix.com/documentation/1.8/manual/tutorials/extending_agent" target="_new"&gt;See zabbix documentation for more information&lt;a&gt;</description>
 		</field>
 	</fields>
 	<custom_php_install_command>
@@ -260,4 +260,4 @@
 	exec("/bin/rm -r /var/run/zabbix/");
 	]]>
 	</custom_php_deinstall_command>
-</packagegui>
\ No newline at end of file
+</packagegui>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 4b01b9e5..95c504d5 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1116,7 +1116,7 @@
 		<website>http://bandwidthd.sourceforge.net/</website>
 		<descr>BandwidthD tracks usage of TCP/IP network subnets and builds html files with graphs to display utilization. Charts are built by individual IPs, and by default display utilization over 2 day, 8 day, 40 day, and 400 day periods. Furthermore, each ip address's utilization can be logged out at intervals of 3.3 minutes, 10 minutes, 1 hour or 12 hours in cdf format, or to a backend database server. HTTP, TCP, UDP, ICMP, VPN, and P2P traffic are color coded.</descr>
 		<category>System</category>
-		<version>2.0.1_5</version>
+		<version>2.0.1_5 pkg v.0.1</version>
 		<status>BETA</status>
 		<required_version>1.2.1</required_version>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 2d6a2f57..b6730f72 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1103,7 +1103,7 @@
 		<website>http://bandwidthd.sourceforge.net/</website>
 		<descr>BandwidthD tracks usage of TCP/IP network subnets and builds html files with graphs to display utilization. Charts are built by individual IPs, and by default display utilization over 2 day, 8 day, 40 day, and 400 day periods. Furthermore, each ip address's utilization can be logged out at intervals of 3.3 minutes, 10 minutes, 1 hour or 12 hours in cdf format, or to a backend database server. HTTP, TCP, UDP, ICMP, VPN, and P2P traffic are color coded.</descr>
 		<category>System</category>
-		<version>2.0.1_5</version>
+		<version>2.0.1_5 pkg v.0.1</version>
 		<status>BETA</status>
 		<required_version>1.2.1</required_version>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>