github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 22:57:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

i18n: alias logstash.runner.configuration.* under logstash.agent.configuration (#13244) (#13843)

Browse source 
A number of plugins reach into Logstash's i18n translations to "helpfully"
communicate certain configuration errors, but rely on translations that were
moved in 00a99c19e5 from logstash.agent to
logstash.runner. Since then, it is possible to hit obtuse error messages about
failing to load a translation instead of the intended helpful message:

~~~
translation missing: en.logstash.agent.configuration.invalid_plugin_register
~~~

By moving the `logstash.agent` definition to _after_ the `logstash.runner`
definition, we can use YAML tooling to name the `logstash.runner.configuration`
node and then merge its contents into `logstash.agent.configuration`. This
effectively allows us to keep a single definition of those translations while
making them available at both addresses.

Co-authored-by: kaisecheng <69120390+kaisecheng@users.noreply.github.com>
(cherry picked from commit 8bec0e658a)
This commit is contained in:
Ry Biesemeyer 2022-03-07 11:05:20 -08:00 • committed by GitHub
parent a491462e69
commit 011cc5ba7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

45
logstash-core/locales/en.yml
View file

@ -72,23 +72,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."
@ -169,7 +152,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
@ -445,6 +430,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: >-
@ -455,4 +461,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}`