Use environment variables to locate Program Files on Windows (#6317)

influxdata · Aug 27, 2019 · 08b903a · 08b903a
1 parent 9f612fd
commit 08b903a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go
@@ -403,12 +403,16 @@ func main() {
 	}
 
 	if runtime.GOOS == "windows" && windowsRunAsService() {
+		programFiles := os.Getenv("ProgramFiles")
+		if programFiles == "" { // Should never happen
+			programFiles = "C:\\Program Files"
+		}
 		svcConfig := &service.Config{
 			Name:        *fServiceName,
 			DisplayName: *fServiceDisplayName,
 			Description: "Collects data using a series of plugins and publishes it to" +
 				"another series of plugins.",
-			Arguments: []string{"--config", "C:\\Program Files\\Telegraf\\telegraf.conf"},
+			Arguments: []string{"--config", programFiles + "\\Telegraf\\telegraf.conf"},
 		}
 
 		prg := &program{

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -641,7 +641,11 @@ func getDefaultConfigPath() (string, error) {
 	homefile := os.ExpandEnv("${HOME}/.telegraf/telegraf.conf")
 	etcfile := "/etc/telegraf/telegraf.conf"
 	if runtime.GOOS == "windows" {
-		etcfile = `C:\Program Files\Telegraf\telegraf.conf`
+		programFiles := os.Getenv("ProgramFiles")
+		if programFiles == "" { // Should never happen
+			programFiles = `C:\Program Files`
+		}
+		etcfile = programFiles + `\Telegraf\telegraf.conf`
 	}
 	for _, path := range []string{envfile, homefile, etcfile} {
 		if _, err := os.Stat(path); err == nil {