|
@@ -48,7 +48,7 @@ app.all('/search', function (req, res) {
|
|
}
|
|
}
|
|
db.listCollections().toArray(function(err, collInfos) {
|
|
db.listCollections().toArray(function(err, collInfos) {
|
|
result = [];
|
|
result = [];
|
|
- for (i = 0; i <= collInfos.length -1; i++) {
|
|
|
|
|
|
+ for (var i = 0; i <= collInfos.length -1; i++) {
|
|
if (collInfos[i]) {
|
|
if (collInfos[i]) {
|
|
result.push(collInfos[i].name);
|
|
result.push(collInfos[i].name);
|
|
}
|
|
}
|
|
@@ -77,7 +77,7 @@ app.all('/query', function (req, res) {
|
|
console.log(err);
|
|
console.log(err);
|
|
}
|
|
}
|
|
// https://docs.mongodb.com/manual/reference/method/db.collection.find/#db.collection.find
|
|
// https://docs.mongodb.com/manual/reference/method/db.collection.find/#db.collection.find
|
|
- db.collection(name).find({ time: { $gte: from_str, $lte: to_str } }, { time: 1, count:1, durations: 1, gauge: 1, set: 1, $slice: maxDataPoints }).sort({ time: 1 }).toArray(function (err, docs) {
|
|
|
|
|
|
+ db.collection(""+name).find({ time: { $gte: from_str, $lte: to_str } }, { type: 1, time: 1, count:1, durations: 1, gauge: 1, set: 1, $slice: maxDataPoints }).sort({ time: 1 }).toArray(function (err, docs) {
|
|
if (err) {
|
|
if (err) {
|
|
console.log(err);
|
|
console.log(err);
|
|
}
|
|
}
|
|
@@ -85,13 +85,13 @@ app.all('/query', function (req, res) {
|
|
result[name] = new Array();
|
|
result[name] = new Array();
|
|
_.each(docs, function (d) {
|
|
_.each(docs, function (d) {
|
|
var value = 0;
|
|
var value = 0;
|
|
- if (name.indexOf('counters')>= 0) {
|
|
|
|
|
|
+ if (d.type == 'counters') {
|
|
value = d.count;
|
|
value = d.count;
|
|
- } else if (name.indexOf('timers')>= 0) {
|
|
|
|
|
|
+ } else if (d.type == 'timers') {
|
|
value = d.durations;
|
|
value = d.durations;
|
|
- } else if (name.indexOf('gauges')>= 0) {
|
|
|
|
|
|
+ } else if (d.type == 'gauges') {
|
|
value = d.gauge;
|
|
value = d.gauge;
|
|
- } else if (name.indexOf('sets')>= 0) {
|
|
|
|
|
|
+ } else if (d.type == 'sets') {
|
|
value = d.set;
|
|
value = d.set;
|
|
}
|
|
}
|
|
(result[name]).push([value, 1000 * d.time]);
|
|
(result[name]).push([value, 1000 * d.time]);
|