Skip to content

Commit cfcc530

Browse files
gracewehnergracewehner
authored
fix: bleu cloud name is azurebleucloud (#1598)
* replace bleu wtith azurebleucloud * fix whitespace * more whitespace
1 parent c86e843 commit cfcc530

15 files changed

Lines changed: 31 additions & 31 deletions

‎charts/azuremonitor-containers/templates/ama-logs-arc-k8s-crd.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
audience: https://monitor.azure.com/
2424
{{- else if eq (.Values.Azure.Cluster.Cloud | lower) "azurechinacloud" }}
2525
audience: https://monitor.azure.cn/
26-
{{- else if eq (.Values.Azure.Cluster.Cloud | lower) "bleu" }}
26+
{{- else if eq (.Values.Azure.Cluster.Cloud | lower) "azurebleucloud" }}
2727
audience: https://monitor.sovcloud-api.fr/
2828
{{- else if eq (.Values.Azure.Cluster.Cloud | lower) "azureusgovernmentcloud" }}
2929
audience: https://monitor.azure.us/

‎kubernetes/linux/main.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ startTime=$(date +%s)
66
echo "startup script start @ $(date +'%Y-%m-%dT%H:%M:%S')"
77

88
# Supported cloud environments
9-
SUPPORTED_CLOUDS=("azurepubliccloud" "azurechinacloud" "azureusgovernmentcloud" "usnat" "ussec" "bleu")
9+
SUPPORTED_CLOUDS=("azurepubliccloud" "azurechinacloud" "azureusgovernmentcloud" "usnat" "ussec" "azurebleucloud")
1010

1111
getDomainFromSecret() {
1212
# Read the domain from the AMA logs secret and convert to lowercase
@@ -51,7 +51,7 @@ getClusterCloudEnvironment() {
5151
echo "ussec"
5252
;;
5353
"opinsights.sovcloud-api.fr")
54-
echo "bleu"
54+
echo "azurebleucloud"
5555
;;
5656
""|*)
5757
echo "unknown"
@@ -147,9 +147,9 @@ setCloudSpecificApplicationInsightsConfig() {
147147
echo "export APPLICATIONINSIGHTS_ENDPOINT=$APPLICATIONINSIGHTS_ENDPOINT" >>~/.bashrc
148148
source ~/.bashrc
149149
;;
150-
"bleu")
151-
# TODO: Bleu cloud is a new cloud environment, we don't have AI in this cloud yet so using Public cloud for now.
152-
# Update this once we have AI in Bleu cloud.
150+
"azurebleucloud")
151+
# TODO: azurebleucloud is a new cloud environment; we don't have AI in this cloud yet so using Public cloud for now.
152+
# Update this once we have AI in azurebleucloud.
153153
APPLICATIONINSIGHTS_AUTH="NzAwZGM5OGYtYTdhZC00NThkLWI5NWMtMjA3ZjM3NmM3YmRi"
154154
APPLICATIONINSIGHTS_ENDPOINT="https://dc.applicationinsights.azure.com/v2/track"
155155
echo "export APPLICATIONINSIGHTS_AUTH=$APPLICATIONINSIGHTS_AUTH" >>~/.bashrc

