Merge branch 'main' into threat-intel-profile

Signed-off-by: Jonathan Rau <[email protected]>

.github/pull_request_template.md

@@ -6,5 +6,4 @@
 1. Did you add a single line summary of changes to `Unreleased` section in the [CHANGELOG.md](https://github.com/ocsf/ocsf-schema/blob/main/CHANGELOG.md) file?
 2. Have you followed the [contribution guidelines](https://github.com/ocsf/ocsf-schema/blob/main/CONTRIBUTING.md)?
 3. Did you run a local instance of the [ocsf-server](https://github.com/ocsf/ocsf-server) and ensure it ran without any errors/warnings?
-4. Have you assigned appropriate labels to the PR?
-5. Is your PR title in sync with the description?
+4. Is your PR title in sync with the description?

.github/workflows/deep-validate.yml

@@ -23,4 +23,5 @@ jobs:
       run: python -m pip install 'ocsf-validator>=0.1.1,<0.2'
 
     - name: Run validator
-      run: python -m ocsf_validator .
+      shell: bash
+      run: export FORCE_COLOR=1 && python -m ocsf_validator .

.gitignore

@@ -0,0 +1 @@
+.DS_Store

CHANGELOG.md

@@ -41,6 +41,7 @@ Thankyou! -->
 
 ### Added
 * #### Categories
+    1. Added `Remediation` category. #1066
 * #### Event Classes
     1. Added `Event Log Activity` event class. #1014
     2. Added `Remediation Activity` `File Remediation Activity` `Process Remediation Activity` `Network Remediation Activity` event classes. #1066
@@ -55,6 +56,7 @@ Thankyou! -->
     6. Added `signatures` object, an array of `signature` objects. #992
     7. Added `whois` object. #992
     8. Added `domain_contact` and array-typed `domain_contacts` object for use with `whois` object. #992
+
 * #### Platform Extensions
 
 ### Improved
@@ -71,9 +73,13 @@ Thankyou! -->
     3. Added `state_id`, `state` to `Digital Signature` object. #1069
     4. Added `ticket` to `Incident Finding` object. ticket. #1068
     5. Added `domain` to `Uniform Resource Locator` object. #1096
+    6. Added `reg_key` and `reg_value` to `Evidence Artifacts` object. #1078
+
 * #### Platform Extensions
 
 ### Bugfixes
+    1. Fixed the host profile construction in `patch_state` event class. #1087
+    2. Removed the optional requirement overrides for `name` and `uid` in `_resource` as they are part of a constraint. #1087
 
 ### Deprecated
 

categories.json

@@ -32,6 +32,11 @@
       "caption": "Application Activity",
       "description": "Application Activity events report detailed information about the behavior of applications and services.",
       "uid": 6
+    },
+    "remediation": {
+      "caption": "Remediation",
+      "description": "Remediation events report the results of remediation commands targeting files, processes, and other objects.",
+      "uid": 7
     }
   }
 }