forked from Azure/Azure-Sentinel
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request Azure#11287 from Azure/v-sabiraj-pcichanges
Updating PCI DSS Compliance solution to 3.0.0
- Loading branch information
Showing
7 changed files
with
90 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,46 +38,32 @@ | |
| } | ||
| }, | ||
| "variables": { | ||
| "solutionId": "azuresentinel.azure-sentinel-solution-pcidsscompliance", | ||
| "_solutionId": "[variables('solutionId')]", | ||
| "email": "[email protected]", | ||
| "_email": "[variables('email')]", | ||
| "_solutionName": "PCI DSS Compliance", | ||
| "_solutionVersion": "3.0.0", | ||
| "solutionId": "azuresentinel.azure-sentinel-solution-pcidsscompliance", | ||
| "_solutionId": "[variables('solutionId')]", | ||
| "workbookVersion1": "1.0.0", | ||
| "workbookContentId1": "PCIDSSComplianceWorkbook", | ||
| "workbookId1": "[resourceId('Microsoft.Insights/workbooks', variables('workbookContentId1'))]", | ||
| "workbookTemplateSpecName1": "[concat(parameters('workspace'),'-wb-',uniquestring(variables('_workbookContentId1')))]", | ||
| "workbookTemplateSpecName1": "[concat(parameters('workspace'),'/Microsoft.SecurityInsights/',concat(parameters('workspace'),'-wb-',uniquestring(variables('_workbookContentId1'))))]", | ||
| "_workbookContentId1": "[variables('workbookContentId1')]", | ||
| "workspaceResourceId": "[resourceId('microsoft.OperationalInsights/Workspaces', parameters('workspace'))]" | ||
| "workspaceResourceId": "[resourceId('microsoft.OperationalInsights/Workspaces', parameters('workspace'))]", | ||
| "_workbookcontentProductId1": "[concat(take(variables('_solutionId'),50),'-','wb','-', uniqueString(concat(variables('_solutionId'),'-','Workbook','-',variables('_workbookContentId1'),'-', variables('workbookVersion1'))))]", | ||
| "_solutioncontentProductId": "[concat(take(variables('_solutionId'),50),'-','sl','-', uniqueString(concat(variables('_solutionId'),'-','Solution','-',variables('_solutionId'),'-', variables('_solutionVersion'))))]" | ||
| }, | ||
| "resources": [ | ||
| { | ||
| "type": "Microsoft.Resources/templateSpecs", | ||
| "apiVersion": "2021-05-01", | ||
| "type": "Microsoft.OperationalInsights/workspaces/providers/contentTemplates", | ||
| "apiVersion": "2023-04-01-preview", | ||
| "name": "[variables('workbookTemplateSpecName1')]", | ||
| "location": "[parameters('workspace-location')]", | ||
| "tags": { | ||
| "hidden-sentinelWorkspaceId": "[variables('workspaceResourceId')]", | ||
| "hidden-sentinelContentType": "Workbook" | ||
| }, | ||
| "properties": { | ||
| "description": "PCI DSS Compliance Workbook with template", | ||
| "displayName": "PCI DSS Compliance workbook template" | ||
| } | ||
| }, | ||
| { | ||
| "type": "Microsoft.Resources/templateSpecs/versions", | ||
| "apiVersion": "2021-05-01", | ||
| "name": "[concat(variables('workbookTemplateSpecName1'),'/',variables('workbookVersion1'))]", | ||
| "location": "[parameters('workspace-location')]", | ||
| "tags": { | ||
| "hidden-sentinelWorkspaceId": "[variables('workspaceResourceId')]", | ||
| "hidden-sentinelContentType": "Workbook" | ||
| }, | ||
| "dependsOn": [ | ||
| "[resourceId('Microsoft.Resources/templateSpecs', variables('workbookTemplateSpecName1'))]" | ||
| "[extensionResourceId(resourceId('Microsoft.OperationalInsights/workspaces', parameters('workspace')), 'Microsoft.SecurityInsights/contentPackages', variables('_solutionId'))]" | ||
| ], | ||
| "properties": { | ||
| "description": "PCIDSSComplianceWorkbook Workbook with template version 2.0.2", | ||
| "description": "PCIDSSCompliance Workbook with template version 3.0.0", | ||
| "mainTemplate": { | ||
| "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", | ||
| "contentVersion": "[variables('workbookVersion1')]", | ||
|
|
@@ -130,7 +116,7 @@ | |
| "operator": "AND", | ||
| "criteria": [ | ||
| { | ||
| "contentId": "AzureDaignostics", | ||
| "contentId": "AzureDiagnostics", | ||
| "kind": "DataType" | ||
| }, | ||
| { | ||
|
|
@@ -158,17 +144,35 @@ | |
| } | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "packageKind": "Solution", | ||
| "packageVersion": "[variables('_solutionVersion')]", | ||
| "packageName": "[variables('_solutionName')]", | ||
| "packageId": "[variables('_solutionId')]", | ||
| "contentSchemaVersion": "3.0.0", | ||
| "contentId": "[variables('_workbookContentId1')]", | ||
| "contentKind": "Workbook", | ||
| "displayName": "[parameters('workbook1-name')]", | ||
| "contentProductId": "[variables('_workbookcontentProductId1')]", | ||
| "id": "[variables('_workbookcontentProductId1')]", | ||
| "version": "[variables('workbookVersion1')]" | ||
| } | ||
| }, | ||
| { | ||
| "type": "Microsoft.OperationalInsights/workspaces/providers/metadata", | ||
| "apiVersion": "2022-01-01-preview", | ||
| "type": "Microsoft.OperationalInsights/workspaces/providers/contentPackages", | ||
| "apiVersion": "2023-04-01-preview", | ||
| "location": "[parameters('workspace-location')]", | ||
| "properties": { | ||
| "version": "2.0.2", | ||
| "version": "3.0.0", | ||
| "kind": "Solution", | ||
| "contentSchemaVersion": "2.0.0", | ||
| "contentSchemaVersion": "3.0.0", | ||
| "displayName": "PCI DSS Compliance", | ||
| "publisherDisplayName": "Microsoft Sentinel, Microsoft Corporation", | ||
| "descriptionHtml": "<p><strong>Note:</strong> Please refer to the following before installing the solution:</p>\n<p>• Review the solution <a href=\"https://github.com/Azure/Azure-Sentinel/tree/master/Solutions/PCI%20DSS%20Compliance/ReleaseNotes.md\">Release Notes</a></p>\n<p>• There may be <a href=\"https://aka.ms/sentinelsolutionsknownissues\">known issues</a> pertaining to this Solution, please refer to them before installing.</p>\n<p>This Solution enables Microsoft Sentinel users to harness the power of their SIEM to assist in meeting PCI-DSS 3.2.1 requirements. This Solution comes with pre-defined dashboards, visualizations, and reports, providing users with immediate insights in their PCI environment.</p>\n<p><strong>Workbooks:</strong> 1</p>\n<p><a href=\"https://aka.ms/azuresentinel\">Learn more about Microsoft Sentinel</a> | <a href=\"https://aka.ms/azuresentinelsolutionsdoc\">Learn more about Solutions</a></p>\n", | ||
| "contentKind": "Solution", | ||
| "contentProductId": "[variables('_solutioncontentProductId')]", | ||
| "id": "[variables('_solutioncontentProductId')]", | ||
| "icon": "<img src=\"https://raw.githubusercontent.com/Azure/Azure-Sentinel/master/Logos/Azure_Sentinel.svg\"width=\"75px\"height=\"75px\">", | ||
| "contentId": "[variables('_solutionId')]", | ||
| "parentId": "[variables('_solutionId')]", | ||
| "source": { | ||
|
|
@@ -193,31 +197,6 @@ | |
| "kind": "Workbook", | ||
| "contentId": "[variables('_workbookContentId1')]", | ||
| "version": "[variables('workbookVersion1')]" | ||
| }, | ||
| { | ||
| "criteria": [ | ||
| { | ||
| "contentId": "azuresentinel.azure-sentinel-solution-oracledbaudit", | ||
| "kind": "Solution", | ||
| "version": "2.0.0" | ||
| }, | ||
| { | ||
| "contentId": "sentinel4azurefirewall.sentinel4azurefirewall", | ||
| "kind": "Solution", | ||
| "version": "2.0.1" | ||
| }, | ||
| { | ||
| "contentId": "azuresentinel.azure-sentinel-solution-securityevents", | ||
| "kind": "Solution", | ||
| "version": "2.0.1" | ||
| }, | ||
| { | ||
| "contentId": "azuresentinel.azure-sentinel-solution-syslog", | ||
| "kind": "Solution", | ||
| "version": "2.0.0" | ||
| } | ||
| ], | ||
| "Operator": "OR" | ||
| } | ||
| ] | ||
| }, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| { | ||
| "location": { | ||
| "type": "string", | ||
| "minLength": 1, | ||
| "defaultValue": "[resourceGroup().location]", | ||
| "metadata": { | ||
| "description": "Not used, but needed to pass arm-ttk test `Location-Should-Not-Be-Hardcoded`. We instead use the `workspace-location` which is derived from the LA workspace" | ||
| } | ||
| }, | ||
| "workspace-location": { | ||
| "type": "string", | ||
| "defaultValue": "", | ||
| "metadata": { | ||
| "description": "[concat('Region to deploy solution resources -- separate from location selection',parameters('location'))]" | ||
| } | ||
| }, | ||
| "workspace": { | ||
| "defaultValue": "", | ||
| "type": "string", | ||
| "metadata": { | ||
| "description": "Workspace name for Log Analytics where Microsoft Sentinel is setup" | ||
| } | ||
| }, | ||
| "workbook1-name": { | ||
| "type": "string", | ||
| "defaultValue": "PCI DSS Compliance", | ||
| "minLength": 1, | ||
| "metadata": { | ||
| "description": "Name for the workbook" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| | **Version** | **Date Modified (DD-MM-YYYY)** | **Change History** | | ||
| |-------------|--------------------------------|--------------------------------------------------------------------| | ||
| | 3.0.0 | 16-10-2024 | Updated solution to fix content issue and data type for **Workbook** issue | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters