diff --git a/Solutions/PCI DSS Compliance/Data/Solution_PCIDSSCompliance.json b/Solutions/PCI DSS Compliance/Data/Solution_PCIDSSCompliance.json index 3151ece1acb..2c912c7e2cb 100644 --- a/Solutions/PCI DSS Compliance/Data/Solution_PCIDSSCompliance.json +++ b/Solutions/PCI DSS Compliance/Data/Solution_PCIDSSCompliance.json @@ -8,6 +8,6 @@ ], "Metadata": "SolutionMetadata.json", "BasePath": "C:\\GitHub\\Azure-Sentinel\\Solutions\\PCI DSS Compliance", - "Version": "2.0.1", + "Version": "3.0.0", "TemplateSpec": true } \ No newline at end of file diff --git a/Solutions/PCI DSS Compliance/Package/3.0.0.zip b/Solutions/PCI DSS Compliance/Package/3.0.0.zip new file mode 100644 index 00000000000..610b0764af4 Binary files /dev/null and b/Solutions/PCI DSS Compliance/Package/3.0.0.zip differ diff --git a/Solutions/PCI DSS Compliance/Package/createUiDefinition.json b/Solutions/PCI DSS Compliance/Package/createUiDefinition.json index 652b2f0e307..c08aedaa2a7 100644 --- a/Solutions/PCI DSS Compliance/Package/createUiDefinition.json +++ b/Solutions/PCI DSS Compliance/Package/createUiDefinition.json @@ -6,7 +6,7 @@ "config": { "isWizard": false, "basics": { - "description": "\n\n**Note:** _There may be [known issues](https://aka.ms/sentinelsolutionsknownissues) pertaining to this Solution, please refer to them before installing._\n\nThis 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.\n\n**Workbooks:** 1\n\n[Learn more about Microsoft Sentinel](https://aka.ms/azuresentinel) | [Learn more about Solutions](https://aka.ms/azuresentinelsolutionsdoc)", + "description": "\n\n**Note:** Please refer to the following before installing the solution: \n\n• Review the solution [Release Notes](https://github.com/Azure/Azure-Sentinel/tree/master/Solutions/PCI%20DSS%20Compliance/ReleaseNotes.md)\n\n • There may be [known issues](https://aka.ms/sentinelsolutionsknownissues) pertaining to this Solution, please refer to them before installing.\n\nThis 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.\n\n**Workbooks:** 1\n\n[Learn more about Microsoft Sentinel](https://aka.ms/azuresentinel) | [Learn more about Solutions](https://aka.ms/azuresentinelsolutionsdoc)", "subscription": { "resourceProviders": [ "Microsoft.OperationsManagement/solutions", @@ -64,7 +64,7 @@ "name": "workbooks-text", "type": "Microsoft.Common.TextBlock", "options": { - "text": "This solution installs workbook to help you gain insights into the telemetry collected in Microsoft Sentinel. After installing the solution, start using the workbook in Manage solution view. " + "text": "This solution installs workbook(s) to help you gain insights into the telemetry collected in Microsoft Sentinel. After installing the solution, start using the workbook in Manage solution view." } }, { @@ -76,6 +76,20 @@ "uri": "https://docs.microsoft.com/azure/sentinel/tutorial-monitor-your-data" } } + }, + { + "name": "workbook1", + "type": "Microsoft.Common.Section", + "label": "PCI DSS Compliance", + "elements": [ + { + "name": "workbook1-text", + "type": "Microsoft.Common.TextBlock", + "options": { + "text": "Choose your subscription and workspace in which PCI assets are deployed" + } + } + ] } ] } @@ -86,4 +100,4 @@ "workspace": "[basics('workspace')]" } } -} \ No newline at end of file +} diff --git a/Solutions/PCI DSS Compliance/Package/mainTemplate.json b/Solutions/PCI DSS Compliance/Package/mainTemplate.json index 19ed8f1cdfd..f13d1682a63 100644 --- a/Solutions/PCI DSS Compliance/Package/mainTemplate.json +++ b/Solutions/PCI DSS Compliance/Package/mainTemplate.json @@ -38,46 +38,32 @@ } }, "variables": { - "solutionId": "azuresentinel.azure-sentinel-solution-pcidsscompliance", - "_solutionId": "[variables('solutionId')]", "email": "support@microsoft.com", "_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": "

Note: Please refer to the following before installing the solution:

\n

• Review the solution Release Notes

\n

• There may be known issues pertaining to this Solution, please refer to them before installing.

\n

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.

\n

Workbooks: 1

\n

Learn more about Microsoft Sentinel | Learn more about Solutions

\n", + "contentKind": "Solution", + "contentProductId": "[variables('_solutioncontentProductId')]", + "id": "[variables('_solutioncontentProductId')]", + "icon": "", "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" } ] }, diff --git a/Solutions/PCI DSS Compliance/Package/testParameters.json b/Solutions/PCI DSS Compliance/Package/testParameters.json new file mode 100644 index 00000000000..01bf533bdcc --- /dev/null +++ b/Solutions/PCI DSS Compliance/Package/testParameters.json @@ -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" + } + } +} diff --git a/Solutions/PCI DSS Compliance/ReleaseNotes.md b/Solutions/PCI DSS Compliance/ReleaseNotes.md new file mode 100644 index 00000000000..4e57811414d --- /dev/null +++ b/Solutions/PCI DSS Compliance/ReleaseNotes.md @@ -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 | \ No newline at end of file diff --git a/Workbooks/WorkbooksMetadata.json b/Workbooks/WorkbooksMetadata.json index 66cfd67221f..34c13b3c0f8 100644 --- a/Workbooks/WorkbooksMetadata.json +++ b/Workbooks/WorkbooksMetadata.json @@ -4426,7 +4426,7 @@ "logoFileName": "Azure_Sentinel.svg", "description": "Choose your subscription and workspace in which PCI assets are deployed", "dataTypesDependencies": [ - "AzureDaignostics", + "AzureDiagnostics", "SecurityEvent", "SecurityAlert", "OracleDatabaseAuditEvent",