Răsfoiți Sursa

Update Kibana docs

Michelle Sausa 7 ani în urmă
părinte
comite
b4b0ad5b56

+ 15 - 42
elasticsearch/content.md

@@ -1,66 +1,39 @@
 # What is Elasticsearch?
 
-Elasticsearch is a search server based on Lucene. It provides a distributed, multitenant-capable full-text search engine with a RESTful web interface and schema-free JSON documents.
-
-Elasticsearch is a registered trademark of Elasticsearch BV.
+Elasticsearch is a distributed, RESTful search and analytics engine capable of solving a growing number of use cases. As the heart of the Elastic Stack, it centrally stores your data so you can discover the expected and uncover the unexpected.
 
 > [wikipedia.org/wiki/Elasticsearch](https://en.wikipedia.org/wiki/Elasticsearch)
 
 %%LOGO%%
 
-# How to use this image
-
-## Cluster
-
-**Note:** since 5.0, Elasticsearch only listens on `localhost` by default on both http and transport, so this image sets `http.host` to `0.0.0.0` (given that `localhost` is not terribly useful in the Docker context).
-
-As a result, this image does not support clustering out of the box and extra configuration must be set in order to support it.
-
-Supporting clustering implies having Elasticsearch in a production mode which is more strict about the bootstrap checks that it performs, especially when checking the value of `vm.max_map_count` which is not namespaced and thus must be set to an acceptable value on the host (as opposed to simply using `--sysctl` on `docker run`).
-
-One example of adding clustering support is to pass the configuration on the `docker run`:
-
-```console
-$ docker run -d --name elas elasticsearch -Etransport.host=0.0.0.0 -Ediscovery.zen.minimum_master_nodes=1
-```
-
-See the following sections of the upstream documentation for more information:
+# About This Image
 
--	[Setup Elasticsearch » Important System Configuration » Virtual memory](https://www.elastic.co/guide/en/elasticsearch/reference/5.0/vm-max-map-count.html)
--	[Setup Elasticsearch » Bootstrap Checks » Maximum map count check](https://www.elastic.co/guide/en/elasticsearch/reference/5.0/_maximum_map_count_check.html)
+This default distribution is governed by the Elastic License, and includes the [full set of free features](https://www.elastic.co/subscriptions).
 
-This [comment in elastic/elasticsearch#4978](https://github.com/elastic/elasticsearch/issues/4978#issuecomment-258676104) shows why this change was added in upstream.
+View the detailed release notes [here](https://www.elastic.co/guide/en/elasticsearch/reference/6.4/release-notes-6.4.1.html).
 
-> Elasticsearch will not start in production mode if `vm.max_map_count` is not high enough. [...] If the value on your system is NOT high enough, then your cluster is going to crash and burn at some stage and you will lose data.
+Not the version you're looking for? View all supported [past releases](https://www.docker.elastic.co).
 
-## Running Containers
+# How to use this image
 
-You can run the default `elasticsearch` command simply:
+**Note:** Pulling an images requires using a specific version number tag. The `latest` tag is not supported. 
 
-```console
-$ docker run -d elasticsearch
-```
+For Elasticsearch 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/). 
 
-You can also pass in additional flags to `elasticsearch`:
+For full Elasticsearch documentation see [here](https://www.elastic.co/guide/en/elasticsearch/reference/6.4/index.html).
 
-```console
-$ docker run -d elasticsearch -Des.node.name="TestNode"
-```
+**The commands below are intended for deploying in a development context only. For production installation and configuration, see [Install Elasticsearch with Docker](https://www.elastic.co/guide/en/elasticsearch/reference/6.4/docker.html).**
 
-This image comes with a default set of configuration files for `elasticsearch`, but if you want to provide your own set of configuration files, you can do so via a volume mounted at `/usr/share/elasticsearch/config`:
+## Running in Development Mode
 
 ```console
-$ docker run -d -v "$PWD/config":/usr/share/elasticsearch/config elasticsearch
+$ docker pull elasticsearch:tag
 ```
 
-This image is configured with a volume at `/usr/share/elasticsearch/data` to hold the persisted index data. Use that path if you would like to keep the data in a mounted volume:
-
 ```console
-$ docker run -d -v "$PWD/esdata":/usr/share/elasticsearch/data elasticsearch
+$ docker run -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" elasticsearch:tag
 ```
+## Running in Production Mode
 
-This image includes `EXPOSE 9200 9300` ([default `http.port`](http://www.elastic.co/guide/en/elasticsearch/reference/1.5/modules-http.html)), so standard container linking will make it automatically available to the linked containers.
-
-## %%STACK%%
+See [Install Elasticsearch with Docker](https://www.elastic.co/guide/en/elasticsearch/reference/6.x/docker.html)
 
-Run `docker stack deploy -c stack.yml %%REPO%%` (or `docker-compose -f stack.yml up`), wait for it to initialize completely, and visit `http://swarm-ip:5601`, `http://localhost:5601`, or `http://host-ip:5601` (as appropriate).

+ 0 - 3
elasticsearch/deprecated.md

@@ -1,3 +0,0 @@
-This image has been deprecated in favor of the [official `elasticsearch` image](https://www.elastic.co/guide/en/elasticsearch/reference/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 Elasticsearch via the [elastic/elasticsearch GitHub repository](https://github.com/elastic/elasticsearch) and the Docker image via the [elastic/elasticsearch-docker GitHub repository](https://github.com/elastic/elasticsearch-docker), as well as community support via its [forums](https://discuss.elastic.co/c/elasticsearch).

+ 1 - 1
elasticsearch/github-repo

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

+ 1 - 1
elasticsearch/license.md

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

+ 0 - 1
elasticsearch/maintainer.md

@@ -1 +0,0 @@
-../.common-templates/maintainer-community.md

+ 1 - 0
elasticsearch/maintainer.md

@@ -0,0 +1 @@
+[the Elastic Product Team](%%GITHUB-REPO%%)

+ 24 - 20
kibana/content.md

@@ -1,41 +1,45 @@
 # What is Kibana?
 
-Kibana is an open source data visualization plugin for Elasticsearch. It provides visualization capabilities on top of the content indexed on an Elasticsearch cluster. Users can create bar, line and scatter plots, or pie charts and maps on top of large volumes of data.
+Kibana is an open source analytics and visualization platform designed to work with Elasticsearch. You use Kibana to search, view, and interact with data stored in Elasticsearch indices. You can easily perform advanced data analysis and visualize your data in a variety of charts, tables, and maps.
 
-Kibana is a registered trademark of Elasticsearch BV.
-
-> [wikipedia.org/wiki/Kibana](https://en.wikipedia.org/wiki/Kibana)
+> For more information about Kibana, please visit [www.elastic.co/products/kibana](https://www.elastic.co/products/kibana)
 
 %%LOGO%%
 
+# About This Image
+
+This default distribution is governed by the Elastic License, and includes the [full set of free features](https://www.elastic.co/subscriptions).
+
+View the detailed release notes [here](https://www.elastic.co/guide/en/kibana/current/release-notes.html).
+
+Not the version you're looking for? View all supported [past releases](https://www.docker.elastic.co).
+
 # How to use this image
 
-You can run the default `%%REPO%%` command simply:
+**Note:** Pulling an images requires using a specific version number tag. The `latest` tag is not supported. 
 
-```console
-$ docker run --link some-elasticsearch:elasticsearch -d %%REPO%%
-```
+For Kibana 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/). 
 
-You can also pass in additional flags to `%%REPO%%`:
+For full Kibana documentation see [here](https://www.elastic.co/guide/en/kibana/index.html).
 
-```console
-$ docker run --link some-elasticsearch:elasticsearch -d %%REPO%% --plugins /somewhere/else
-```
+## Running in Development Mode
 
-This image includes `EXPOSE 5601` ([default `port`](https://www.elastic.co/guide/en/kibana/5.2/settings.html)). If you'd like to be able to access the instance from the host without the container's IP, standard port mappings can be used:
+In the given example, Kibana will a attach to a user defined network (useful for connecting to other services (e.g. Elasticsearch)). If network has not yet been created, this can be done with the following command:
 
 ```console
-$ docker run --name some-%%REPO%% --link some-elasticsearch:elasticsearch -p 5601:5601 -d %%REPO%%
-```
+$ docker network create somenetwork
+``` 
+*Note: In this example, Kibana is using the default configuration and expects to connect to a running Elasticsearch instance at http://localhost:9200*
 
-You can also provide the address of elasticsearch via `ELASTICSEARCH_URL` environnement variable:
+Run Kibana
 
 ```console
-$ docker run --name some-kibana -e ELASTICSEARCH_URL=http://some-elasticsearch:9200 -p 5601:5601 -d kibana
+$ docker run -d --name kibana --net somenetwork -p 5601:5601 kibana:tag
 ```
 
-Then, access it via `http://localhost:5601` or `http://host-ip:5601` in a browser.
+Kibana can be accessed by browser via `http://localhost:5601` or `http://host-ip:5601`
+
 
-## %%STACK%%
+## Running in Production Mode
 
-Run `docker stack deploy -c stack.yml %%REPO%%` (or `docker-compose -f stack.yml up`), wait for it to initialize completely, and visit `http://swarm-ip:5601`, `http://localhost:5601`, or `http://host-ip:5601` (as appropriate).
+For additional information on running and configuring Kibana on Docker, see [Running Kibana on Docker](https://www.elastic.co/guide/en/kibana/current/docker.html)

+ 0 - 3
kibana/deprecated.md

@@ -1,3 +0,0 @@
-This image has been deprecated in favor of the [official `kibana` image](https://www.elastic.co/guide/en/kibana/current/_pulling_the_image.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 Kibana via the [elastic/kibana GitHub repository](https://github.com/elastic/kibana) and the Docker image via the [elastic/kibana-docker GitHub repository](https://github.com/elastic/kibana-docker), as well as community support via its [forums](https://discuss.elastic.co/c/kibana).

+ 1 - 0
kibana/get-help.md

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

+ 1 - 1
kibana/github-repo

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

+ 3 - 0
kibana/issues.md

@@ -0,0 +1,3 @@
+For issues with the Kibana Docker image: %%GITHUB-REPO%%/issues
+
+For issues with Kibana: [https://github.com/elastic/kibana/issues](https://github.com/elastic/kibana/issues)

+ 1 - 1
kibana/license.md

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

+ 0 - 1
kibana/maintainer.md

@@ -1 +0,0 @@
-../.common-templates/maintainer-community.md

+ 1 - 0
kibana/maintainer.md

@@ -0,0 +1 @@
+[the Elastic Team](%%GITHUB-REPO%%)