first crack at adding a new configurable option to the windows instal…

…ler for static mode Signed-off-by: erikbaranowski <[email protected]>
grafana · Dec 11, 2023 · da9cf03 · da9cf03
1 parent e8fd587
commit da9cf03
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/packaging/grafana-agent/windows/install_script.nsis b/packaging/grafana-agent/windows/install_script.nsis
@@ -27,6 +27,8 @@ LicenseData LICENSE
 Var EnableExporterCheck
 Var EnableExporterValue
 Var EnableExporterDialog
+Var ExpandEnvCheck
+Var ExpandEnvValue
 Var PassedInParameters
 Var Url
 Var Username
@@ -58,6 +60,7 @@ Section "install"
     ThisIsSilent:
         ${GetParameters} $PassedInParameters
         ${GetOptions} $PassedInParameters "/EnableExporter" $EnableExporterValue
+        ${GetOptions} $PassedInParameters "/ExpandEnv" $ExpandEnvValue
         ${GetOptions} $PassedInParameters "/Url" $Url
         ${GetOptions} $PassedInParameters "/Username" $Username
         ${GetOptions} $PassedInParameters "/Password" $Password
@@ -81,6 +84,12 @@ Function enableWindowsExporter
     ${NSD_CreateCheckBox} 0 13u 100% 12u ""
     Pop $EnableExporterCheck
 
+    ${NSD_CreateLabel} 0 0 100% 12u "Expand Environment Variables"
+    Pop $0
+
+    ${NSD_CreateCheckBox} 0 13u 100% 12u ""
+    Pop $ExpandEnvCheck
+
     nsDialogs::Show
 FunctionEnd
 
@@ -91,6 +100,13 @@ Function enableWindowsExporterLeave
     ${Else}
         StrCpy $EnableExporterValue "false"
     ${EndIf}
+
+    ${NSD_GetState} $ExpandEnvCheck $ExpandEnvValue
+    ${If} $ExpandEnvValue == ${BST_CHECKED}
+        StrCpy $ExpandEnvValue "true"
+    ${Else}
+        StrCpy $ExpandEnvValue "false"
+    ${EndIf}
 FunctionEnd
 
 Function Install
@@ -128,7 +144,11 @@ Function Install
     nsExec::ExecToLog 'sc create "Grafana Agent" binpath= "\"$INSTDIR\grafana-agent-windows-amd64.exe\""'
     Pop $0
     # These separate create and config commands are needed, on the config the binpath is required
-    nsExec::ExecToLog 'sc config "Grafana Agent" start= auto binpath= "\"$INSTDIR\grafana-agent-windows-amd64.exe\" -config.file=\"$INSTDIR\agent-config.yaml\""'
+    ${If} $ExpandEnvValue == "true"
+        nsExec::ExecToLog 'sc config "Grafana Agent" start= auto binpath= "\"$INSTDIR\grafana-agent-windows-amd64.exe\" -config.expand-env -config.file=\"$INSTDIR\agent-config.yaml\""'
+    ${Else}
+        nsExec::ExecToLog 'sc config "Grafana Agent" start= auto binpath= "\"$INSTDIR\grafana-agent-windows-amd64.exe\" -config.file=\"$INSTDIR\agent-config.yaml\""'
+    ${EndIf}
     Pop $0
     nsExec::ExecToLog `sc start "Grafana Agent"`
     Pop $0