Clean up Agent values file and tests

.github/data/matrix-smoke-nap.json

@@ -69,7 +69,7 @@
       "image": "debian-plus-nap",
       "type": "plus",
       "nap_modules": "waf",
-      "marker": "agent",
+      "marker": "agentv2",
       "platforms": "linux/amd64"
     }
   ],

charts/nginx-ingress/values.yaml

@@ -665,27 +665,29 @@ nginxServiceMesh:
 nginxAgent:
   ## Enables NGINX Agent.
   enable: false
+  logLevel: "error"
+
+  # Agent V2 configuration
   ## If nginxAgent.instanceGroup is not set the value of nginx-ingress.controller.fullname will be used
   instanceGroup: ""
-  logLevel: "error"
-  ## Syslog listener which NGINX Agent uses to accept messages from App Protect WAF
-  syslog:
-    host: "127.0.0.1"
-    port: 1514
-  napMonitoring:
-    collectorBufferSize: 50000
-    processorBufferSize: 50000
   instanceManager:
     # FQDN or IP for connecting to NGINX Instance Manager, e.g. nim.example.com
     host: ""
     grpcPort: 443
-    sni: ""
     tls:
       enabled: true
       skipVerify: false
       ## kubernetes.io/tls secret with a TLS certificate and key for using mTLS between NGINX Agent and Instance Manager
       secret: ""
       ## nginx.org/ca secret for verification of Instance Manager TLS
       caSecret: ""
+    sni: ""
+  ## Syslog listener which NGINX Agent uses to accept messages from App Protect WAF
+  syslog:
+    host: "127.0.0.1"
+    port: 1514
+  napMonitoring:
+    collectorBufferSize: 50000
+    processorBufferSize: 50000
   ## The name of a custom ConfigMap to use instead of the one provided by default
   customConfigMap: ""