Merge branch 'main' into cred_uid_observ

Signed-off-by: Rajas <[email protected]>

CHANGELOG.md

@@ -80,6 +80,7 @@ Thankyou! -->
     5. Added `reg_key` and `reg_value` to `Evidence Artifacts` object. #1078  
     6. Added `type_id` and associated entity objects to `Managed Entity`. #1094
     7. Added `vendor_name`, `type`, `type_id` to object `package`. #1093
+    8. Added `router`, `ids`, and `ips` entries to `type_id` enum in the `Endpoint` object. #1121
 * #### Platform Extensions
 
 ### Bugfixes

objects/endpoint.json

@@ -94,7 +94,7 @@
         },
         "7": {
           "caption": "IOT",
-          "description": "A <a target='_blank' href='https://www.techtarget.com/iotagenda/definition/IoT-device'>IOT (Internet of Things) device</a>."
+          "description": "An <a target='_blank' href='https://www.techtarget.com/iotagenda/definition/IoT-device'>IOT (Internet of Things) device</a>."
         },
         "8": {
           "caption": "Browser",
@@ -111,6 +111,18 @@
         "11": {
           "caption": "Hub",
           "description": "A <a target='_blank' href='https://en.wikipedia.org/wiki/Ethernet_hub'>networking hub</a>."
+        },
+        "12": {
+          "caption": "Router",
+          "description": "A <a target='_blank' href='https://d3fend.mitre.org/dao/artifact/d3f:Router/'>networking router</a>."
+        },
+        "13": {
+          "caption": "IDS",
+          "description": "An <a target='_blank' href='https://d3fend.mitre.org/dao/artifact/d3f:IntrusionDetectionSystem/'>intrusion detection system</a>."
+        },
+        "14": {
+          "caption": "IPS",
+          "description": "An <a target='_blank' href='https://d3fend.mitre.org/dao/artifact/d3f:IntrusionPreventionSystem/'>intrusion prevention system</a>."
         }
       },
       "requirement": "recommended"