CC - Release v5.5.1 (#1346)

* Release files v5.5.1 * Wiki changes
OfficeDev · Feb 22, 2024 · 6f90c51 · 6f90c51
1 parent 33ff23c
commit 6f90c51
Show file tree

Hide file tree

Showing 18 changed files with 312 additions and 39 deletions.
diff --git a/Deployment/DOD/azuredeploy.json b/Deployment/DOD/azuredeploy.json
@@ -284,6 +284,8 @@
     "hostingPlanName": "[parameters('baseResourceName')]",
     "storageAccountName": "[uniquestring(concat(resourceGroup().id, parameters('baseResourceName')))]",
     "appInsightsName": "[parameters('baseResourceName')]",
+    "workspaceAnalyticsName": "[concat(parameters('baseResourceName'), '-log-analytics')]",
+    "workspaceAnalyticsSku": "pergb2018",
     "prepFunctionAppName": "[concat(parameters('baseResourceName'), '-prep-function')]",
     "sendFunctionAppName": "[concat(parameters('baseResourceName'), '-function')]",
     "dataFunctionAppName": "[concat(parameters('baseResourceName'), '-data-function')]",
@@ -474,16 +476,31 @@
       }
     },
     {
-      "apiVersion": "2015-05-01",
-      "name": "[variables('appInsightsName')]",
+      "type": "Microsoft.OperationalInsights/workspaces",
+      "apiVersion": "2017-03-15-preview",
+      "name": "[variables('workspaceAnalyticsName')]",
+      "location": "[parameters('location')]",
+      "properties": {
+          "sku": {
+              "name": "[variables('workspaceAnalyticsSku')]"
+          }
+      }
+    },
+    {
       "type": "Microsoft.Insights/components",
+      "apiVersion": "2020-02-02-preview",
+      "name": "[variables('appInsightsName')]",
       "location": "[parameters('location')]",
+      "dependsOn": [
+          "[resourceId('Microsoft.OperationalInsights/workspaces', variables('workspaceAnalyticsName'))]"
+      ],
       "tags": {
-        "[concat('hidden-link:', resourceGroup().id, '/providers/Microsoft.Web/sites/', variables('botAppName'))]": "Resource"
+          "[concat('hidden-link:', resourceGroup().id, '/providers/Microsoft.Web/sites/', variables('botAppName'))]": "Resource"
       },
       "properties": {
-        "Application_Type": "web",
-        "Request_Source": "rest"
+          "Application_Type": "web",
+          "Request_Source": "rest",
+          "WorkspaceResourceId": "[resourceId('Microsoft.OperationalInsights/workspaces', variables('workspaceAnalyticsName'))]"
       }
     },
     {

diff --git a/Deployment/GCC/botazuredeploy.json b/Deployment/GCC/botazuredeploy.json
@@ -56,20 +56,37 @@
     "botAppName": "[parameters('baseResourceName')]",
     "botAppDomain": "[concat(variables('botAppName'), '.azurewebsites.us')]",
     "botAppUrl": "[concat('https://', variables('botAppDomain'))]",
-    "appInsightsName": "[parameters('baseResourceName')]"
+    "appInsightsName": "[parameters('baseResourceName')]",
+    "workspaceAnalyticsName": "[concat(parameters('baseResourceName'), '-log-analytics')]",
+    "workspaceAnalyticsSku": "pergb2018"
   },
   "resources": [
     {
-      "apiVersion": "2015-05-01",
-      "name": "[variables('appInsightsName')]",
+      "type": "Microsoft.OperationalInsights/workspaces",
+      "apiVersion": "2017-03-15-preview",
+      "name": "[variables('workspaceAnalyticsName')]",
+      "location": "[resourceGroup().location]",
+      "properties": {
+          "sku": {
+              "name": "[variables('workspaceAnalyticsSku')]"
+          }
+      }
+    },
+    {
       "type": "Microsoft.Insights/components",
+      "apiVersion": "2020-02-02-preview",
+      "name": "[variables('appInsightsName')]",
       "location": "[resourceGroup().location]",
+      "dependsOn": [
+          "[resourceId('Microsoft.OperationalInsights/workspaces', variables('workspaceAnalyticsName'))]"
+      ],
       "tags": {
-        "[concat('hidden-link:', resourceGroup().id, '/providers/Microsoft.Web/sites/', variables('botAppName'))]": "Resource"
+          "[concat('hidden-link:', resourceGroup().id, '/providers/Microsoft.Web/sites/', variables('botAppName'))]": "Resource"
       },
       "properties": {
-        "Application_Type": "web",
-        "Request_Source": "rest"
+          "Application_Type": "web",
+          "Request_Source": "rest",
+          "WorkspaceResourceId": "[resourceId('Microsoft.OperationalInsights/workspaces', variables('workspaceAnalyticsName'))]"
       }
     },
     {

diff --git a/Deployment/GCCH/azuredeploy.json b/Deployment/GCCH/azuredeploy.json
@@ -284,6 +284,8 @@
     "hostingPlanName": "[parameters('baseResourceName')]",
     "storageAccountName": "[uniquestring(concat(resourceGroup().id, parameters('baseResourceName')))]",
     "appInsightsName": "[parameters('baseResourceName')]",
+    "workspaceAnalyticsName": "[concat(parameters('baseResourceName'), '-log-analytics')]",
+    "workspaceAnalyticsSku": "pergb2018",
     "prepFunctionAppName": "[concat(parameters('baseResourceName'), '-prep-function')]",
     "sendFunctionAppName": "[concat(parameters('baseResourceName'), '-function')]",
     "dataFunctionAppName": "[concat(parameters('baseResourceName'), '-data-function')]",
@@ -474,16 +476,31 @@
       }
     },
     {
-      "apiVersion": "2015-05-01",
-      "name": "[variables('appInsightsName')]",
+      "type": "Microsoft.OperationalInsights/workspaces",
+      "apiVersion": "2017-03-15-preview",
+      "name": "[variables('workspaceAnalyticsName')]",
+      "location": "[parameters('location')]",
+      "properties": {
+          "sku": {
+              "name": "[variables('workspaceAnalyticsSku')]"
+          }
+      }
+    },
+    {
       "type": "Microsoft.Insights/components",
+      "apiVersion": "2020-02-02-preview",
+      "name": "[variables('appInsightsName')]",
       "location": "[parameters('location')]",
+      "dependsOn": [
+          "[resourceId('Microsoft.OperationalInsights/workspaces', variables('workspaceAnalyticsName'))]"
+      ],
       "tags": {
-        "[concat('hidden-link:', resourceGroup().id, '/providers/Microsoft.Web/sites/', variables('botAppName'))]": "Resource"
+          "[concat('hidden-link:', resourceGroup().id, '/providers/Microsoft.Web/sites/', variables('botAppName'))]": "Resource"
       },
       "properties": {
-        "Application_Type": "web",
-        "Request_Source": "rest"
+          "Application_Type": "web",
+          "Request_Source": "rest",
+          "WorkspaceResourceId": "[resourceId('Microsoft.OperationalInsights/workspaces', variables('workspaceAnalyticsName'))]"
       }
     },
     {

diff --git a/Deployment/applicationinsights-migration.ps1 b/Deployment/applicationinsights-migration.ps1
@@ -0,0 +1,67 @@
+function CreateLogAnalyticsWorkspace {
+    param(
+        [Parameter(Mandatory = $true)] [string] $subscriptionId,
+        [Parameter(Mandatory = $true)] [string] $resourceGroupName,
+        [Parameter(Mandatory = $true)] [string] $baseResourceName
+    )
+
+    try{
+        $workspaceName = $baseResourceName + "-log-analytics"
+
+	Import-Module Az.OperationalInsights
+        Write-Host "Please login with your Azure subscription account"
+        az login
+        az account set -s $subscriptionId
+        Write-Host "Successfully logged in to Azure Subscription " -ForegroundColor Green
+
+        Write-Host "Getting resource group location"
+        $rgLocation = (Get-AzResourceGroup -Name $resourceGroupName).location
+        Write-Host "Successfully got the resource group location " -ForegroundColor Green
+
+
+        Write-Host "****************************************************************************************************************************************************************************************************************************"
+        Write-Host "Creating Log Analytics Workspace"
+        New-AzOperationalInsightsWorkspace -Location $rgLocation -Name $workspaceName -ResourceGroupName $resourceGroupName
+        Write-Host "Successfully created Log Analytics Workspace : $WorkspaceName" -ForegroundColor Green
+
+}
+catch {
+        $errorMessage = $_.Exception.Message
+        Write-Host "Failed to create the Log Analytics Workspace. Error message: $errorMessage" -ForegroundColor Red
+    }
+}
+
+
+function UpdateClassicAppInsights {
+    param(
+        [Parameter(Mandatory = $true)] [string] $resourceGroupName,
+        [Parameter(Mandatory = $true)] [string] $baseResourceName
+    )
+
+    try{
+
+        $workspaceName = $baseResourceName + "-log-analytics"
+
+        Write-Host "****************************************************************************************************************************************************************************************************************************"        
+        Write-Host "Getting resource id for log analytics workspace"
+        $workspaceResourceId = (Get-AzOperationalInsightsWorkspace -ResourceGroupName $resourceGroupName -Name $workspaceName).ResourceId
+        Write-Host "Successfully got the resource id for log analytics workspace " -ForegroundColor Green
+
+        Write-Host "****************************************************************************************************************************************************************************************************************************"
+        Write-Host "Updating classic application insights to workspace based application insights"
+        Update-AzApplicationInsights -Name $baseResourceName -ResourceGroupName $resourceGroupName -IngestionMode LogAnalytics -WorkspaceResourceId $workspaceResourceId 
+        Write-Host "Successfully migrated the classic application insights to workspace based application insights $baseResourceName" -ForegroundColor Green
+}
+catch {
+        $errorMessage = $_.Exception.Message
+        Write-Host "Failed to update the classic application insights $baseResourceName. Error message: $errorMessage" -ForegroundColor Red
+    }
+}
+
+$subscriptionId = Read-Host "Please enter the subscription id of the resources where Company Communicator deployed"
+$resourceGroupName = Read-Host "Please enter the resource group name"
+$baseResourceName = Read-Host "Please enter the base resource name used"
+
+
+CreateLogAnalyticsWorkspace -subscriptionId $subscriptionId -resourceGroupName $resourceGroupName -baseResourceName $baseResourceName
+UpdateClassicAppInsights -resourceGroupName $resourceGroupName -baseResourceName $baseResourceName
diff --git a/Deployment/azuredeploy.json b/Deployment/azuredeploy.json
@@ -284,6 +284,8 @@
     "hostingPlanName": "[parameters('baseResourceName')]",
     "storageAccountName": "[uniquestring(concat(resourceGroup().id, parameters('baseResourceName')))]",
     "appInsightsName": "[parameters('baseResourceName')]",
+    "workspaceAnalyticsName": "[concat(parameters('baseResourceName'), '-log-analytics')]",
+    "workspaceAnalyticsSku": "pergb2018",
     "prepFunctionAppName": "[concat(parameters('baseResourceName'), '-prep-function')]",
     "sendFunctionAppName": "[concat(parameters('baseResourceName'), '-function')]",
     "dataFunctionAppName": "[concat(parameters('baseResourceName'), '-data-function')]",
@@ -461,16 +463,31 @@
       }
     },
     {
-      "apiVersion": "2015-05-01",
-      "name": "[variables('appInsightsName')]",
+      "type": "Microsoft.OperationalInsights/workspaces",
+      "apiVersion": "2017-03-15-preview",
+      "name": "[variables('workspaceAnalyticsName')]",
+      "location": "[parameters('location')]",
+      "properties": {
+          "sku": {
+              "name": "[variables('workspaceAnalyticsSku')]"
+          }
+      }
+    },
+    {
       "type": "Microsoft.Insights/components",
+      "apiVersion": "2020-02-02-preview",
+      "name": "[variables('appInsightsName')]",
       "location": "[parameters('location')]",
+      "dependsOn": [
+          "[resourceId('Microsoft.OperationalInsights/workspaces', variables('workspaceAnalyticsName'))]"
+      ],
       "tags": {
-        "[concat('hidden-link:', resourceGroup().id, '/providers/Microsoft.Web/sites/', variables('botAppName'))]": "Resource"
+          "[concat('hidden-link:', resourceGroup().id, '/providers/Microsoft.Web/sites/', variables('botAppName'))]": "Resource"
       },
       "properties": {
-        "Application_Type": "web",
-        "Request_Source": "rest"
+          "Application_Type": "web",
+          "Request_Source": "rest",
+          "WorkspaceResourceId": "[resourceId('Microsoft.OperationalInsights/workspaces', variables('workspaceAnalyticsName'))]"
       }
     },
     {

diff --git a/Deployment/azuredeploywithcert.json b/Deployment/azuredeploywithcert.json
@@ -290,6 +290,8 @@
     "hostingPlanName": "[parameters('baseResourceName')]",
     "storageAccountName": "[uniquestring(concat(resourceGroup().id, parameters('baseResourceName')))]",
     "appInsightsName": "[parameters('baseResourceName')]",
+	  "workspaceAnalyticsName": "[concat(parameters('baseResourceName'), '-log-analytics')]",
+	  "workspaceAnalyticsSku": "pergb2018",
     "prepFunctionAppName": "[concat(parameters('baseResourceName'), '-prep-function')]",
     "sendFunctionAppName": "[concat(parameters('baseResourceName'), '-function')]",
     "dataFunctionAppName": "[concat(parameters('baseResourceName'), '-data-function')]",
@@ -460,19 +462,34 @@
         "capacity": 0
       }
     },
