From 79e88e7218b94f223c5fa8a63c3afc590d719752 Mon Sep 17 00:00:00 2001 From: Michael Briggs Date: Wed, 21 Feb 2024 14:26:55 -0500 Subject: [PATCH 1/3] UPDATE - Switch to Workspace-based App Insights --- BlobViaEventGrid/ARM/BlobViaEventGrid.json | 33 ++++++++++++++++------ BlobViaEventGrid/CHANGELOG.md | 5 +++- BlobViaEventGrid/package.json | 2 +- DiagnosticData/ARM/DiagnosticData.json | 31 +++++++++++++++----- DiagnosticData/CHANGELOG.md | 5 +++- DiagnosticData/package.json | 2 +- EventHub/ARM/EventHub.json | 33 ++++++++++++++++------ EventHub/CHANGELOG.md | 5 +++- EventHub/package.json | 2 +- StorageQueue/ARM/StorageQueue.json | 31 +++++++++++++++----- StorageQueue/CHANGELOG.md | 5 +++- StorageQueue/package.json | 2 +- 12 files changed, 118 insertions(+), 38 deletions(-) diff --git a/BlobViaEventGrid/ARM/BlobViaEventGrid.json b/BlobViaEventGrid/ARM/BlobViaEventGrid.json index 66688e5..3a50856 100644 --- a/BlobViaEventGrid/ARM/BlobViaEventGrid.json +++ b/BlobViaEventGrid/ARM/BlobViaEventGrid.json @@ -139,17 +139,34 @@ } }, { - "type": "Microsoft.Insights/components", - "apiVersion": "2020-02-02", + "type": "Microsoft.OperationalInsights/workspaces", + "apiVersion": "2020-08-01", "name": "[variables('applicationInsightsName')]", - "location": "[variables('functionAppLocation')]", - "tags": { - "[format('hidden-link:{0}', resourceId('Microsoft.Web/sites', variables('applicationInsightsName')))]": "Resource" - }, + "location": "[variables('location')]", "properties": { - "Application_Type": "web" + "sku": { + "name": "PerGB2018" + }, + "retentionInDays": "90" }, - "kind": "web" + "resources": [ + { + "type": "Microsoft.Insights/components", + "apiVersion": "2020-02-02", + "name": "[variables('applicationInsightsName')]", + "location": "[variables('location')]", + "properties": { + "ApplicationId": "[variables('applicationInsightsName')]", + "Application_Type": "web", + "Flow_Type": "Bluefield", + "Request_Source": "rest", + "WorkspaceResourceId": "[resourceId(resourceGroup().name, 'Microsoft.OperationalInsights/workspaces', variables('applicationInsightsName'))]" + }, + "dependsOn": [ + "[resourceId(resourceGroup().name, 'Microsoft.OperationalInsights/workspaces', variables('applicationInsightsName'))]" + ] + } + ] }, { "type": "Microsoft.Web/sites", diff --git a/BlobViaEventGrid/CHANGELOG.md b/BlobViaEventGrid/CHANGELOG.md index 50bbe38..7a1d700 100644 --- a/BlobViaEventGrid/CHANGELOG.md +++ b/BlobViaEventGrid/CHANGELOG.md @@ -3,4 +3,7 @@ ## BlobViaEventGrid - \ No newline at end of file + + +### 2.0.0 / 21 Feb 2023 +[Update/Breaking] Replacing "Classic" Application Insights with Workspace-Based Application Insights. \ No newline at end of file diff --git a/BlobViaEventGrid/package.json b/BlobViaEventGrid/package.json index 9698895..733cb57 100644 --- a/BlobViaEventGrid/package.json +++ b/BlobViaEventGrid/package.json @@ -1,7 +1,7 @@ { "name": "coralogix-azure-serverless", "title": "Azure Functions for integration with Coralogix", - "version": "1.0.1", + "version": "2.0.0", "description": "Azure Functions Set for integration with Coralogix", "homepage": "https://coralogix.com", "license": "Apache-2.0", diff --git a/DiagnosticData/ARM/DiagnosticData.json b/DiagnosticData/ARM/DiagnosticData.json index d3ed92a..af96a2f 100644 --- a/DiagnosticData/ARM/DiagnosticData.json +++ b/DiagnosticData/ARM/DiagnosticData.json @@ -114,17 +114,34 @@ } }, { - "type": "Microsoft.Insights/components", - "apiVersion": "2020-02-02", + "type": "Microsoft.OperationalInsights/workspaces", + "apiVersion": "2020-08-01", "name": "[variables('applicationInsightsName')]", "location": "[variables('location')]", - "tags": { - "[format('hidden-link:{0}', resourceId('Microsoft.Web/sites', variables('applicationInsightsName')))]": "Resource" - }, "properties": { - "Application_Type": "web" + "sku": { + "name": "PerGB2018" + }, + "retentionInDays": "90" }, - "kind": "web" + "resources": [ + { + "type": "Microsoft.Insights/components", + "apiVersion": "2020-02-02", + "name": "[variables('applicationInsightsName')]", + "location": "[variables('location')]", + "properties": { + "ApplicationId": "[variables('applicationInsightsName')]", + "Application_Type": "web", + "Flow_Type": "Bluefield", + "Request_Source": "rest", + "WorkspaceResourceId": "[resourceId(resourceGroup().name, 'Microsoft.OperationalInsights/workspaces', variables('applicationInsightsName'))]" + }, + "dependsOn": [ + "[resourceId(resourceGroup().name, 'Microsoft.OperationalInsights/workspaces', variables('applicationInsightsName'))]" + ] + } + ] }, { "type": "Microsoft.Web/sites", diff --git a/DiagnosticData/CHANGELOG.md b/DiagnosticData/CHANGELOG.md index 89cbd25..7199092 100644 --- a/DiagnosticData/CHANGELOG.md +++ b/DiagnosticData/CHANGELOG.md @@ -3,4 +3,7 @@ ## DiagnosticData - \ No newline at end of file + + +### 2.0.0 / 21 Feb 2023 +[Update/Breaking] Replacing "Classic" Application Insights with Workspace-Based Application Insights. \ No newline at end of file diff --git a/DiagnosticData/package.json b/DiagnosticData/package.json index 48c13eb..4d9fd08 100644 --- a/DiagnosticData/package.json +++ b/DiagnosticData/package.json @@ -1,7 +1,7 @@ { "name": "coralogix-azure-serverless", "title": "Azure Functions for integration with Coralogix", - "version": "1.0.0", + "version": "2.0.0", "description": "Azure Functions Set for integration with Coralogix", "homepage": "https://coralogix.com", "license": "Apache-2.0", diff --git a/EventHub/ARM/EventHub.json b/EventHub/ARM/EventHub.json index df4175a..61dce2a 100644 --- a/EventHub/ARM/EventHub.json +++ b/EventHub/ARM/EventHub.json @@ -4,7 +4,7 @@ "parameters": { "CoralogixRegion": { "type": "string", - "defaultValue": "Europe", + "defaultValue": "Europe(eu-west-1)", "allowedValues": [ "Europe(eu-west-1)", "US(us-east-2)", @@ -114,17 +114,34 @@ } }, { - "type": "Microsoft.Insights/components", - "apiVersion": "2020-02-02", + "type": "Microsoft.OperationalInsights/workspaces", + "apiVersion": "2020-08-01", "name": "[variables('applicationInsightsName')]", "location": "[variables('location')]", - "tags": { - "[format('hidden-link:{0}', resourceId('Microsoft.Web/sites', variables('applicationInsightsName')))]": "Resource" - }, "properties": { - "Application_Type": "web" + "sku": { + "name": "PerGB2018" + }, + "retentionInDays": "90" }, - "kind": "web" + "resources": [ + { + "type": "Microsoft.Insights/components", + "apiVersion": "2020-02-02", + "name": "[variables('applicationInsightsName')]", + "location": "[variables('location')]", + "properties": { + "ApplicationId": "[variables('applicationInsightsName')]", + "Application_Type": "web", + "Flow_Type": "Bluefield", + "Request_Source": "rest", + "WorkspaceResourceId": "[resourceId(resourceGroup().name, 'Microsoft.OperationalInsights/workspaces', variables('applicationInsightsName'))]" + }, + "dependsOn": [ + "[resourceId(resourceGroup().name, 'Microsoft.OperationalInsights/workspaces', variables('applicationInsightsName'))]" + ] + } + ] }, { "type": "Microsoft.Web/sites", diff --git a/EventHub/CHANGELOG.md b/EventHub/CHANGELOG.md index 6a32e33..139bdc8 100644 --- a/EventHub/CHANGELOG.md +++ b/EventHub/CHANGELOG.md @@ -3,4 +3,7 @@ ## EventHub - \ No newline at end of file + + +### 2.0.0 / 21 Feb 2023 +[Update/Breaking] Replacing "Classic" Application Insights with Workspace-Based Application Insights. \ No newline at end of file diff --git a/EventHub/package.json b/EventHub/package.json index 63b17dd..12670c1 100644 --- a/EventHub/package.json +++ b/EventHub/package.json @@ -1,7 +1,7 @@ { "name": "coralogix-azure-serverless", "title": "Azure Functions for integration with Coralogix", - "version": "1.0.1", + "version": "2.0.0", "description": "Azure Functions Set for integration with Coralogix", "homepage": "https://coralogix.com", "license": "Apache-2.0", diff --git a/StorageQueue/ARM/StorageQueue.json b/StorageQueue/ARM/StorageQueue.json index bbc9cc4..7a47ed9 100644 --- a/StorageQueue/ARM/StorageQueue.json +++ b/StorageQueue/ARM/StorageQueue.json @@ -108,17 +108,34 @@ } }, { - "type": "Microsoft.Insights/components", - "apiVersion": "2020-02-02", + "type": "Microsoft.OperationalInsights/workspaces", + "apiVersion": "2020-08-01", "name": "[variables('applicationInsightsName')]", "location": "[variables('location')]", - "tags": { - "[format('hidden-link:{0}', resourceId('Microsoft.Web/sites', variables('applicationInsightsName')))]": "Resource" - }, "properties": { - "Application_Type": "web" + "sku": { + "name": "PerGB2018" + }, + "retentionInDays": "90" }, - "kind": "web" + "resources": [ + { + "type": "Microsoft.Insights/components", + "apiVersion": "2020-02-02", + "name": "[variables('applicationInsightsName')]", + "location": "[variables('location')]", + "properties": { + "ApplicationId": "[variables('applicationInsightsName')]", + "Application_Type": "web", + "Flow_Type": "Bluefield", + "Request_Source": "rest", + "WorkspaceResourceId": "[resourceId(resourceGroup().name, 'Microsoft.OperationalInsights/workspaces', variables('applicationInsightsName'))]" + }, + "dependsOn": [ + "[resourceId(resourceGroup().name, 'Microsoft.OperationalInsights/workspaces', variables('applicationInsightsName'))]" + ] + } + ] }, { "type": "Microsoft.Web/sites", diff --git a/StorageQueue/CHANGELOG.md b/StorageQueue/CHANGELOG.md index 1edca5c..9ab3ba7 100644 --- a/StorageQueue/CHANGELOG.md +++ b/StorageQueue/CHANGELOG.md @@ -3,4 +3,7 @@ ## StorageQueue - \ No newline at end of file + + +### 2.0.0 / 21 Feb 2023 +[Update/Breaking] Replacing "Classic" Application Insights with Workspace-Based Application Insights. \ No newline at end of file diff --git a/StorageQueue/package.json b/StorageQueue/package.json index 37058fb..9c47c89 100644 --- a/StorageQueue/package.json +++ b/StorageQueue/package.json @@ -1,7 +1,7 @@ { "name": "coralogix-azure-serverless", "title": "Azure Functions for integration with Coralogix", - "version": "1.0.0", + "version": "2.0.0", "description": "Azure Functions Set for integration with Coralogix", "homepage": "https://coralogix.com", "license": "Apache-2.0", From 96b81924fad0e6fee8e550eb95d6a628110df4ae Mon Sep 17 00:00:00 2001 From: Michael Briggs Date: Wed, 21 Feb 2024 14:35:26 -0500 Subject: [PATCH 2/3] UPDATE - Update github action to nodejs 18 --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index aae49ae..342a6db 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -50,7 +50,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v2 with: - node-version: 16 + node-version: 18 - name: install AWS cli run: | From b1a0f0594fc10fa2a7f8fbf758a5942ac1a657b5 Mon Sep 17 00:00:00 2001 From: Michael Briggs Date: Wed, 21 Feb 2024 14:53:59 -0500 Subject: [PATCH 3/3] BUG - Pin dependency versions --- BlobViaEventGrid/package.json | 4 ++-- EventHub/package.json | 4 ++-- StorageQueue/package.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/BlobViaEventGrid/package.json b/BlobViaEventGrid/package.json index 733cb57..58304ec 100644 --- a/BlobViaEventGrid/package.json +++ b/BlobViaEventGrid/package.json @@ -57,8 +57,8 @@ "url": "https://github.com/coralogix/coralogix-azure-serverless/issues" }, "devDependencies": { - "@azure/functions": ">=3.5.0", - "@types/node": "^18.15.3", + "@azure/functions": "^3.5.1", + "@types/node": "^18.15.11", "@typescript-eslint/eslint-plugin": ">=5.48.2", "@typescript-eslint/parser": ">=5.48.2", "eslint": ">=8.32.0", diff --git a/EventHub/package.json b/EventHub/package.json index 12670c1..28bb252 100644 --- a/EventHub/package.json +++ b/EventHub/package.json @@ -55,8 +55,8 @@ "url": "https://github.com/coralogix/coralogix-azure-serverless/issues" }, "devDependencies": { - "@azure/functions": ">=3.5.0", - "@types/node": ">=18.11.18", + "@azure/functions": "^3.5.1", + "@types/node": "^18.15.11", "@typescript-eslint/eslint-plugin": ">=5.48.2", "@typescript-eslint/parser": ">=5.48.2", "eslint": ">=8.32.0", diff --git a/StorageQueue/package.json b/StorageQueue/package.json index 9c47c89..560b776 100644 --- a/StorageQueue/package.json +++ b/StorageQueue/package.json @@ -49,8 +49,8 @@ "url": "https://github.com/coralogix/coralogix-azure-serverless/issues" }, "devDependencies": { - "@azure/functions": ">=3.5.0", - "@types/node": ">=18.11.18", + "@azure/functions": "^3.5.1", + "@types/node": "^18.15.11", "@typescript-eslint/eslint-plugin": ">=5.48.2", "@typescript-eslint/parser": ">=5.48.2", "eslint": ">=8.32.0",