Gangams/make infra geneva config optional in multi tenancy (#1050)

* make geneva config optional

* include namespace for geneva telemetry service pod

* remove unused prom scrape annotations

* remove unused prom scrape annotations

* fix bug

* fix pr feedback

* fix pr feedback

Author: ganga1980

build/common/installer/scripts/tomlparser-geneva-config.rb

@@ -225,6 +225,14 @@ def get_command_windows(env_variable_name, env_variable_value)
   return "[System.Environment]::SetEnvironmentVariable(\"#{env_variable_name}\", \"#{env_variable_value}\", \"Process\")" + "\n" + "[System.Environment]::SetEnvironmentVariable(\"#{env_variable_name}\", \"#{env_variable_value}\", \"Machine\")" + "\n"
 end
 
+def is_configure_geneva_env_vars()
+  is_configure = false
+  if (@geneva_logs_integration && (!@multi_tenancy || !@infra_namespaces.empty?))
+    is_configure = true
+  end
+  return is_configure
+end
+
 @configSchemaVersion = ENV["AZMON_AGENT_CFG_SCHEMA_VERSION"]
 puts "****************Start Agent Integrations Config Processing********************"
 if !@configSchemaVersion.nil? && !@configSchemaVersion.empty? && @configSchemaVersion.strip.casecmp("v1") == 0 #note v1 is the only supported schema version , so hardcoding it
@@ -254,7 +262,7 @@ def get_command_windows(env_variable_name, env_variable_value)
     file.write("export ENABLE_FBIT_THREADING=#{@enable_fbit_threading}\n")
   end
 
-  if @geneva_logs_integration
+  if is_configure_geneva_env_vars()
     file.write("export MONITORING_GCS_ENVIRONMENT=#{@geneva_account_environment}\n")
     file.write("export MONITORING_GCS_NAMESPACE=#{@geneva_account_namespace}\n")
     file.write("export MONITORING_GCS_ACCOUNT=#{@geneva_account_name}\n")
@@ -290,7 +298,7 @@ def get_command_windows(env_variable_name, env_variable_value)
       file.write(commands)
     end
 
-    if @geneva_logs_integration
+    if is_configure_geneva_env_vars()
       commands = get_command_windows("MONITORING_GCS_ENVIRONMENT", @geneva_account_environment)
       file.write(commands)
       commands = get_command_windows("MONITORING_GCS_NAMESPACE", @geneva_account_namespace_windows)

build/linux/installer/conf/fluent-bit-geneva-telemetry-svc.conf

@@ -18,15 +18,15 @@
 
 [INPUT]
     Name              forward
-    Alias             input_forward
+    Alias             input_${GENEVA_TELEMETRY_SERVICE_POD_NAMESPACE}_forward
     Listen            0.0.0.0
     Port              24224
     Buffer_Chunk_Size ${FBIT_INPUT_FORWARD_BUFFER_CHUNK_SIZE}
     Buffer_Max_Size   ${FBIT_INPUT_FORWARD_BUFFER_CHUNK_MAX_SIZE}
 
 [OUTPUT]
     Name                            oms
-    Alias                           output_geneva
+    Alias                           output_${GENEVA_TELEMETRY_SERVICE_POD_NAMESPACE}_geneva
     EnableTelemetry                 true
     Retry_Limit                     10
     TelemetryPushIntervalSeconds    300

charts/azuremonitor-containers-geneva/templates/deployment.yaml

@@ -18,8 +18,6 @@ spec:
     metadata:
      annotations:
        agentVersion: {{ .Values.image.agentVersion }}
-       prometheus.io/scrape: "true"
-       prometheus.io/port: "9102"
      labels:
        rsName: "ama-logs-geneva"
        aadpodidbinding: {{ .Values.genevaLogsConfig.aadpodidbinding }}
@@ -35,6 +33,10 @@ spec:
          resources:
           {{- toYaml .Values.resources | nindent 12 }}
          env:
+         - name: GENEVA_TELEMETRY_SERVICE_POD_NAMESPACE
+           valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
          - name: ENABLE_FBIT_INTERNAL_METRICS
            value: {{ .Values.enableInternalMetrics | quote }}
          - name: FBIT_SERVICE_GRACE_INTERVAL_SECONDS

kubernetes/linux/main.sh

@@ -61,6 +61,15 @@ waitforlisteneronTCPport() {
       fi
 }
 
+isGenevaMode() {
+  if [ "${GENEVA_LOGS_INTEGRATION}" == "true" ] && { [ "${GENEVA_LOGS_MULTI_TENANCY}" == "false" ] || [ -n "${GENEVA_LOGS_INFRA_NAMESPACES}" ]; }; then
+   true
+  elif [ "${GENEVA_LOGS_INTEGRATION_SERVICE_MODE}" == "true" ]; then
+   true
+  else
+   false
+  fi
+}
 checkAgentOnboardingStatus() {
       local sleepdurationsecs=1
       local totalsleptsecs=0
@@ -80,7 +89,8 @@ checkAgentOnboardingStatus() {
                         successMessage="Loaded data sources"
                         failureMessage="Failed to load data sources into config"
                   fi
-                  if [ "${GENEVA_LOGS_INTEGRATION}" == "true" ] || [ "${GENEVA_LOGS_INTEGRATION_SERVICE_MODE}" == "true" ]; then
+
+                  if isGenevaMode; then
                         successMessage="Config downloaded and parsed"
                         failureMessage="failed to download start up config"
                   fi
@@ -800,7 +810,7 @@ source /etc/mdsd.d/envmdsd
 MDSD_AAD_MSI_AUTH_ARGS=""
 # check if its AAD Auth MSI mode via USING_AAD_MSI_AUTH
 export AAD_MSI_AUTH_MODE=false
-if [ "${CONTAINER_TYPE}" != "PrometheusSidecar" ] && [ "${GENEVA_LOGS_INTEGRATION}" == "true"  -o "${GENEVA_LOGS_INTEGRATION_SERVICE_MODE}" == "true" ]; then
+if [ "${CONTAINER_TYPE}" != "PrometheusSidecar" ] && isGenevaMode; then
     echo "Runnning AMA in Geneva Logs Integration Mode"
     export MONITORING_USE_GENEVA_CONFIG_SERVICE=true
     echo "export MONITORING_USE_GENEVA_CONFIG_SERVICE=true" >> ~/.bashrc

kubernetes/windows/main.ps1

@@ -716,6 +716,29 @@ function Bootstrap-CACertificates {
     }
 }
 
+function IsGenevaMode() {
+    $isGenevaLogsIntegration=$false
+    $isGenevaLogsMultitenancy=$false
+    $genevaLogsIntegration = [System.Environment]::GetEnvironmentVariable("GENEVA_LOGS_INTEGRATION")
+    $genevaLogsMultitenancy = [System.Environment]::GetEnvironmentVariable("GENEVA_LOGS_MULTI_TENANCY")
+    $genevaLogsInfraNameSpaces = [System.Environment]::GetEnvironmentVariable("GENEVA_LOGS_INFRA_NAMESPACES")
+    $isGenevaLogsInfraNameSpacesEmpty=$true
+
+    if (![string]::IsNullOrEmpty($genevaLogsIntegration) -and $genevaLogsIntegration.ToLower() -eq 'true') {
+        $isGenevaLogsIntegration=$true
+    }
+    if (![string]::IsNullOrEmpty($genevaLogsMultitenancy) -and $genevaLogsMultitenancy.ToLower() -eq 'true') {
+        $isGenevaLogsMultitenancy=$true
+    }
+    if (![string]::IsNullOrEmpty($genevaLogsInfraNameSpaces)) {
+        $isGenevaLogsInfraNameSpacesEmpty=$false
+    }
+    if ($isGenevaLogsIntegration -and (!$isGenevaLogsMultitenancy -or !$isGenevaLogsInfraNameSpacesEmpty)){
+      return $true
+    }
+    return $false
+}
+
 Set-ProcessAndMachineEnvVariables "COMPlus_ThreadPool_UnfairSemaphoreSpinLimit" "0"
 
 Start-Transcript -Path main.txt
@@ -736,9 +759,8 @@ if (![string]::IsNullOrEmpty($requiresCertBootstrap) -and `
     Bootstrap-CACertificates
 }
 
-$isGenevaLogsIntegration = [System.Environment]::GetEnvironmentVariable("GENEVA_LOGS_INTEGRATION")
 $isAADMSIAuth = [System.Environment]::GetEnvironmentVariable("USING_AAD_MSI_AUTH")
-if (![string]::IsNullOrEmpty($isGenevaLogsIntegration) -and $isGenevaLogsIntegration.ToLower() -eq 'true') {
+if (IsGenevaMode) {
     Write-Host "Starting Windows AMA in 1P Mode"
     #start Windows AMA
     Start-Job -ScriptBlock { Start-Process -NoNewWindow -FilePath "C:\opt\windowsazuremonitoragent\windowsazuremonitoragent\Monitoring\Agent\MonAgentLauncher.exe" -ArgumentList @("-useenv")}