Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES 2013-02-05 15:14:44 UTC (rev 11352)
+++ trunk/CHANGES 2013-02-05 16:52:49 UTC (rev 11353)
@@ -25,6 +25,8 @@
Changed Nagios CGI date format to be iso8601 on fresh installs
Updated NRD configuration to apply results into checkresults with timestamp value for Nagios to process in order
Removed all use_prefork and use_lighttpd references from code
+ Conversion routines between bytes and megabytes now use 1000^2, rather than 1024^2. This may affect the graphing display
+ although all historic data is held in a raw format
NOTICES:
Only a subset of Nagios environment macros are available. Plugins will only get environment variables if
specified within the plugin. Notifications and event handlers have a limited set of macros. See
Modified: trunk/opsview-core/lib/Opsview/Utils.pm
===================================================================
--- trunk/opsview-core/lib/Opsview/Utils.pm 2013-02-05 15:14:44 UTC (rev 11352)
+++ trunk/opsview-core/lib/Opsview/Utils.pm 2013-02-05 16:52:49 UTC (rev 11353)
@@ -353,15 +353,15 @@
},
"KB" => {
uom => "bytes",
- multiplier => 1024
+ multiplier => 1000
},
"MB" => {
uom => "bytes",
- multiplier => 1024 * 1024
+ multiplier => 1000 * 1000
},
"TB" => {
uom => "bytes",
- multiplier => 1024 * 1024 * 1024
+ multiplier => 1000 * 1000 * 1000
},
"s" => {
uom => "seconds",
Modified: trunk/opsview-core/share/_javascript_/opsviewgraphs.js
===================================================================
--- trunk/opsview-core/share/_javascript_/opsviewgraphs.js 2013-02-05 15:14:44 UTC (rev 11352)
+++ trunk/opsview-core/share/_javascript_/opsviewgraphs.js 2013-02-05 16:52:49 UTC (rev 11353)
@@ -461,11 +461,11 @@
unitsPerUOM: {
"bytes": [
{ name: 'Raw', f: null },
- { name: 'Bytes', min: 1, max: 1024, f: function(n,a) { return (n).toPrecision(3)+'B'; } },
- { name: 'Kilobytes', min: 1024, max: 1024*1024, f: function(n,a) { return (n/1024).toPrecision(3)+'KB'; } },
- { name: 'Megabytes', min: 1024*1024, max: 1024*1024*1024, f: function(n,a) { return (n/(1024*1024)).toPrecision(3)+'MB'; } },
- { name: 'Gigabytes', min: 1024*1024*1024, max: 1024*1024*1024*1024, f: function(n,a) { return (n/(1024*1024*1024)).toPrecision(3)+'GB'; } },
- { name: 'Terabytes', min: 1024*1024*1024*1024, max: Number.POSITIVE_INFINITY, f: function(n,a) { return (n/(1024*1024*1024*1024)).toPrecision(3)+'TB'; } }
+ { name: 'Bytes', min: 1, max: 1000, f: function(n,a) { return (n).toPrecision(3)+'B'; } },
+ { name: 'Kilobytes', min: 1000, max: 1000*1000, f: function(n,a) { return (n/1000).toPrecision(3)+'KB'; } },
+ { name: 'Megabytes', min: 1000*1000, max: 1000*1000*1000, f: function(n,a) { return (n/(1000*1000)).toPrecision(3)+'MB'; } },
+ { name: 'Gigabytes', min: 1000*1000*1000, max: 1000*1000*1000*1000, f: function(n,a) { return (n/(1000*1000*1000)).toPrecision(3)+'GB'; } },
+ { name: 'Terabytes', min: 1000*1000*1000*1000, max: Number.POSITIVE_INFINITY, f: function(n,a) { return (n/(1000*1000*1000*1000)).toPrecision(3)+'TB'; } }
],
"percent": [
{ name: 'Raw', f: null },
