File tree Expand file tree Collapse file tree 3 files changed +5
-3
lines changed
build/common/installer/scripts Expand file tree Collapse file tree 3 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -615,7 +615,7 @@ def populateSettingValuesFromConfigMap(parsedConfig)
615615 file . write ( "export AZMON_ANNOTATION_BASED_LOG_FILTERING=#{ @annotationBasedLogFiltering } \n " )
616616 if @isAzMonMultiTenancyLogCollectionEnabled
617617 file . write ( "export AZMON_MULTI_TENANCY_LOG_COLLECTION=#{ @isAzMonMultiTenancyLogCollectionEnabled } \n " )
618- file . write ( "export AZMON_MULTI_TENANCY_FALLBACK_INGESTION_DISABLE =#{ @isAzMonMultiTenancyFallbackIngestionDisabled } \n " )
618+ file . write ( "export AZMON_MULTI_TENANCY_FALLBACK_INGESTION_DISABLED =#{ @isAzMonMultiTenancyFallbackIngestionDisabled } \n " )
619619 file . write ( "export AZMON_MULTI_TENANCY_LOG_COLLECTION_ADVANCED_MODE=#{ @isAzMonMultiTenancyLogCollectionAdvancedMode } \n " )
620620 azMonMultiTenantNamespacesString = @azMonMultiTenantNamespaces . join ( "," )
621621 file . write ( "export AZMON_MULTI_TENANCY_NAMESPACES=#{ azMonMultiTenantNamespacesString } \n " )
@@ -701,7 +701,7 @@ def get_command_windows(env_variable_name, env_variable_value)
701701 if @isAzMonMultiTenancyLogCollectionEnabled
702702 commands = get_command_windows ( "AZMON_MULTI_TENANCY_LOG_COLLECTION" , @isAzMonMultiTenancyLogCollectionEnabled )
703703 file . write ( commands )
704- commands = get_command_windows ( "AZMON_MULTI_TENANCY_FALLBACK_INGESTION_DISABLE " , @isAzMonMultiTenancyFallbackIngestionDisabled )
704+ commands = get_command_windows ( "AZMON_MULTI_TENANCY_FALLBACK_INGESTION_DISABLED " , @isAzMonMultiTenancyFallbackIngestionDisabled )
705705 file . write ( commands )
706706 commands = get_command_windows ( "AZMON_MULTI_TENANCY_LOG_COLLECTION_ADVANCED_MODE" , @isAzMonMultiTenancyLogCollectionAdvancedMode )
707707 file . write ( commands )
Original file line number Diff line number Diff line change @@ -2369,7 +2369,7 @@ func InitializePlugin(pluginConfPath string, agentVersion string) {
23692369 }
23702370
23712371 IsAzMonMultiTenancyFallbackIngestionDisabled = false
2372- multiTenancyFallbackIngestionDisabled := strings .TrimSpace (strings .ToLower (os .Getenv ("AZMON_MULTI_TENANCY_FALLBACK_INGESTION_DISABLE " )))
2372+ multiTenancyFallbackIngestionDisabled := strings .TrimSpace (strings .ToLower (os .Getenv ("AZMON_MULTI_TENANCY_FALLBACK_INGESTION_DISABLED " )))
23732373 if multiTenancyFallbackIngestionDisabled != "" && strings .Compare (strings .ToLower (multiTenancyFallbackIngestionDisabled ), "true" ) == 0 {
23742374 IsAzMonMultiTenancyFallbackIngestionDisabled = true
23752375 Log ("Azure Monitor Multi-tenancy Fallback ingestion disabled" )
Original file line number Diff line number Diff line change @@ -279,11 +279,13 @@ func SendContainerLogPluginMetrics(telemetryPushIntervalProperty string) {
279279
280280 isAzMonMultitenancyEnabled := os .Getenv ("AZMON_MULTI_TENANCY_LOG_COLLECTION" )
281281 isAzMonMultitenancyAdvancedMode := os .Getenv ("AZMON_MULTI_TENANCY_LOG_COLLECTION_ADVANCED_MODE" )
282+ isAzMonMultitenancyDefaultFallbackIngestionDisabled := os .Getenv ("AZMON_MULTI_TENANCY_FALLBACK_INGESTION_DISABLED" )
282283 if isAzMonMultitenancyEnabled != "" {
283284 telemetryDimensions ["isAzMonMultitenancyEnabled" ] = isAzMonMultitenancyEnabled
284285 telemetryDimensions ["isAzMonMultitenancyAdvancedMode" ] = isAzMonMultitenancyAdvancedMode
285286 telemetryDimensions ["containerLogV2ExtensionDCRCount" ] = strconv .Itoa (containerLogV2ExtensionDCRCount )
286287 telemetryDimensions ["multitenantNamespaceCount" ] = strconv .Itoa (multitenantNamespaceCount )
288+ telemetryDimensions ["isAzMonMultitenancyFallbackIngestionDisabled" ] = isAzMonMultitenancyDefaultFallbackIngestionDisabled
287289 }
288290
289291 enableCustomMetrics := os .Getenv ("ENABLE_CUSTOM_METRICS" )
You can’t perform that action at this time.
0 commit comments