-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Introduce CLI flag -environment (#15422)
* Introduce CLI flag -environment Introduce CLI flags -environment to control the default logging settings the Beat should use if no logging is configured. The behavior of -e does not change. By replacing `-e` with `-environment system` in the system unit file we continue to log to stdout/stderr by default, but users are still able to overwrite settings. * Add more environment types Add windows_service, macos_service, and container envionment types. If beats are installed using our scripts the `-environment` flag will always be set. Replace `-e` with `-environment docker` CLI flag in the Dockerfile. Although it's uncommon, users can not overwrite the logging configuration in docker containers as well. The docker(container) environment and systemd environment will default to stdout/stderr logging. All other environments continue to use file rotation as default.
- Loading branch information
Steffen Siering
authored
Jan 24, 2020
1 parent
0018e47
commit 1d3d4d1
Showing
11 changed files
with
174 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you under | ||
| // the Apache License, Version 2.0 (the "License"); you may | ||
| // not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package logp | ||
|
|
||
| import "strings" | ||
|
|
||
| // Environment indicates the environment the logger is supped to be run in. | ||
| // The default logger configuration may be different for different environments. | ||
| type Environment int | ||
|
|
||
| const ( | ||
| // DefaultEnvironment is used if the environment the process runs in is not known. | ||
| DefaultEnvironment Environment = iota | ||
|
|
||
| // SystemdEnvironment indicates that the process is started and managed by systemd. | ||
| SystemdEnvironment | ||
|
|
||
| // ContainerEnvironment indicates that the process is running within a container (docker, k8s, rkt, ...). | ||
| ContainerEnvironment | ||
|
|
||
| // MacOSServiceEnvironment indicates that the process is running as a daemon on macOS (e.g. managed via launchctl). | ||
| MacOSServiceEnvironment | ||
|
|
||
| // WindowsServiceEnvironment indicates the the process is run as a windows service. | ||
| WindowsServiceEnvironment | ||
|
|
||
| // InvalidEnvironment indicates that the environment name given is unknown or invalid. | ||
| InvalidEnvironment | ||
| ) | ||
|
|
||
| // String returns the string representation the configured environment | ||
| func (v Environment) String() string { | ||
| switch v { | ||
| case DefaultEnvironment: | ||
| return "default" | ||
| case SystemdEnvironment: | ||
| return "systemd" | ||
| case ContainerEnvironment: | ||
| return "container" | ||
| case MacOSServiceEnvironment: | ||
| return "macOS_service" | ||
| case WindowsServiceEnvironment: | ||
| return "windows_service" | ||
| default: | ||
| return "<invalid>" | ||
| } | ||
| } | ||
|
|
||
| // ParseEnvironment returns the environment type by name. | ||
| // The parse is case insensitive. | ||
| // InvalidEnvironment is returned if the environment type is unknown. | ||
| func ParseEnvironment(in string) Environment { | ||
| switch strings.ToLower(in) { | ||
| case "default": | ||
| return DefaultEnvironment | ||
| case "systemd": | ||
| return SystemdEnvironment | ||
| case "container": | ||
| return ContainerEnvironment | ||
| case "macos_service": | ||
| return MacOSServiceEnvironment | ||
| case "windows_service": | ||
| return WindowsServiceEnvironment | ||
| default: | ||
| return InvalidEnvironment | ||
| } | ||
| } |