‎kubernetes/windows/main.ps1‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ function Set-CloudSpecificApplicationInsightsConfig {
103103
Set-ProcessAndMachineEnvVariables "APPLICATIONINSIGHTS_AUTH" "NTc5ZDRiZjUtMTA1Mi0wODQzLThhNTYtMjU5YzEyZmJhZTkyCg=="
104104
Set-ProcessAndMachineEnvVariables "APPLICATIONINSIGHTS_ENDPOINT" "https://dc.applicationinsights.azure.microsoft.scloud/v2/track"
105105
}
106-
"bleu" {
107-
# TODO: Bleu cloud is a new cloud environment, we don't have AI in this cloud yet so using Public cloud for now.
108-
# Update this once we have AI in Bleu cloud.
109-
Write-Host "Set-CloudSpecificApplicationInsightsConfig: Setting Application Insights configuration for Bleu Cloud"
106+
"azurebleucloud" {
107+
# TODO: azurebleucloud is a new cloud environment; we don't have AI in this cloud yet so using Public cloud for now.
108+
# Update this once we have AI in azurebleucloud.
109+
Write-Host "Set-CloudSpecificApplicationInsightsConfig: Setting Application Insights configuration for azurebleucloud"
110110
Set-ProcessAndMachineEnvVariables "APPLICATIONINSIGHTS_AUTH" "NzAwZGM5OGYtYTdhZC00NThkLWI5NWMtMjA3ZjM3NmM3YmRi"
111111
Set-ProcessAndMachineEnvVariables "APPLICATIONINSIGHTS_ENDPOINT" "https://dc.applicationinsights.azure.com/v2/track"
112112
}
@@ -204,7 +204,7 @@ function Is-SupportedCloudEnvironment {
204204
param (
205205
[string]$cloudEnvironment
206206
)
207-
$supportedCloudEnvironments = @("azurepubliccloud", "azurechinacloud", "azureusgovernmentcloud", "usnat", "ussec", "bleu")
207+
$supportedCloudEnvironments = @("azurepubliccloud", "azurechinacloud", "azureusgovernmentcloud", "usnat", "ussec", "azurebleucloud")
208208
if ($supportedCloudEnvironments -contains $cloudEnvironment) {
209209
return $true
210210
}
@@ -228,7 +228,7 @@ function Get-ClusterCloudEnvironment{
228228
"opinsights.azure.us" { $cloud_environment = "azureusgovernmentcloud" }
229229
"opinsights.azure.eaglex.ic.gov" { $cloud_environment = "usnat" }
230230
"opinsights.azure.microsoft.scloud" { $cloud_environment = "ussec" }
231-
"opinsights.sovcloud-api.fr" { $cloud_environment = "bleu" }
231+
"opinsights.sovcloud-api.fr" { $cloud_environment = "azurebleucloud" }
232232
}
233233
} else {
234234
Write-Host "Domain name either null or empty. Defaulting to azurepubliccloud."
@@ -275,7 +275,7 @@ function Get-McsAzureResourceEndpoint {
275275
"azureusgovernmentcloud" { $mcs_azure_resource_endpoint = "https://monitor.azure.us/" }
276276
"usnat" { $mcs_azure_resource_endpoint = "https://monitor.azure.eaglex.ic.gov/" }
277277
"ussec" { $mcs_azure_resource_endpoint = "https://monitor.azure.microsoft.scloud/" }
278-
"bleu" { $mcs_azure_resource_endpoint = "https://monitor.sovcloud-api.fr/" }
278+
"azurebleucloud" { $mcs_azure_resource_endpoint = "https://monitor.sovcloud-api.fr/" }
279279
}
280280
}
281281
return $mcs_azure_resource_endpoint
@@ -293,7 +293,7 @@ function Get-McsEndpoint {
293293
"azureusgovernmentcloud" { $mcs_endpoint = "monitor.azure.us" }
294294
"usnat" { $mcs_endpoint = "monitor.azure.eaglex.ic.gov" }
295295
"ussec" { $mcs_endpoint = "monitor.azure.microsoft.scloud" }
296-
"bleu" { $mcs_endpoint = "monitor.sovcloud-api.fr" }
296+
"azurebleucloud" { $mcs_endpoint = "monitor.sovcloud-api.fr" }
297297
}
298298
}
299299
return $mcs_endpoint
@@ -327,7 +327,7 @@ function Get-McsGlobalEndpoint{
327327
"azureusgovernmentcloud" { $mcs_globalendpoint = "https://global.handler.control.monitor.azure.us" }
328328
"usnat" { $mcs_globalendpoint = "https://global.handler.control.monitor.azure.eaglex.ic.gov" }
329329
"ussec" { $mcs_globalendpoint = "https://global.handler.control.monitor.azure.microsoft.scloud" }
330-
"bleu" { $mcs_globalendpoint = "https://global.handler.control.monitor.sovcloud-api.fr" }
330+
"azurebleucloud" { $mcs_globalendpoint = "https://global.handler.control.monitor.sovcloud-api.fr" }
331331
}
332332
}
333333
}

