forked from orlandov/azathoth
-
Notifications
You must be signed in to change notification settings - Fork 72
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Replace jmx.js with external.js. Add graphProcess() which replaces spawnAndMonitor() - graphJmx() checks for existence of jmxstat/jmxstat.jar - Add report.getReport, which returns the first report by the same name or creates one Util: - Add LineReader class Console: - Change keyboard shortcuts on console UI - Update console dygraph version - Change console x-axis to use timestamps
- Loading branch information
Showing
15 changed files
with
182 additions
and
144 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /*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 util = require('../util'); | ||
| var path = require('path'); | ||
| } | ||
|
|
||
| var graphProcess; | ||
|
|
||
| var graphJmx = exports.graphJmx = function(options) { | ||
| // Verify that java & jmxstat jar can be found. Search for jmxstat/jmxstat.jar located next to the | ||
| // current module or a parent module that included it. | ||
| var m = module; | ||
| var jmxstat, found = false; | ||
| while (m && !found) { | ||
| jmxstat = path.join(path.dirname(m.filename), 'jmxstat/jmxstat.jar'); | ||
| found = path.existsSync(jmxstat); | ||
| m = m.parent; | ||
| } | ||
| if (!found) { | ||
| throw new Error('jmxstat/jmxstat.jar not found.'); | ||
| } | ||
|
|
||
| // Build command line args, output regex, and field labels | ||
| var regex = '\\d{2}:\\d{2}:\\d{2}', columns = [], mbeans = []; | ||
| for (var mbean in options.mbeans) { | ||
| regex += '\\t([^\\t]*)'; | ||
| columns.push(mbean); | ||
| mbeans.push(options.mbeans[mbean]); | ||
| } | ||
|
|
||
| // Start jmxstat | ||
| var interval = options.interval || ''; | ||
| return graphProcess({ | ||
| reportName: options.reportName || options.host || 'Monitor', | ||
| chartName: options.chartName || 'JMX', | ||
| command: 'java -jar ' + jmxstat + ' ' + options.host + ' ' + mbeans.join(' ') + ' ' + interval, | ||
| columns: columns, | ||
| regex: regex, | ||
| dataFormatter: options.dataFormatter | ||
| }); | ||
| }; | ||
|
|
||
|
|
||
| /** Spawn a child process, extract data using a regex, and graph the results on the summary report. | ||
| Returns a standard ChildProcess object. | ||
| */ | ||
| var graphProcess = exports.graphProcess = function(options) { | ||
| var delimiter = options.delimiter || ' +', | ||
| columns = options.columns || [], | ||
| fieldRegex = columns.map(function() { return '(.*?)'; }).join(delimiter), // e.g. (.*?) +(.*?) +... | ||
| regex = options.regex || ('^ *' + fieldRegex + ' *$'), | ||
| splitIdx = columns.indexOf(options.splitBy) + 1; | ||
|
|
||
| var report = REPORT_MANAGER.getReport(options.reportName || 'Monitor'), | ||
| graph = report.getChart(options.chartName || options.command), | ||
| format = options.dataFormatter || function(x) { return x; }; | ||
|
|
||
| var proc = child_process.spawn('/bin/sh', ['-c', options.command], options.spawnOptions), | ||
| lr = new util.LineReader(proc.stdout); | ||
|
|
||
| lr.on('data', function (line) { | ||
| var vals = line.match(regex); | ||
| if (vals) { | ||
| var obj = {}, prefix = ''; | ||
| if (splitIdx > 0 && vals[splitIdx]) { | ||
| prefix = vals[splitIdx] + ' '; | ||
| } | ||
| for (var i = 1; i < vals.length; i++) { | ||
| if (columns[i-1]) { | ||
| obj[prefix + columns[i-1]] = vals[i]; | ||
| } | ||
| } | ||
| graph.put(format(obj)); | ||
| } | ||
| }); | ||
|
|
||
| return proc; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../jmxstat |
Oops, something went wrong.