Przeglądaj źródła

Update Logstash docs for 6.x

Redo the Logstash docs to focus on the new 6.x images which are
repackaged versions of the images from the upstream vendor, Elastic.

Relates:
 - https://github.com/docker-library/official-images/pull/5039
 - https://github.com/docker-library/logstash/pull/91
Toby McLaughlin 7 lat temu
rodzic
commit
0ec96bc990

+ 1 - 1
.common-templates/maintainer-community.md

@@ -1 +1 @@
-[the Docker Community](%%GITHUB-REPO%%)
+[the Elastic Team](%%GITHUB-REPO%%)

+ 13 - 49
logstash/content.md

@@ -1,63 +1,27 @@
 # What is Logstash?
 
-Logstash is a tool that can be used to collect, process and forward events and log messages. Collection is accomplished via number of configurable input plugins including raw socket/packet communication, file tailing and several message bus clients. Once an input plugin has collected data it can be processed by any number of filters which modify and annotate the event data. Finally events are routed to output plugins which can forward the events to a variety of external programs including Elasticsearch, local files and several message bus implementations.
+Logstash is an open source data collection engine with real-time pipelining capabilities. Logstash can dynamically unify data from disparate sources and normalize the data into destinations of your choice.
 
-> [wikitech.wikimedia.org/wiki/Logstash](https://wikitech.wikimedia.org/wiki/Logstash)
+Collection is accomplished via a number of configurable input plugins including raw socket/packet communication, file tailing and several message bus clients. Once an input plugin has collected data it can be processed by any number of filters which modify and annotate the event data. Finally, events are routed to output plugins which can forward the events to a variety of external programs including Elasticsearch, local files and several message bus implementations.
 
-%%LOGO%%
-
-# How to use this image
-
-## Start Logstash with commandline configuration
-
-If you need to run logstash with configuration provided on the commandline, you can use the logstash image as follows:
-
-```console
-$ docker run -it --rm logstash -e 'input { stdin { } } output { stdout { } }'
-```
-
-## Start Logstash with configuration file
-
-If you need to run logstash with a configuration file, `logstash.conf`, that's located in your current directory, you can use the logstash image as follows:
+> For more information about Logstash, please visit [www.elastic.co/products/logstash](https://www.elastic.co/products/logstash)
 
-```console
-$ docker run -it --rm -v "$PWD":/config-dir logstash -f /config-dir/logstash.conf
-```
-
-### Using a `Dockerfile`
-
-If you'd like to have a production Logstash image with a pre-baked configuration file, use of a `Dockerfile` is recommended:
-
-```dockerfile
-FROM logstash
-
-COPY logstash.conf /some/config-dir/
-
-CMD ["-f", "/some/config-dir/logstash.conf"]
-```
-
-Then, build with `docker build -t my-logstash .` and deploy with something like the following:
+%%LOGO%%
 
-```console
-$ docker run -d my-logstash
-```
+# About This Image
 
-## Installing plugins
+This default distribution is governed by the Elastic License and includes the [full set of free features](https://www.elastic.co/subscriptions).
 
-If you need to add any logstash plugins that do not ship with Logstash by default, the simplest solution is a Dockerfile using `logstash-plugin` included with Logsatsh. You can also pack in your customized config file.
+View the detailed release notes [here](https://www.elastic.co/guide/en/logstash/current/releasenotes.html).
 
-```dockerfile
-FROM logstash:5
+Not the version you're looking for? View all supported [past releases](https://www.docker.elastic.co).
 
-RUN logstash-plugin install logstash-filter-de_dot
+# How to use this image
 
-COPY logstash.conf /some/config-dir/
+**Note:** Pulling an image requires using a specific version number tag. The `latest` tag is not supported.
 
-CMD ["-f", "/some/config-dir/logstash.conf"]
-```
+For Logstash versions prior to 6.4.0, a full list of images, tags, and documentation can be found at [docker.elastic.co](https://www.docker.elastic.co/).
 
-Then, build with `docker build -t my-logstash .` and deploy just like the previous example:
+For full Logstash documentation see [here](https://www.elastic.co/guide/en/logstash/current/index.html).
 
-```console
-$ docker run -d my-logstash
-```
+For instructions specifically related to running the Docker image, see [this section](https://www.elastic.co/guide/en/logstash/current/docker-config.html) of the Logstash documentation.

+ 0 - 3
logstash/deprecated.md

@@ -1,3 +0,0 @@
-This image has been deprecated in favor of the [official `logstash` image](https://www.elastic.co/guide/en/logstash/current/docker.html) provided and maintained by [elastic.co](https://www.elastic.co/). The list of images available from Elastic can be found at [www.docker.elastic.co](https://www.docker.elastic.co/). The images found here will receive no further updates once the `6.0.0` release is available upstream. Please adjust your usage accordingly.
-
-Elastic provides open-source support for Logstash via the [elastic/logstash GitHub repository](https://github.com/elastic/logstash) and the Docker image via the [elastic/logstash-docker GitHub repository](https://github.com/elastic/logstash-docker), as well as community support via its [forums](https://discuss.elastic.co/c/logstash).

+ 1 - 0
logstash/get-help.md

@@ -0,0 +1 @@
+the [Logstash Discuss Forums](https://discuss.elastic.co/c/logstash) and the [Elastic community](https://www.elastic.co/community).

+ 1 - 1
logstash/github-repo

@@ -1 +1 @@
-https://github.com/docker-library/logstash
+https://github.com/elastic/logstash-docker

+ 1 - 0
logstash/issues.md

@@ -0,0 +1 @@
+%%GITHUB-REPO%%/issues

+ 1 - 1
logstash/license.md

@@ -1 +1 @@
-View [license information](https://github.com/elastic/logstash/blob/master/LICENSE) for the software contained in this image.
+View [license information](https://github.com/elastic/logstash/blob/6.4/licenses/ELASTIC-LICENSE.txt) for the software contained in this image.

BIN
logstash/logo.png


+ 0 - 0
logstash/variant-alpine.md