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

Log by default to journald on systems with systemd #8942

Merged
merged 10 commits into from
Dec 9, 2018
1 change: 1 addition & 0 deletions CHANGELOG-developer.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ The list below covers the major changes between 6.3.0 and master only.
used because the value is specified in magefile.go. {pull}7670[7670]
- Outputs must implement String. {pull}6404[6404]
- Renamed `-beat-name` CLI option used in `kibana_index_pattern.go` to `-beat` for consistency with other scripts in `dev-tools/cmd`. {pull}8615[8615]
- Systemd unit file template used on Linux packaging includes now environment variables to ease flag overriding. One of them includes the `-e` flag, making beats log to stderr by default on systemd uses. {pull}8942[8942]
jsoriano marked this conversation as resolved.
Show resolved Hide resolved

==== Bugfixes

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ https://github.com/elastic/beats/compare/v6.4.0...master[Check the HEAD diff]
*Affecting all Beats*

- Dissect syntax change, use * instead of ? when working with field reference. {issue}8054[8054]
- On systems with systemd the Beats log is now written to journald by default rather than file, this behaviour can be reverted by overriding BEAT_LOG_OPTS with an empty value. {pull}8942[8942].
jsoriano marked this conversation as resolved.
Show resolved Hide resolved

*Auditbeat*

Expand Down
4 changes: 4 additions & 0 deletions auditbeat/docs/setting-up-running.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ This section includes additional information on how to set up and run

* <<running-on-kubernetes>>

* <<running-with-systemd>>


//MAINTAINERS: If you add a new file to this section, make sure you update the bulleted list ^^ too.

Expand All @@ -35,4 +37,6 @@ include::./running-on-docker.asciidoc[]

include::./running-on-kubernetes.asciidoc[]

include::../../libbeat/docs/shared-systemd.asciidoc[]

include::../../libbeat/docs/shared-shutdown.asciidoc[]
5 changes: 4 additions & 1 deletion dev-tools/packaging/templates/linux/systemd.unit.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ Wants=network-online.target
After=network-online.target

[Service]
ExecStart=/usr/share/{{.BeatName}}/bin/{{.BeatName}} -c /etc/{{.BeatName}}/{{.BeatName}}.yml -path.home /usr/share/{{.BeatName}} -path.config /etc/{{.BeatName}} -path.data /var/lib/{{.BeatName}} -path.logs /var/log/{{.BeatName}}
Environment=BEAT_LOG_OPTS="-e"
Environment=BEAT_CONFIG_OPTS="-c /etc/{{.BeatName}}/{{.BeatName}}.yml"
Environment=BEAT_PATH_OPTS="-path.home /usr/share/{{.BeatName}} -path.config /etc/{{.BeatName}} -path.data /var/lib/{{.BeatName}} -path.logs /var/log/{{.BeatName}}"
ExecStart=/usr/share/{{.BeatName}}/bin/{{.BeatName}} $BEAT_LOG_OPTS $BEAT_CONFIG_OPTS $BEAT_PATH_OPTS
Restart=always

[Install]
Expand Down
4 changes: 4 additions & 0 deletions filebeat/docs/setting-up-running.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ This section includes additional information on how to set up and run

* <<running-on-kubernetes>>

* <<running-with-systemd>>


//MAINTAINERS: If you add a new file to this section, make sure you update the bulleted list ^^ too.

Expand All @@ -35,4 +37,6 @@ include::./running-on-docker.asciidoc[]

include::./running-on-kubernetes.asciidoc[]

include::../../libbeat/docs/shared-systemd.asciidoc[]

include::../../libbeat/docs/shared-shutdown.asciidoc[]
4 changes: 4 additions & 0 deletions heartbeat/docs/setting-up-running.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ This section includes additional information on how to set up and run

* <<running-on-docker>>

* <<running-with-systemd>>

//MAINTAINERS: If you add a new file to this section, make sure you update the bulleted list ^^ too.

include::../../libbeat/docs/shared-directory-layout.asciidoc[]
Expand All @@ -30,4 +32,6 @@ include::../../libbeat/docs/command-reference.asciidoc[]

include::./running-on-docker.asciidoc[]

include::../../libbeat/docs/shared-systemd.asciidoc[]

include::../../libbeat/docs/shared-shutdown.asciidoc[]
3 changes: 3 additions & 0 deletions journalbeat/docs/setting-up-running.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ This section includes additional information on how to set up and run
* <<directory-layout>>
* <<keystore>>
* <<command-line-options>>
* <<running-with-systemd>>
* <<shutdown>>


Expand All @@ -28,4 +29,6 @@ include::../../libbeat/docs/keystore.asciidoc[]

include::../../libbeat/docs/command-reference.asciidoc[]

include::../../libbeat/docs/shared-systemd.asciidoc[]

include::../../libbeat/docs/shared-shutdown.asciidoc[]
99 changes: 99 additions & 0 deletions libbeat/docs/shared-systemd.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
[[running-with-systemd]]
=== { beatname_uc } and systemd
jsoriano marked this conversation as resolved.
Show resolved Hide resolved

DEB and RPM packages include a service unit for Linux systems with systemd. On
these systems { beatname_uc } can be managed with the usual systemd commands:
jsoriano marked this conversation as resolved.
Show resolved Hide resolved

==== Starting and stoping { beatname_uc}
jsoriano marked this conversation as resolved.
Show resolved Hide resolved

