diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-02-21 19:34:08 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-02-21 19:34:08 +0000 |
| commit | 6d2e027eb728c8294fdd7c3692e9853b3ca2603b (patch) | |
| tree | 3e190253238075ac8590b2f214852d2256fdad53 /collectors/python.d.plugin/sensors/sensors.chart.py | |
| parent | Opting out by default from sending anonymous statistics (phone home). (diff) | |
| download | netdata-6d2e027eb728c8294fdd7c3692e9853b3ca2603b.tar.xz netdata-6d2e027eb728c8294fdd7c3692e9853b3ca2603b.zip | |
Merging upstream version 1.12.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'collectors/python.d.plugin/sensors/sensors.chart.py')
| -rw-r--r-- | collectors/python.d.plugin/sensors/sensors.chart.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/collectors/python.d.plugin/sensors/sensors.chart.py b/collectors/python.d.plugin/sensors/sensors.chart.py index e622eb8e6..02e88e6a4 100644 --- a/collectors/python.d.plugin/sensors/sensors.chart.py +++ b/collectors/python.d.plugin/sensors/sensors.chart.py @@ -41,7 +41,7 @@ CHARTS = { 'power': { 'options': [None, ' power', 'Watt', 'power', 'sensors.power', 'line'], 'lines': [ - [None, None, 'absolute', 1, 1000000] + [None, None, 'absolute', 1, 1000] ] }, 'fan': { @@ -51,9 +51,9 @@ CHARTS = { ] }, 'energy': { - 'options': [None, ' energy', 'Joule', 'energy', 'sensors.energy', 'areastack'], + 'options': [None, ' energy', 'Joule', 'energy', 'sensors.energy', 'line'], 'lines': [ - [None, None, 'incremental', 1, 1000000] + [None, None, 'incremental', 1, 1000] ] }, 'humidity': { @@ -115,7 +115,7 @@ class Service(SimpleService): limit = LIMITS[type_name] if val < limit[0] or val > limit[1]: continue - data[prefix + '_' + str(feature.name.decode())] = int(val * 1000) + data[prefix + '_' + str(feature.name.decode())] = int(val * 1000) except sensors.SensorsError as error: self.error(error) return None |