‎source/plugins/go/input/lib/applicationinsights.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ func getWorkspaceCloud() string {
284284
case "opinsights.azure.microsoft.scloud":
285285
workspaceCloud = "ussec"
286286
case "opinsights.sovcloud-api.fr":
287-
workspaceCloud = "bleu"
287+
workspaceCloud = "azurebleucloud"
288288
default:
289289
workspaceCloud = "Unknown"
290290
}

‎source/plugins/ruby/ApplicationInsightsUtility.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ def getWorkspaceCloud()
308308
elsif workspaceDomain.casecmp("opinsights.azure.microsoft.scloud") == 0
309309
workspaceCloud = "ussec"
310310
elsif workspaceDomain.casecmp("opinsights.sovcloud-api.fr") == 0
311-
workspaceCloud = "bleu"
311+
workspaceCloud = "azurebleucloud"
312312
else
313313
workspaceCloud = "Unknown"
314314
end

‎test/unit-tests/test_cases/Test-GetClusterCloudEnvironment.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function Test-ValidEnvironmentVariables {
1111
"azureusgovernmentcloud",
1212
"usnat",
1313
"ussec",
14-
"bleu"
14+
"azurebleucloud"
1515
)
1616

1717
foreach ($cloud in $testCases) {
@@ -38,7 +38,7 @@ function Test-DomainFileFallback {
3838
@{domain="opinsights.azure.us"; expected="azureusgovernmentcloud"},
3939
@{domain="opinsights.azure.eaglex.ic.gov"; expected="usnat"},
4040
@{domain="opinsights.azure.microsoft.scloud"; expected="ussec"},
41-
@{domain="opinsights.sovcloud-api.fr"; expected="bleu"}
41+
@{domain="opinsights.sovcloud-api.fr"; expected="azurebleucloud"}
4242
)
4343

4444
foreach ($testCase in $testCases) {

‎test/unit-tests/test_cases/Test-GetMcsEndpoint.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function Test-CloudEnvironments {
2727
expected = "monitor.azure.microsoft.scloud"
2828
},
2929
@{
30-
cloud = "bleu"
30+
cloud = "azurebleucloud"
3131
expected = "monitor.sovcloud-api.fr"
3232
}
3333
)

‎test/unit-tests/test_cases/Test-GetMcsGlobalEndpoint.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function Test-CloudEnvironments {
4242
expected = "https://global.handler.control.monitor.azure.microsoft.scloud"
4343
},
4444
@{
45-
cloud = "bleu"
45+
cloud = "azurebleucloud"
4646
expected = "https://global.handler.control.monitor.sovcloud-api.fr"
4747
}
4848
)

‎test/unit-tests/test_cases/Test-IsSupportedCloudEnvironment.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function Test-ValidCloudEnvironments {
1111
"azureusgovernmentcloud",
1212
"usnat",
1313
"ussec",
14-
"bleu"
14+
"azurebleucloud"
1515
)
1616

1717
foreach ($cloud in $testCases) {

‎test/unit-tests/test_cases/test_getClusterCloudEnvironment.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ test_valid_environment_variables() {
1414
"azureusgovernmentcloud"
1515
"usnat"
1616
"ussec"
17-
"bleu"
17+
"azurebleucloud"
1818
)
1919

2020
for cloud in "${test_cases[@]}"; do
@@ -45,7 +45,7 @@ test_domain_file_fallback() {
4545
"opinsights.azure.us:azureusgovernmentcloud"
4646
"opinsights.azure.eaglex.ic.gov:usnat"
4747
"opinsights.azure.microsoft.scloud:ussec"
48-
"opinsights.sovcloud-api.fr:bleu"
48+
"opinsights.sovcloud-api.fr:azurebleucloud"
4949
)
5050

5151
for test_case in "${test_cases[@]}"; do

0 commit comments

Comments
 (0)