From 47a53a51e4bb625e28232cb8f792f2053b2e0b64 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 7 Sep 2018 11:16:09 -0400 Subject: [PATCH] Fix non-unique name for similar inventory items. --- .../confluent/plugins/hardwaremanagement/ipmi.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py index 1cd70e23..2052cc6e 100644 --- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py +++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py @@ -410,6 +410,7 @@ persistent_ipmicmds = {} class IpmiHandler(object): def __init__(self, operation, node, element, cfd, inputdata, cfg, output): self.sensormap = {} + self.usedlabels = {} self.invmap = {} self.output = output self.sensorcategory = None @@ -916,7 +917,12 @@ class IpmiHandler(object): if vstr: newinf['information']['PCI Vendor'] = vstr if dstr: - newinf['name'] = dstr + newname = dstr + instance = 1 + while newname in self.usednames: + instance += 1 + newname = dstr + ' {1}'.format(instance) + newinf['name'] = newname invitems.append(newinf) def handle_sensors(self):