Added new elements to delete event

README.md

@@ -92,7 +92,6 @@ _prometheus_multiproc_dir_ environment variable. This is done automatically.
 python run_gunicorn.py
 ```
 
-
 ## Configuration environment variables
 
 ```

api/host.py

@@ -283,28 +283,28 @@ def find_hosts_by_hostname_or_id(account_number, hostname):
 def delete_by_id(host_id_list):
     query = _get_host_list_by_id_list(current_identity.account_number, host_id_list)
 
-    host_ids_to_delete = []
+    hosts_to_delete = []
     for host in query.all():
         try:
-            host_ids_to_delete.append(host.id)
+            hosts_to_delete.append(host)
         except sqlalchemy.orm.exc.ObjectDeletedError:
             logger.exception(
                 "Encountered sqlalchemy.orm.exc.ObjectDeletedError exception during delete_by_id operation.  Host was "
                 "already deleted."
             )
 
-    if not host_ids_to_delete:
+    if not hosts_to_delete:
         return flask.abort(status.HTTP_404_NOT_FOUND)
 
     with metrics.delete_host_processing_time.time():
         query.delete(synchronize_session="fetch")
     db.session.commit()
 
-    metrics.delete_host_count.inc(len(host_ids_to_delete))
+    metrics.delete_host_count.inc(len(hosts_to_delete))
 
-    logger.debug("Deleted hosts: %s", host_ids_to_delete)
+    logger.debug("Deleted hosts: %s", hosts_to_delete)
 
-    for deleted_host_id in host_ids_to_delete:
+    for deleted_host_id in hosts_to_delete:
         emit_event(events.delete(deleted_host_id))
 
 

app/events.py

@@ -3,6 +3,10 @@
 
 from marshmallow import fields
 from marshmallow import Schema
+from marshmallow import validate
+
+from app.models import CanonicalFacts
+from app.validators import verify_uuid_format
 
 logger = logging.getLogger(__name__)
 
@@ -11,7 +15,28 @@ class HostEvent(Schema):
     id = fields.UUID()
     timestamp = fields.DateTime(format="iso8601")
     type = fields.Str()
+    account = fields.Str(validate=validate.Length(min=1, max=255))
+    insights_id = fields.Str(validate=verify_uuid_format)
+    rhel_machine_id = fields.Str(validate=verify_uuid_format)
+    subscription_manager_id = fields.Str(validate=verify_uuid_format)
+    satellite_id = fields.Str(validate=verify_uuid_format)
+    fqdn = fields.Str(validate=validate.Length(min=1, max=255))
+    bios_uuid = fields.Str(validate=verify_uuid_format)
+    ip_addresses = fields.List(fields.Str(validate=validate.Length(min=1, max=255)))
+    mac_addresses = fields.List(fields.Str(validate=validate.Length(min=1, max=255)))
+    external_id = fields.Str(validate=validate.Length(min=1, max=500))
 
 
-def delete(id):
-    return HostEvent(strict=True).dumps({"id": id, "timestamp": datetime.utcnow(), "type": "delete"}).data
+def delete(host):
+    return (
+        HostEvent()
+        .dumps(
+            {
+                "timestamp": datetime.utcnow(),
+                **CanonicalFacts.to_json(host.canonical_facts),
+                "account": host.account,
+                "type": "delete",
+            }
+        )
+        .data
+    )