justin/Zerto_Exporter
1
0
Fork 0
mirror of https://github.com/recklessop/Zerto_Exporter.git synced 2026-07-02 23:53:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #69 from recklessop/fix/counter-reset-on-zvm-reboot

Browse Source 
Fix: suppress counter spike/negative value on ZVM reboot
This commit is contained in:
Justin Paul
2026-02-20 19:56:23 -05:00
committed by GitHub
parent 5a659c789f 1f591e20ef
commit f360c34b3d
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/.pypirc
-3
View File
@@ -1,3 +0,0 @@
[pypi]
username = __token__
password = pypi-AgEIcHlwaS5vcmcCJDZlMmZlNTc4LTI2NTgtNDVlZS04MDA2LTVmMGUzNTQyMzFmZAACKlszLCJjNTQzODQ3Yy1iOGQ1LTQwZDAtOTU5Yy0zNWIxNGVmM2NhNjkiXQAABiBdsEOQWVnk-qd-erTO48YJLKxiztWySeNQ45V6y45fkw
app/python-node-exporter.py
+19 -8
View File
@@ -136,6 +136,16 @@ g_thread_status = Gauge('exporter_thread_status', 'Exporter Thread Status',
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# Thread which gets VM level encryption statistics from ZVM API # Thread which gets VM level encryption statistics from ZVM API
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
def _counter_delta(new, old, vm_id, metric):
"""Return new-old normally; if new < old, the ZVM counter reset (reboot).
In that case return new as-is and log a warning so the spike is suppressed."""
if new >= old:
return new - old
log.warning(f"Counter reset detected for VM {vm_id} metric '{metric}' "
f"(old={old}, new={new}) - ZVM may have rebooted. Publishing raw value.")
return new
def GetStatsFunc(zvm_instance): def GetStatsFunc(zvm_instance):
tempdb = TinyDB(storage=MemoryStorage) tempdb = TinyDB(storage=MemoryStorage)
dbvm = Query() dbvm = Query()
@@ -194,22 +204,23 @@ def GetStatsFunc(zvm_instance):
log.debug(vm) log.debug(vm)
log.debug("!@!@!@!@!@ Stats !@!@!@!@!@") log.debug("!@!@!@!@!@ Stats !@!@!@!@!@")
VMName = oldvmdata[0]['VmName'] VMName = oldvmdata[0]['VmName']
vid = vm['VmIdentifier']
log.debug("Current VM " + str(VMName)) log.debug("Current VM " + str(VMName))
CurrentIops = abs(vm['IoOperationsCounter'] - oldvmdata[0]['IoOperationsCounter']) CurrentIops = _counter_delta(vm['IoOperationsCounter'], oldvmdata[0]['IoOperationsCounter'], vid, 'IoOperationsCounter')
log.debug("CurrentIops " + str(CurrentIops)) log.debug("CurrentIops " + str(CurrentIops))
CurrentSyncCounterInMBs = abs(vm['SyncCounterInMBs'] - oldvmdata[0]['SyncCounterInMBs']) CurrentSyncCounterInMBs = _counter_delta(vm['SyncCounterInMBs'], oldvmdata[0]['SyncCounterInMBs'], vid, 'SyncCounterInMBs')
log.debug("CurrentSyncCounterInMBs " + str(CurrentSyncCounterInMBs)) log.debug("CurrentSyncCounterInMBs " + str(CurrentSyncCounterInMBs))
CurrentNetworkTrafficCounterInMBs = abs(vm['NetworkTrafficCounterInMBs'] - oldvmdata[0]['NetworkTrafficCounterInMBs']) CurrentNetworkTrafficCounterInMBs = _counter_delta(vm['NetworkTrafficCounterInMBs'], oldvmdata[0]['NetworkTrafficCounterInMBs'], vid, 'NetworkTrafficCounterInMBs')
log.debug("CurrentNetworkTrafficCounterInMBs " + str(CurrentNetworkTrafficCounterInMBs)) log.debug("CurrentNetworkTrafficCounterInMBs " + str(CurrentNetworkTrafficCounterInMBs))
CurrentWriteCounterInMBs = abs(vm['WriteCounterInMBs'] - oldvmdata[0]['WriteCounterInMBs']) CurrentWriteCounterInMBs = _counter_delta(vm['WriteCounterInMBs'], oldvmdata[0]['WriteCounterInMBs'], vid, 'WriteCounterInMBs')
log.debug("CurrentWriteCounterInMBs " + str(CurrentWriteCounterInMBs)) log.debug("CurrentWriteCounterInMBs " + str(CurrentWriteCounterInMBs))
CurrentEncryptedLBs = abs(vm['EncryptionMetrics']['EncryptedData'] - oldvmdata[0]['EncryptionMetrics']['EncryptedData']) CurrentEncryptedLBs = _counter_delta(vm['EncryptionMetrics']['EncryptedData'], oldvmdata[0]['EncryptionMetrics']['EncryptedData'], vid, 'EncryptedData')
log.debug("CurrentEncryptedLBs " + str(CurrentEncryptedLBs)) log.debug("CurrentEncryptedLBs " + str(CurrentEncryptedLBs))
CurrentUnencryptedLBs = abs(vm['EncryptionMetrics']['NonEncryptedData'] - oldvmdata[0]['EncryptionMetrics']['NonEncryptedData']) CurrentUnencryptedLBs = _counter_delta(vm['EncryptionMetrics']['NonEncryptedData'], oldvmdata[0]['EncryptionMetrics']['NonEncryptedData'], vid, 'NonEncryptedData')
log.debug("CurrentUnencryptedLBs " + str(CurrentUnencryptedLBs)) log.debug("CurrentUnencryptedLBs " + str(CurrentUnencryptedLBs))
CurrentTrendChangeLevel = abs(vm['EncryptionMetrics']['TrendChangeLevel'] - oldvmdata[0]['EncryptionMetrics']['TrendChangeLevel']) CurrentTrendChangeLevel = _counter_delta(vm['EncryptionMetrics']['TrendChangeLevel'], oldvmdata[0]['EncryptionMetrics']['TrendChangeLevel'], vid, 'TrendChangeLevel')
log.debug("CurrentTrendChangeLevel " + str(CurrentTrendChangeLevel)) log.debug("CurrentTrendChangeLevel " + str(CurrentTrendChangeLevel))
CurrentTotalLBs = abs(CurrentEncryptedLBs + CurrentUnencryptedLBs) CurrentTotalLBs = CurrentEncryptedLBs + CurrentUnencryptedLBs
log.debug("CurrentTotalLBs " + str(CurrentTotalLBs)) log.debug("CurrentTotalLBs " + str(CurrentTotalLBs))
if CurrentTotalLBs != 0: if CurrentTotalLBs != 0:
CurrentPercentEncrypted = (CurrentEncryptedLBs / CurrentTotalLBs) * 100 CurrentPercentEncrypted = (CurrentEncryptedLBs / CurrentTotalLBs) * 100
app/version.py
+1 -1
View File
@@ -1,5 +1,5 @@
# version.py # version.py
VERSION = "2.1.0" VERSION = "3.0.0"
def main(): def main():
# Put your main program code here # Put your main program code here