Skip to content

Add regex for syslog timestamp in extract_log #7597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kellyyeh merged 2 commits into from
Mar 5, 2023
Merged

Add regex for syslog timestamp in extract_log #7597

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b10aec
Add regex for kvm syslog timestamp
kellyyeh Feb 28, 2023
7b83b5e
Add double line break
kellyyeh Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions ansible/library/extract_log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ def extract_number(s):
else:
return int(ns[0])


Copy link
Copy Markdown
Contributor

@vaibhavhd vaibhavhd Mar 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor: two places where line breaks are removed. Double line break is a pip8 suggested format.

Copy link
Copy Markdown
Contributor Author

@kellyyeh kellyyeh Mar 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

def convert_date(fct, s):
dt = None
re_result = re.findall(r'^\S{3}\s{1,2}\d{1,2} \d{2}:\d{2}:\d{2}\.?\d*', s)
Expand All @@ -137,9 +136,16 @@ def convert_date(fct, s):
if (dt - fct).days > 183:
dt.replace(year = dt.year - 1)
else:
re_result = re.findall(r'^\d{4}-\d{2}-\d{2}\.\d{2}:\d{2}:\d{2}\.\d{6}', s)
str_date = re_result[0]
dt = datetime.datetime.strptime(str_date, '%Y-%m-%d.%X.%f')
re_result = re.findall(r'^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{6}', s)
if len(re_result) > 0:
str_date = re_result[0]
str_date = str_date.replace("T", " ")
dt = datetime.datetime.strptime(str_date, '%Y-%m-%d %X.%f')
else:
re_result = re.findall(r'^\d{4}-\d{2}-\d{2}\.\d{2}:\d{2}:\d{2}\.\d{6}', s)
if len(re_result) > 0:
str_date = re_result[0]
dt = datetime.datetime.strptime(str_date, '%Y-%m-%d.%X.%f')
locale.setlocale(locale.LC_ALL, loc)

return dt
Expand Down