Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add application insights connection string support - APPLICATIONINSIGHTS_CONNECTION_STRING #19855

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Add application insights connection string support - APPLICATIONINSIGHTS_CONNECTION_STRING #19855

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ac9b76e
Add application insights connection string support
May 6, 2024
2a32fc2
Merge remote-tracking branch 'origin/master' into feature/app-insight…
May 10, 2024
ab13ff6
Bump task version
May 10, 2024
102e7e6
Bump task version to 240 to match sprint
May 11, 2024
4596589
Merge remote-tracking branch 'origin/master' into feature/app-insight…
May 21, 2024
450c718
Merge remote-tracking branch 'origin/master' into feature/app-insight…
May 27, 2024
4d5aee7
Merge branch 'master' into feature/app-insights-connection-string
FinVamp1 May 28, 2024
770e6fb
Merge remote-tracking branch 'origin/master' into feature/app-insight…
Jun 3, 2024
de5b101
Update to sprint 241
Jun 3, 2024
8510eee
Merge branch 'master' into feature/app-insights-connection-string
v-schhabra Jun 6, 2024
c74f0e6
Merge remote-tracking branch 'Greybird/master' into aa
Jul 5, 2024
7070e69
Udate to sprint 242
Jul 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions Tasks/AzureFunctionAppContainerV1/operations/ReleaseAnnotationUtility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels'
export async function addReleaseAnnotation(endpoint: AzureEndpoint, azureAppService: AzureAppService, isDeploymentSuccess: boolean): Promise<void> {
try {
var appSettings = await azureAppService.getApplicationSettings();
var instrumentationKey = appSettings && appSettings.properties && appSettings.properties.APPINSIGHTS_INSTRUMENTATIONKEY;
var instrumentationKey = getInstrumentationKey(appSettings);
if(instrumentationKey) {
let appinsightsResources: ApplicationInsightsResources = new ApplicationInsightsResources(endpoint);
var appInsightsResources = await appinsightsResources.list(null, [`$filter=InstrumentationKey eq '${instrumentationKey}'`]);
Expand Down Expand Up @@ -89,4 +89,21 @@ function getPipelineVariable(variableName: string): string | undefined {
let variable = tl.getVariable(variableName);
//we dont want to set a variable to be empty string
return !!variable ? variable : undefined;
}
}

function getInstrumentationKey(appSettings: any): string | undefined {
let connectionString = appSettings?.properties?.APPLICATIONINSIGHTS_CONNECTION_STRING;
if (connectionString){
const FIELDS_SEPARATOR = ";";
const FIELD_KEY_VALUE_SEPARATOR = "=";

const kvPairs = connectionString.split(FIELDS_SEPARATOR);
for (const kvPair of kvPairs) {
const pair = kvPair.split(FIELD_KEY_VALUE_SEPARATOR);
if (pair.length === 2 && pair[0].trim().toLowerCase() === "instrumentationkey") {
return pair[1].trim();
}
}
}
return appSettings?.properties?.APPINSIGHTS_INSTRUMENTATIONKEY;
}
19 changes: 18 additions & 1 deletion Tasks/AzureFunctionAppV1/operations/ReleaseAnnotationUtility.ts
View file
Open in desktop
FinVamp1 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var uuidV4 = require("uuid/v4");
export async function addReleaseAnnotation(endpoint: AzureEndpoint, azureAppService: AzureAppService, isDeploymentSuccess: boolean): Promise<void> {
try {
var appSettings = await azureAppService.getApplicationSettings();
var instrumentationKey = appSettings && appSettings.properties && appSettings.properties.APPINSIGHTS_INSTRUMENTATIONKEY;
var instrumentationKey = getInstrumentationKey(appSettings);
if(instrumentationKey) {
let appinsightsResources: ApplicationInsightsResources = new ApplicationInsightsResources(endpoint);
var appInsightsResources = await appinsightsResources.list(null, [`$filter=InstrumentationKey eq '${instrumentationKey}'`]);
Expand Down Expand Up @@ -91,3 +91,20 @@ function getPipelineVariable(variableName: string): string | undefined {
//we dont want to set a variable to be empty string
return !!variable ? variable : undefined;
}

function getInstrumentationKey(appSettings: any): string | undefined {
let connectionString = appSettings?.properties?.APPLICATIONINSIGHTS_CONNECTION_STRING;
if (connectionString){
const FIELDS_SEPARATOR = ";";
const FIELD_KEY_VALUE_SEPARATOR = "=";

const kvPairs = connectionString.split(FIELDS_SEPARATOR);
for (const kvPair of kvPairs) {
const pair = kvPair.split(FIELD_KEY_VALUE_SEPARATOR);
if (pair.length === 2 && pair[0].trim().toLowerCase() === "instrumentationkey") {
return pair[1].trim();
}
}
}
return appSettings?.properties?.APPINSIGHTS_INSTRUMENTATIONKEY;
}
19 changes: 18 additions & 1 deletion Tasks/AzureFunctionAppV2/operations/ReleaseAnnotationUtility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var uuidV4 = require("uuid/v4");
export async function addReleaseAnnotation(endpoint: AzureEndpoint, azureAppService: AzureAppService, isDeploymentSuccess: boolean): Promise<void> {
try {
var appSettings = await azureAppService.getApplicationSettings();
var instrumentationKey = appSettings && appSettings.properties && appSettings.properties.APPINSIGHTS_INSTRUMENTATIONKEY;
var instrumentationKey = getInstrumentationKey(appSettings);
if(instrumentationKey) {
let appinsightsResources: ApplicationInsightsResources = new ApplicationInsightsResources(endpoint);
var appInsightsResources = await appinsightsResources.list(null, [`$filter=InstrumentationKey eq '${instrumentationKey}'`]);
Expand Down Expand Up @@ -91,3 +91,20 @@ function getPipelineVariable(variableName: string): string | undefined {
//we dont want to set a variable to be empty string
return !!variable ? variable : undefined;
}

function getInstrumentationKey(appSettings: any): string | undefined {
let connectionString = appSettings?.properties?.APPLICATIONINSIGHTS_CONNECTION_STRING;
if (connectionString){
const FIELDS_SEPARATOR = ";";
const FIELD_KEY_VALUE_SEPARATOR = "=";

const kvPairs = connectionString.split(FIELDS_SEPARATOR);
for (const kvPair of kvPairs) {
const pair = kvPair.split(FIELD_KEY_VALUE_SEPARATOR);
if (pair.length === 2 && pair[0].trim().toLowerCase() === "instrumentationkey") {
return pair[1].trim();
}
}
}
return appSettings?.properties?.APPINSIGHTS_INSTRUMENTATIONKEY;
}
21 changes: 19 additions & 2 deletions Tasks/AzureRmWebAppDeploymentV3/operations/ReleaseAnnotationUtility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var uuidV4 = require("uuid/v4");
export async function addReleaseAnnotation(endpoint: AzureEndpoint, azureAppService: AzureAppService, isDeploymentSuccess: boolean): Promise<void> {
try {
var appSettings = await azureAppService.getApplicationSettings();
var instrumentationKey = appSettings && appSettings.properties && appSettings.properties.APPINSIGHTS_INSTRUMENTATIONKEY;
var instrumentationKey = getInstrumentationKey(appSettings);
if(instrumentationKey) {
let appinsightsResources: ApplicationInsightsResources = new ApplicationInsightsResources(endpoint);
var appInsightsResources = await appinsightsResources.list(null, [`$filter=InstrumentationKey eq '${instrumentationKey}'`]);
Expand Down Expand Up @@ -90,4 +90,21 @@ function getPipelineVariable(variableName: string): string | undefined {
let variable = tl.getVariable(variableName);
//we dont want to set a variable to be empty string
return !!variable ? variable : undefined;
}
}

function getInstrumentationKey(appSettings: any): string | undefined {
let connectionString = appSettings?.properties?.APPLICATIONINSIGHTS_CONNECTION_STRING;
if (connectionString){
const FIELDS_SEPARATOR = ";";
const FIELD_KEY_VALUE_SEPARATOR = "=";

const kvPairs = connectionString.split(FIELDS_SEPARATOR);
for (const kvPair of kvPairs) {
const pair = kvPair.split(FIELD_KEY_VALUE_SEPARATOR);
if (pair.length === 2 && pair[0].trim().toLowerCase() === "instrumentationkey") {
return pair[1].trim();
}
}
}
return appSettings?.properties?.APPINSIGHTS_INSTRUMENTATIONKEY;
}
19 changes: 18 additions & 1 deletion Tasks/AzureRmWebAppDeploymentV4/operations/ReleaseAnnotationUtility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var uuidV4 = require("uuid/v4");
export async function addReleaseAnnotation(endpoint: AzureEndpoint, azureAppService: AzureAppService, isDeploymentSuccess: boolean): Promise<void> {
try {
var appSettings = await azureAppService.getApplicationSettings();
var instrumentationKey = appSettings && appSettings.properties && appSettings.properties.APPINSIGHTS_INSTRUMENTATIONKEY;
var instrumentationKey = getInstrumentationKey(appSettings);
if(instrumentationKey) {
let appinsightsResources: ApplicationInsightsResources = new ApplicationInsightsResources(endpoint);
var appInsightsResources = await appinsightsResources.list(null, [`$filter=InstrumentationKey eq '${instrumentationKey}'`]);
Expand Down Expand Up @@ -90,4 +90,21 @@ function getPipelineVariable(variableName: string): string | undefined {
let variable = tl.getVariable(variableName);
//we dont want to set a variable to be empty string
return !!variable ? variable : undefined;
}

function getInstrumentationKey(appSettings: any): string | undefined {
let connectionString = appSettings?.properties?.APPLICATIONINSIGHTS_CONNECTION_STRING;
if (connectionString){
const FIELDS_SEPARATOR = ";";
const FIELD_KEY_VALUE_SEPARATOR = "=";

const kvPairs = connectionString.split(FIELDS_SEPARATOR);
for (const kvPair of kvPairs) {
const pair = kvPair.split(FIELD_KEY_VALUE_SEPARATOR);
if (pair.length === 2 && pair[0].trim().toLowerCase() === "instrumentationkey") {
return pair[1].trim();
}
}
}
return appSettings?.properties?.APPINSIGHTS_INSTRUMENTATIONKEY;
}
21 changes: 19 additions & 2 deletions Tasks/AzureWebAppContainerV1/operations/ReleaseAnnotationUtility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels'
export async function addReleaseAnnotation(endpoint: AzureEndpoint, azureAppService: AzureAppService, isDeploymentSuccess: boolean): Promise<void> {
try {
var appSettings = await azureAppService.getApplicationSettings();
var instrumentationKey = appSettings && appSettings.properties && appSettings.properties.APPINSIGHTS_INSTRUMENTATIONKEY;
var instrumentationKey = getInstrumentationKey(appSettings);
if(instrumentationKey) {
let appinsightsResources: ApplicationInsightsResources = new ApplicationInsightsResources(endpoint);
var appInsightsResources = await appinsightsResources.list(null, [`$filter=InstrumentationKey eq '${instrumentationKey}'`]);
Expand Down Expand Up @@ -89,4 +89,21 @@ function getPipelineVariable(variableName: string): string | undefined {
let variable = tl.getVariable(variableName);
//we dont want to set a variable to be empty string
return !!variable ? variable : undefined;
}
}

function getInstrumentationKey(appSettings: any): string | undefined {
let connectionString = appSettings?.properties?.APPLICATIONINSIGHTS_CONNECTION_STRING;
if (connectionString){
const FIELDS_SEPARATOR = ";";
const FIELD_KEY_VALUE_SEPARATOR = "=";

const kvPairs = connectionString.split(FIELDS_SEPARATOR);
for (const kvPair of kvPairs) {
const pair = kvPair.split(FIELD_KEY_VALUE_SEPARATOR);
if (pair.length === 2 && pair[0].trim().toLowerCase() === "instrumentationkey") {
return pair[1].trim();
}
}
}
return appSettings?.properties?.APPINSIGHTS_INSTRUMENTATIONKEY;
}
21 changes: 19 additions & 2 deletions Tasks/AzureWebAppV1/operations/ReleaseAnnotationUtility.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var uuidV4 = require("uuid/v4");
export async function addReleaseAnnotation(endpoint: AzureEndpoint, azureAppService: AzureAppService, isDeploymentSuccess: boolean): Promise<void> {
try {
var appSettings = await azureAppService.getApplicationSettings();
var instrumentationKey = appSettings && appSettings.properties && appSettings.properties.APPINSIGHTS_INSTRUMENTATIONKEY;
var instrumentationKey = getInstrumentationKey(appSettings);
if(instrumentationKey) {
let appinsightsResources: ApplicationInsightsResources = new ApplicationInsightsResources(endpoint);
var appInsightsResources = await appinsightsResources.list(null, [`$filter=InstrumentationKey eq '${instrumentationKey}'`]);
Expand Down Expand Up @@ -90,4 +90,21 @@ function getPipelineVariable(variableName: string): string | undefined {
let variable = tl.getVariable(variableName);
//we dont want to set a variable to be empty string
return !!variable ? variable : undefined;
}
}

function getInstrumentationKey(appSettings: any): string | undefined {
let connectionString = appSettings?.properties?.APPLICATIONINSIGHTS_CONNECTION_STRING;
if (connectionString){
const FIELDS_SEPARATOR = ";";
const FIELD_KEY_VALUE_SEPARATOR = "=";

const kvPairs = connectionString.split(FIELDS_SEPARATOR);
for (const kvPair of kvPairs) {
const pair = kvPair.split(FIELD_KEY_VALUE_SEPARATOR);
if (pair.length === 2 && pair[0].trim().toLowerCase() === "instrumentationkey") {
return pair[1].trim();
}
}
}
return appSettings?.properties?.APPINSIGHTS_INSTRUMENTATIONKEY;
}