When using systemd, { beatname_uc } can be started or stopped with `systemctl`.
jsoriano marked this conversation as resolved.
Show resolved Hide resolved

["source", "sh", subs="attributes"]
------------------------------------------------
systemctl start {beatname_lc}
------------------------------------------------

["source", "sh", subs="attributes"]
------------------------------------------------
systemctl stop {beatname_lc}
------------------------------------------------

Service start on system boot can be enabled or disabled with `systemctl`,
jsoriano marked this conversation as resolved.
Show resolved Hide resolved
{ beatname_uc } is enabled when installed.

["source", "sh", subs="attributes"]
------------------------------------------------
systemctl enable {beatname_lc}
------------------------------------------------

["source", "sh", subs="attributes"]
------------------------------------------------
systemctl disable {beatname_lc}
------------------------------------------------


==== { beatname_uc } status and logs

Service status can be also obtained with `systemctl`.
jsoriano marked this conversation as resolved.
Show resolved Hide resolved

["source", "sh", subs="attributes"]
------------------------------------------------
systemctl start {beatname_lc}
jsoriano marked this conversation as resolved.
Show resolved Hide resolved
------------------------------------------------

Logs are stored by default in journald, they can be viewed with `journalctl`.
jsoriano marked this conversation as resolved.
Show resolved Hide resolved

["source", "sh", subs="attributes"]
------------------------------------------------
journalctl -u {beatname_lc}.service
------------------------------------------------

NOTE: Unit file included in packages sets by default `-e` flag, that flag makes
jsoriano marked this conversation as resolved.
Show resolved Hide resolved
{ beatname_uc } to log to stderr and disables other log outputs. Systemd stores
all output sent to stderr in journald.

[float]
=== Customizing systemd unit for { beatname_uc }

Systemd service unit file includes some environment variables that can be
jsoriano marked this conversation as resolved.
Show resolved Hide resolved
overriden to change default options.
[cols="<h,<,<m,<m",options="header",]
jsoriano marked this conversation as resolved.
Show resolved Hide resolved
|=======================================
| Variable | Description | Default value
| BEAT_LOG_OPTS | Log options | `-e`
| BEAT_CONFIG_OPTS | Flags for configuration file path | `-c /etc/{ beatname_lc }/{ beatname_lc }.yml`
| BEAT_PATH_OPTS | Other paths | -path.home /usr/share/{ beatname_lc } -path.config /etc/{ beatname_lc } -path.data /var/lib/{ beatname_lc } -path.logs /var/log/{ beatname_lc }
|=======================================

These variables can be overriden with a drop-in unit file placed in `/etc/systemd/system/{ beatname_lc }.service.d` directory.
jsoriano marked this conversation as resolved.
Show resolved Hide resolved

For example a file with the following content placed in `/etc/systemd/system/{ beatname_lc }.service.d/debug.conf`
jsoriano marked this conversation as resolved.
Show resolved Hide resolved
would override `BEAT_LOG_OPTS` to enable debug for Elasticsearch output.

["source", "systemd", subs="attributes"]
------------------------------------------------
[Service]
Environment=BEAT_LOG_OPTS="-e -d elasticsearch"
------------------------------------------------

It can also be emptied to rely on settings on the configuration file for
jsoriano marked this conversation as resolved.
Show resolved Hide resolved
logging.

["source", "systemd", subs="attributes"]
------------------------------------------------
[Service]
Environment=BEAT_LOG_OPTS=""
------------------------------------------------

Remember to reload systemd configuration and restart the service to apply
jsoriano marked this conversation as resolved.
Show resolved Hide resolved
changes on these files.

["source", "sh", subs="attributes"]
------------------------------------------------
systemctl daemon-reload
systemctl restart { beatname_lc }
------------------------------------------------

NOTE: It is recommended to use some configuration management tool to include
jsoriano marked this conversation as resolved.
Show resolved Hide resolved
drop-in unit files, but when needed to add a drop-in by hand `systemctl edit { beatname_lc }.service
can be used-
4 changes: 4 additions & 0 deletions metricbeat/docs/setting-up-running.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ This section includes additional information on how to set up and run

* <<running-on-kubernetes>>

* <<running-with-systemd>>

//MAINTAINERS: If you add a new file to this section, make sure you update the bulleted list ^^ too.

include::../../libbeat/docs/shared-directory-layout.asciidoc[]
Expand All @@ -34,4 +36,6 @@ include::./running-on-docker.asciidoc[]

include::./running-on-kubernetes.asciidoc[]

include::../../libbeat/docs/shared-systemd.asciidoc[]

include::../../libbeat/docs/shared-shutdown.asciidoc[]
4 changes: 4 additions & 0 deletions packetbeat/docs/setting-up-running.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ This section includes additional information on how to set up and run

* <<running-on-docker>>

* <<running-with-systemd>>

//MAINTAINERS: If you add a new file to this section, make sure you update the bulleted list ^^ too.

include::../../libbeat/docs/shared-directory-layout.asciidoc[]
Expand All @@ -30,4 +32,6 @@ include::../../libbeat/docs/command-reference.asciidoc[]

include::./running-on-docker.asciidoc[]

include::../../libbeat/docs/shared-systemd.asciidoc[]

include::../../libbeat/docs/shared-shutdown.asciidoc[]