Released Monitorix plugin (version 0.0.4)

i-MSCP · Feb 3, 2014 · 4f55c5c · 4f55c5c
1 parent 15ce5f5
commit 4f55c5c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 10 deletions.
diff --git a/incubator/Monitorix/CHANGELOG b/incubator/Monitorix/CHANGELOG
@@ -1,6 +1,12 @@
 i-MSCP Monitorix plugin ChangeLog
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+------------------------------------------------------------------------------------------------------------------------
+Version 0.0.4
+------------------------------------------------------------------------------------------------------------------------
+
+	- Fixed: Plugin is not compatible with Perl version from Squeeze
+
 ------------------------------------------------------------------------------------------------------------------------
 Version 0.0.3
 ------------------------------------------------------------------------------------------------------------------------

diff --git a/incubator/Monitorix/README.md b/incubator/Monitorix/README.md
@@ -1,6 +1,6 @@
-## i-MSCP Monitorix plugin v0.0.3
+## i-MSCP Monitorix plugin v0.0.4
 
-Plugin provides lightweight system monitoring tool for Linux/UNIX servers.
+Plugin providing lightweight system monitoring tool for Linux/UNIX servers.
 
 If you install this plugin manually, make sure it is installed in
 gui/plugins/ - if the folder is called different it will not work!
@@ -32,6 +32,8 @@ See [GPL v2](http://www.gnu.org/licenses/gpl-2.0.html "GPL v2")
 	- Download package from: http://www.monitorix.org/downloads.html
 	- wget http://www.monitorix.org/monitorix_(version)-izzy1_all.deb
 	- apt-get install rrdtool libmime-lite-perl libhttp-server-simple-perl libhttp-server-simple-perl libconfig-general-perl
+	( on Squeeze only ):
+	- apt-get install librrds-perl
 	- dpkg -i monitorix_(version)-izzy1_all.deb
 
 	Ubuntu:

diff --git a/incubator/Monitorix/backend/Monitorix.pm b/incubator/Monitorix/backend/Monitorix.pm
@@ -179,13 +179,20 @@ sub buildMonitorixGraphics
 	} else {
 		$monitorixGraphColor = 'white';
 	}
-	
-	while (my($monitorixConfigKey, $monitorixConfigValue) = each($monitorixConfig->{'graph_enabled'})) {
-		if($monitorixConfigValue eq 'y') {
-			my $rs = $self->_createMonitorixGraphics($monitorixConfigKey, $monitorixGraphColor);
+
+	for(keys %{$monitorixConfig->{'graph_enabled'}}) {
+		if($monitorixConfig->{'graph_enabled'}->{$_} eq 'y') {
+			my $rs = $self->_createMonitorixGraphics($_, $monitorixConfig->{'graph_enabled'}->{$_});
 			return $rs if $rs;
 		}
 	}
+
+	#while (my($monitorixConfigKey, $monitorixConfigValue) = each($monitorixConfig->{'graph_enabled'})) {
+	#	if($monitorixConfigValue eq 'y') {
+	#		my $rs = $self->_createMonitorixGraphics($monitorixConfigKey, $monitorixGraphColor);
+	#		return $rs if $rs;
+	#	}
+	#}
 
 	$self->_setMonitorixGraphicsPermission();
 }
@@ -390,10 +397,14 @@ sub _modifyMonitorixSystemConfigEnabledGraphics
 
 	my $monitorixConfig = decode_json($rdata->{'Monitorix'}->{'plugin_config'});
 
-	while (my($monitorixConfigKey, $monitorixConfigValue) = each($monitorixConfig->{'graph_enabled'})) {
-		$fileContent =~ s/$monitorixConfigKey(\t\t|\t)= (y|n)/$monitorixConfigKey$1= $monitorixConfigValue/gm;
+	for(keys %{$monitorixConfig->{'graph_enabled'}}) {
+		$fileContent =~ s/$_(\t\t|\t)= (y|n)/$_$1= $monitorixConfig->{'graph_enabled'}->{$_}/gm;
 	}
 
+	#while (my($monitorixConfigKey, $monitorixConfigValue) = each($monitorixConfig->{'graph_enabled'})) {
+	#	$fileContent =~ s/$monitorixConfigKey(\t\t|\t)= (y|n)/$monitorixConfigKey$1= $monitorixConfigValue/gm;
+	#}
+
 	my $rs = $file->set($fileContent);
 	return 1 if $rs;
 

diff --git a/incubator/Monitorix/info.php b/incubator/Monitorix/info.php
@@ -29,8 +29,8 @@
 return array(
 	'author' => 'Sascha Bay',
 	'email' => 'info@space2place.de',
-	'version' => '0.0.3',
-	'date' => '2014-01-31',
+	'version' => '0.0.4',
+	'date' => '2014-02-03',
 	'name' => 'Monitorix',
 	'desc' => 'Plugin providing lightweight system monitoring tool for Linux/UNIX servers',
 	'url' => 'http://wiki.i-mscp.net/doku.php?id=plugins:monitorix'