xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-22 09:32:21 +00:00
Code Issues Projects Releases Wiki Activity

Support 'energy' sensor category

Browse Source 
Energy is distinct from power, categorize it as such.
This commit is contained in:
Jarrod Johnson 2017-10-17 11:07:54 -04:00
parent 3a1e9fe0bc
commit bfc2b65e99
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
confluent_client/bin/nodesensors
View File

@ -36,6 +36,7 @@ import confluent.client as client
sensorcollections = {
'all': 'sensors/hardware/all/all',
'energy': 'sensors/hardware/energy/all',
'temperature': 'sensors/hardware/temperature/all',
'temp': 'sensors/hardware/temperature/all',
'power': 'sensors/hardware/power/all',

4
confluent_server/confluent/core.py
View File

@ -257,6 +257,10 @@ def _init_core():
'pluginattrs': ['hardwaremanagement.method'],
'default': 'ipmi',
}),
'energy': PluginCollection({
'pluginattrs': ['hardwaremanagement.method'],
'default': 'ipmi',
}),
'temperature': PluginCollection({
'pluginattrs': ['hardwaremanagement.method'],
'default': 'ipmi',

3
confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
View File

@ -69,7 +69,8 @@ _ipmiwaiters = []
sensor_categories = {
'temperature': frozenset(['Temperature']),
'power': frozenset(['Power', 'Current', 'Battery']),
'energy': frozenset(['Energy']),
'power': frozenset(['Power', 'Current']),
'fans': frozenset(['Fan', 'Cooling Device']),
}