Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unified Windows installer + passing the version number to nsis phase #101

Merged
merged 2 commits into from
Nov 15, 2016
Merged

Unified Windows installer + passing the version number to nsis phase #101

merged 2 commits into from
Nov 15, 2016

Conversation

nicozanf
Copy link
Contributor

32 and 64 bit executables are now packaged inside a single Windows installer called _X86 - but only the right one will be copied at runtime.
Also, the build number is now obtained from the Makefile (which in turn gets it from github).

@mariussturm
Copy link
Contributor

Thanks for the PR, two points:

  • This works for the Sidecar binary but you also need to ship the right version of the File- and Winlogbeat binary
  • Please create only one PR next time. Splitting a new feature across multiple PRs makes it hard to test for us

@@ -42,22 +38,14 @@
Var Tags
Var Dialog
Var Label
Var Graylog_dir
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be called GraylogDir

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I'm changing it ;-)

@nicozanf
Copy link
Contributor Author

The currently supported collectors (Filebeat, Winlogbeat and NXlog) are 32 bit only. But you are right, in order to support new collectors' versions you'll have to change the nsis source - along with dist/fetch_collectors.sh. But this should be easy now, maybe I could already prepare the support for the 64 bit collectors that are present in *beat 5.0.
I'm sorry for the double PR, I'll be more careful next time!

@mariussturm
Copy link
Contributor

Ok great, will merge this for now. The 32/64bit binary support is needed when the beats5 support is merged into the sidecar.

@mariussturm mariussturm merged commit 3a37cc8 into Graylog2:master Nov 15, 2016
@nicozanf nicozanf deleted the patch-2 branch November 15, 2016 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants