Skip to content
This repository has been archived by the owner on Aug 16, 2022. It is now read-only.

Commit

Permalink
Preparing for 1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
aetter committed Jul 12, 2019
1 parent b59d003 commit c5a4da2
Show file tree
Hide file tree
Showing 14 changed files with 32 additions and 28 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ _site
.jekyll-metadata
.DS_Store
Gemfile.lock
build-old-versions.sh
_config-old-versions.yml
1 change: 1 addition & 0 deletions build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bundle exec jekyll serve --incremental
2 changes: 1 addition & 1 deletion docs/elasticsearch/snapshot-restore.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ readonly | Whether the repository is read-only. Useful when migrating from one c
If you're using the Docker installation, see [Run with custom plugins](../../install/docker/#run-with-custom-plugins). Your `Dockerfile` should look something like this:

```
FROM amazon/opendistro-for-elasticsearch:1.0.0
FROM amazon/opendistro-for-elasticsearch:1.0.1

ENV AWS_ACCESS_KEY_ID <access-key>
ENV AWS_SECRET_ACCESS_KEY <secret-key>
Expand Down
6 changes: 3 additions & 3 deletions docs/install/docker-security.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Before deploying to a production environment, you should replace the demo securi
version: '3'
services:
odfe-node1:
image: amazon/opendistro-for-elasticsearch:1.0.0
image: amazon/opendistro-for-elasticsearch:1.0.1
container_name: odfe-node1
environment:
- cluster.name=odfe-cluster
Expand Down Expand Up @@ -52,7 +52,7 @@ services:
networks:
- odfe-net
odfe-node2:
image: amazon/opendistro-for-elasticsearch:1.0.0
image: amazon/opendistro-for-elasticsearch:1.0.1
container_name: odfe-node2
environment:
- cluster.name=odfe-cluster
Expand Down Expand Up @@ -85,7 +85,7 @@ services:
networks:
- odfe-net
kibana:
image: amazon/opendistro-for-elasticsearch-kibana:1.0.0
image: amazon/opendistro-for-elasticsearch-kibana:1.0.1
container_name: odfe-kibana
ports:
- 5601:5601
Expand Down
18 changes: 9 additions & 9 deletions docs/install/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ nav_order: 1
You can pull the Open Distro for Elasticsearch Docker image just like any other image:

```bash
docker pull amazon/opendistro-for-elasticsearch:1.0.0
docker pull amazon/opendistro-for-elasticsearch-kibana:1.0.0
docker pull amazon/opendistro-for-elasticsearch:1.0.1
docker pull amazon/opendistro-for-elasticsearch-kibana:1.0.1
```

Open Distro for Elasticsearch images use `centos:7` as the base image.
Expand All @@ -31,7 +31,7 @@ Open Distro for Elasticsearch images use `centos:7` as the base image.
To run the image for local development:

```bash
docker run -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" amazon/opendistro-for-elasticsearch:1.0.0
docker run -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" amazon/opendistro-for-elasticsearch:1.0.1
```

Then send requests to the server to verify that Elasticsearch is up and running:
Expand Down Expand Up @@ -84,7 +84,7 @@ This sample file starts two data nodes and Kibana. If you're running Docker loca
version: '3'
services:
odfe-node1:
image: amazon/opendistro-for-elasticsearch:1.0.0
image: amazon/opendistro-for-elasticsearch:1.0.1
container_name: odfe-node1
environment:
- cluster.name=odfe-cluster
Expand All @@ -108,7 +108,7 @@ services:
networks:
- odfe-net
odfe-node2:
image: amazon/opendistro-for-elasticsearch:1.0.0
image: amazon/opendistro-for-elasticsearch:1.0.1
container_name: odfe-node2
environment:
- cluster.name=odfe-cluster
Expand All @@ -129,7 +129,7 @@ services:
networks:
- odfe-net
kibana:
image: amazon/opendistro-for-elasticsearch-kibana:1.0.0
image: amazon/opendistro-for-elasticsearch-kibana:1.0.1
container_name: odfe-kibana
ports:
- 5601:5601
Expand Down Expand Up @@ -162,7 +162,7 @@ docker run \
-p 9200:9200 -p 9600:9600 \
-e "discovery.type=single-node" \
-v /<full-path-to>/custom-elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml \
amazon/opendistro-for-elasticsearch:1.0.0
amazon/opendistro-for-elasticsearch:1.0.1
```

