graphs: send service graphs

src/routes/apps.js

@@ -58,6 +58,7 @@ exports = module.exports = {
     updateBackup,
 
     getLimits,
+    getGraphs,
 
     load
 };
@@ -68,6 +69,7 @@ const apps = require('../apps.js'),
     BoxError = require('../boxerror.js'),
     constants = require('../constants.js'),
     debug = require('debug')('box:routes/apps'),
+    graphs = require('../graphs.js'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess,
     safe = require('safetydance'),
@@ -959,3 +961,16 @@ async function getLimits(req, res, next) {
 
     next(new HttpSuccess(200, { limits }));
 }
+
+async function getGraphs(req, res, next) {
+    assert.strictEqual(typeof req.app, 'object');
+
+    if (!req.query.fromMinutes || !parseInt(req.query.fromMinutes)) return next(new HttpError(400, 'fromMinutes must be a number'));
+
+    const fromMinutes = parseInt(req.query.fromMinutes);
+    const noNullPoints = !!req.query.noNullPoints;
+    const [error, result] = await safe(graphs.getContainerStats(req.app.id, fromMinutes, noNullPoints));
+    if (error) return next(new HttpError(500, error));
+
+    next(new HttpSuccess(200, result));
+}

src/routes/cloudron.js

@@ -25,7 +25,8 @@ exports = module.exports = {
     getServerIpv6,
     getLanguages,
     syncExternalLdap,
-    syncDnsRecords
+    syncDnsRecords,
+    getSystemGraphs
 };
 
 const assert = require('assert'),
@@ -36,6 +37,7 @@ const assert = require('assert'),
     debug = require('debug')('box:routes/cloudron'),
     eventlog = require('../eventlog.js'),
     externalLdap = require('../externalldap.js'),
+    graphs = require('../graphs.js'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess,
     safe = require('safetydance'),
@@ -343,3 +345,14 @@ async function syncDnsRecords(req, res, next) {
 
     next(new HttpSuccess(201, { taskId }));
 }
+
+async function getSystemGraphs(req, res, next) {
+    if (!req.query.fromMinutes || !parseInt(req.query.fromMinutes)) return next(new HttpError(400, 'fromMinutes must be a number'));
+
+    const fromMinutes = parseInt(req.query.fromMinutes);
+    const noNullPoints = !!req.query.noNullPoints;
+    const [error, result] = await safe(graphs.getSystem(fromMinutes, noNullPoints));
+    if (error) return next(new HttpError(500, error));
+
+    next(new HttpSuccess(200, result));
+}

src/routes/graphs.js

@@ -1,36 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    getSystemGraphs,
-    getAppGraphs
-};
-
-const assert = require('assert'),
-    graphs = require('../graphs.js'),
-    HttpError = require('connect-lastmile').HttpError,
-    HttpSuccess = require('connect-lastmile').HttpSuccess,
-    safe = require('safetydance');
-
-async function getSystemGraphs(req, res, next) {
-    if (!req.query.fromMinutes || !parseInt(req.query.fromMinutes)) return next(new HttpError(400, 'fromMinutes must be a number'));
-
-    const fromMinutes = parseInt(req.query.fromMinutes);
-    const noNullPoints = !!req.query.noNullPoints;
-    const [error, result] = await safe(graphs.getSystem(fromMinutes, noNullPoints));
-    if (error) return next(new HttpError(500, error));
-
-    next(new HttpSuccess(200, result));
-}
-
-async function getAppGraphs(req, res, next) {
-    assert.strictEqual(typeof req.app, 'object');
-
-    if (!req.query.fromMinutes || !parseInt(req.query.fromMinutes)) return next(new HttpError(400, 'fromMinutes must be a number'));
-
-    const fromMinutes = parseInt(req.query.fromMinutes);
-    const noNullPoints = !!req.query.noNullPoints;
-    const [error, result] = await safe(graphs.getApp(req.app, fromMinutes, noNullPoints));
-    if (error) return next(new HttpError(500, error));
-
-    next(new HttpSuccess(200, result));
-}

src/routes/index.js

@@ -12,7 +12,6 @@ exports = module.exports = {
     domains: require('./domains.js'),
     eventlog: require('./eventlog.js'),
     filemanager: require('./filemanager.js'),
-    graphs: require('./graphs.js'),
     groups: require('./groups.js'),
     mail: require('./mail.js'),
     mailserver: require('./mailserver.js'),

src/routes/services.js

@@ -7,12 +7,14 @@ exports = module.exports = {
     getLogs,
     getLogStream,
     restart,
-    rebuild
+    rebuild,
+    getGraphs
 };
 
 const assert = require('assert'),
     AuditSource = require('../auditsource.js'),
     BoxError = require('../boxerror.js'),
+    graphs = require('../graphs.js'),
     HttpError = require('connect-lastmile').HttpError,
     HttpSuccess = require('connect-lastmile').HttpSuccess,
     safe = require('safetydance'),
@@ -131,3 +133,16 @@ async function rebuild(req, res, next) {
 
     next(new HttpSuccess(202, {}));
 }
+
+async function getGraphs(req, res, next) {
+    assert.strictEqual(typeof req.params.service, 'string');
+
+    if (!req.query.fromMinutes || !parseInt(req.query.fromMinutes)) return next(new HttpError(400, 'fromMinutes must be a number'));
+
+    const fromMinutes = parseInt(req.query.fromMinutes);
+    const noNullPoints = !!req.query.noNullPoints;
+    const [error, result] = await safe(graphs.getContainerStats(req.params.service, fromMinutes, noNullPoints));
+    if (error) return next(new HttpError(500, error));
+
+    next(new HttpSuccess(200, result));
+}