-    {
-      "apiVersion": "2015-05-01",
-      "name": "[variables('appInsightsName')]",
-      "type": "Microsoft.Insights/components",
+	  {
+      "type": "Microsoft.OperationalInsights/workspaces",
+      "apiVersion": "2017-03-15-preview",
+      "name": "[variables('workspaceAnalyticsName')]",
       "location": "[parameters('location')]",
-      "tags": {
-        "[concat('hidden-link:', resourceGroup().id, '/providers/Microsoft.Web/sites/', variables('botAppName'))]": "Resource"
-      },
       "properties": {
-        "Application_Type": "web",
-        "Request_Source": "rest"
+          "sku": {
+              "name": "[variables('workspaceAnalyticsSku')]"
+          }
       }
     },
+    {
+	    "type": "Microsoft.Insights/components",
+	    "apiVersion": "2020-02-02-preview",
+	    "name": "[variables('appInsightsName')]",
+	    "location": "[parameters('location')]",
+	    "dependsOn": [
+		    "[resourceId('Microsoft.OperationalInsights/workspaces', variables('workspaceAnalyticsName'))]"
+		  ],
+	    "tags": {
+		    "[concat('hidden-link:', resourceGroup().id, '/providers/Microsoft.Web/sites/', variables('botAppName'))]": "Resource"
+		  },
+	    "properties": {
+		  "Application_Type": "web",
+		  "Request_Source": "rest",
+		  "WorkspaceResourceId": "[resourceId('Microsoft.OperationalInsights/workspaces', variables('workspaceAnalyticsName'))]"
+	    }
+	  },
     {
       "apiVersion": "2021-03-01",
       "name": "[variables('authorBotName')]",

diff --git a/Manifest/manifest_authors.json b/Manifest/manifest_authors.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.5/MicrosoftTeams.schema.json",
   "manifestVersion": "1.5",
-  "version": "5.5",
+  "version": "5.5.1",
   "id": "1c07cd26-a088-4db8-8928-ace382fa219f",
   "packageName": "com.microsoft.teams.companycommunicator.authors",
   "developer": {

diff --git a/Manifest/manifest_users.json b/Manifest/manifest_users.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.5/MicrosoftTeams.schema.json",
   "manifestVersion": "1.5",
-  "version": "5.5",
+  "version": "5.5.1",
   "id": "148a66bb-e83d-425a-927d-09f4299a9274",
   "packageName": "com.microsoft.teams.companycommunicator",
   "developer": {

diff --git a/Source/CompanyCommunicator/ClientApp/package.json b/Source/CompanyCommunicator/ClientApp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "company-communicator",
-  "version": "5.4.1",
+  "version": "5.5.1",
   "private": true,
   "dependencies": {
     "@fluentui/react": "^8.110.3",

diff --git a/Wiki/Cost-estimate.md b/Wiki/Cost-estimate.md
@@ -19,6 +19,11 @@ We ignore:
 The recommended SKUs for a production environment are:
 * App Service: Standard (S2)
 * Service Bus: Basic
+* Workspace-basd Application Insights:
+    This Application Insights resource is sending its data to a Log Analytics workspace.
+    The log Analytics workspace offers Pay-as-you-go pricing tier as it offers flexible consumption pricing in which charged per GB of data ingested - 
+    * Analytics Logs data ingestion - **$2.30/GB** of data ingested per month
+    * Basic Logs data ingestion - **$0.50/GB** of data ingested per month
 
 ## Estimated load
 
@@ -70,8 +75,8 @@ App Service (Bot + Tab)                     | -             |
 Azure Function                              | Dedicated     | 10000 executions   | (free up to 1 million executions)
 Service Bus                                 | Basic         | 10000 operations  | $0.01
 Azure Front Door                            | Azure Front Door Classic          | < 1GB data transfer, 2 routing rules        | $0.50 + $0.01 + $43.65 = $44.16
-Application Insights                        | -             | < 5GB data        | $0.02
-**Total**                                   |               |                   | **$190.58**
+Log Analytics Workspace (App Insights)                        | -             |  < 1GB data ingested        | $2.30
+**Total**                                   |               |                   | **$192.86**
 
 
 ## Estimated load - 1M messages
@@ -124,8 +129,8 @@ App Service (Bot + Tab)                     | -             |
 Azure Function                              | Dedicated     | 1M executions     | (free up to 1 million executions)
 Service Bus                                 | Basic         | 2M executions     | $0.10
 Azure Front Door                            | Azure Front Door Classic          | < 3GB data transfer, 2 routing rules        | $0.50 + $0.03 + $43.65 = $44.18
-Application Insights                        | -             | < 5GB data        | $0.02
-**Total**                                   |               |                   | **$191.10**
+Log Analytics Workspace (App Insights)                        | -             |  < 1GB data ingested        | $2.30
+**Total**                                   |               |                   | **$193.38**
 
 ## Estimated load - 2M messages
 
@@ -177,5 +182,5 @@ App Service (Bot + Tab)                     | -             |
 Azure Function                              | Dedicated     | 2M executions     | $5.80
 Service Bus                                 | Basic         | 2M executions     | $0.10
 Azure Front Door                            | Azure Front Door Classic          | < 3GB data transfer, 2 routing rules        | $0.50 + $0.03 + $43.65 = $44.18
-Application Insights                        | -             | < 5GB data        | $0.02
-**Total**                                   |               |                   | **$197.36**
+Log Analytics Workspace (App Insights)                        | -             |  < 1GB data ingested        | $2.30
+**Total**                                   |               |                   | **$199.64**
diff --git a/Wiki/Release-notes.md b/Wiki/Release-notes.md
@@ -6,6 +6,7 @@ Cumulative improvements in Company Communicator App.
 
 |Version |Release Date |
 |---|---|
+| 5.5.1 | Feb 22, 2024
 | 5.5 | Sep 20, 2023
 | 5.4.1 | June 14, 2023
 | 5.4 | May 10, 2023
@@ -27,6 +28,10 @@ Cumulative improvements in Company Communicator App.
 | 1.0 | Dec 20, 2019
 
 ### Company Communicator feature release notes
+#### 5.5.1 (February 22, 2024)
+##### Changes introduced
+- Migration of classic Application Insights to workspace-based Application Insights.
+
 #### 5.5 (September 14, 2023)
 ##### Changes introduced
 - Mobile Support for Android and iOS.