Skip to content

Update log handling in playbooks and mock data for JSON compatibility #34

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
merged 1 commit into from
Mar 31, 2025
Merged

Update log handling in playbooks and mock data for JSON compatibility #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,3 +406,5 @@ FodyWeavers.xsd
WORKSPACES/*
.ppk
VMWPASSWORD
.coverage.*
*.ini
6 changes: 4 additions & 2 deletions src/roles/misc/tasks/post-validations-db.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@
{{
(
hostvars[cluster_status_pre.primary_node]['var_log_messages_output'].filtered_logs
| default([])
| default('[]')
| from_json
)
+
(
hostvars[cluster_status_pre.secondary_node]['var_log_messages_output'].filtered_logs
| default([])
| default('[]')
| from_json
)
}}
Expand Down
6 changes: 4 additions & 2 deletions src/roles/misc/tasks/post-validations-scs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@
{{
(
hostvars[cluster_status_pre.ascs_node]['var_log_messages_output'].filtered_logs
| default([])
| default('[]')
| from_json
)
+
(
hostvars[cluster_status_pre.ers_node]['var_log_messages_output'].filtered_logs
| default([])
| default('[]')
| from_json
)
}}
Expand Down
6 changes: 4 additions & 2 deletions src/roles/misc/tasks/rescue.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@
{{
(
hostvars[first_node]['var_log_messages_output'].filtered_logs
| default([])
| default('[]')
| from_json
)
+
(
hostvars[second_node]['var_log_messages_output'].filtered_logs
| default([])
| default('[]')
| from_json
)
}}
Expand Down
3 changes: 2 additions & 1 deletion tests/roles/mock_data/log_parser.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/python3
# -*- coding: utf-8 -*-

import json
from ansible.module_utils.basic import AnsibleModule

def main():
Expand All @@ -17,7 +18,7 @@ def main():
# Return a mock cluster status
module.exit_json(
changed=False,
filtered_logs=["Mock log entry 1", "Mock log entry 2"],
filtered_logs=json.dumps(["Mock log entry 1", "Mock log entry 2"]),
status="PASSED",
keywords=module.params['keywords'],
start_time=module.params['start_time'],
Expand Down
Loading