Support 'energy' sensor category

Energy is distinct from power, categorize it as such.

confluent_client/bin/nodesensors

@@ -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',

confluent_server/confluent/core.py

@@ -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',

confluent_server/confluent/plugins/hardwaremanagement/ipmi.py

@@ -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']),
 }