Merge pull request #1 from amousset/master

Upgrade

Author: SeaweedbrainCY

README.md

@@ -12,124 +12,9 @@ The plugins requires:
 
 Copy the content of the `lib` folder into the `lib` folder of your PHP Weathermap installation.
 
-## Configuration
+## Documentation
 
-### Configuration of the new datasource for traffic
-
-You have to configure the following parameters in your weathermap file global settings:
-
----
-
-`SET zabbix_user username`
-
-Zabbix username you want to connect with.
-
----
-
-`SET zabbix_password password`
-
-Zabbix password for the given user, you can connect with a `guest` account by ommitting this parameter.
-
----
-
-`SET zabbix_url http://zabbix/zabbix/api_jsonrpc.php`
-
-The Zabbix API URL used to make requests.
-
----
-
-To configure a link, use the following `TARGET` syntax:
-
-```
-TARGET zabbix:keyname:hostname:input_item_name:output_item_name
-```
-
-with:
-
-* `keyname`: the attribute you want to use to select items in the configuration, possible values:
-** `name` refers to the item name configured in Zabbix
-** `key_` refers to the key configured in Zabbix
-** `itemid` refers to the item id used by Zabbix
-* `hostname`: the hostname of the host you want to use
-* `input_item_name`: the input item identifier (according to what you put as keyname)
-* `output_item_name`: the output item identifier (according to what you put as keyname)
-
-For example:
-
-```
-TARGET zabbix:name:switch-01:GigabitEthernet3/8-IN:GigabitEthernet3/8-OUT
-```
-
-### Configuration of the Zabbix graphs integration
-
-You have to configure the following parameters in yoour weathermap file:
-
----
-
-`SET post_zabbix_graphs 1`
-
-Enable the Zabbix integration for overlib graphs, using a specific `OVERLIBGRAPH` syntax.
-
----
-
-`SET post_zabbix_graph_links 1`
-
-Enable the links to the graph page in Zabbix, overriding the `INFOURL` links with link to a Zabbix graph.
-
----
-
-`SET post_zabbix_graph_base_url https://zabbix/zabbix`
-
-The URL to the Zabbix frontend used to generate the graphs links.
-
----
-
-`SET post_zabbix_graph_width 420`
-
-The graphs width in pixels, use `OVERLIBWIDTH` to improve the positionning of the popup image. This is the width of the actual graph, and the image will be larger.
-
----
-
-`SET post_zabbix_graph_height 150`
-
-The graph height in pixels, use `OVERLIBHEIGHT` to improve the positionning of the popup image. This is the height of the actual graph, and the image will be larger.
-
----
-
-`SET post_zabbix_graph_period 86400`
-
-The graph period in seconds.
-
----
-
-To configure a graph, use the following `OVERLIBGRAPH` syntax, for nodes and links:
-
-```
-OVERLIBGRAPH zabbix:hostname:graph_name
-```
-
-with:
-
-* `keyname`: the attribute you want to use to select items in the configuration, possible values:
-** `name` refers to the graph name configured in Zabbix
-** `graphid` refers to the graph is used by Zabbix
-* `hostname`: the hostname of the host you want to use
-* `graph_name`: the graph identifier (according to what you put as keyname)
-
-For example:
-
-```
-OVERLIBGRAPH zabbix:switch-01:GigabitEthernet3/8
-```
-
-It can also be used with `INOVERLIBGRAPH` and `OUTOVERLIBGRAPH` (for links only):
-
-```
-INOVERLIBGRAPH zabbix:name:switch-01:GigabitEthernet3/8-IN
-OUTOVERLIBGRAPH zabbix:name:switch-01:GigabitEthernet3/8-OUT
-```
-
-The generated `INFOURL` will be a link to the configured graph in your Zabbix frontend.
+A complete documentation is available on the project [wiki](https://github.com/amousset/php-weathermap-zabbix-plugin/wiki).
 
 ## TODO
 

lib/datasources/WeatherMapDataSource_zabbix.php

@@ -18,7 +18,7 @@ function Init(&$map)
 
 	function Recognise($targetstring)
 	{
-		if(preg_match("/^zabbix:([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+)$/", $targetstring, $matches))
+		if(preg_match("/^zabbix:([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\],]+):([-a-zA-Z0-9_\.\/\[\],]+)$/", $targetstring, $matches))
 		{
 			return true;
 		}
@@ -34,7 +34,7 @@ function ReadData($targetstring, &$map, &$item)
 		$data[OUT] = null;
 		$data_time = 0;
 
-		if(preg_match("/^zabbix:([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+)$/", $targetstring, $matches))
+		if(preg_match("/^zabbix:([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\],]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\],]+)$/", $targetstring, $matches))
 		{
 			$zabbix_uri = $map->get_hint('zabbix_uri');
 
@@ -45,8 +45,9 @@ function ReadData($targetstring, &$map, &$item)
 
 			wm_debug ("Zabbix ReadData: Found (".$host.",".$in.",".$out.")\n");
 
-			$in_value = $this->zabbixApi->getItemLastValue($host, $zabbix_key, $in)["lastvalue"];
 			$raw_out_value = $this->zabbixApi->getItemLastValue($host, $zabbix_key, $out);
+			$raw_in_value = $this->zabbixApi->getItemLastValue($host, $zabbix_key, $in);
+			$in_value = $raw_in_value["lastvalue"];
 			$out_value = $raw_out_value["lastvalue"];
 			$data_time = $raw_out_value["lastclock"];
 

lib/post/WeatherMapPostProcessorZabbix.php

@@ -1,6 +1,6 @@
 <?php
 
-class WeatherMapPostProcessorZabbix extends WeatherMapPostProcessor 
+class WeatherMapPostProcessorZabbix extends WeatherMapPostProcessor
 {
 	function run(&$map)
 	{
@@ -17,11 +17,11 @@ function run(&$map)
 				$graphPeriod = $map->get_hint('post_zabbix_graph_period');
 
 				foreach (array_merge($map->links, $map->nodes) as $item) {
-					foreach (range(0, 1) as $k) {
+					foreach (range(0, 1) as $k) {    // IN and OUT, if necessary
 						$graph = $item->overliburl[$k];
 
-						if (count($graph) == 1) {
-							if(preg_match('/^zabbix:([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+)$/', $graph[0], $matches))
+						foreach ($graph as $index=>$graphItem) {
+							if(preg_match('/^zabbix:([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+):([-a-zA-Z0-9_\.\/\[\]]+)$/', $graphItem, $matches))
 							{
 								$keyname = $matches[1];
 								$host = $matches[2];
@@ -31,10 +31,10 @@ function run(&$map)
 
 								$graphId = $this->zabbixApi->getGraphId($host, $keyname, $key);
 								if (isset($graphId)) {
-									if ($addGraphLink) { 
+									if ($addGraphLink) {
 										$item->infourl[$k] = $baseUrl.'/charts.php?form_refresh=1&fullscreen=0&graphid='.$graphId;
 									}
-									$item->overliburl[$k][0] = $baseUrl.'/chart2.php?width='.$graphWidth.'&height='.
+									$item->overliburl[$k][$index] = $baseUrl.'/chart2.php?width='.$graphWidth.'&height='.
 										$graphHeight.'&period='.$graphPeriod.'&stime=now&graphid='.$graphId;
 								}
 							}