From e355577a40479358d70ab56fae51cbc2ac52ef54 Mon Sep 17 00:00:00 2001 From: CrowleyRajapakse Date: Wed, 27 Mar 2024 12:16:04 +0530 Subject: [PATCH] add agent helm chart changes to tests --- .../agent-helm-chart/templates/log-conf.yaml | 20 +++++++++++++------ .../agent-helm-chart/values.yaml | 4 ++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/test/apim-apk-agent-test/agent-helm-chart/templates/log-conf.yaml b/test/apim-apk-agent-test/agent-helm-chart/templates/log-conf.yaml index 613871038..1e5ad464e 100644 --- a/test/apim-apk-agent-test/agent-helm-chart/templates/log-conf.yaml +++ b/test/apim-apk-agent-test/agent-helm-chart/templates/log-conf.yaml @@ -19,14 +19,22 @@ data: enabled = {{ .Values.dataPlane.enabled }} k8ResourceEndpoint = "{{ .Values.dataPlane.k8ResourceEndpoint }}" namespace = "{{ .Values.dataPlane.namespace }}" + + [metrics] + enabled = {{.Values.metrics.enabled}} + type = "{{.Values.metrics.type| default "prometheus" }}" + port = 18006 + + [agent] + mode = "{{ .Values.agent.mode }}" log_config.toml: | # The logging configuration for Adapter ## Adapter root Level configurations - + logLevel = "INFO" # LogLevels can be "DEBG", "FATL", "ERRO", "WARN", "INFO", "PANC" LogFormat = "TEXT" # Values can be "JSON", "TEXT" - + [rotation] MaxSize = 10 # In MegaBytes (MB) MaxBackups = 3 @@ -34,22 +42,22 @@ data: Compress = true ## Adapter package Level configurations - + [[pkg]] name = "github.com/wso2/apk/adapter/internal/adapter" logLevel = "INFO" # LogLevels can be "DEBG", "FATL", "ERRO", "WARN", "INFO", "PANC" - + [[pkg]] name = "github.com/wso2/apk/adapter/internal/oasparser" logLevel = "INFO" # The logging configuration for Router - + [accessLogs] enable = false format = "[%START_TIME%] '%REQ(:METHOD)% %DYNAMIC_METADATA(envoy.filters.http.ext_authz:originalPath)% %REQ(:PATH)% %PROTOCOL%' %RESPONSE_CODE% %RESPONSE_FLAGS% %BYTES_RECEIVED% %BYTES_SENT% %DURATION% %RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)% '%REQ(X-FORWARDED-FOR)%' '%REQ(USER-AGENT)%' '%REQ(X-REQUEST-ID)%' '%REQ(:AUTHORITY)%' '%UPSTREAM_HOST%'\n" - + [wireLogs] enable = false include = ["Headers", "Body", "Trailers"] diff --git a/test/apim-apk-agent-test/agent-helm-chart/values.yaml b/test/apim-apk-agent-test/agent-helm-chart/values.yaml index 9f336ec2a..b76f9ed06 100644 --- a/test/apim-apk-agent-test/agent-helm-chart/values.yaml +++ b/test/apim-apk-agent-test/agent-helm-chart/values.yaml @@ -34,3 +34,7 @@ dataPlane: enabled: true k8ResourceEndpoint: https://apk-wso2-apk-config-ds-service.apk.svc.cluster.local:9443/api/configurator/apis/generate-k8s-resources namespace: apk +metrics: + enabled: false +agent: + mode: CPtoDP \ No newline at end of file