Add default collector config

nginx · Oct 11, 2024 · 582031b · 582031b
1 parent c25a931
commit 582031b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/internal/collector/otelcol.tmpl b/internal/collector/otelcol.tmpl
@@ -1,5 +1,5 @@
 receivers:
-{{- if ne .Receivers.HostMetrics.CollectionInterval 0 }}
+{{- if ne .Receivers.HostMetrics nil }}
   hostmetrics:
     collection_interval: {{ .Receivers.HostMetrics.CollectionInterval }}
     initial_delay: {{ .Receivers.HostMetrics.InitialDelay }}
@@ -148,7 +148,7 @@ service:
   pipelines:
     metrics:
       receivers:
-        {{- if ne .Receivers.HostMetrics.CollectionInterval 0 }}
+        {{- if ne .Receivers.HostMetrics nil }}
         - hostmetrics
         {{- end }}
         {{- range $index, $otlpReceiver := .Receivers.OtlpReceivers }}

diff --git a/test/config/agent/nginx-agent-otel-load.conf b/test/config/agent/nginx-agent-otel-load.conf
@@ -23,10 +23,9 @@ client:
 collector:
   receivers:
     otlp_receivers:
-        - server:
-            host: "127.0.0.1"
-            port: 4317
-            type: 0
+      - server:
+          host: "127.0.0.1"
+          port: 4317
   processors:
     batch: {}
   exporters:

diff --git a/test/load/nginx_agent_process_collector.go b/test/load/nginx_agent_process_collector.go
@@ -244,6 +244,12 @@ func (cp *agentProcessCollector) Stop() (stopped bool, err error) {
 
 		cp.isStopped = true
 
+		out, catError := exec.Command("cat", "/var/log/nginx-agent/agent.log").Output()
+		if catError != nil {
+			log.Println("Error reading /var/log/nginx-agent/agent.log: %w", catError)
+		}
+		log.Printf("\nNGINX agent logs:\n%s\n", out)
+
 		log.Printf("Gracefully terminating %s pid=%d, sending SIGTEM...", cp.name, cp.cmd.Process.Pid)
 
 		// Notify resource monitor to stop.