Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
audience: https://monitor.azure.com/
{{- else if eq (.Values.Azure.Cluster.Cloud | lower) "azurechinacloud" }}
audience: https://monitor.azure.cn/
{{- else if eq (.Values.Azure.Cluster.Cloud | lower) "bleu" }}
{{- else if eq (.Values.Azure.Cluster.Cloud | lower) "azurebleucloud" }}
audience: https://monitor.sovcloud-api.fr/
{{- else if eq (.Values.Azure.Cluster.Cloud | lower) "azureusgovernmentcloud" }}
audience: https://monitor.azure.us/
Expand Down
10 changes: 5 additions & 5 deletions kubernetes/linux/main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ startTime=$(date +%s)
echo "startup script start @ $(date +'%Y-%m-%dT%H:%M:%S')"

# Supported cloud environments
SUPPORTED_CLOUDS=("azurepubliccloud" "azurechinacloud" "azureusgovernmentcloud" "usnat" "ussec" "bleu")
SUPPORTED_CLOUDS=("azurepubliccloud" "azurechinacloud" "azureusgovernmentcloud" "usnat" "ussec" "azurebleucloud")

getDomainFromSecret() {
# Read the domain from the AMA logs secret and convert to lowercase
Expand Down Expand Up @@ -51,7 +51,7 @@ getClusterCloudEnvironment() {
echo "ussec"
;;
"opinsights.sovcloud-api.fr")
echo "bleu"
echo "azurebleucloud"
;;
""|*)
echo "unknown"
Expand Down Expand Up @@ -147,9 +147,9 @@ setCloudSpecificApplicationInsightsConfig() {
echo "export APPLICATIONINSIGHTS_ENDPOINT=$APPLICATIONINSIGHTS_ENDPOINT" >>~/.bashrc
source ~/.bashrc
;;
"bleu")
# TODO: Bleu cloud is a new cloud environment, we don't have AI in this cloud yet so using Public cloud for now.
# Update this once we have AI in Bleu cloud.
"azurebleucloud")
# TODO: azurebleucloud is a new cloud environment; we don't have AI in this cloud yet so using Public cloud for now.
# Update this once we have AI in azurebleucloud.
APPLICATIONINSIGHTS_AUTH="NzAwZGM5OGYtYTdhZC00NThkLWI5NWMtMjA3ZjM3NmM3YmRi"
APPLICATIONINSIGHTS_ENDPOINT="https://dc.applicationinsights.azure.com/v2/track"
echo "export APPLICATIONINSIGHTS_AUTH=$APPLICATIONINSIGHTS_AUTH" >>~/.bashrc
Expand Down
18 changes: 9 additions & 9 deletions kubernetes/windows/main.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ function Set-CloudSpecificApplicationInsightsConfig {
Set-ProcessAndMachineEnvVariables "APPLICATIONINSIGHTS_AUTH" "NTc5ZDRiZjUtMTA1Mi0wODQzLThhNTYtMjU5YzEyZmJhZTkyCg=="
Set-ProcessAndMachineEnvVariables "APPLICATIONINSIGHTS_ENDPOINT" "https://dc.applicationinsights.azure.microsoft.scloud/v2/track"
}
"bleu" {
# TODO: Bleu cloud is a new cloud environment, we don't have AI in this cloud yet so using Public cloud for now.
# Update this once we have AI in Bleu cloud.
Write-Host "Set-CloudSpecificApplicationInsightsConfig: Setting Application Insights configuration for Bleu Cloud"
"azurebleucloud" {
# TODO: azurebleucloud is a new cloud environment; we don't have AI in this cloud yet so using Public cloud for now.
# Update this once we have AI in azurebleucloud.
Write-Host "Set-CloudSpecificApplicationInsightsConfig: Setting Application Insights configuration for azurebleucloud"
Set-ProcessAndMachineEnvVariables "APPLICATIONINSIGHTS_AUTH" "NzAwZGM5OGYtYTdhZC00NThkLWI5NWMtMjA3ZjM3NmM3YmRi"
Set-ProcessAndMachineEnvVariables "APPLICATIONINSIGHTS_ENDPOINT" "https://dc.applicationinsights.azure.com/v2/track"
}
Expand Down Expand Up @@ -204,7 +204,7 @@ function Is-SupportedCloudEnvironment {
param (
[string]$cloudEnvironment
)
$supportedCloudEnvironments = @("azurepubliccloud", "azurechinacloud", "azureusgovernmentcloud", "usnat", "ussec", "bleu")
$supportedCloudEnvironments = @("azurepubliccloud", "azurechinacloud", "azureusgovernmentcloud", "usnat", "ussec", "azurebleucloud")
if ($supportedCloudEnvironments -contains $cloudEnvironment) {
return $true
}
Expand All @@ -228,7 +228,7 @@ function Get-ClusterCloudEnvironment{
"opinsights.azure.us" { $cloud_environment = "azureusgovernmentcloud" }
"opinsights.azure.eaglex.ic.gov" { $cloud_environment = "usnat" }
"opinsights.azure.microsoft.scloud" { $cloud_environment = "ussec" }
"opinsights.sovcloud-api.fr" { $cloud_environment = "bleu" }
"opinsights.sovcloud-api.fr" { $cloud_environment = "azurebleucloud" }
}
} else {
Write-Host "Domain name either null or empty. Defaulting to azurepubliccloud."
Expand Down Expand Up @@ -275,7 +275,7 @@ function Get-McsAzureResourceEndpoint {
"azureusgovernmentcloud" { $mcs_azure_resource_endpoint = "https://monitor.azure.us/" }
"usnat" { $mcs_azure_resource_endpoint = "https://monitor.azure.eaglex.ic.gov/" }
"ussec" { $mcs_azure_resource_endpoint = "https://monitor.azure.microsoft.scloud/" }
"bleu" { $mcs_azure_resource_endpoint = "https://monitor.sovcloud-api.fr/" }
"azurebleucloud" { $mcs_azure_resource_endpoint = "https://monitor.sovcloud-api.fr/" }
}
}
return $mcs_azure_resource_endpoint
Expand All @@ -293,7 +293,7 @@ function Get-McsEndpoint {
"azureusgovernmentcloud" { $mcs_endpoint = "monitor.azure.us" }
"usnat" { $mcs_endpoint = "monitor.azure.eaglex.ic.gov" }
"ussec" { $mcs_endpoint = "monitor.azure.microsoft.scloud" }
"bleu" { $mcs_endpoint = "monitor.sovcloud-api.fr" }
"azurebleucloud" { $mcs_endpoint = "monitor.sovcloud-api.fr" }
}
}
return $mcs_endpoint
Expand Down Expand Up @@ -327,7 +327,7 @@ function Get-McsGlobalEndpoint{
"azureusgovernmentcloud" { $mcs_globalendpoint = "https://global.handler.control.monitor.azure.us" }
"usnat" { $mcs_globalendpoint = "https://global.handler.control.monitor.azure.eaglex.ic.gov" }
"ussec" { $mcs_globalendpoint = "https://global.handler.control.monitor.azure.microsoft.scloud" }
"bleu" { $mcs_globalendpoint = "https://global.handler.control.monitor.sovcloud-api.fr" }
"azurebleucloud" { $mcs_globalendpoint = "https://global.handler.control.monitor.sovcloud-api.fr" }
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion source/plugins/go/input/lib/applicationinsights.go
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ func getWorkspaceCloud() string {
case "opinsights.azure.microsoft.scloud":
workspaceCloud = "ussec"
case "opinsights.sovcloud-api.fr":
workspaceCloud = "bleu"
workspaceCloud = "azurebleucloud"
default:
workspaceCloud = "Unknown"
}
Expand Down
2 changes: 1 addition & 1 deletion source/plugins/ruby/ApplicationInsightsUtility.rb
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ def getWorkspaceCloud()
elsif workspaceDomain.casecmp("opinsights.azure.microsoft.scloud") == 0
workspaceCloud = "ussec"
elsif workspaceDomain.casecmp("opinsights.sovcloud-api.fr") == 0
workspaceCloud = "bleu"
workspaceCloud = "azurebleucloud"
else
workspaceCloud = "Unknown"
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function Test-ValidEnvironmentVariables {
"azureusgovernmentcloud",
"usnat",
"ussec",
"bleu"
"azurebleucloud"
)

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

foreach ($testCase in $testCases) {
Expand Down
2 changes: 1 addition & 1 deletion test/unit-tests/test_cases/Test-GetMcsEndpoint.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function Test-CloudEnvironments {
expected = "monitor.azure.microsoft.scloud"
},
@{
cloud = "bleu"
cloud = "azurebleucloud"
expected = "monitor.sovcloud-api.fr"
}
)
Expand Down
2 changes: 1 addition & 1 deletion test/unit-tests/test_cases/Test-GetMcsGlobalEndpoint.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function Test-CloudEnvironments {
expected = "https://global.handler.control.monitor.azure.microsoft.scloud"
},
@{
cloud = "bleu"
cloud = "azurebleucloud"
expected = "https://global.handler.control.monitor.sovcloud-api.fr"
}
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function Test-ValidCloudEnvironments {
"azureusgovernmentcloud",
"usnat",
"ussec",
"bleu"
"azurebleucloud"
)

foreach ($cloud in $testCases) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ test_valid_environment_variables() {
"azureusgovernmentcloud"
"usnat"
"ussec"
"bleu"
"azurebleucloud"
)

for cloud in "${test_cases[@]}"; do
Expand Down Expand Up @@ -45,7 +45,7 @@ test_domain_file_fallback() {
"opinsights.azure.us:azureusgovernmentcloud"
"opinsights.azure.eaglex.ic.gov:usnat"
"opinsights.azure.microsoft.scloud:ussec"
"opinsights.sovcloud-api.fr:bleu"
"opinsights.sovcloud-api.fr:azurebleucloud"
)

for test_case in "${test_cases[@]}"; do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ function Is-SupportedCloudEnvironment {
param (
[string]$cloudEnvironment
)
$supportedCloudEnvironments = @("azurepubliccloud", "azurechinacloud", "azureusgovernmentcloud", "usnat", "ussec", "bleu")
$supportedCloudEnvironments = @("azurepubliccloud", "azurechinacloud", "azureusgovernmentcloud", "usnat", "ussec", "azurebleucloud")
if ($supportedCloudEnvironments -contains $cloudEnvironment) {
return $true
}
Expand All @@ -26,7 +26,7 @@ function Get-ClusterCloudEnvironment{
"opinsights.azure.us" { $cloud_environment = "azureusgovernmentcloud" }
"opinsights.azure.eaglex.ic.gov" { $cloud_environment = "usnat" }
"opinsights.azure.microsoft.scloud" { $cloud_environment = "ussec" }
"opinsights.sovcloud-api.fr" { $cloud_environment = "bleu" }
"opinsights.sovcloud-api.fr" { $cloud_environment = "azurebleucloud" }
}
} else {
Write-Host "Domain name either null or empty. Defaulting to azurepubliccloud."
Expand Down
2 changes: 1 addition & 1 deletion test/unit-tests/test_functions/Get-McsEndpoint.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function Get-McsEndpoint {
"azureusgovernmentcloud" { $mcs_endpoint = "monitor.azure.us" }
"usnat" { $mcs_endpoint = "monitor.azure.eaglex.ic.gov" }
"ussec" { $mcs_endpoint = "monitor.azure.microsoft.scloud" }
"bleu" { $mcs_endpoint = "monitor.sovcloud-api.fr" }
"azurebleucloud" { $mcs_endpoint = "monitor.sovcloud-api.fr" }
}
}
return $mcs_endpoint
Expand Down
2 changes: 1 addition & 1 deletion test/unit-tests/test_functions/Get-McsGlobalEndpoint.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function Get-McsGlobalEndpoint{
"azureusgovernmentcloud" { $mcs_globalendpoint = "https://global.handler.control.monitor.azure.us" }
"usnat" { $mcs_globalendpoint = "https://global.handler.control.monitor.azure.eaglex.ic.gov" }
"ussec" { $mcs_globalendpoint = "https://global.handler.control.monitor.azure.microsoft.scloud" }
"bleu" { $mcs_globalendpoint = "https://global.handler.control.monitor.sovcloud-api.fr" }
"azurebleucloud" { $mcs_globalendpoint = "https://global.handler.control.monitor.sovcloud-api.fr" }
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function Is-SupportedCloudEnvironment {
param (
[string]$cloudEnvironment
)
$supportedCloudEnvironments = @("azurepubliccloud", "azurechinacloud", "azureusgovernmentcloud", "usnat", "ussec", "bleu")
$supportedCloudEnvironments = @("azurepubliccloud", "azurechinacloud", "azureusgovernmentcloud", "usnat", "ussec", "azurebleucloud")
if ($supportedCloudEnvironments -contains $cloudEnvironment) {
return $true
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Original source: kubernetes/linux/main.sh

# Required variables
SUPPORTED_CLOUDS=("azurepubliccloud" "azurechinacloud" "azureusgovernmentcloud" "usnat" "ussec" "bleu")
SUPPORTED_CLOUDS=("azurepubliccloud" "azurechinacloud" "azureusgovernmentcloud" "usnat" "ussec" "azurebleucloud")

getDomainFromSecret() {
# Read the domain from the AMA logs secret and convert to lowercase
Expand Down Expand Up @@ -55,7 +55,7 @@ getClusterCloudEnvironment() {
echo "ussec"
;;
"opinsights.sovcloud-api.fr")
echo "bleu"
echo "azurebleucloud"
;;
""|*)
echo "unknown"
Expand Down
Loading