diff options
Diffstat (limited to 'applications')
2 files changed, 38 insertions, 13 deletions
diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/sensors.js b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/sensors.js index b3361e1bf4..3da1bcfd82 100644 --- a/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/sensors.js +++ b/applications/luci-app-statistics/htdocs/luci-static/resources/statistics/rrdtool/definitions/sensors.js @@ -7,20 +7,44 @@ return baseclass.extend({ title: _('Sensors'), rrdargs: function(graph, host, plugin, plugin_instance, dtype) { - return { - per_instance: true, - title: "%H: %pi - %di", - vlabel: "\xb0C", - number_format: "%4.1lf\xb0C", - data: { - types: [ "temperature" ], - options: { - temperature__value: { - color: "ff0000", - title: "Temperature" + var rv = []; + var types = graph.dataTypes(host, plugin, plugin_instance); + + if (types.indexOf('temperature') > -1) { + rv.push({ + per_instance: true, + title: "%H: %pi - %di", + vlabel: "\xb0C", + number_format: "%4.1lf\xb0C", + data: { + types: [ "temperature" ], + options: { + temperature__value: { + color: "ff0000", + title: "Temperature" + } + } + } + }); + } + if (types.indexOf('humidity') > -1) { + rv.push({ + per_instance: true, + title: "%H: %pi - %di", + vlabel: "%RH", + number_format: "%4.1lf %%RH", + data: { + types: [ "humidity" ], + options: { + humidity__value: { + color: "0000ff", + title: "Humidity" + } } } - } - }; + }); + } + + return rv; } }); diff --git a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/sensors.js b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/sensors.js index 8424966d2d..a1a2472654 100644 --- a/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/sensors.js +++ b/applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/sensors.js @@ -8,6 +8,7 @@ var sensorTypes = [ /^(?:ain|in|vccp|vdd|vid|vin|volt|voltbatt|vrm)[0-9]*$/, 'voltage', /^(?:cpu_temp|remote_temp|temp)[0-9]*$/, 'temperature', /^(?:fan)[0-9]*$/, 'fanspeed', + /^(?:humidity)[0-9]*$/, 'humidity', /^(?:power)[0-9]*$/, 'power' ]; |