Merge branch 'master' into v-rusraut/iboss,SecurityBridge-DCRemove

armor · Jan 8, 2025 · ec86bcd · ec86bcd
2 parents 7396d39 + b944d75
commit ec86bcd
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 21 deletions.
diff --git a/.github/workflows/detection-template-schema-validations.yaml b/.github/workflows/detection-template-schema-validations.yaml
@@ -8,7 +8,7 @@ on:
     workflow_dispatch:
 jobs:
     DetectionTemplateSchemaValidation:
-      runs-on: ubuntu-latest
+      runs-on: ubuntu-22.04
       env:
         buildConfiguration: Release
         dotnetSdkVersion: 3.1.401

diff --git a/.github/workflows/non-ascii-validations.yaml b/.github/workflows/non-ascii-validations.yaml
@@ -9,7 +9,7 @@ on:
     workflow_dispatch:
 jobs:
     NonAsciiValidations:
-      runs-on: ubuntu-latest
+      runs-on: ubuntu-22.04
       env:
         buildConfiguration: Release
         dotnetSdkVersion: 3.1.401

diff --git a/.script/tests/asimParsersTest/ASimFilteringTest.py b/.script/tests/asimParsersTest/ASimFilteringTest.py
@@ -18,7 +18,7 @@
 # Workspace ID for the Log Analytics workspace where the ASim filtering tests will be performed.
 WORKSPACE_ID = "e9beceee-7d61-429f-a177-ee5e2b7f481a"
 # Timespan for the parser query
-TIME_SPAN_IN_DAYS = 7
+TIME_SPAN_IN_DAYS = 2
 
 # exclusion_file_path refers to the CSV file path containing a list of parsers. Despite failing tests, these parsers will not cause the overall workflow to fail
 exclusion_file_path = '.script/tests/asimParsersTest/ExclusionListForASimTests.csv'
@@ -309,6 +309,7 @@ def main():
                 if parser_file['EquivalentBuiltInParser'] in read_exclusion_list_from_csv():
                     print(f"{YELLOW}The parser {parser_file_path} is listed in the exclusions file. Therefore, this workflow run will not fail because of it. To allow this parser to cause the workflow to fail, please remove its name from the exclusions list file located at: {exclusion_file_path}{RESET}")
                     sys.stdout.flush()
+                    continue
                 # Check for exception cases where the failure can be ignored
                 # Check if the failure message and schema match the exception cases
                 if len(result.failures) == 1:

