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

Backport PR #13244 to 8.1: i18n: alias logstash.runner.configuration.* under logstash.agent.configuration #13842

Merged
merged 1 commit into from
Mar 18, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 26 additions & 19 deletions logstash-core/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,23 +61,6 @@ en:
0-1-x: >-
Using version 0.1.x %{type} plugin '%{name}'. This plugin isn't well
supported by the community and likely has no maintainer.
agent:
sighup: >-
SIGHUP received.
sigint: >-
SIGINT received. Shutting down.
sigterm: >-
SIGTERM received. Shutting down.
slow_shutdown: |-
Received shutdown signal, but pipeline is still waiting for in-flight events
to be processed. Sending another ^C will force quit Logstash, but this may cause
data loss.
forced_sigint: >-
SIGINT received. Terminating immediately..
non_reloadable_config_reload: >-
Unable to reload configuration because it does not support dynamic reloading
non_reloadable_config_register: |-
Logstash is not able to start since configuration auto reloading was enabled but the configuration contains plugins that don't support it. Quitting...
web_api:
cant_bind_to_port: |-
Logstash tried to bind to port %{port}, but the port is already in use. You can specify a new port by launching logstash with the --api.http.port option."
Expand Down Expand Up @@ -158,7 +141,9 @@ en:
configtest-flag-information: |-
You may be interested in the '--configtest' flag which you can use to validate
logstash's configuration before you choose to restart a running system.
configuration:
# YAML named reference to the logstash.runner.configuration
# so we can later alias it from logstash.agent.configuration
configuration: &runner_configuration
obsolete: >-
The setting `%{name}` in plugin `%{plugin}` is obsolete and is no
longer available. %{extra} If you have any questions about this, you
Expand Down Expand Up @@ -414,6 +399,27 @@ en:
Running Logstash with the bundled JDK is recommended.
The bundled JDK has been verified to work with each specific version of Logstash, and generally provides best performance and reliability.
If you have compelling reasons for using your own JDK (organizational-specific compliance requirements, for example), you can configure LS_JAVA_HOME to use that version instead.
agent:
sighup: >-
SIGHUP received.
sigint: >-
SIGINT received. Shutting down.
sigterm: >-
SIGTERM received. Shutting down.
slow_shutdown: |-
Received shutdown signal, but pipeline is still waiting for in-flight events
to be processed. Sending another ^C will force quit Logstash, but this may cause
data loss.
forced_sigint: >-
SIGINT received. Terminating immediately..
non_reloadable_config_reload: >-
Unable to reload configuration because it does not support dynamic reloading
non_reloadable_config_register: |-
Logstash is not able to start since configuration auto reloading was enabled but the configuration contains plugins that don't support it. Quitting...
# LEGACY: many plugins refer to logstash.agent.configuration.*
# so we alias the canonical logstash.runner.configuration.*
configuration:
<<: *runner_configuration
settings:
deprecation:
set: >-
Expand All @@ -424,4 +430,5 @@ en:
Code should be updated to query `%{canonical_name}` instead
ambiguous: >-
Both `%{canonical_name}` and its deprecated alias `%{deprecated_alias}` have been set.
Please only set `%{canonical_name}`
Please only set `%{canonical_name}`