Updating Forescout, McAfeeNSF

Solutions/Forescout/Data/Solution_Forescout.json

@@ -10,7 +10,7 @@
     "Parsers/ForescoutEvent.txt"
   ],
   "BasePath": "C:\\GitHub\\Azure-Sentinel\\Solutions\\Forescout",
-  "Version": "2.0.0",
+  "Version": "2.0.1",
   "Metadata": "SolutionMetadata.json",
   "TemplateSpec": true,
   "Is1Pconnector": false

Solutions/Forescout/Package/mainTemplate.json

@@ -80,7 +80,7 @@
         "[resourceId('Microsoft.Resources/templateSpecs', variables('dataConnectorTemplateSpecName1'))]"
       ],
       "properties": {
-        "description": "Forescout data connector with template version 2.0.0",
+        "description": "Forescout data connector with template version 2.0.1",
         "mainTemplate": {
           "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
           "contentVersion": "[variables('dataConnectorVersion1')]",
@@ -436,7 +436,7 @@
               "title": "2. Configure Forescout event forwarding"
             }
           ],
-          "id": "[extensionResourceId(resourceId('Microsoft.OperationalInsights/workspaces', parameters('workspace')), 'Microsoft.SecurityInsights/dataConnectors', variables('_uiConfigId1'))]",
+          "id": "[variables('_uiConfigId1')]",
           "additionalRequirementBanner": "This data connector depends on a parser based on a Kusto Function to work as expected [**ForescoutEvent**](https://aka.ms/sentinel-forescout-parser) which is deployed with the Microsoft Sentinel Solution."
         }
       }
@@ -468,7 +468,7 @@
         "[resourceId('Microsoft.Resources/templateSpecs', variables('parserTemplateSpecName1'))]"
       ],
       "properties": {
-        "description": "ForescoutEvent Data Parser with template version 2.0.0",
+        "description": "ForescoutEvent Data Parser with template version 2.0.1",
         "mainTemplate": {
           "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
           "contentVersion": "[variables('parserVersion1')]",
@@ -577,7 +577,7 @@
       "apiVersion": "2022-01-01-preview",
       "location": "[parameters('workspace-location')]",
       "properties": {
-        "version": "2.0.0",
+        "version": "2.0.1",
         "kind": "Solution",
         "contentSchemaVersion": "2.0.0",
         "contentId": "[variables('_solutionId')]",

Solutions/McAfee Network Security Platform/Data/Solution_McAfee Network Security Platform.json

@@ -11,7 +11,7 @@
   ],
   "Metadata": "SolutionMetadata.json",
   "BasePath": "C:\\GitHub\\Azure-Sentinel\\Solutions\\McAfee Network Security Platform",
-  "Version": "2.0.0",
+  "Version": "2.0.1",
   "TemplateSpec": true,
   "Is1PConnector": false
 }

Solutions/McAfee Network Security Platform/Package/mainTemplate.json

@@ -32,6 +32,8 @@
   "variables": {
     "solutionId": "azuresentinel.azure-sentinel-solution-mcafeensp",
     "_solutionId": "[variables('solutionId')]",
+    "email": "support@microsoft.com",
+    "_email": "[variables('email')]",
     "workspaceResourceId": "[resourceId('microsoft.OperationalInsights/Workspaces', parameters('workspace'))]",
     "uiConfigId1": "McAfeeNSP",
     "_uiConfigId1": "[variables('uiConfigId1')]",
@@ -78,7 +80,7 @@
         "[resourceId('Microsoft.Resources/templateSpecs', variables('dataConnectorTemplateSpecName1'))]"
       ],
       "properties": {
-        "description": "McAfee Network Security Platform data connector with template version 2.0.0",
+        "description": "McAfee Network Security Platform data connector with template version 2.0.1",
         "mainTemplate": {
           "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
           "contentVersion": "[variables('dataConnectorVersion1')]",
@@ -247,7 +249,8 @@
                   "sourceId": "[variables('_solutionId')]"
                 },
                 "author": {
-                  "name": "Microsoft - support@microsoft.com"
+                  "name": "Microsoft",
+                  "email": "[variables('_email')]"
                 },
                 "support": {
                   "name": "Microsoft Corporation",
@@ -280,7 +283,8 @@
           "sourceId": "[variables('_solutionId')]"
         },
         "author": {
-          "name": "Microsoft - support@microsoft.com"
+          "name": "Microsoft",
+          "email": "[variables('_email')]"
         },
         "support": {
           "name": "Microsoft Corporation",
@@ -432,7 +436,7 @@
               "title": "2. Configure McAfee® Network Security Platform event forwarding"
             }
           ],
-          "id": "[extensionResourceId(resourceId('Microsoft.OperationalInsights/workspaces', parameters('workspace')), 'Microsoft.SecurityInsights/dataConnectors', variables('_uiConfigId1'))]",
+          "id": "[variables('_uiConfigId1')]",
           "additionalRequirementBanner": "This data connector depends on a parser based on a Kusto Function to work as expected [**McAfeeNSPEvent**](https://aka.ms/sentinel-mcafeensp-parser) which is deployed with the Microsoft Sentinel Solution."
         }
       }
@@ -464,7 +468,7 @@
         "[resourceId('Microsoft.Resources/templateSpecs', variables('parserTemplateSpecName1'))]"
       ],
       "properties": {
-        "description": "McAfeeNSPEvent Data Parser with template version 2.0.0",
+        "description": "McAfeeNSPEvent Data Parser with template version 2.0.1",
         "mainTemplate": {
           "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
           "contentVersion": "[variables('parserVersion1')]",
@@ -509,7 +513,8 @@
                   "sourceId": "[variables('_solutionId')]"
                 },
                 "author": {
-                  "name": "Microsoft - support@microsoft.com"
+                  "name": "Microsoft",
+                  "email": "[variables('_email')]"
                 },
                 "support": {
                   "name": "Microsoft Corporation",
@@ -556,7 +561,8 @@
           "sourceId": "[variables('_solutionId')]"
         },
         "author": {
-          "name": "Microsoft - support@microsoft.com"
+          "name": "Microsoft",
+          "email": "[variables('_email')]"
         },
         "support": {
           "name": "Microsoft Corporation",
@@ -571,7 +577,7 @@
       "apiVersion": "2022-01-01-preview",
       "location": "[parameters('workspace-location')]",
       "properties": {
-        "version": "2.0.0",
+        "version": "2.0.1",
         "kind": "Solution",
         "contentSchemaVersion": "2.0.0",
         "contentId": "[variables('_solutionId')]",
@@ -582,7 +588,8 @@
           "sourceId": "[variables('_solutionId')]"
         },
         "author": {
-          "name": "Microsoft - support@microsoft.com"
+          "name": "Microsoft",
+          "email": "[variables('_email')]"
         },
         "support": {
           "name": "Microsoft Corporation",