You can perform the same operation in `docker-compose.yml` using a relative path:
Expand Down Expand Up @@ -218,7 +218,7 @@ The `docker-compose.yml` file above also contains several key settings: `bootstr
To run the image with a custom plugin, first create a [`Dockerfile`](https://docs.docker.com/engine/reference/builder/):

```
FROM amazon/opendistro-for-elasticsearch:1.0.0
FROM amazon/opendistro-for-elasticsearch:1.0.1
RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install --batch <plugin-name-or-url>
```

Expand All @@ -232,7 +232,7 @@ docker run -p 9200:9200 -p 9600:9600 -v /usr/share/elasticsearch/data odfe-custo
You can also use a `Dockerfile` to pass your own certificates for use with the [Security](../../security-configuration/) plugin, similar to the `-v` argument in [Configure Elasticsearch](#configure-elasticsearch):

```
FROM amazon/opendistro-for-elasticsearch:1.0.0
FROM amazon/opendistro-for-elasticsearch:1.0.1
COPY --chown=elasticsearch:elasticsearch elasticsearch.yml /usr/share/elasticsearch/config/
COPY --chown=elasticsearch:elasticsearch my-key-file.pem /usr/share/elasticsearch/config/
COPY --chown=elasticsearch:elasticsearch my-certificate-chain.pem /usr/share/elasticsearch/config/
Expand Down
2 changes: 1 addition & 1 deletion docs/install/plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Navigate to the Elasticsearch home directory (likely `/usr/share/elasticsearch`)
#### Security

```bash
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-security/opendistro_security-1.0.0.0.zip
sudo bin/elasticsearch-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/elasticsearch-plugins/opendistro-security/opendistro_security-1.0.0.1.zip
```

After installing the Security plugin, you can run `sudo sh /usr/share/elasticsearch/plugins/opendistro_security/tools/install_demo_configuration.sh` to quickly get started with demo certificates. Otherwise, you must configure it manually.
Expand Down
2 changes: 1 addition & 1 deletion docs/kibana/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Kibana is the default visualization tool for data in Elasticsearch. It also serv

