Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions lib/appmetrics-dash.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ var latestCPUEvent;
var latestMemEvent;
var latestGCEvent;
var latestLoopEvent;
var latestMysqlQueries = [];
var aggregateHttpEvent;
var aggregateHttpOutboundEvent;
var aggregateHttpsEvent;
Expand Down Expand Up @@ -448,6 +449,10 @@ exports.monitor = function(options) {
});

monitoring.on('mysql', function(data) {
while (latestMysqlQueries.length>300){
latestMysqlQueries.shift();
}
latestMysqlQueries.push({query:data.query,duration:data.duration});
addProbeEvent('MySQL', data);
});

Expand Down Expand Up @@ -515,6 +520,9 @@ function emitData() {
io.emit('https-outbound', JSON.stringify(aggregateHttpsOutboundEvent));
aggregateHttpsOutboundEvent = null;
}
if (latestMysqlQueries){
io.emit('mysql', JSON.stringify(latestMysqlQueries));
}
if (aggregateProbeEvents.length > 0) {
io.emit('probe-events', JSON.stringify(aggregateProbeEvents));
aggregateProbeEvents = [];
Expand Down
9 changes: 8 additions & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@
<div class="container-fluid">
<div class="row">
<div class="graph-container col-md-7">
<div class="col-md-12 height-fill hideable" id="httpSummaryDiv"></div>
<div class="col-md-12 hideable" id="httpSummaryDiv"></div>
<div class="col-md-12 hideable" id="mysqlSummaryDiv"></div>
</div>
<div class="graph-container col-md-5">
<div class="col-md-12 hideable" id="envDiv"></div>
Expand Down Expand Up @@ -194,6 +195,7 @@ <h4 class="modal-title" font-color=black>Heap Snapshot</h4>
<script type="text/javascript" src="graphmetrics/js/httpThroughPutChart.js"></script>
<script type="text/javascript" src="graphmetrics/js/top5.js"></script>
<script type="text/javascript" src="graphmetrics/js/httpSummary.js"></script>
<script type="text/javascript" src="graphmetrics/js/mysqlSummary.js"></script>
<script type="text/javascript" src="graphmetrics/js/httpHttpsOutboundRequestsChart.js"></script>

<script type="text/javascript" src="graphmetrics/js/memChart.js"></script>
Expand All @@ -210,6 +212,7 @@ <h4 class="modal-title" font-color=black>Heap Snapshot</h4>
let envTable = new TextTable('#envDiv', '#summary', localizedStrings.envTitle);
let summaryTable = new TextTable('#summaryDiv', '#summary', localizedStrings.summaryTitle);
let httpSummary = new HttpSummary('#httpSummaryDiv', '#summary', localizedStrings.httpSummaryTitle);
let mysqlSummary = new MysqlSummary('#mysqlSummaryDiv', '#summary', localizedStrings.mysqlSummaryTitle);
httpSummary.setHttpSummaryOptions({host: hostname, filteredPath: dashboardRoot});

socket.emit('connected');
Expand Down Expand Up @@ -245,6 +248,9 @@ <h4 class="modal-title" font-color=black>Heap Snapshot</h4>
socket.on('https', function(data) {
updateHttpsData(data);
});
socket.on('mysql', function(data) {
mysqlSummary.updateData(data);
});
socket.on('http-urls', function(data) {
httpSummary.updateURLData(data);
});
Expand Down Expand Up @@ -310,6 +316,7 @@ <h4 class="modal-title" font-color=black>Heap Snapshot</h4>
envTable.resizeTable();
summaryTable.resizeTable();
httpSummary.resizeTable();
mysqlSummary.resizeTable();
} else {
refreshFlameGraph();
}
Expand Down