Don't use HOME env in the my-cnf config (#745)

* Don't use HOME env in the my-cnf config Use a relative file as the default for the .my.cnf style configuration. Fixes: #633 --------- Signed-off-by: SuperQ <superq@gmail.com> Signed-off-by: Ben Kochie <superq@gmail.com> Co-authored-by: Matthias Rampke <matthias.rampke@googlemail.com>
prometheus · Jun 22, 2023 · 931b76d · 931b76d
1 parent 2b7699b
commit 931b76d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,12 @@
 
 BREAKING CHANGES:
 
+The default client configuration file is now `.my.cnf` in the process working directory. Use `--config.my-cnf="$HOME/.my.cnf"` to retain the previous default.
+
 Changes:
 
+* [CHANGE] Don't use HOME env in the my-cnf config path. #745
+
 * [CHANGE]
 * [FEATURE]
 * [ENHANCEMENT]

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ NOTE: It is recommended to set a max connection limit for the user to avoid over
 
 #####  Single exporter mode
 
-Running using ~/.my.cnf:
+Running using `.my.cnf` from the current directory:
 
     ./mysqld_exporter <flags>
 

diff --git a/mysqld_exporter.go b/mysqld_exporter.go
@@ -17,7 +17,6 @@ import (
 	"context"
 	"net/http"
 	"os"
-	"path"
 	"strconv"
 	"time"
 
@@ -48,7 +47,7 @@ var (
 	configMycnf = kingpin.Flag(
 		"config.my-cnf",
 		"Path to .my.cnf file to read MySQL credentials from.",
-	).Default(path.Join(os.Getenv("HOME"), ".my.cnf")).String()
+	).Default(".my.cnf").String()
 	mysqldAddress = kingpin.Flag(
 		"mysqld.address",
 		"Address to use for connecting to MySQL",