diff --git a/.gitignore b/.gitignore index 62e7e1d..f8842fb 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,5 @@ __pycache__/ # Custom .DS_Store iris_webhooks_module.egg-info/ -in_test/ \ No newline at end of file +in_test/ +.venv/ \ No newline at end of file diff --git a/iris_webhooks_module/IrisWebHooksInterface.py b/iris_webhooks_module/IrisWebHooksInterface.py index 2496f95..b19cbd1 100644 --- a/iris_webhooks_module/IrisWebHooksInterface.py +++ b/iris_webhooks_module/IrisWebHooksInterface.py @@ -346,12 +346,17 @@ def _do_web_hook(self, hook_name, data, hook, server_url) -> InterfaceStatus.IIS } elif hook_object == 'alert': - if isinstance(data[0], dict): + if isinstance(data[0], dict) and 'comment' in data[0]: + object_url = f"{server_url}/alerts/filter?alert_ids={data[0]['alert']['alert_id']}" + alerts_data = data[0] + elif isinstance(data[0], dict): object_url = f"{server_url}/alerts/filter?alert_ids={data[0]['alert_ids']}" + alerts_data = AlertSchema(many=True).dump(data) else: object_url = f"{server_url}/alerts/filter?alert_ids={data[0].alert_id}" + alerts_data = AlertSchema(many=True).dump(data) raw_data = { - 'alerts': AlertSchema(many=True).dump(data), + 'alerts': alerts_data, 'object_url': object_url }