Merge branch 'v3' into container-metrics-receiver

dhurley · dhurley · commit 5fae3b044133 · 2025-04-25T18:33:25.000+01:00
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -215,7 +215,7 @@ func registerFlags() {
 		"info",
 		"The desired verbosity level for logging messages from nginx-agent. "+
 			"Available options, in order of severity from highest to lowest, are: "+
-			"panic, fatal, error, info and debug.",
+			"error, warn, info and debug.",
 	)
 	fs.String(
 		LogPathKey,
diff --git a/test/config/agent/nginx-agent-otel-load.conf b/test/config/agent/nginx-agent-otel-load.conf
@@ -5,7 +5,7 @@
 #
 
 log:
-  # set log level (panic, fatal, error, info, debug, trace; default "info")
+  # set log level (error, warn, info, debug; default "info")
   level: debug
   # set log path. if empty, don't log to file.
   path: /var/log/nginx-agent/
diff --git a/test/mock/collector/nginx-agent.conf b/test/mock/collector/nginx-agent.conf
@@ -5,7 +5,7 @@
 #
 
 log:
-  # set log level (panic, fatal, error, info, debug, trace; default "info")
+  # set log level (error, warn, info, debug; default "info")
   level: debug
   # set log path. if empty, don't log to file.
   path: /var/log/nginx-agent/

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ func registerFlags() {`
`215`	`215`	`"info",`
`216`	`216`	`"The desired verbosity level for logging messages from nginx-agent. "+`
`217`	`217`	`"Available options, in order of severity from highest to lowest, are: "+`
`218`		`- "panic, fatal, error, info and debug.",`
	`218`	`+ "error, warn, info and debug.",`
`219`	`219`	`)`
`220`	`220`	`fs.String(`
`221`	`221`	`LogPathKey,`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#`
`6`	`6`
`7`	`7`	`log:`
`8`		`- # set log level (panic, fatal, error, info, debug, trace; default "info")`
	`8`	`+ # set log level (error, warn, info, debug; default "info")`
`9`	`9`	`level: debug`
`10`	`10`	`# set log path. if empty, don't log to file.`
`11`	`11`	`path: /var/log/nginx-agent/`