diff --git a/webadmin/src/views/certs.html b/webadmin/src/views/certs.html index c88b360af..dee3a5837 100644 --- a/webadmin/src/views/certs.html +++ b/webadmin/src/views/certs.html @@ -31,7 +31,7 @@
- +
@@ -116,7 +116,7 @@ - API token + DigitalOcean token hidden @@ -152,10 +152,10 @@
-

Certificates are obtained via Let’s Encrypt.

+

Certificates are automatically obtained and renewed from Let’s Encrypt. See the current rate limit here.


-

This wildcard certificate that will be used for apps, if getting a Let’s Encrypt certificate failed. This might be due to rate limits on Let’s Encrypt side.

+

This wildcard certificate will be used for apps, should getting a Let’s Encrypt certificate fail.

{{ defaultCert.error }}
Upload successful
diff --git a/webadmin/src/views/graphs.html b/webadmin/src/views/graphs.html index 7c350a7aa..e3471a95b 100644 --- a/webadmin/src/views/graphs.html +++ b/webadmin/src/views/graphs.html @@ -1,104 +1,68 @@
-
-
-

Graphs

-
-
- -
-
-
-

Disk Usage

-
-
-

App Data {{ diskUsage['data'].sum }} GB

- -

- Free {{ diskUsage['data'].free }} GB -   - Used {{ diskUsage['data'].used }} GB -

-
-
-

System {{ diskUsage['system'].sum }} GB

- -

- Free {{ diskUsage['system'].free }} GB -   - Used {{ diskUsage['system'].used }} GB -

-
-
-

Description

- App Data shows the virtual disk usage for application user data. - The full App Data disk size may not be entirely accounted for in the overall System usage numbers, depending on the utilization. -
-
- The System disk size includes application images, which may consume the majority of disk space. Running low on system disk space may indicate that too many apps are installed. -
-
- -
-
- -
-
+
+
-
+

Memory

-
+
+
+
+

Apps

+ +
+
+

System

+ +
+
-
-
-

Apps

-
-
-

System

-
-
+
-
-
- -
-
-

- {{ data.label }} {{ data.value }} MB -   -

-
-
- -
-
-

- {{ data.label }} {{ data.value }} MB -   -

-
-
- -
- -
-
+
+

System

{{ activeApp.location }}

- +
+ +

Memory consumption in MB.

+
-
- -

Memory consumption over time in MB.

+ +
+
+ +
+
+
+
+

Disk Usage

+
+
+ +
+
+

{{ diskUsage['system'].sum }} GB

+ +

+ Free {{ diskUsage['system'].free }} GB +   + Used {{ diskUsage['system'].used }} GB +

+
+
+
+
+

diff --git a/webadmin/src/views/graphs.js b/webadmin/src/views/graphs.js index 884c86a1b..07356fa3c 100644 --- a/webadmin/src/views/graphs.js +++ b/webadmin/src/views/graphs.js @@ -58,8 +58,8 @@ angular.module('Application').controller('GraphsController', ['$scope', '$locati $scope.setMemoryApp = function (app, color) { $scope.activeApp = app; - var timePeriod = 2 * 60; // in minutes - var timeBucketSize = 30; // in minutes + var timePeriod = 12 * 60; // in minutes + var timeBucketSize = 60; // in minutes var target; if (app === 'system') target = 'summarize(collectd.localhost.memory.memory-used, "' + timeBucketSize + 'min", "avg")'; @@ -70,7 +70,10 @@ angular.module('Application').controller('GraphsController', ['$scope', '$locati // translate the data from bytes to MB var data = result[0].datapoints.map(function (d) { return parseInt((d[0] / 1024 / 1024).toFixed(2)); }); - var labels = data.map(function (d, index) { return '-' + (timePeriod - (index * timeBucketSize)) / 60 + 'h'; }); + var labels = data.map(function (d, index) { + var dateTime = new Date(Date.now() - ((timePeriod - (index * timeBucketSize)) * 60 *1000)); + return ('0' + dateTime.getHours()).slice(-2) + ':00'; + }); var tmp = { labels: labels, @@ -103,17 +106,13 @@ angular.module('Application').controller('GraphsController', ['$scope', '$locati $scope.updateDiskGraphs = function () { Client.graphs([ - 'averageSeries(collectd.localhost.df-loop*.df_complex-free)', - 'averageSeries(collectd.localhost.df-loop*.df_complex-reserved)', - 'averageSeries(collectd.localhost.df-loop*.df_complex-used)', 'averageSeries(collectd.localhost.df-*d*.df_complex-free)', 'averageSeries(collectd.localhost.df-*d*.df_complex-reserved)', 'averageSeries(collectd.localhost.df-*d*.df_complex-used)' ], '-1min', function (error, data) { if (error) return console.log(error); - renderDisk('data', data[0], data[1], data[2]); - renderDisk('system', data[3], data[4], data[5]); + renderDisk('system', data[0], data[1], data[2]); }); }; @@ -174,7 +173,7 @@ angular.module('Application').controller('GraphsController', ['$scope', '$locati $scope.installedApps.forEach(function (app) { targets.push('summarize(collectd.localhost.table-' + app.id + '-memory.gauge-rss, "1min", "avg")'); targetsInfo.push({ - label: app.location || 'naked domain', + label: app.location || 'bare domain', color: getRandomColor(), app: app });