remove fluentd dependency (#1324)

* remove fluentd dependency * add controller_type env to ama-logs-geneva deployment
microsoft · Sep 26, 2024 · 92658e3 · 92658e3
1 parent 69419d3
commit 92658e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/charts/azuremonitor-containers-geneva/templates/deployment.yaml b/charts/azuremonitor-containers-geneva/templates/deployment.yaml
@@ -33,6 +33,8 @@ spec:
          resources:
           {{- toYaml .Values.resources | nindent 12 }}
          env:
+         - name: CONTROLLER_TYPE
+           value: "ReplicaSet"
          - name: GENEVA_TELEMETRY_SERVICE_POD_NAMESPACE
            valueFrom:
               fieldRef:

diff --git a/kubernetes/linux/main.sh b/kubernetes/linux/main.sh
@@ -1111,7 +1111,7 @@ if [ "${CONTROLLER_TYPE}" == "ReplicaSet" ] && [ "${GENEVA_LOGS_INTEGRATION_SERV
     fluentd -c /etc/fluent/kube.conf -o /var/opt/microsoft/docker-cimprov/log/fluentd.log --log-rotate-age 5 --log-rotate-size 20971520 &
 elif [ "$AZMON_RESOURCE_OPTIMIZATION_ENABLED" != "true" ]; then
     # no dependency on fluentd for Prometheus sidecar container
-    if [ "${CONTAINER_TYPE}" != "PrometheusSidecar" ] && [ "${GENEVA_LOGS_INTEGRATION_SERVICE_MODE}" != "true" ] && [ ! -e "/etc/config/kube.conf" ]; then
+    if [ "${CONTROLLER_TYPE}" == "DaemonSet" ] && [ "${CONTAINER_TYPE}" != "PrometheusSidecar" ]; then
         if [ "$LOGS_AND_EVENTS_ONLY" != "true" ]; then
             echo "*** starting fluentd v1 in daemonset"
             if [ "${ENABLE_CUSTOM_METRICS}" == "true" ]; then