Update python-node-exporter.py

Updated logic to look for VM and VPG ID in encryption detection stats incase VM is protected using one to many
This commit is contained in:
2023-03-25 13:23:15 -04:00
parent 65ab4d33d6
commit 251b23990c
+7 -6
View File
@@ -150,8 +150,9 @@ def ZvmAuthHandler():
# Thread which gets VM level encryption statistics from ZVM API # Thread which gets VM level encryption statistics from ZVM API
def GetStatsFunc(): def GetStatsFunc():
tempdb = TinyDB(storage=MemoryStorage) tempdb = TinyDB(storage=MemoryStorage) # ('./db.json') used for storing db on disk for debugging
dbvm = Query() dbvm = Query()
dbvpg = Query()
while (True) : while (True) :
global token global token
global siteId global siteId
@@ -187,13 +188,13 @@ def GetStatsFunc():
CurrentPercentEncrypted = 0 CurrentPercentEncrypted = 0
VMName = "NA" VMName = "NA"
oldvmdata = tempdb.search(dbvm.VmIdentifier == vm['VmIdentifier']) oldvmdata = tempdb.search(dbvm.VmIdentifier == vm['VmIdentifier'] and dbvpg.VpgIdentifier == vm['VpgIdentifier'])
log.info("Checking TempDB for VM " + vm['VmIdentifier'] + " in VPG " + vm['VpgIdentifier']) log.info("Checking TempDB for VM " + vm['VmIdentifier'] + " in VPG " + vm['VpgIdentifier'])
if (oldvmdata and (oldvmdata[0]['VpgIdentifier'] != vm['VpgIdentifier'])): if (oldvmdata):
log.info(vm['VmIdentifier'] + " Record Found") log.info(vm['VmIdentifier'] + " Record Found, Updating DB")
log.debug(oldvmdata[0]) log.debug(oldvmdata[0])
log.debug(tempdb.update(vm, dbvm.VmIdentifier == vm['VmIdentifier'])) log.debug(tempdb.update(vm, dbvm.VmIdentifier == vm['VmIdentifier'] and dbvpg.VpgIdentifier == vm['VpgIdentifier']))
log.debug("!@!@!@!@!@ Stats !@!@!@!@!@") log.debug("!@!@!@!@!@ Stats !@!@!@!@!@")
VMName = oldvmdata[0]['VmName'] VMName = oldvmdata[0]['VmName']
@@ -232,7 +233,7 @@ def GetStatsFunc():
else: else:
log.debug("vapi_json: " + str(vapi_json)) log.debug("vapi_json: " + str(vapi_json))
tempdb.update({'VmName': vapi_json['VmName']}, dbvm.VmIdentifier == vm['VmIdentifier']) tempdb.update({'VmName': vapi_json['VmName']}, dbvm.VmIdentifier == vm['VmIdentifier'])
log.info("Added to temp vm db" + vm['VmIdentifier'] + " - " + vapi_json['VmName']) log.info("Added vm to tempdb " + vm['VmIdentifier'] + " - " + vapi_json['VmName'])
VMName = vapi_json['VmName'] VMName = vapi_json['VmName']
# Store Calculated Metrics # Store Calculated Metrics