Adding workbook for AWS Security Hub Compliance

Solutions/AWS Security Hub/Data/Solution_AWSSecurityHub.json

@@ -1,8 +1,13 @@
 {
   "Name": "AWS Security Hub",
-  "Author": "Microsoft",
+  "Author": "Microsoft - support@microsoft.com",
   "Logo": "<img src=\"https://raw.githubusercontent.com/Azure/Azure-Sentinel/master/Logos/Aws.svg\" width=\"75px\" height=\"75px\">",
   "Description": "AWS Security Hub Solution for Microsoft Sentinel provides data connector to ingest AWS Security Hub findings into Microsoft Sentinel.",
+  "Workbooks": [
+      "Workbooks/AWSSecurityHubComplianceWorkbook.json"
+  ],
+  "WorkbookBladeDescription": "Monitor AWS Security Hub findings and compliance status across multiple accounts and regions. Track failing security controls, analyze resource types, and view IAM/EC2-specific findings. Essential for AWS security monitoring and compliance reporting in Microsoft Sentinel.",
+  "StaticDataConnector": true,
   "Data Connectors": [
     "Data Connectors/AWSSecurityHubFindings_CCP/AWSSecurityHubFindings_DataConnectorDefinition.json"
   ],
@@ -22,7 +27,7 @@
     "Hunting Queries/IAMUserMFADisabled.yaml"
   ],
   "BasePath": "C:\\Github\\Azure-Sentinel\\Solutions\\AWS Security Hub",
-  "Version": "3.0.1",
+  "Version": "3.0.3",
   "Metadata": "SolutionMetadata.json",
-  "TemplateSpec": true
-}
+  "TemplateSpec": false
+}

Solutions/AWS Security Hub/Package/createUiDefinition.json

@@ -6,7 +6,7 @@
     "config": {
       "isWizard": false,
       "basics": {
-        "description": "<img src=\"https://raw.githubusercontent.com/Azure/Azure-Sentinel/master/Logos/Aws.svg\" width=\"75px\" height=\"75px\">\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/AWS%20Security%20Hub/ReleaseNotes.md)\n\n • There may be [known issues](https://aka.ms/sentinelsolutionsknownissues) pertaining to this Solution, please refer to them before installing.\n\nAWS Security Hub Solution for Microsoft Sentinel provides data connector to ingest AWS Security Hub findings into Microsoft Sentinel.\n\n**Data Connectors:** 1, **Analytic Rules:** 8, **Hunting Queries:** 3\n\n[Learn more about Microsoft Sentinel](https://aka.ms/azuresentinel) | [Learn more about Solutions](https://aka.ms/azuresentinelsolutionsdoc)",
+        "description": "<img src=\"https://raw.githubusercontent.com/Azure/Azure-Sentinel/master/Logos/Aws.svg\" width=\"75px\" height=\"75px\">\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/AWS%20Security%20Hub/ReleaseNotes.md)\n\n • There may be [known issues](https://aka.ms/sentinelsolutionsknownissues) pertaining to this Solution, please refer to them before installing.\n\nAWS Security Hub Solution for Microsoft Sentinel provides data connector to ingest AWS Security Hub findings into Microsoft Sentinel.\n\n**Data Connectors:** 1, **Workbooks:** 1, **Analytic Rules:** 8, **Hunting Queries:** 3\n\n[Learn more about Microsoft Sentinel](https://aka.ms/azuresentinel) | [Learn more about Solutions](https://aka.ms/azuresentinelsolutionsdoc)",
         "subscription": {
           "resourceProviders": [
             "Microsoft.OperationsManagement/solutions",
@@ -60,7 +60,7 @@
             "name": "dataconnectors1-text",
             "type": "Microsoft.Common.TextBlock",
             "options": {
-              "text": "This Solution installs the data connector for AWS Security Hub. You can get AWS Security Hub data in your Microsoft Sentinel workspace. After installing the solution, configure and enable this data connector by following guidance in Manage solution view."
+              "text": "This Solution installs the data connector for AWS Security Hub Findings (via Codeless Connector Framework). You can get AWS Security Hub Findings (via Codeless Connector Framework) data in your Microsoft Sentinel workspace. After installing the solution, configure and enable this data connector by following guidance in Manage solution view."
             }
           },
           {
@@ -75,6 +75,48 @@
           }
         ]
       },
+      {
+        "name": "workbooks",
+        "label": "Workbooks",
+        "subLabel": {
+          "preValidation": "Configure the workbooks",
+          "postValidation": "Done"
+        },
+        "bladeTitle": "Workbooks",
+        "elements": [
+          {
+            "name": "workbooks-text",
+            "type": "Microsoft.Common.TextBlock",
+            "options": {
+              "text": "Monitor AWS Security Hub findings and compliance status across multiple accounts and regions. Track failing security controls, analyze resource types, and view IAM/EC2-specific findings. Essential for AWS security monitoring and compliance reporting in Microsoft Sentinel."
+            }
+          },
+          {
+            "name": "workbooks-link",
+            "type": "Microsoft.Common.TextBlock",
+            "options": {
+              "link": {
+                "label": "Learn more",
+                "uri": "https://docs.microsoft.com/azure/sentinel/tutorial-monitor-your-data"
+              }
+            }
+          },
+          {
+            "name": "workbook1",
+            "type": "Microsoft.Common.Section",
+            "label": "AWS Security Hub Compliance Workbook",
+            "elements": [
+              {
+                "name": "workbook1-text",
+                "type": "Microsoft.Common.TextBlock",
+                "options": {
+                  "text": "Configure AWS Security Hub Compliance Workbook"
+                }
+              }
+            ]
+          }
+        ]
+      },
       {
         "name": "analytics",
         "label": "Analytics",
@@ -285,7 +327,8 @@
     "outputs": {
       "workspace-location": "[first(map(filter(basics('getLAWorkspace').value, (filter) => and(contains(toLower(filter.id), toLower(resourceGroup().name)),equals(filter.name,basics('workspace')))), (item) => item.location))]",
       "location": "[location()]",
-      "workspace": "[basics('workspace')]"
+      "workspace": "[basics('workspace')]",
+        "workbook1-name": "[steps('workbooks').workbook1.workbook1-name]"
     }
   }
 }

Solutions/AWS Security Hub/Package/testParameters.json

@@ -21,6 +21,14 @@
       "description": "Workspace name for Log Analytics where Microsoft Sentinel is setup"
     }
   },
+  "workbook1-name": {
+    "type": "string",
+    "defaultValue": null,
+    "minLength": 1,
+    "metadata": {
+      "description": "Name for the workbook"
+    }
+  },
   "resourceGroupName": {
     "type": "string",
     "defaultValue": "[resourceGroup().name]",