From 65e1dfcc57b93fae1d7ade6f775fed28077ece70 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 2 May 2019 10:54:15 -0400 Subject: [PATCH] Fix nodesensors with redfish plugin redfish plugin does not produce the same data as ipmi, tolerate that difference. --- confluent_client/bin/nodesensors | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/confluent_client/bin/nodesensors b/confluent_client/bin/nodesensors index 51eb9128..9a03bd29 100755 --- a/confluent_client/bin/nodesensors +++ b/confluent_client/bin/nodesensors @@ -114,7 +114,8 @@ def sensorpass(showout=True, appendtime=False): continue for redundant_state in ('Non-Critical', 'Critical'): try: - sensedata['states'].remove(redundant_state) + if sensedata.get('states', False): + sensedata['states'].remove(redundant_state) except ValueError: pass resultdata[node][sensedata['name']] = sensedata @@ -132,11 +133,12 @@ def sensorpass(showout=True, appendtime=False): showval = u' {0} '.format(sensedata['value']) if sensedata['units'] not in (None, u''): showval += sensedata['units'] - if sensedata['health'] != 'ok': + if sensedata.get('health', 'ok') != 'ok': datadescription = [sensedata['health']] else: datadescription = [] - datadescription.extend(sensedata['states']) + if sensedata.get('states', False): + datadescription.extend(sensedata['states']) if datadescription: if showval == '': showval += u' {0}'.format(