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

Update coming annotations to reflect current release state

Browse source 
Fixes #5589
This commit is contained in:
DeDe Morton 2016-07-05 14:23:11 -07:00
parent 4cf8031a49
commit a597110fd9
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/static/command-line-flags.asciidoc vendored
View file

@ -5,7 +5,7 @@ Logstash has the following flags. You can use the `--help` flag to display this
You can also control Logstash execution by specifying options in the Logstash settings file. For more info, see <<logstash-settings-file>>. You can also control Logstash execution by specifying options in the Logstash settings file. For more info, see <<logstash-settings-file>>.
coming[5.0.0-alpha3, Command-line flags have dots instead of dashes in their names] added[5.0.0-alpha3, Command-line flags have dots instead of dashes in their names]
*`-f, --path.config CONFIGFILE`*:: *`-f, --path.config CONFIGFILE`*::
Load the Logstash config from a specific file or directory, or a wildcard. If Load the Logstash config from a specific file or directory, or a wildcard. If

2
docs/static/contributing-to-logstash.asciidoc vendored
View file

@ -24,7 +24,7 @@ deploying your own plugins:
* <<submitting-plugin,Submitting a Plugin>> * <<submitting-plugin,Submitting a Plugin>>
[float] [float]
==== Plugin API Changes added[2.0] ==== Plugin API Changes
The 2.0 release of Logstash changes how input plugins shut down to increase shutdown reliability. There are three methods The 2.0 release of Logstash changes how input plugins shut down to increase shutdown reliability. There are three methods
for plugin shutdown: `stop`, `stop?`, and `close`. for plugin shutdown: `stop`, `stop?`, and `close`.

6
docs/static/monitoring-apis.asciidoc vendored
View file

@ -69,7 +69,7 @@ consumption. The default for the `human` flag is
[[node-info-api]] [[node-info-api]]
=== Node Info API === Node Info API
coming[5.0.0-alpha4] added[5.0.0-alpha4]
experimental[] experimental[]
@ -240,7 +240,7 @@ Gets JVM stats, including stats about threads. added[5.0.0-alpha3,Adds thread co
`process`:: `process`::
Gets process stats, including stats about file descriptors, memory consumption, and CPU usage. added[5.0.0-alpha3] Gets process stats, including stats about file descriptors, memory consumption, and CPU usage. added[5.0.0-alpha3]
`mem`:: `mem`::
Gets memory usage stats. coming[5.0.0-alpha4] Gets memory usage stats. added[5.0.0-alpha4]
==== Event Stats ==== Event Stats
@ -367,7 +367,7 @@ Logstash monitoring APIs.
[[pipeline-stats-api]] [[pipeline-stats-api]]
=== Pipeline Stats API === Pipeline Stats API
coming[5.0.0-alpha4,Stats for input stages are not yet available] added[5.0.0-alpha4,Stats for input stages are not yet available]
experimental[] experimental[]

6
docs/static/setting-up-logstash.asciidoc vendored
View file

@ -16,7 +16,7 @@ This section includes additional information on how to set up and run Logstash,
This section describes the default directory structure that is created when you unpack the Logstash installation packages. This section describes the default directory structure that is created when you unpack the Logstash installation packages.
coming[5.0.0-alpha3, Includes breaking changes to the Logstash directory structure] added[5.0.0-alpha3, Includes breaking changes to the Logstash directory structure]
[[zip-targz-layout]] [[zip-targz-layout]]
==== Directory Layout of `.zip` and `.tar.gz` Archives ==== Directory Layout of `.zip` and `.tar.gz` Archives
@ -118,7 +118,7 @@ See <<configuration>> for more info.
==== Settings Files ==== Settings Files
coming[5.0.0-alpha3] added[5.0.0-alpha3]
The settings files are already defined in the Logstash installation. Logstash includes the following settings files: The settings files are already defined in the Logstash installation. Logstash includes the following settings files:
@ -140,7 +140,7 @@ The settings files are already defined in the Logstash installation. Logstash in
[[running-logstash]] [[running-logstash]]
=== Running Logstash as a Service on Debian or RPM === Running Logstash as a Service on Debian or RPM
coming[5.0.0-alpha3] added[5.0.0-alpha3]
Logstash is not started automatically after installation. How to start and stop Logstash depends on whether your system Logstash is not started automatically after installation. How to start and stop Logstash depends on whether your system
uses systemd, upstart, or SysV. uses systemd, upstart, or SysV.

2
docs/static/settings-file.asciidoc vendored
View file

@ -1,7 +1,7 @@
[[logstash-settings-file]] [[logstash-settings-file]]
=== Settings File === Settings File
coming[5.0.0-alpha3] added[5.0.0-alpha3]
You can set options in the Logstash settings file, `logstash.yml`, to control Logstash execution. Each setting in the You can set options in the Logstash settings file, `logstash.yml`, to control Logstash execution. Each setting in the
`logstash.yml` file corresponds to a <<command-line-flags,command-line flag>>. `logstash.yml` file corresponds to a <<command-line-flags,command-line flag>>.