This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch 23077 in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0c8d4aaa10fc949e1242f94dced869119cc6c031 Author: Andrea Cosentino <[email protected]> AuthorDate: Wed Feb 25 14:56:43 2026 +0100 CAMEL-23077 - Camel-OCSF: Add missing class UID constants and fix generation script Signed-off-by: Andrea Cosentino <[email protected]> --- .../camel/dataformat/ocsf/OcsfConstants.java | 24 ++++++++++++++++++++++ .../src/main/resources/schema/AccountChange.json | 2 +- .../src/main/resources/schema/ApiActivity.json | 2 +- .../src/main/resources/schema/Authentication.json | 2 +- .../main/resources/schema/AuthorizeSession.json | 2 +- .../src/main/resources/schema/Certificate.json | 8 ++++---- .../main/resources/schema/ComplianceFinding.json | 2 +- .../camel-ocsf/src/main/resources/schema/Cve.json | 8 ++++---- .../main/resources/schema/DatastoreActivity.json | 2 +- .../main/resources/schema/DetectionFinding.json | 2 +- .../src/main/resources/schema/Device.json | 20 +++++++++--------- .../src/main/resources/schema/DhcpActivity.json | 2 +- .../src/main/resources/schema/DnsActivity.json | 10 ++++----- .../src/main/resources/schema/EmailActivity.json | 2 +- .../src/main/resources/schema/Enrichment.json | 4 ++-- .../main/resources/schema/EntityManagement.json | 2 +- .../camel-ocsf/src/main/resources/schema/Epss.json | 4 ++-- .../camel-ocsf/src/main/resources/schema/File.json | 12 +++++------ .../src/main/resources/schema/FileActivity.json | 2 +- .../src/main/resources/schema/FindingInfo.json | 16 +++++++-------- .../src/main/resources/schema/FtpActivity.json | 2 +- .../src/main/resources/schema/GroupManagement.json | 2 +- .../src/main/resources/schema/HttpActivity.json | 2 +- .../src/main/resources/schema/IncidentFinding.json | 2 +- .../src/main/resources/schema/KbArticle.json | 4 ++-- .../src/main/resources/schema/KernelActivity.json | 2 +- .../resources/schema/KernelExtensionActivity.json | 2 +- .../src/main/resources/schema/Logger.json | 8 ++++---- .../src/main/resources/schema/MemoryActivity.json | 2 +- .../src/main/resources/schema/Metadata.json | 16 +++++++-------- .../src/main/resources/schema/ModuleActivity.json | 2 +- .../src/main/resources/schema/NetworkActivity.json | 2 +- .../main/resources/schema/NetworkFileActivity.json | 6 +++--- .../src/main/resources/schema/NtpActivity.json | 2 +- .../src/main/resources/schema/Process.json | 8 ++++---- .../src/main/resources/schema/ProcessActivity.json | 2 +- .../src/main/resources/schema/RdpActivity.json | 2 +- .../main/resources/schema/RemediationActivity.json | 2 +- .../src/main/resources/schema/ResourceDetails.json | 8 ++++---- .../src/main/resources/schema/ScanActivity.json | 2 +- .../resources/schema/ScheduledJobActivity.json | 2 +- .../src/main/resources/schema/SecurityFinding.json | 2 +- .../src/main/resources/schema/Session.json | 8 ++++---- .../src/main/resources/schema/SmbActivity.json | 2 +- .../src/main/resources/schema/SshActivity.json | 2 +- .../src/main/resources/schema/UserAccess.json | 2 +- .../src/main/resources/schema/Vulnerability.json | 12 +++++------ .../resources/schema/VulnerabilityFinding.json | 2 +- .../resources/schema/WebResourcesActivity.json | 2 +- .../src/main/script/generate-ocsf-schemas.py | 4 +--- 50 files changed, 133 insertions(+), 111 deletions(-) diff --git a/components/camel-ocsf/src/main/java/org/apache/camel/dataformat/ocsf/OcsfConstants.java b/components/camel-ocsf/src/main/java/org/apache/camel/dataformat/ocsf/OcsfConstants.java index 9894e73a4416..9b34872fe657 100644 --- a/components/camel-ocsf/src/main/java/org/apache/camel/dataformat/ocsf/OcsfConstants.java +++ b/components/camel-ocsf/src/main/java/org/apache/camel/dataformat/ocsf/OcsfConstants.java @@ -41,6 +41,15 @@ public final class OcsfConstants { public static final int CATEGORY_APPLICATION_ACTIVITY = 6; public static final int CATEGORY_REMEDIATION = 7; + // OCSF Event Class UIDs - System Activity Category + public static final int CLASS_FILE_ACTIVITY = 1001; + public static final int CLASS_KERNEL_EXTENSION_ACTIVITY = 1002; + public static final int CLASS_KERNEL_ACTIVITY = 1003; + public static final int CLASS_MEMORY_ACTIVITY = 1004; + public static final int CLASS_MODULE_ACTIVITY = 1005; + public static final int CLASS_SCHEDULED_JOB_ACTIVITY = 1006; + public static final int CLASS_PROCESS_ACTIVITY = 1007; + // OCSF Event Class UIDs - Findings Category public static final int CLASS_SECURITY_FINDING = 2001; public static final int CLASS_VULNERABILITY_FINDING = 2002; @@ -62,7 +71,22 @@ public final class OcsfConstants { public static final int CLASS_HTTP_ACTIVITY = 4002; public static final int CLASS_DNS_ACTIVITY = 4003; public static final int CLASS_DHCP_ACTIVITY = 4004; + public static final int CLASS_RDP_ACTIVITY = 4005; + public static final int CLASS_SMB_ACTIVITY = 4006; public static final int CLASS_SSH_ACTIVITY = 4007; + public static final int CLASS_FTP_ACTIVITY = 4008; + public static final int CLASS_EMAIL_ACTIVITY = 4009; + public static final int CLASS_NETWORK_FILE_ACTIVITY = 4010; + public static final int CLASS_NTP_ACTIVITY = 4013; + + // OCSF Event Class UIDs - Application Activity Category + public static final int CLASS_WEB_RESOURCES_ACTIVITY = 6001; + public static final int CLASS_API_ACTIVITY = 6003; + public static final int CLASS_DATASTORE_ACTIVITY = 6005; + public static final int CLASS_SCAN_ACTIVITY = 6007; + + // OCSF Event Class UIDs - Remediation Category + public static final int CLASS_REMEDIATION_ACTIVITY = 7001; // OCSF Severity IDs public static final int SEVERITY_UNKNOWN = 0; diff --git a/components/camel-ocsf/src/main/resources/schema/AccountChange.json b/components/camel-ocsf/src/main/resources/schema/AccountChange.json index 0c6b2ef0d45e..55c19e46c5f9 100644 --- a/components/camel-ocsf/src/main/resources/schema/AccountChange.json +++ b/components/camel-ocsf/src/main/resources/schema/AccountChange.json @@ -59,4 +59,4 @@ "$ref": "Policy.json" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/ApiActivity.json b/components/camel-ocsf/src/main/resources/schema/ApiActivity.json index b21c9ff6678c..b38336aa2a65 100644 --- a/components/camel-ocsf/src/main/resources/schema/ApiActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/ApiActivity.json @@ -49,4 +49,4 @@ "$ref": "Fingerprint.json" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/Authentication.json b/components/camel-ocsf/src/main/resources/schema/Authentication.json index eebb6fab6346..02ba1864e80d 100644 --- a/components/camel-ocsf/src/main/resources/schema/Authentication.json +++ b/components/camel-ocsf/src/main/resources/schema/Authentication.json @@ -105,4 +105,4 @@ "title": "Cleartext Credentials" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/AuthorizeSession.json b/components/camel-ocsf/src/main/resources/schema/AuthorizeSession.json index b8437c27d63c..2cbad2bc4713 100644 --- a/components/camel-ocsf/src/main/resources/schema/AuthorizeSession.json +++ b/components/camel-ocsf/src/main/resources/schema/AuthorizeSession.json @@ -55,4 +55,4 @@ "$ref": "Fingerprint.json" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/Certificate.json b/components/camel-ocsf/src/main/resources/schema/Certificate.json index 5fde79d965cf..632bc4661dff 100644 --- a/components/camel-ocsf/src/main/resources/schema/Certificate.json +++ b/components/camel-ocsf/src/main/resources/schema/Certificate.json @@ -35,13 +35,13 @@ }, "created_time": { "type": "integer", - "title": "Created Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Created Time" }, "expiration_time": { "type": "integer", - "title": "Expiration Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Expiration Time" }, "sans": { "type": "array", diff --git a/components/camel-ocsf/src/main/resources/schema/ComplianceFinding.json b/components/camel-ocsf/src/main/resources/schema/ComplianceFinding.json index 85d1372b6883..808279866831 100644 --- a/components/camel-ocsf/src/main/resources/schema/ComplianceFinding.json +++ b/components/camel-ocsf/src/main/resources/schema/ComplianceFinding.json @@ -73,4 +73,4 @@ "title": "Confidence" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/Cve.json b/components/camel-ocsf/src/main/resources/schema/Cve.json index 93e90af84be8..3a5e77aeb0fc 100644 --- a/components/camel-ocsf/src/main/resources/schema/Cve.json +++ b/components/camel-ocsf/src/main/resources/schema/Cve.json @@ -34,8 +34,8 @@ }, "created_time": { "type": "integer", - "title": "Created Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Created Time" }, "cvss": { "type": "array", @@ -60,8 +60,8 @@ }, "modified_time": { "type": "integer", - "title": "Modified Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Modified Time" }, "related_cwes": { "type": "array", diff --git a/components/camel-ocsf/src/main/resources/schema/DatastoreActivity.json b/components/camel-ocsf/src/main/resources/schema/DatastoreActivity.json index 3f327a3c8e05..2df5bcb0b02f 100644 --- a/components/camel-ocsf/src/main/resources/schema/DatastoreActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/DatastoreActivity.json @@ -63,4 +63,4 @@ "additionalProperties": true } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/DetectionFinding.json b/components/camel-ocsf/src/main/resources/schema/DetectionFinding.json index 7723db2e01ec..3b8a7f5aa90f 100644 --- a/components/camel-ocsf/src/main/resources/schema/DetectionFinding.json +++ b/components/camel-ocsf/src/main/resources/schema/DetectionFinding.json @@ -125,4 +125,4 @@ "title": "Risk Level" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/Device.json b/components/camel-ocsf/src/main/resources/schema/Device.json index df081f1f9e96..613b2e551efa 100644 --- a/components/camel-ocsf/src/main/resources/schema/Device.json +++ b/components/camel-ocsf/src/main/resources/schema/Device.json @@ -66,8 +66,8 @@ }, "created_time": { "type": "integer", - "title": "Created Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Created Time" }, "network_interfaces": { "type": "array", @@ -105,8 +105,8 @@ }, "boot_time": { "type": "integer", - "title": "Boot Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Boot Time" }, "is_compliant": { "type": "boolean", @@ -127,8 +127,8 @@ }, "first_seen_time": { "type": "integer", - "title": "First Seen", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "First Seen" }, "uid_alt": { "type": "string", @@ -186,13 +186,13 @@ }, "modified_time": { "type": "integer", - "title": "Modified Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Modified Time" }, "last_seen_time": { "type": "integer", - "title": "Last Seen", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Last Seen" }, "udid": { "type": "string", diff --git a/components/camel-ocsf/src/main/resources/schema/DhcpActivity.json b/components/camel-ocsf/src/main/resources/schema/DhcpActivity.json index ec37324d7df4..5274635e7f16 100644 --- a/components/camel-ocsf/src/main/resources/schema/DhcpActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/DhcpActivity.json @@ -83,4 +83,4 @@ "$ref": "Tls.json" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/DnsActivity.json b/components/camel-ocsf/src/main/resources/schema/DnsActivity.json index ac0e48d0698d..49ab12fd8d38 100644 --- a/components/camel-ocsf/src/main/resources/schema/DnsActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/DnsActivity.json @@ -59,8 +59,8 @@ }, "response_time": { "type": "integer", - "title": "Response Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Response Time" }, "rcode": { "type": "string", @@ -82,8 +82,8 @@ }, "query_time": { "type": "integer", - "title": "Query Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Query Time" }, "proxy": { "type": "object", @@ -97,4 +97,4 @@ "$ref": "Tls.json" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/EmailActivity.json b/components/camel-ocsf/src/main/resources/schema/EmailActivity.json index 3905daec35d1..999efc6f6db0 100644 --- a/components/camel-ocsf/src/main/resources/schema/EmailActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/EmailActivity.json @@ -83,4 +83,4 @@ "additionalProperties": true } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/Enrichment.json b/components/camel-ocsf/src/main/resources/schema/Enrichment.json index 34a8652cf976..ab6fdb5e0466 100644 --- a/components/camel-ocsf/src/main/resources/schema/Enrichment.json +++ b/components/camel-ocsf/src/main/resources/schema/Enrichment.json @@ -36,8 +36,8 @@ }, "created_time": { "type": "integer", - "title": "Created Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Created Time" }, "provider": { "type": "string", diff --git a/components/camel-ocsf/src/main/resources/schema/EntityManagement.json b/components/camel-ocsf/src/main/resources/schema/EntityManagement.json index d03e0a28c6d1..268f59655b89 100644 --- a/components/camel-ocsf/src/main/resources/schema/EntityManagement.json +++ b/components/camel-ocsf/src/main/resources/schema/EntityManagement.json @@ -59,4 +59,4 @@ "additionalProperties": true } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/Epss.json b/components/camel-ocsf/src/main/resources/schema/Epss.json index 7ce617d3bfa9..a0fbd58c5a95 100644 --- a/components/camel-ocsf/src/main/resources/schema/Epss.json +++ b/components/camel-ocsf/src/main/resources/schema/Epss.json @@ -12,8 +12,8 @@ }, "created_time": { "type": "integer", - "title": "Created Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Created Time" }, "percentile": { "type": "number", diff --git a/components/camel-ocsf/src/main/resources/schema/File.json b/components/camel-ocsf/src/main/resources/schema/File.json index a51fd534363d..c3b40aeecc6c 100644 --- a/components/camel-ocsf/src/main/resources/schema/File.json +++ b/components/camel-ocsf/src/main/resources/schema/File.json @@ -28,8 +28,8 @@ }, "accessed_time": { "type": "integer", - "title": "Accessed Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Accessed Time" }, "confidentiality": { "type": "string", @@ -63,8 +63,8 @@ }, "created_time": { "type": "integer", - "title": "Created Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Created Time" }, "tags": { "type": "array", @@ -118,8 +118,8 @@ }, "modified_time": { "type": "integer", - "title": "Modified Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Modified Time" }, "name": { "type": "string", diff --git a/components/camel-ocsf/src/main/resources/schema/FileActivity.json b/components/camel-ocsf/src/main/resources/schema/FileActivity.json index e61964f95164..0ee4d5fb74c0 100644 --- a/components/camel-ocsf/src/main/resources/schema/FileActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/FileActivity.json @@ -56,4 +56,4 @@ "title": "Component" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/FindingInfo.json b/components/camel-ocsf/src/main/resources/schema/FindingInfo.json index dc475cc95e79..d4f878748963 100644 --- a/components/camel-ocsf/src/main/resources/schema/FindingInfo.json +++ b/components/camel-ocsf/src/main/resources/schema/FindingInfo.json @@ -52,8 +52,8 @@ }, "created_time": { "type": "integer", - "title": "Created Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Created Time" }, "data_sources": { "type": "array", @@ -64,8 +64,8 @@ }, "first_seen_time": { "type": "integer", - "title": "First Seen", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "First Seen" }, "kill_chain": { "type": "array", @@ -76,13 +76,13 @@ }, "last_seen_time": { "type": "integer", - "title": "Last Seen", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Last Seen" }, "modified_time": { "type": "integer", - "title": "Modified Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Modified Time" }, "product_uid": { "type": "string", diff --git a/components/camel-ocsf/src/main/resources/schema/FtpActivity.json b/components/camel-ocsf/src/main/resources/schema/FtpActivity.json index 02cc1d4c4d32..7ec27ac940c0 100644 --- a/components/camel-ocsf/src/main/resources/schema/FtpActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/FtpActivity.json @@ -103,4 +103,4 @@ "$ref": "Tls.json" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/GroupManagement.json b/components/camel-ocsf/src/main/resources/schema/GroupManagement.json index 12f9a44f783e..b8527c75e3ff 100644 --- a/components/camel-ocsf/src/main/resources/schema/GroupManagement.json +++ b/components/camel-ocsf/src/main/resources/schema/GroupManagement.json @@ -55,4 +55,4 @@ "$ref": "Fingerprint.json" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/HttpActivity.json b/components/camel-ocsf/src/main/resources/schema/HttpActivity.json index 32851859bf76..a15f6ae264da 100644 --- a/components/camel-ocsf/src/main/resources/schema/HttpActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/HttpActivity.json @@ -89,4 +89,4 @@ "$ref": "Tls.json" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/IncidentFinding.json b/components/camel-ocsf/src/main/resources/schema/IncidentFinding.json index dd682203f6ac..4b5c8585db34 100644 --- a/components/camel-ocsf/src/main/resources/schema/IncidentFinding.json +++ b/components/camel-ocsf/src/main/resources/schema/IncidentFinding.json @@ -113,4 +113,4 @@ "title": "Confidence" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/KbArticle.json b/components/camel-ocsf/src/main/resources/schema/KbArticle.json index 010ecb182b68..0ec2b4ca3a86 100644 --- a/components/camel-ocsf/src/main/resources/schema/KbArticle.json +++ b/components/camel-ocsf/src/main/resources/schema/KbArticle.json @@ -42,8 +42,8 @@ }, "created_time": { "type": "integer", - "title": "Created Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Created Time" }, "install_state": { "type": "string", diff --git a/components/camel-ocsf/src/main/resources/schema/KernelActivity.json b/components/camel-ocsf/src/main/resources/schema/KernelActivity.json index 12cd6507f62a..784c1619cdba 100644 --- a/components/camel-ocsf/src/main/resources/schema/KernelActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/KernelActivity.json @@ -34,4 +34,4 @@ "additionalProperties": true } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/KernelExtensionActivity.json b/components/camel-ocsf/src/main/resources/schema/KernelExtensionActivity.json index 58b5d6deb3b7..0bef7a2ddb2b 100644 --- a/components/camel-ocsf/src/main/resources/schema/KernelExtensionActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/KernelExtensionActivity.json @@ -34,4 +34,4 @@ "$ref": "Fingerprint.json" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/Logger.json b/components/camel-ocsf/src/main/resources/schema/Logger.json index 99a02169946c..2db44e5941ef 100644 --- a/components/camel-ocsf/src/main/resources/schema/Logger.json +++ b/components/camel-ocsf/src/main/resources/schema/Logger.json @@ -54,13 +54,13 @@ }, "logged_time": { "type": "integer", - "title": "Logged Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Logged Time" }, "transmit_time": { "type": "integer", - "title": "Transmission Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Transmission Time" }, "untruncated_size": { "type": "integer", diff --git a/components/camel-ocsf/src/main/resources/schema/MemoryActivity.json b/components/camel-ocsf/src/main/resources/schema/MemoryActivity.json index 506e6de4de29..98cd401b40e7 100644 --- a/components/camel-ocsf/src/main/resources/schema/MemoryActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/MemoryActivity.json @@ -49,4 +49,4 @@ "title": "Requested Permissions" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/Metadata.json b/components/camel-ocsf/src/main/resources/schema/Metadata.json index 36767de316da..7f5258314acb 100644 --- a/components/camel-ocsf/src/main/resources/schema/Metadata.json +++ b/components/camel-ocsf/src/main/resources/schema/Metadata.json @@ -44,8 +44,8 @@ }, "transmit_time": { "type": "integer", - "title": "Transmission Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Transmission Time" }, "tags": { "type": "array", @@ -99,8 +99,8 @@ }, "logged_time": { "type": "integer", - "title": "Logged Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Logged Time" }, "reporter": { "type": "object", @@ -116,8 +116,8 @@ }, "modified_time": { "type": "integer", - "title": "Modified Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Modified Time" }, "original_event_uid": { "type": "string", @@ -137,8 +137,8 @@ }, "processed_time": { "type": "integer", - "title": "Processed Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Processed Time" }, "type": { "type": "string", diff --git a/components/camel-ocsf/src/main/resources/schema/ModuleActivity.json b/components/camel-ocsf/src/main/resources/schema/ModuleActivity.json index 3aecd29b2065..8a040e5910f1 100644 --- a/components/camel-ocsf/src/main/resources/schema/ModuleActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/ModuleActivity.json @@ -33,4 +33,4 @@ "$ref": "Fingerprint.json" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/NetworkActivity.json b/components/camel-ocsf/src/main/resources/schema/NetworkActivity.json index 4e8ac427656d..0a66486e91df 100644 --- a/components/camel-ocsf/src/main/resources/schema/NetworkActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/NetworkActivity.json @@ -75,4 +75,4 @@ "$ref": "Tls.json" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/NetworkFileActivity.json b/components/camel-ocsf/src/main/resources/schema/NetworkFileActivity.json index 148076a93c3a..99017f660999 100644 --- a/components/camel-ocsf/src/main/resources/schema/NetworkFileActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/NetworkFileActivity.json @@ -60,8 +60,8 @@ }, "expiration_time": { "type": "integer", - "title": "Expiration Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Expiration Time" }, "observation_point_id": { "type": "integer", @@ -79,4 +79,4 @@ "$ref": "Tls.json" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/NtpActivity.json b/components/camel-ocsf/src/main/resources/schema/NtpActivity.json index 3271103dd705..762b5c2043ac 100644 --- a/components/camel-ocsf/src/main/resources/schema/NtpActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/NtpActivity.json @@ -88,4 +88,4 @@ "title": "Stratum ID" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/Process.json b/components/camel-ocsf/src/main/resources/schema/Process.json index 832ed4562c24..84396bbe680a 100644 --- a/components/camel-ocsf/src/main/resources/schema/Process.json +++ b/components/camel-ocsf/src/main/resources/schema/Process.json @@ -61,8 +61,8 @@ }, "created_time": { "type": "integer", - "title": "Created Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Created Time" }, "environment_variables": { "type": "array", @@ -100,8 +100,8 @@ }, "terminated_time": { "type": "integer", - "title": "Terminated Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Terminated Time" }, "working_directory": { "type": "string", diff --git a/components/camel-ocsf/src/main/resources/schema/ProcessActivity.json b/components/camel-ocsf/src/main/resources/schema/ProcessActivity.json index 28b10a641317..20fdbc5e167c 100644 --- a/components/camel-ocsf/src/main/resources/schema/ProcessActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/ProcessActivity.json @@ -64,4 +64,4 @@ "title": "Launch Type" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/RdpActivity.json b/components/camel-ocsf/src/main/resources/schema/RdpActivity.json index 363ee0b4ed87..2695b8e63c3d 100644 --- a/components/camel-ocsf/src/main/resources/schema/RdpActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/RdpActivity.json @@ -112,4 +112,4 @@ "$ref": "Tls.json" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/RemediationActivity.json b/components/camel-ocsf/src/main/resources/schema/RemediationActivity.json index 76fb7c6988d4..b2f91c373e1b 100644 --- a/components/camel-ocsf/src/main/resources/schema/RemediationActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/RemediationActivity.json @@ -42,4 +42,4 @@ "$ref": "Fingerprint.json" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/ResourceDetails.json b/components/camel-ocsf/src/main/resources/schema/ResourceDetails.json index 397e676cd7e4..c64fbcb5052d 100644 --- a/components/camel-ocsf/src/main/resources/schema/ResourceDetails.json +++ b/components/camel-ocsf/src/main/resources/schema/ResourceDetails.json @@ -81,8 +81,8 @@ }, "created_time": { "type": "integer", - "title": "Created Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Created Time" }, "criticality": { "type": "string", @@ -94,8 +94,8 @@ }, "modified_time": { "type": "integer", - "title": "Modified Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Modified Time" }, "resource_relationship": { "type": "object", diff --git a/components/camel-ocsf/src/main/resources/schema/ScanActivity.json b/components/camel-ocsf/src/main/resources/schema/ScanActivity.json index e4bf6b8f1bdb..0e89db352aab 100644 --- a/components/camel-ocsf/src/main/resources/schema/ScanActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/ScanActivity.json @@ -78,4 +78,4 @@ "title": "Scanned Folders" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/ScheduledJobActivity.json b/components/camel-ocsf/src/main/resources/schema/ScheduledJobActivity.json index 00f9f475e4ef..24d4b6db68c6 100644 --- a/components/camel-ocsf/src/main/resources/schema/ScheduledJobActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/ScheduledJobActivity.json @@ -34,4 +34,4 @@ "additionalProperties": true } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/SecurityFinding.json b/components/camel-ocsf/src/main/resources/schema/SecurityFinding.json index 7ef0eea41f69..020421341541 100644 --- a/components/camel-ocsf/src/main/resources/schema/SecurityFinding.json +++ b/components/camel-ocsf/src/main/resources/schema/SecurityFinding.json @@ -150,4 +150,4 @@ } } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/Session.json b/components/camel-ocsf/src/main/resources/schema/Session.json index 5e21b3aec6aa..73c9beed217f 100644 --- a/components/camel-ocsf/src/main/resources/schema/Session.json +++ b/components/camel-ocsf/src/main/resources/schema/Session.json @@ -29,8 +29,8 @@ }, "created_time": { "type": "integer", - "title": "Created Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Created Time" }, "credential_uid": { "type": "string", @@ -42,8 +42,8 @@ }, "expiration_time": { "type": "integer", - "title": "Expiration Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Expiration Time" }, "is_mfa": { "type": "boolean", diff --git a/components/camel-ocsf/src/main/resources/schema/SmbActivity.json b/components/camel-ocsf/src/main/resources/schema/SmbActivity.json index d04b8841c33a..e7a3c4aad294 100644 --- a/components/camel-ocsf/src/main/resources/schema/SmbActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/SmbActivity.json @@ -113,4 +113,4 @@ "$ref": "Tls.json" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/SshActivity.json b/components/camel-ocsf/src/main/resources/schema/SshActivity.json index 1d39dfb48219..e76365e333dc 100644 --- a/components/camel-ocsf/src/main/resources/schema/SshActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/SshActivity.json @@ -91,4 +91,4 @@ "$ref": "Tls.json" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/UserAccess.json b/components/camel-ocsf/src/main/resources/schema/UserAccess.json index 2238a2501fe4..b27b0251c83c 100644 --- a/components/camel-ocsf/src/main/resources/schema/UserAccess.json +++ b/components/camel-ocsf/src/main/resources/schema/UserAccess.json @@ -56,4 +56,4 @@ "$ref": "Fingerprint.json" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/Vulnerability.json b/components/camel-ocsf/src/main/resources/schema/Vulnerability.json index 15d58565ae9b..154900e2b103 100644 --- a/components/camel-ocsf/src/main/resources/schema/Vulnerability.json +++ b/components/camel-ocsf/src/main/resources/schema/Vulnerability.json @@ -64,8 +64,8 @@ }, "exploit_last_seen_time": { "type": "integer", - "title": "Exploit Last Seen Time", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Exploit Last Seen Time" }, "exploit_ref_url": { "type": "string", @@ -81,8 +81,8 @@ }, "first_seen_time": { "type": "integer", - "title": "First Seen", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "First Seen" }, "fix_available": { "type": "boolean", @@ -120,8 +120,8 @@ }, "last_seen_time": { "type": "integer", - "title": "Last Seen", - "existingJavaType": "java.lang.Long" + "existingJavaType": "java.lang.Long", + "title": "Last Seen" }, "packages": { "type": "array", diff --git a/components/camel-ocsf/src/main/resources/schema/VulnerabilityFinding.json b/components/camel-ocsf/src/main/resources/schema/VulnerabilityFinding.json index 77d6bf9f95a8..9e9e631a1e30 100644 --- a/components/camel-ocsf/src/main/resources/schema/VulnerabilityFinding.json +++ b/components/camel-ocsf/src/main/resources/schema/VulnerabilityFinding.json @@ -66,4 +66,4 @@ "title": "Confidence" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/resources/schema/WebResourcesActivity.json b/components/camel-ocsf/src/main/resources/schema/WebResourcesActivity.json index 8dbbb3920b86..2d4e95d21acc 100644 --- a/components/camel-ocsf/src/main/resources/schema/WebResourcesActivity.json +++ b/components/camel-ocsf/src/main/resources/schema/WebResourcesActivity.json @@ -55,4 +55,4 @@ "$ref": "Tls.json" } } -} +} \ No newline at end of file diff --git a/components/camel-ocsf/src/main/script/generate-ocsf-schemas.py b/components/camel-ocsf/src/main/script/generate-ocsf-schemas.py index dd3a291ee395..657f4f7047c0 100644 --- a/components/camel-ocsf/src/main/script/generate-ocsf-schemas.py +++ b/components/camel-ocsf/src/main/script/generate-ocsf-schemas.py @@ -91,11 +91,9 @@ CLASSES_TO_GENERATE = [ 'user_access', 'entity_management', - # Discovery (Category 5) - 'scan_activity', - # Application Activity (Category 6) 'web_resources_activity', + 'scan_activity', 'api_activity', 'datastore_activity',
