Merge pull request #2165 from CrowleyRajapakse/new-main6

Add agent helm chart changes to tests
wso2 · Mar 28, 2024 · eafb381 · eafb381
2 parents 18290e0 + e355577
commit eafb381
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 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
@@ -19,37 +19,45 @@ 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
       MaxAge =  2   # In days
       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
@@ -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