Skip to content

Commit

Permalink
Issue 339 1.0 (#372)
Browse files Browse the repository at this point in the history
* Stop setting default node name to graylog-sidecar (#346)

Removed the lines to default the node name to graylog-sidecar. 
The current action doesn't match the documentation.
# The node name of the sidecar. If this is empty, the sidecar will use the
# hostname of the host it is running on.

(cherry picked from commit b7c0048)

* Default the windows installer to an empty nodename (#347)

It's a better default to use the system's hostname.

Fixes #339

(cherry picked from commit 5472b0d)
  • Loading branch information
mpfz0r authored and Marius Sturm committed Aug 13, 2019
1 parent 09e30f3 commit a3700e4
Showing 1 changed file with 6 additions and 11 deletions.
17 changes: 6 additions & 11 deletions dist/recipe.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,6 @@ Section "Post"
${If} $ServerUrl == ""
StrCpy $ServerUrl "http://127.0.0.1:9000/api"
${EndIf}
${If} $NodeName == ""
StrCpy $NodeName "graylog-sidecar"
${EndIf}
${If} $UpdateInterval == ""
StrCpy $UpdateInterval "10"
${EndIf}
Expand Down Expand Up @@ -295,14 +292,16 @@ Function nsDialogsPage
${NSD_CreateText} 50 20 75% 12u "http://127.0.0.1:9000/api"
Pop $InputServerUrl

${NSD_CreateLabel} 0 60 100% 12u "Enter the name of this instance:"
${NSD_CreateLabel} 0 60 100% 12u "The name of this instance:"
Pop $Label
${NSD_CreateText} 50 80 75% 12u "graylog-sidecar"
${NSD_CreateText} 50 80 75% 12u ""
Pop $InputNodeName
${NSD_CreateLabel} 50 100 100% 12u "If empty, the hostname will be used."
Pop $Label

${NSD_CreateLabel} 0 120 100% 12u "Enter the server API token:"
${NSD_CreateLabel} 0 140 100% 12u "Enter the server API token:"
Pop $Label
${NSD_CreateText} 50 140 75% 12u ""
${NSD_CreateText} 50 160 75% 12u ""
Pop $InputApiToken

nsDialogs::Show
Expand All @@ -317,10 +316,6 @@ Function nsDialogsPageLeave
MessageBox MB_OK "Please enter a valid address to your Graylog server!"
Abort
${EndIf}
${If} $NodeName == ""
MessageBox MB_OK "Please enter the instance name!"
Abort
${EndIf}
${If} $ApiToken == ""
MessageBox MB_OK "Please enter an API token!"
Abort
Expand Down

0 comments on commit a3700e4

Please sign in to comment.