Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-statistics: memory: make hiding 'free' configurable

Browse source 
Make hiding the 'free' memory configurable.
Set default as disabled, shown in graph which always scales to 100%.

If enabled, the graph scales to actually used memory,
which enables a more detailed view to memory usage.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2023-10-09 23:16:28 +03:00
parent f235491381
commit 08540c4462
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/memory.js
View file

@ -5,12 +5,14 @@
'use strict';
'require baseclass';
'require uci';
return baseclass.extend({
title: _('Memory'),
rrdargs: function(graph, host, plugin, plugin_instance, dtype) {
var p = [];
var hide_free = uci.get("luci_statistics", "collectd_memory", "HideFree") == "1" ? true : false;
var memory = {
title: "%H: Memory usage",
@ -21,7 +23,7 @@ return baseclass.extend({
data: {
instances: {
memory: [
"free",
...(hide_free ? [] : ["free"]),
"buffered",
"cached",
"used"
@ -58,7 +60,7 @@ return baseclass.extend({
data: {
instances: {
percent: [
"free",
...(hide_free ? [] : ["free"]),
"buffered",
"cached",
"used"

5
applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/memory.js
View file

@ -11,6 +11,11 @@ return baseclass.extend({
o = s.option(form.Flag, 'enable', _('Enable this plugin'));
o = s.option(form.Flag, 'HideFree', _('Hide free memory'),
_('Hiding the free memory item makes the graph to scale to actual memory usage, not to 100%.'));
o.default = '0';
o.rmempty = false;
o = s.option(form.Flag, 'ValuesAbsolute', _('Absolute values'), _('When set to true, we request absolute values'));
o.default = '1';
o.depends('enable', '1');

1
applications/luci-app-statistics/root/etc/config/luci_statistics
View file

@ -158,6 +158,7 @@ config statistics 'collectd_load'
config statistics 'collectd_memory'
option enable '1'
option HideFree '0'
option ValuesAbsolute '1'
option ValuesPercentage '0'