[PLINT-363] Add additional event tags for non-host resources (#17403)

* Add additional event tags for non host resources

* Add changelog

* Fix

* fix changelog

Author: sarah-witt

vsphere/changelog.d/17403.fixed

@@ -0,0 +1 @@
+Add additional tags on events for non-host resources.

vsphere/datadog_checks/vsphere/event.py

@@ -11,7 +11,7 @@
 
 from datadog_checks.base import ensure_unicode
 
-from .constants import MOR_TYPE_AS_STRING, SOURCE_TYPE
+from .constants import DEFAULT_EVENT_RESOURCES, MOR_TYPE_AS_STRING, SOURCE_TYPE
 
 EXCLUDE_FILTERS = {
     'AlarmStatusChangedEvent': [r'Gray to Green', r'Green to Gray'],
@@ -193,6 +193,16 @@ def get_agg_key(alarm_event):
         )
         if host_name is not None:
             self.payload['host'] = host_name
+
+        # VMs and hosts submit these as host tags
+        if self.host_type.lower() not in DEFAULT_EVENT_RESOURCES:
+            self.payload['tags'].extend(
+                [
+                    'vsphere_type:{}'.format(self.host_type),
+                    'vsphere_resource:{}'.format(entity_name),
+                ]
+            )
+
         return self.payload
 
     def transform_vmmessageevent(self):

vsphere/tests/test_event.py

@@ -126,10 +126,14 @@ def test_events_collection(aggregator, realtime_instance):
 
     check.api.mock_events = [event2, event3, event3, event4]
     check.check(None)
-    for from_status, to_status, count in [('yellow', 'red', 1), ('red', 'red', 2), ('red', 'green', 1)]:
+    for from_status, to_status, count, additional_tags in [
+        ('yellow', 'red', 1, []),
+        ('red', 'red', 2, []),
+        ('red', 'green', 1, ['vsphere_type:cluster', 'vsphere_resource:c1']),
+    ]:
         aggregator.assert_event(
             "vCenter monitor status changed on this alarm, it was {} and it's now {}.".format(from_status, to_status),
-            tags=['vcenter_server:FAKE'],
+            tags=additional_tags + ['vcenter_server:FAKE'],
             count=count,
         )
     assert len(aggregator.events) == 4
@@ -142,10 +146,12 @@ def test_events_collection(aggregator, realtime_instance):
 
     check.api.mock_events = [event2, event3, event3, event4]
     check.check(None)
-    for from_status, to_status, count in [('red', 'green', 1)]:
+    for from_status, to_status, count, additional_tags in [
+        ('red', 'green', 1, ['vsphere_type:cluster', 'vsphere_resource:c1'])
+    ]:
         aggregator.assert_event(
             "vCenter monitor status changed on this alarm, it was {} and it's now {}.".format(from_status, to_status),
-            tags=['vcenter_server:FAKE'],
+            tags=additional_tags + ['vcenter_server:FAKE'],
             count=count,
         )
     assert len(aggregator.events) == 1