Change type of mta resource for logs

cloudfoundry · Sep 30, 2024 · 27a8067 · 27a8067
1 parent c1a1393
commit 27a8067
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
diff --git a/src/acceptance/helpers/helpers_test.go b/src/acceptance/helpers/helpers_test.go
diff --git a/src/autoscaler/build-extension-file.sh b/src/autoscaler/build-extension-file.sh
@@ -39,6 +39,10 @@ _schema-version: 3.3.0
 
 modules:
   - name: metricsforwarder
+    requires:
+    - name: config
+    - name: policydb
+    - name: syslog-client
     parameters:
       routes:
       - route: ${METRICSFORWARDER_APPNAME}.\${default-domain}

diff --git a/src/autoscaler/helpers/logger.go b/src/autoscaler/helpers/logger.go
@@ -5,6 +5,7 @@ import (
 	"log/slog"
 	"os"
 
+	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/configutil"
 	"code.cloudfoundry.org/lager/v3"
 )
 
@@ -20,11 +21,15 @@ func InitLoggerFromConfig(conf *LoggingConfig, name string) lager.Logger {
 
 	logger := lager.NewLogger(name)
 
-	redactedSink := createRedactedSink(logLevel)
-	logger.RegisterSink(redactedSink)
+	vcapConfig, _ := configutil.NewVCAPConfigurationReader()
 
-	plaintextFormatSink := createPlaintextSink()
-	logger.RegisterSink(plaintextFormatSink)
+	if vcapConfig.IsRunningOnCF() {
+		plaintextFormatSink := createPlaintextSink()
+		logger.RegisterSink(plaintextFormatSink)
+	} else {
+		redactedSink := createRedactedSink(logLevel)
+		logger.RegisterSink(redactedSink)
+	}
 
 	return logger
 }

diff --git a/src/autoscaler/mta.tpl.yaml b/src/autoscaler/mta.tpl.yaml
@@ -47,9 +47,9 @@ resources:
     - syslog-client
 - name: app-autoscaler-application-logs
   active: false
-  type: application-logs
+  type: org.cloudfoundry.managed-service
   parameters:
-    service-broker: null
+    service: application-logs
     service-plan: standard
   parameters-metadata:
     service-broker: