External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 18:07:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

properly support job host summary data in custom notification templates

Browse Source 
see: https://github.com/ansible/tower/issues/4148
This commit is contained in:
Ryan Petrello
2020-03-03 14:28:46 -05:00
parent d009ce49f5
commit 32ef805e23
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
awx/main/models/notifications.py
View File

@@ -270,7 +270,8 @@ class JobNotificationMixin(object):
'elapsed', 'job_explanation', 'execution_node', 'controller_node', 'allow_simultaneous', 'elapsed', 'job_explanation', 'execution_node', 'controller_node', 'allow_simultaneous',
'scm_revision', 'diff_mode', 'job_slice_number', 'job_slice_count', 'custom_virtualenv', 'scm_revision', 'diff_mode', 'job_slice_number', 'job_slice_count', 'custom_virtualenv',
'approval_status', 'approval_node_name', 'workflow_url', 'approval_status', 'approval_node_name', 'workflow_url',
{'host_status_counts': ['skipped', 'ok', 'changed', 'failures', 'dark']}, {'host_status_counts': ['skipped', 'ok', 'changed', 'failed', 'failures', 'dark'
'processed', 'rescued', 'ignored']},
{'playbook_counts': ['play_count', 'task_count']}, {'playbook_counts': ['play_count', 'task_count']},
{'summary_fields': [{'inventory': ['id', 'name', 'description', 'has_active_failures', {'summary_fields': [{'inventory': ['id', 'name', 'description', 'has_active_failures',
'total_hosts', 'hosts_with_active_failures', 'total_groups', 'total_hosts', 'hosts_with_active_failures', 'total_groups',
@@ -303,7 +304,7 @@ class JobNotificationMixin(object):
'finished': False, 'finished': False,
'force_handlers': False, 'force_handlers': False,
'forks': 0, 'forks': 0,
'host_status_counts': {'skipped': 1, 'ok': 5, 'changed': 3, 'failures': 0, 'dark': 0}, 'host_status_counts': {'skipped': 1, 'ok': 5, 'changed': 3, 'failures': 0, 'dark': 0, 'failed': False, 'processed': 0, 'rescued': 0},
'id': 42, 'id': 42,
'job_explanation': 'Sample job explanation', 'job_explanation': 'Sample job explanation',
'job_slice_count': 1, 'job_slice_count': 1,
@@ -392,10 +393,20 @@ class JobNotificationMixin(object):
The context will contain whitelisted content retrieved from a serialized job object The context will contain whitelisted content retrieved from a serialized job object
(see JobNotificationMixin.JOB_FIELDS_WHITELIST), the job's friendly name, (see JobNotificationMixin.JOB_FIELDS_WHITELIST), the job's friendly name,
and a url to the job run.""" and a url to the job run."""
context = {'job': {}, job_context = {'host_status_counts': {}}
'job_friendly_name': self.get_notification_friendly_name(), summary = None
'url': self.get_ui_url(), if hasattr(self, 'job_host_summaries'):
'job_metadata': json.dumps(self.notification_data(), indent=4)} summary = self.job_host_summaries.first()
if summary:
from awx.api.serializers import JobHostSummarySerializer
summary_data = JobHostSummarySerializer(summary).to_representation(summary)
job_context['host_status_counts'] = summary_data
context = {
'job': job_context,
'job_friendly_name': self.get_notification_friendly_name(),
'url': self.get_ui_url(),
'job_metadata': json.dumps(self.notification_data(), indent=4)
}
def build_context(node, fields, whitelisted_fields): def build_context(node, fields, whitelisted_fields):
for safe_field in whitelisted_fields: for safe_field in whitelisted_fields: