diff --git a/awx/main/models/notifications.py b/awx/main/models/notifications.py index 3d422d5e25..9163e57e92 100644 --- a/awx/main/models/notifications.py +++ b/awx/main/models/notifications.py @@ -366,7 +366,7 @@ class JobNotificationMixin(object): 'verbosity': 0}, 'job_friendly_name': 'Job', 'url': 'https://towerhost/#/jobs/playbook/1010', - 'job_summary_dict': """{'url': 'https://towerhost/$/jobs/playbook/13', + 'job_metadata': """{'url': 'https://towerhost/$/jobs/playbook/13', 'traceback': '', 'status': 'running', 'started': '2019-08-07T21:46:38.362630+00:00', @@ -392,7 +392,7 @@ class JobNotificationMixin(object): context = {'job': {}, 'job_friendly_name': self.get_notification_friendly_name(), 'url': self.get_ui_url(), - 'job_summary_dict': json.dumps(self.notification_data(), indent=4)} + 'job_metadata': json.dumps(self.notification_data(), indent=4)} def build_context(node, fields, whitelisted_fields): for safe_field in whitelisted_fields: diff --git a/awx/main/models/workflow.py b/awx/main/models/workflow.py index 83a7c91ad3..100ba1c323 100644 --- a/awx/main/models/workflow.py +++ b/awx/main/models/workflow.py @@ -805,7 +805,7 @@ class WorkflowApproval(UnifiedJob, JobNotificationMixin): return {'approval_status': approval_status, 'approval_node_name': self.workflow_approval_template.name, 'workflow_url': workflow_url, - 'job_summary_dict': json.dumps(self.notification_data(), indent=4)} + 'job_metadata': json.dumps(self.notification_data(), indent=4)} @property def workflow_job_template(self): diff --git a/awx/main/notifications/custom_notification_base.py b/awx/main/notifications/custom_notification_base.py index 2abff26f62..b7038ec867 100644 --- a/awx/main/notifications/custom_notification_base.py +++ b/awx/main/notifications/custom_notification_base.py @@ -4,7 +4,7 @@ class CustomNotificationBase(object): DEFAULT_MSG = "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}" - DEFAULT_BODY = "{{ job_friendly_name }} #{{ job.id }} had status {{ job.status }}, view details at {{ url }}\n\n{{ job_summary_dict }}" + DEFAULT_BODY = "{{ job_friendly_name }} #{{ job.id }} had status {{ job.status }}, view details at {{ url }}\n\n{{ job_metadata }}" default_messages = {"started": {"message": DEFAULT_MSG, "body": None}, "success": {"message": DEFAULT_MSG, "body": None}, diff --git a/awx/main/notifications/pagerduty_backend.py b/awx/main/notifications/pagerduty_backend.py index a2399b9777..45869a34db 100644 --- a/awx/main/notifications/pagerduty_backend.py +++ b/awx/main/notifications/pagerduty_backend.py @@ -26,7 +26,7 @@ class PagerDutyBackend(AWXBaseEmailBackend, CustomNotificationBase): recipient_parameter = "service_key" sender_parameter = "client_name" - DEFAULT_BODY = "{{ job_summary_dict }}" + DEFAULT_BODY = "{{ job_metadata }}" default_messages = {"started": {"message": DEFAULT_MSG, "body": DEFAULT_BODY}, "success": {"message": DEFAULT_MSG, "body": DEFAULT_BODY}, "error": {"message": DEFAULT_MSG, "body": DEFAULT_BODY}, diff --git a/awx/main/notifications/webhook_backend.py b/awx/main/notifications/webhook_backend.py index f05012c4d6..b9c2c35d22 100644 --- a/awx/main/notifications/webhook_backend.py +++ b/awx/main/notifications/webhook_backend.py @@ -26,7 +26,7 @@ class WebhookBackend(AWXBaseEmailBackend, CustomNotificationBase): recipient_parameter = "url" sender_parameter = None - DEFAULT_BODY = "{{ job_summary_dict }}" + DEFAULT_BODY = "{{ job_metadata }}" default_messages = {"started": {"body": DEFAULT_BODY}, "success": {"body": DEFAULT_BODY}, "error": {"body": DEFAULT_BODY}, diff --git a/awx/main/tests/functional/models/test_notifications.py b/awx/main/tests/functional/models/test_notifications.py index 2ebbcca71a..1b671efdcb 100644 --- a/awx/main/tests/functional/models/test_notifications.py +++ b/awx/main/tests/functional/models/test_notifications.py @@ -87,7 +87,7 @@ class TestJobNotificationMixin(object): 'use_fact_cache': bool, 'verbosity': int}, 'job_friendly_name': str, - 'job_summary_dict': str, + 'job_metadata': str, 'url': str} diff --git a/awx/main/tests/unit/api/serializers/test_notification_template_serializers.py b/awx/main/tests/unit/api/serializers/test_notification_template_serializers.py index afd29820d2..f0bd6784d4 100644 --- a/awx/main/tests/unit/api/serializers/test_notification_template_serializers.py +++ b/awx/main/tests/unit/api/serializers/test_notification_template_serializers.py @@ -26,7 +26,7 @@ class TestNotificationTemplateSerializer(): {'started': {'message': '{{ job.id }}', 'body': '{{ job.status }}'}, 'success': {'message': None, 'body': '{{ job_friendly_name }}'}, 'error': {'message': '{{ url }}', 'body': None}}, - {'started': {'body': '{{ job_summary_dict }}'}}, + {'started': {'body': '{{ job_metadata }}'}}, {'started': {'body': '{{ job.summary_fields.inventory.total_hosts }}'}}, {'started': {'body': u'Iñtërnâtiônàlizætiøn'}} ])