Skip to content
This repository has been archived by the owner on Mar 30, 2023. It is now read-only.

Add support for Elastic Stack 7.1.1 #281

Merged
merged 19 commits into from
Jun 7, 2019
Merged

Add support for Elastic Stack 7.1.1 #281

merged 19 commits into from
Jun 7, 2019

Conversation

russcam
Copy link
Contributor

@russcam russcam commented Jun 4, 2019

This PR adds support for Elastic Stack 7.1.1 and 6.8.0.

The biggest change in adding support for these new versions is related to Elastic Security features TLS and role-based access control (RBAC) now supported in the free basic license level. The deployment scripts for each product have been updated to reflect this change.

russcam added 16 commits June 3, 2019 12:04
…rsion supports TLS

This commit updates when SSL/TLS certificates can be installed. When

xPackPlugins is 'Yes'

or

Version is >= 6.8.0 and < 7.0.0, or >= 7.1.0

and certificates have been supplied, then configure TLS.
This commit updates when TLS on HTTP layer is configured:

1. esHttpCertBlob or esHttpCaCertBlob supplied

and

2. xPackPlugins is 'Yes'

or

esVersion is 7.1.0+ or starts with 6 and 6.8.0+
This commit adds an integration test for basic license with TLS when the version is >= 7.1.0. This test configures TLS on the HTTP and Transport layers and asserts both Kibana and Logstash can communicate with the cluster.
This commit updates the deployment scripts to configure Security when a basic license is configured and the stack version allows.
@russcam
Copy link
Contributor Author

russcam commented Jun 4, 2019

Need to run

npm run links -- --branch master

before merging

Copy link
Contributor

@codebrain codebrain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

# Conflicts:
#	docs/azure-arm-template.asciidoc
@russcam russcam merged commit 6cfe434 into 7.1 Jun 7, 2019
@@ -267,6 +268,11 @@ done
# Parameter state changes
#########################

# supports security features with a basic license
if [[ $(dpkg --compare-versions "$ES_VERSION" "ge" "7.1.0"; echo $?) -eq 0 || ($(dpkg --compare-versions "$ES_VERSION" "ge" "6.8.0"; echo $?) -eq 0 && $(dpkg --compare-versions "$ES_VERSION" "lt" "7.0.0"; echo $?) -eq 0) ]]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

took me a double read :D

# Configure SSL/TLS for HTTP layer
if [[ -n "${HTTP_CERT}" || -n "$HTTP_CACERT" && ${INSTALL_XPACK} -ne 0 ]]; then
if [[ -n "${HTTP_CERT}" || -n "$HTTP_CACERT" && ${INSTALL_CERTS} -ne 0 ]]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Much better check, regardless of version 👍

russcam added a commit that referenced this pull request Jun 11, 2019
This commit adds support for Elastic Stack 7.1.1 and 6.8.0. It includes a change to configure basic security when

xPackPlugins is 'Yes'

or

Version is >= 6.8.0 and < 7.0.0, or >= 7.1.0

and configures TLS when certificates have been supplied,

Add an integration test for basic license with TLS when the version is >= 7.1.0. This test configures TLS on the HTTP and Transport layers and asserts both Kibana and Logstash can communicate with the cluster.

Closes #279
russcam added a commit that referenced this pull request Jun 11, 2019
This commit adds support for Elastic Stack 7.1.1 and 6.8.0. It includes a change to configure basic security when

xPackPlugins is 'Yes'

or

Version is >= 6.8.0 and < 7.0.0, or >= 7.1.0

and configures TLS when certificates have been supplied,

Add an integration test for basic license with TLS when the version is >= 7.1.0. This test configures TLS on the HTTP and Transport layers and asserts both Kibana and Logstash can communicate with the cluster.

Closes #279
@russcam russcam deleted the feature/7.1.1 branch June 26, 2019 21:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants