parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 109 Wiki Activity

Remove bracketed text from fault_str 

This ensures that certain faults e.g. Ceph status faults, will be
combined despite the added text in brackets, while still keeping them
mostly separate.

Also ensure the health text is updated each time to assist with this, as
this health text may now change independent of the fault ID.
This commit is contained in:
Joshua Boniface 2023-12-09 14:11:00 -05:00
parent a70c1d63b0
commit 4003204f14
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
daemon-common/faults.py
View File

@ -21,13 +21,16 @@
from datetime import datetime from datetime import datetime
from hashlib import md5 from hashlib import md5
from re import sub
def generate_fault( def generate_fault(
zkhandler, logger, fault_name, fault_time, fault_delta, fault_message zkhandler, logger, fault_name, fault_time, fault_delta, fault_message
): ):
# Generate a fault ID from the fault_message and fault_delta # Strip off any "extra" data from the message (things in brackets)
fault_str = f"{fault_name} {fault_delta} {fault_message}" fault_core_message = sub(r"[\(\[].*?[\)\]]", "", fault_message).strip()
# Generate a fault ID from the fault_name, fault_delta, and fault_core_message
fault_str = f"{fault_name} {fault_delta} {fault_core_message}"
fault_id = str(md5(fault_str.encode("utf-8")).hexdigest())[:8] fault_id = str(md5(fault_str.encode("utf-8")).hexdigest())[:8]
# Strip the microseconds off of the fault time; we don't care about that precision # Strip the microseconds off of the fault time; we don't care about that precision
@ -63,6 +66,7 @@ def generate_fault(
zkhandler.write( zkhandler.write(
[ [
(("faults.last_time", fault_id), fault_time), (("faults.last_time", fault_id), fault_time),
(("faults.message", fault_id), fault_message),
] ]
) )
# Otherwise, generate a new fault event # Otherwise, generate a new fault event