Skip to content

Commit 1b523ba

Browse files
ar2rsawseenar2rsawseen
committed
[tracker] try new data format
1 parent c871ec9 commit 1b523ba

File tree

3 files changed

+40
-24
lines changed

3 files changed

+40
-24
lines changed

‎api/parts/mgmt/tracker.js

+16-11
Original file line numberDiff line numberDiff line change
@@ -179,20 +179,25 @@ function collectServerData() {
179179
if (common.db.build && common.db.build.version) {
180180
Countly.userData.set("db_version", common.db.build.version);
181181
}
182-
getDomain(function(err, domain) {
183-
if (!err) {
184-
Countly.userData.set("domain", domain);
185-
Countly.user_details({"name": stripTrailingSlash((domain + "").split("://").pop())});
182+
common.db.command({ serverStatus: 1 }, function(errCmd, res) {
183+
if (res && res.storageEngine && res.storageEngine.name) {
184+
Countly.userData.set("db_engine", res.storageEngine.name);
186185
}
187-
getDistro(function(err2, distro) {
188-
if (!err2) {
189-
Countly.userData.set("distro", distro);
186+
getDomain(function(err, domain) {
187+
if (!err) {
188+
Countly.userData.set("domain", domain);
189+
Countly.user_details({"name": stripTrailingSlash((domain + "").split("://").pop())});
190190
}
191-
getHosting(function(err3, hosting) {
192-
if (!err3) {
193-
Countly.userData.set("hosting", hosting);
191+
getDistro(function(err2, distro) {
192+
if (!err2) {
193+
Countly.userData.set("distro", distro);
194194
}
195-
Countly.userData.save();
195+
getHosting(function(err3, hosting) {
196+
if (!err3) {
197+
Countly.userData.set("hosting", hosting);
198+
}
199+
Countly.userData.save();
200+
});
196201
});
197202
});
198203
});

‎plugins/server-stats/api/jobs/stats.js

+5
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,23 @@ class StatsJob extends job.Job {
8888
utcMoment = moment.utc();
8989
months = {};
9090
data = {};
91+
var ids = {};
9192
var Countly = tracker.getSDK();
9293
for (let i = 0; i < 6; i++) {
9394
months[utcMoment.format("YYYY:M")] = "DP " + (i + 1) + " - " + utcMoment.format("MMM YYYY");
95+
ids[utcMoment.format("YYYY:M")] = utcMoment.format("MMM YYYY");
9496
Countly.userData.unset("DP " + i + " - " + utcMoment.format("MMM YYYY"));
9597
utcMoment.subtract(1, 'months');
9698
}
9799

100+
data.DP = {};
101+
98102
Countly.userData.unset("DP 6 - " + utcMoment.format("MMM YYYY"));
99103

100104
for (let i = 0; i < allData.length; i++) {
101105
if (months[allData[i]._id]) {
102106
data[months[allData[i]._id]] = allData[i].e + allData[i].s;
107+
data.DP[ids[allData[i]._id]] = allData[i].e + allData[i].s;
103108
}
104109
}
105110
Countly.user_details({

‎plugins/system-utility/api/api.js

+19-13
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,26 @@ var plugin = {},
5656
for (let i = 0; i < ram.details.length; i++) {
5757
if (ram.details[i].id !== "-/+") {
5858
id = ram.details[i].id;
59-
sdk.userData.set(id + "_total", Math.ceil(parseFloat(ram.details[i].total) / 1024));
60-
sdk.userData.set(id + "_free", Math.round(parseFloat(ram.details[i].free) / 1024));
61-
sdk.userData.set(id + "_used", Math.round(parseFloat(ram.details[i].used) / 1024));
62-
sdk.userData.set(id + "_usage", parseFloat(ram.details[i].usage).toFixed(2));
59+
sdk.userData.set(id, {
60+
total: Math.ceil(parseFloat(ram.details[i].total) / 1024),
61+
free: Math.round(parseFloat(ram.details[i].free) / 1024),
62+
used: Math.round(parseFloat(ram.details[i].used) / 1024),
63+
usage: parseFloat(ram.details[i].usage).toFixed(2)
64+
});
6365
}
6466
}
6567
}
6668
//track disks
6769
var disks = values[1];
6870
if (disks && disks.details) {
6971
for (let i = 0; i < disks.details.length; i++) {
70-
sdk.userData.set("disk_" + i, disks.details[i].id);
71-
sdk.userData.set("disk_" + i + "_total", Math.ceil(parseFloat(disks.details[i].total) / 1024 / 1024 / 1024));
72-
sdk.userData.set("disk_" + i + "_free", Math.round(parseFloat(disks.details[i].free) / 1024 / 1024 / 1024));
73-
sdk.userData.set("disk_" + i + "_used", Math.round(parseFloat(disks.details[i].used) / 1024 / 1024 / 1024));
74-
sdk.userData.set("disk_" + i + "_usage", parseFloat(disks.details[i].usage).toFixed(2));
72+
sdk.userData.set("disk_" + i, {
73+
path: disks.details[i].id,
74+
total: Math.ceil(parseFloat(disks.details[i].total) / 1024 / 1024 / 1024),
75+
free: Math.round(parseFloat(disks.details[i].free) / 1024 / 1024 / 1024),
76+
used: Math.round(parseFloat(disks.details[i].used) / 1024 / 1024 / 1024),
77+
usage: parseFloat(disks.details[i].usage).toFixed(2)
78+
});
7579
}
7680
}
7781

@@ -85,10 +89,12 @@ var plugin = {},
8589
disks = values[3];
8690
if (disks && disks.details) {
8791
for (let i = 0; i < disks.details.length; i++) {
88-
sdk.userData.set("disk_db" + i + "_total", Math.ceil(parseFloat(disks.details[i].total) / 1024 / 1024 / 1024));
89-
sdk.userData.set("disk_db" + i + "_free", Math.round(parseFloat(disks.details[i].free) / 1024 / 1024 / 1024));
90-
sdk.userData.set("disk_db" + i + "_used", Math.round(parseFloat(disks.details[i].used) / 1024 / 1024 / 1024));
91-
sdk.userData.set("disk_db" + i + "_usage", parseFloat(disks.details[i].usage).toFixed(2));
92+
sdk.userData.set("disk_db" + i, {
93+
total: Math.ceil(parseFloat(disks.details[i].total) / 1024 / 1024 / 1024),
94+
free: Math.round(parseFloat(disks.details[i].free) / 1024 / 1024 / 1024),
95+
used: Math.round(parseFloat(disks.details[i].used) / 1024 / 1024 / 1024),
96+
usage: parseFloat(disks.details[i].usage).toFixed(2)
97+
});
9298
}
9399
}
94100

0 commit comments

Comments
 (0)