diff --git a/.script/tests/asimParsersTest/VerifyASimParserTemplate.py b/.script/tests/asimParsersTest/VerifyASimParserTemplate.py
@@ -125,6 +125,10 @@ def extract_and_check_properties(Parser_file, Union_Parser__file, FileType, Pars
     if match:
         event_product = match.group(1)
         results.append((event_product, '"EventProduct" field is mapped in parser', 'Pass'))
+    # if equivalent_built_in_parser end with Native, then use 'EventProduct' as SchemaName + 'NativeTable'
+    elif equivalent_built_in_parser.endswith('_Native'):
+        event_product = 'NativeTable'
+        results.append((event_product, '"EventProduct" field is not required since this is a native table parser. Static value will be used for "EventProduct".', 'Pass'))
     # If 'EventProduct' was not found in the KQL query, add to results
     else:
         results.append((f'{RED}EventProduct{RESET}', f'{RED}"EventProduct" field not mapped in parser. Please map it in parser query.{RESET}', f'{RED}Fail{RESET}'))
@@ -136,6 +140,10 @@ def extract_and_check_properties(Parser_file, Union_Parser__file, FileType, Pars
     if match:
         event_vendor = match.group(1)
         results.append((event_vendor, '"EventVendor" field is mapped in parser', 'Pass'))
+    # if equivalent_built_in_parser end with Native, then use 'EventVendor' as 'Microsoft'
+    elif equivalent_built_in_parser.endswith('_Native'):
+        event_vendor = 'Microsoft'
+        results.append((event_vendor, '"EventVendor" field is not required since this is a native table parser. Static value will be used for "EventVendor".', 'Pass'))
     # If 'EventVendor' was not found in the KQL query, add to results
     else:
         results.append((f'{RED}EventVendor{RESET}', f'{RED}"EventVendor" field not mapped in parser. Please map it in parser query.{RESET}', f'{RED}Fail{RESET}'))

diff --git a/.script/tests/asimParsersTest/ingestASimSampleData.py b/.script/tests/asimParsersTest/ingestASimSampleData.py
@@ -259,12 +259,18 @@ def extract_event_vendor_product(parser_query,parser_file):
     match = re.search(r'EventVendor\s*=\s*[\'"]([^\'"]+)[\'"]', parser_query)
     if match:
         event_vendor = match.group(1)
+    # if equivalent_built_in_parser end with Native, then use 'EventVendor' as 'Microsoft'
+    elif equivalent_built_in_parser.endswith('_Native'):
+        event_vendor = 'Microsoft'
     else:
         print(f'EventVendor field not mapped in parser. Please map it in parser query.{parser_file}')
 
     match = re.search(r'EventProduct\s*=\s*[\'"]([^\'"]+)[\'"]', parser_query)
     if match:
         event_product = match.group(1)
+    # if equivalent_built_in_parser end with Native, then use 'EventProduct' as SchemaName + 'NativeTable'
+    elif equivalent_built_in_parser.endswith('_Native'):
+        event_product = 'NativeTable'
     else:
         print(f'Event Product field not mapped in parser. Please map it in parser query.{parser_file}')
     return event_vendor, event_product ,schema_name   
@@ -332,6 +338,7 @@ def convert_data_type(schema_result, data_result):
     parser_query = asim_parser.get('ParserQuery', '')
     normalization = asim_parser.get('Normalization', {})
     schema = normalization.get('Schema')
+    equivalent_built_in_parser = asim_parser.get('EquivalentBuiltInParser')
     event_vendor, event_product, schema_name = extract_event_vendor_product(parser_query, file)
 
     SampleDataFile = f'{event_vendor}_{event_product}_{schema}_IngestedLogs.csv'

diff --git a/Solutions/Check Point CloudGuard CNAPP/Package/3.0.0.zip b/Solutions/Check Point CloudGuard CNAPP/Package/3.0.0.zip
diff --git a/Solutions/Check Point CloudGuard CNAPP/Package/mainTemplate.json b/Solutions/Check Point CloudGuard CNAPP/Package/mainTemplate.json
@@ -48,7 +48,7 @@
     "_email": "[variables('email')]",
     "_solutionName": "Check Point CloudGuard CNAPP",
     "_solutionVersion": "3.0.0",
-    "solutionId": "checkpoint-cloudguard.checkpoint-sentinel-solutions-cloud-guard",
+    "solutionId": "checkpoint.checkpoint-sentinel-solutions-cloud-guard",
     "_solutionId": "[variables('solutionId')]",
     "workspaceResourceId": "[resourceId('microsoft.OperationalInsights/Workspaces', parameters('workspace'))]",
     "dataConnectorCCPVersion": "1.0.0",

diff --git a/Solutions/Check Point CloudGuard CNAPP/SolutionMetadata.json b/Solutions/Check Point CloudGuard CNAPP/SolutionMetadata.json
@@ -1,5 +1,5 @@
 {
-  "publisherId": "checkpoint-cloudguard",
+  "publisherId": "checkpoint",
   "offerId": "checkpoint-sentinel-solutions-cloud-guard",
   "firstPublishDate": "2024-11-12",
   "providers": [

diff --git a/Tools/Sentinel-All-In-One/v2/LinkedTemplates/solutionsAndAlerts.json b/Tools/Sentinel-All-In-One/v2/LinkedTemplates/solutionsAndAlerts.json
@@ -96,7 +96,7 @@
         },
         {
             "dependsOn": [
-                "[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', variables('identityName'))]"
+                "[resourceId('Microsoft.Authorization/roleAssignments', variables('roleGuidId'))]"
             ],
             "type": "Microsoft.Resources/deploymentScripts",
             "apiVersion": "2020-10-01",
@@ -122,4 +122,4 @@
         }
     ],
     "outputs": {}
-}
+}
diff --git a/Workbooks/WorkbooksMetadata.json b/Workbooks/WorkbooksMetadata.json
@@ -1066,7 +1066,6 @@
 			"CommonSecurityLog"
 		],
 		"dataConnectorsDependencies": [
-			"TrendMicro",
 			"CefAma"
 		],
 		"previewImagesFileNames": [
@@ -1087,7 +1086,6 @@
 			"CommonSecurityLog"
 		],
 		"dataConnectorsDependencies": [
-			"TrendMicro",
 			"CefAma"
 		],
 		"previewImagesFileNames": [
@@ -1133,7 +1131,6 @@
 			"Syslog"
 		],
 		"dataConnectorsDependencies": [
-			"BarracudaCloudFirewall",
 			"SyslogAma"
 		],
 		"previewImagesFileNames": [
@@ -1601,7 +1598,6 @@
 			"Syslog"
 		],
 		"dataConnectorsDependencies": [
-			"SymantecProxySG",
 			"SyslogAma"
 		],
 		"previewImagesFileNames": [
@@ -3681,7 +3677,6 @@
 			"CommonSecurityLog"
 		],
 		"dataConnectorsDependencies": [
-			"AristaAwakeSecurity",
 			"CefAma"
 		],
 		"previewImagesFileNames": [
@@ -3973,8 +3968,6 @@
 			"CommonSecurityLog"
 		],
 		"dataConnectorsDependencies": [
-			"InfobloxCloudDataConnector",
-			"InfobloxCloudDataConnectorAma",
 			"CefAma"
 		],
 		"previewImagesFileNames": [
@@ -4104,7 +4097,7 @@
 			"SecurityBridgeLogs"
 		],
 		"dataConnectorsDependencies": [
-			"SecurityBridgeSAP"
+			"CustomLogsAma"
 		],
 		"previewImagesFileNames": [
 			""
@@ -4166,7 +4159,6 @@
 			"McAfeeEPOEvent"
 		],
 		"dataConnectorsDependencies": [
-			"McAfeeePO",
 			"SyslogAma"
 		],
 		"previewImagesFileNames": [
@@ -4642,7 +4634,6 @@
 			"DigitalGuardianDLPEvent"
 		],
 		"dataConnectorsDependencies": [
-			"DigitalGuardianDLP",
 			"SyslogAma"
 		],
 		"previewImagesFileNames": [
@@ -4703,7 +4694,6 @@
 			"Syslog"
 		],
 		"dataConnectorsDependencies": [
-			"CiscoWSA",
 			"SyslogAma"
 		],
 		"previewImagesFileNames": [
@@ -5790,7 +5780,6 @@
 		"description": "A workbook providing insights into malware and C2 activity detected by iboss.",
 		"dataTypesDependencies": [],
 		"dataConnectorsDependencies": [
-			"ibossAma",
 			"CefAma"
 		],
 		"previewImagesFileNames": [
@@ -5808,7 +5797,6 @@
 		"description": "A workbook providing insights into web usage activity detected by iboss.",
 		"dataTypesDependencies": [],
 		"dataConnectorsDependencies": [
-			"ibossAma",
 			"CefAma"
 		],
 		"previewImagesFileNames": [
@@ -7944,7 +7932,7 @@
 		"Infoblox_Config_Insight_Details_CL"
 		],
 		"dataConnectorsDependencies": [
-		"InfobloxCloudDataConnectorAma",
+		"CefAma",
 		"InfobloxSOCInsightsDataConnector_AMA",
 		"InfobloxSOCInsightsDataConnector_API",
 		"InfobloxSOCInsightsDataConnector_Legacy"