Merge branch 'master' of git://github.com/ahbishop/nimbus

nimbusproject · Jan 30, 2010 · 8ee490b · 8ee490b
2 parents f8e1d38 + 47a315d
commit 8ee490b
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/monitoring/nagios/nimbus_server_script.py b/monitoring/nagios/nimbus_server_script.py
@@ -441,8 +441,7 @@ def __call__(self, option, opt_str, value, parser):
 
         for key in poolListing.keys():
             for entry in totalNetPools.keys():
-		# The additional '*1024' was added to convert MB to kB and maintain consistency across all plug-ins
-                self.logger.info(key+" ; "+entry+" ; "+str(poolListing[key][entry]*1024))            
+                self.logger.info(key+" ; "+entry+" ; "+str(poolListing[key][entry]))            
 
         pluginExit(self.resourceName, self.logString.getvalue(), NAGIOS_RET_OK)