Merge pull request #1947 from Oloremo/supervisord_env_vars

Added an ability to pass collector.supervisord.url via ENV vars
prometheus · Feb 3, 2021 · 477a192 · 477a192
2 parents 182d379 + 8d14732
commit 477a192
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * [ENHANCEMENT] Include TCP OutRsts in netstat metrics
 * [ENHANCEMENT] Added XFS inode operations to XFS metrics
 * [ENHANCEMENT] Remove CGO dependencies for OpenBSD amd64
+* [ENHANCEMENT] Added an ability to pass collector.supervisord.url via SUPERVISORD_URL environment variable
 * [BUGFIX] Handle EPERM for syscall in timex collector
 * [BUGFIX]
 

diff --git a/collector/supervisord.go b/collector/supervisord.go
@@ -31,7 +31,7 @@ import (
 )
 
 var (
-	supervisordURL = kingpin.Flag("collector.supervisord.url", "XML RPC endpoint.").Default("http://localhost:9001/RPC2").String()
+	supervisordURL = kingpin.Flag("collector.supervisord.url", "XML RPC endpoint.").Default("http://localhost:9001/RPC2").Envar("SUPERVISORD_URL").String()
 	xrpc           *xmlrpc.Client
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,7 @@ import ( @@
     )
     var (
-    	supervisordURL = kingpin.Flag("collector.supervisord.url", "XML RPC endpoint.").Default("http://localhost:9001/RPC2").String()
+    	supervisordURL = kingpin.Flag("collector.supervisord.url", "XML RPC endpoint.").Default("http://localhost:9001/RPC2").Envar("SUPERVISORD_URL").String()
     	xrpc           *xmlrpc.Client
     )
@@ Expand Down @@