You *can* start Kibana using `docker run` after [creating a Docker network](https://docs.docker.com/engine/reference/commandline/network_create/) and starting Elasticsearch, but the process of connecting Kibana to Elasticsearch is significantly easier with a Docker Compose file.

1. Run `docker pull amazon/opendistro-for-elasticsearch-kibana:1.0.0`.
1. Run `docker pull amazon/opendistro-for-elasticsearch-kibana:1.0.1`.

1. Create a [`docker-compose.yml`](https://docs.docker.com/compose/compose-file/) file appropriate for your environment. A sample file that includes Kibana is available on the Open Distro for Elasticsearch [Docker installation page](../install/docker/#sample-docker-compose-file).

Expand Down
2 changes: 1 addition & 1 deletion docs/kibana/plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Navigate to the Kibana home directory (likely `/usr/share/kibana`) and run the i
#### Security

```bash
sudo bin/kibana-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/kibana-plugins/opendistro-security/opendistro_security_kibana_plugin-1.0.0.0.zip
sudo bin/kibana-plugin install https://d3g5vo6xdbdb9a.cloudfront.net/downloads/kibana-plugins/opendistro-security/opendistro_security_kibana_plugin-1.0.0.1.zip
```


Expand Down
8 changes: 4 additions & 4 deletions docs/security-access-control/cross-cluster-search.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Save this file as `docker-compose.yml` and run `docker-compose up` to start two
version: '3'
services:
odfe-node1:
image: amazon/opendistro-for-elasticsearch:1.0.0
image: amazon/opendistro-for-elasticsearch:1.0.1
container_name: odfe-node1
environment:
- cluster.name=odfe-cluster1
Expand All @@ -85,7 +85,7 @@ services:
- odfe-net
odfe-node2:
image: amazon/opendistro-for-elasticsearch:1.0.0
image: amazon/opendistro-for-elasticsearch:1.0.1
container_name: odfe-node2
environment:
- cluster.name=odfe-cluster2
Expand Down Expand Up @@ -134,8 +134,8 @@ To get the IP address for the remote cluster, first identify its container ID:
```bash
docker ps
CONTAINER ID IMAGE PORTS NAMES
6fe89ebc5a8e amazon/opendistro-for-elasticsearch:1.0.0 0.0.0.0:9200->9200/tcp, 0.0.0.0:9600->9600/tcp, 9300/tcp odfe-node1
2da08b6c54d8 amazon/opendistro-for-elasticsearch:1.0.0 9300/tcp, 0.0.0.0:9250->9200/tcp, 0.0.0.0:9700->9600/tcp odfe-node2
6fe89ebc5a8e amazon/opendistro-for-elasticsearch:1.0.1 0.0.0.0:9200->9200/tcp, 0.0.0.0:9600->9600/tcp, 9300/tcp odfe-node1
2da08b6c54d8 amazon/opendistro-for-elasticsearch:1.0.1 9300/tcp, 0.0.0.0:9250->9200/tcp, 0.0.0.0:9700->9600/tcp odfe-node2
```

Then get that container's IP address:
Expand Down
4 changes: 2 additions & 2 deletions docs/security-configuration/disable.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ If you disable the Security plugin in `elasticsearch.yml` (or delete the plugin
1. Create a new `Dockerfile`:

```
FROM amazon/opendistro-for-elasticsearch-kibana:1.0.0
FROM amazon/opendistro-for-elasticsearch-kibana:1.0.1
RUN /usr/share/kibana/bin/kibana-plugin remove opendistro_security
```

Expand All @@ -49,7 +49,7 @@ If you disable the Security plugin in `elasticsearch.yml` (or delete the plugin
docker build --tag=kibana-no-security .
```

1. In `docker-compose.yml`, change `amazon/opendistro-for-elasticsearch-kibana:1.0.0` to `kibana-no-security`.
1. In `docker-compose.yml`, change `amazon/opendistro-for-elasticsearch-kibana:1.0.1` to `kibana-no-security`.
1. Change `ELASTICSEARCH_URL` (`docker-compose.yml`) or `elasticsearch.url` (your custom `kibana.yml`) to `http://` rather than `https://`.
1. Change `ELASTICSEARCH_HOSTS` or `elasticsearch.hosts` to `http://` rather than `https://`.
1. Remove all `opendistro_security` lines from `kibana.yml`.
Expand Down
4 changes: 2 additions & 2 deletions docs/upgrade/1-0-0.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
layout: default
title: Upgrade to 1.0.0
title: Upgrade to 1.x.x
parent: Upgrade
nav_order: 1
---

# Upgrade to 1.0.0
# Upgrade to 1.x.x

Open Distro for Elasticsearch 1.0.0 uses Elasticsearch 7.0.1, which has numerous breaking changes from 6.x.x. This page includes several important considerations when upgrading from Open Distro for Elasticsearch 0.x.x to 1.x.x.

Expand Down
2 changes: 1 addition & 1 deletion docs/upgrade/cluster-restart.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ The steps on this page are most applicable if you installed Open Distro for Elas
Alternately, `yum` lets you upgrade to a specific version of Open Distro for Elasticsearch:

```bash
sudo yum install opendistro-for-elasticsearch-1.0.0
sudo yum install opendistro-for-elasticsearch-1.0.1
```

Unfortunately, `apt` upgrades dependencies to their latest versions and thus only supports upgrades to the newest version of Open Distro for Elasticsearch.
Expand Down
2 changes: 1 addition & 1 deletion docs/upgrade/rolling.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ The steps on this page are most applicable if you installed Open Distro for Elas
Alternately, `yum` lets you upgrade to a specific version of Open Distro for Elasticsearch:

```bash
sudo yum install opendistro-for-elasticsearch-1.0.0
sudo yum install opendistro-for-elasticsearch-1.0.1
```

Unfortunately, `apt` upgrades dependencies to their latest versions and thus only supports upgrades to the newest version of Open Distro for Elasticsearch.
Expand Down
5 changes: 3 additions & 2 deletions index.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ Docker
1. Run the following commands:

```bash
docker pull amazon/opendistro-for-elasticsearch:1.0.0
docker run -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" amazon/opendistro-for-elasticsearch:1.0.0
docker pull amazon/opendistro-for-elasticsearch:1.0.1
docker run -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" amazon/opendistro-for-elasticsearch:1.0.1
```

1. In a new terminal session, run:
Expand All @@ -71,6 +71,7 @@ To learn more, see [Install](docs/install/).

Open Distro for Elasticsearch version | Release highlights | Release date | Elasticsearch version
:--- | :--- | :--- | :---
1.0.1 | Fixes backend role bugs in the Security plugin. | 12 July 2019 | 7.0.1
1.0.0 | Adds action throttling to the alerting plugin and bumps Elasticsearch to a new major version. See [Upgrade to 1.0.0](./docs/upgrade/1-0-0/) for breaking changes. | 28 June 2019 | 7.0.1
0.9.0 | Bumps Elasticsearch version. | 1 May 2019 | 6.7.1
0.8.0 | Bumps Elasticsearch version. | 5 April 2019 | 6.6.2
Expand Down

0 comments on commit c5a4da2

Please sign in to comment.