Add reporting.graphJmx()

Upgrade jmxstat

Makefile

@@ -1,6 +1,6 @@
 .PHONY: clean templates compile
 PROCESS_TPL = scripts/process_tpl.js
-SOURCES = lib/header.js lib/config.js lib/util.js lib/stats.js lib/loop/loop.js lib/loop/multiloop.js lib/monitoring/collectors.js lib/monitoring/statslogger.js lib/monitoring/monitor.js lib/monitoring/monitorgroup.js lib/http.js lib/reporting/*.tpl.js lib/reporting/template.js lib/reporting/report.js lib/reporting/reportmanager.js lib/reporting/process.js lib/loadtesting.js lib/remote/endpoint.js lib/remote/endpointclient.js lib/remote/slave.js lib/remote/slaves.js lib/remote/slavenode.js lib/remote/cluster.js lib/remote/httphandler.js lib/remote/remotetesting.js
+SOURCES = lib/header.js lib/config.js lib/util.js lib/stats.js lib/loop/loop.js lib/loop/multiloop.js lib/monitoring/collectors.js lib/monitoring/statslogger.js lib/monitoring/monitor.js lib/monitoring/monitorgroup.js lib/http.js lib/reporting/*.tpl.js lib/reporting/template.js lib/reporting/report.js lib/reporting/reportmanager.js lib/reporting/jmx.js lib/loadtesting.js  lib/remote/endpoint.js lib/remote/endpointclient.js lib/remote/slave.js lib/remote/slaves.js lib/remote/slavenode.js lib/remote/cluster.js lib/remote/httphandler.js lib/remote/remotetesting.js
 
 all: compile
 

lib/reporting/index.js

@@ -3,4 +3,4 @@ exports.Report = report.Report;
 exports.Chart = report.Chart;
 exports.ReportGroup = report.ReportGroup;
 exports.REPORT_MANAGER= require('./reportmanager').REPORT_MANAGER;
-exports.spawnAndMonitor = require('./process').spawnAndMonitor;
+exports.graphJmx = require('./jmx').graphJmx;

lib/reporting/process.js → lib/reporting/jmx.js

@@ -1,8 +1,40 @@
+/*jslint forin:true */
+
 var BUILD_AS_SINGLE_FILE;
 if (!BUILD_AS_SINGLE_FILE) {
 var child_process = require('child_process');
+var REPORT_MANAGER = require('./reportmanager').REPORT_MANAGER;
 }
 
+var spawnAndMonitor;
+
+var graphJmx = exports.graphJmx = function(options) {
+  // Verify that java & jmxstat jar can be found
+
+  // Build command line args, output regex, and field labels
+  var regex = '\\d{2}:\\d{2}:\\d{2}',
+    labels = [],
+    mbeans = [];
+  for (var m in options.mbeans) {
+    regex += '\\t([^\\t]*)';
+    labels.push(m);
+    mbeans.push(options.mbeans[m]);
+  }
+  regex = new RegExp(regex);
+
+  // Add graph
+  var report = REPORT_MANAGER.addReport(options.host),
+      graph = report.getChart(options.title);
+
+  // Spawn jmxstat
+  var jmx = spawnAndMonitor(
+    regex, labels,
+    'java', ['-jar', 'jmxstat/jmxstat.jar', options.host].concat(mbeans).concat(options.interval)
+  );
+
+  graph.updateFromEventEmitter(jmx, labels);
+};
+
 /** Spawn a child process and extract data using a regex. Each line is compared to the regex. If a match
 is found, the groups are written to an object using the given field names, and the 'data' event is
 emitted.
@@ -23,7 +55,7 @@ then:
 
 will emit('data', {userReadable: 'r', groupReadable: 'r', worldReadable: '-'});
 */
-var spawnAndMonitor = exports.spawnAndMonitor = function(regex, fields, spawnArguments) {
+function spawnAndMonitor(regex, fields, spawnArguments) {
   var buf = '', proc = child_process.spawn.apply(child_process, Array.prototype.slice.call(arguments, 2));
   proc.stdout.on('data', function (data) {
     buf += data.toString();
@@ -47,4 +79,4 @@ var spawnAndMonitor = exports.spawnAndMonitor = function(regex, fields, spawnArg
     });
   });
   return proc;
-};
+}

lib/reporting/summary.tpl

@@ -91,8 +91,7 @@
                                 labelsDiv: document.getElementById("chartlegend" + chart.uid),
                                 labelsSeparateLines: true,
                                 labels: chart.columns,
-                                xAxisLabelWidth: 80,
-                                pixelsPerXLabel: 100
+                                xAxisLabelWidth: 80
                             });
                     }
                 }