diff --git a/src/views/system.js b/src/views/system.js index 438588250..9805c515e 100644 --- a/src/views/system.js +++ b/src/views/system.js @@ -188,14 +188,14 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati // use collectd instead of df data so the timeframe matches with the du data Client.graphs([ 'absolute(collectd.localhost.df-' + diskName + '.df_complex-free)', - 'absolute(collectd.localhost.df-' + diskName + '.df_complex-reserved)', + 'absolute(collectd.localhost.df-' + diskName + '.df_complex-reserved)', // reserved for root (default: 5%) tune2fs -l/m 'absolute(collectd.localhost.df-' + diskName + '.df_complex-used)' ], '-1min', {}, function (error, data) { if (error) return $scope.setError('disk', error); disk.size = data[2].datapoints[0][0] + data[1].datapoints[0][0] + data[0].datapoints[0][0]; disk.free = data[0].datapoints[0][0]; - disk.occupied = data[2].datapoints[0][0] + data[1].datapoints[0][0]; + disk.occupied = data[2].datapoints[0][0]; colorIndex = 0; disk.contains.forEach(function (content) { @@ -225,7 +225,7 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati if (index === 0) { // the root mount point is the first disk disk.contains.push({ - label: 'Everything else (Ubuntu, Swap, ...)', + label: 'Everything else (Ubuntu, Swap, etc)', id: 'other', color: '#27CE65', usage: usageOther