Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow patch level mismatch between Kibana and Elasticsearch #8976

Merged
merged 1 commit into from
Nov 5, 2016

Conversation

epixa
Copy link
Contributor

@epixa epixa commented Nov 4, 2016

Kibana should be able to run against Elasticsearch nodes that are at the
same minor version regardless of whether they are at the same patch
version. In the event that their patch versions differ, we render a
warning.

Fixes #8515

@@ -30,9 +30,9 @@ _Note: The version numbers below are only examples, meant to illustrate the rela
| ------------------------- | -------------------------- |------------------- | ------- |
| Versions are the same. | 5.1.2 | 5.1.2 | 💚 OK |
| ES patch number is newer. | 5.1.__2__ | 5.1.__5__ | ⚠️ Logged warning |
| ES patch number is older. | 5.1.__2__ | 5.1.__0__ | ⚠️ Logged warning |
Copy link
Contributor

@cjcenizal cjcenizal Nov 4, 2016

Choose a reason for hiding this comment

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

I think we should keep this placement in the original order. I think people will be scanning for conditions and then looking for outcomes, instead of the other way around. In the original order, there's a repeating pattern to aid scanning.

@epixa epixa self-assigned this Nov 4, 2016
@epixa epixa added the blocked label Nov 4, 2016

it('when majors and minors are equal, but ES patch is less than Kibana patch', () => {
expect(isEsCompatibleWithKibana('1.1.0', '1.1.1')).to.be(false);
});
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't we just change this assertion to be true and move it to the 'returns true' describe block?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, definitely. Good catch.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

Kibana should be able to run against Elasticsearch nodes that are at the
same minor version regardless of whether they are at the same patch
version. In the event that their patch versions differ, we render a
warning.
@epixa epixa removed their assignment Nov 4, 2016
@epixa epixa added the review label Nov 4, 2016
@cjcenizal
Copy link
Contributor

Tested this locally by faking different versions of Kibana. Everything works as expected and the tests pass. LGTM!

Copy link
Contributor

@spalger spalger left a comment

Choose a reason for hiding this comment

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

LGTM

@cjcenizal cjcenizal merged commit aa69744 into elastic:master Nov 5, 2016
elastic-jasper added a commit that referenced this pull request Nov 5, 2016
Backports PR #8976

**Commit 1:**
Allow patch level mismatch between Kibana and Elasticsearch

Kibana should be able to run against Elasticsearch nodes that are at the
same minor version regardless of whether they are at the same patch
version. In the event that their patch versions differ, we render a
warning.

* Original sha: 79ea67f
* Authored by Court Ewing <court@epixa.com> on 2016-11-04T21:28:46Z
cjcenizal added a commit that referenced this pull request Nov 5, 2016
Backports PR #8976

**Commit 1:**
Allow patch level mismatch between Kibana and Elasticsearch

Kibana should be able to run against Elasticsearch nodes that are at the
same minor version regardless of whether they are at the same patch
version. In the event that their patch versions differ, we render a
warning.

* Original sha: 79ea67f
* Authored by Court Ewing <court@epixa.com> on 2016-11-04T21:28:46Z
cjcenizal pushed a commit that referenced this pull request Nov 5, 2016
Backports PR #8976

**Commit 1:**
Allow patch level mismatch between Kibana and Elasticsearch

Kibana should be able to run against Elasticsearch nodes that are at the
same minor version regardless of whether they are at the same patch
version. In the event that their patch versions differ, we render a
warning.

* Original sha: 79ea67f
* Authored by Court Ewing <court@epixa.com> on 2016-11-04T21:28:46Z
elastic-jasper added a commit that referenced this pull request Nov 5, 2016
Backports PR #8976

**Commit 1:**
Allow patch level mismatch between Kibana and Elasticsearch

Kibana should be able to run against Elasticsearch nodes that are at the
same minor version regardless of whether they are at the same patch
version. In the event that their patch versions differ, we render a
warning.

* Original sha: 79ea67f
* Authored by Court Ewing <court@epixa.com> on 2016-11-04T21:28:46Z
cjcenizal added a commit that referenced this pull request Nov 5, 2016
Backports PR #8976

**Commit 1:**
Allow patch level mismatch between Kibana and Elasticsearch

Kibana should be able to run against Elasticsearch nodes that are at the
same minor version regardless of whether they are at the same patch
version. In the event that their patch versions differ, we render a
warning.

* Original sha: 79ea67f
* Authored by Court Ewing <court@epixa.com> on 2016-11-04T21:28:46Z
cjcenizal pushed a commit that referenced this pull request Nov 5, 2016
Backports PR #8976

**Commit 1:**
Allow patch level mismatch between Kibana and Elasticsearch

Kibana should be able to run against Elasticsearch nodes that are at the
same minor version regardless of whether they are at the same patch
version. In the event that their patch versions differ, we render a
warning.

* Original sha: 79ea67f
* Authored by Court Ewing <court@epixa.com> on 2016-11-04T21:28:46Z
nreese pushed a commit to nreese/kibana that referenced this pull request Nov 10, 2016
…8976)

Kibana should be able to run against Elasticsearch nodes that are at the
same minor version regardless of whether they are at the same patch
version. In the event that their patch versions differ, we render a
warning.
@epixa epixa added v5.1.1 and removed v5.1.0 labels Dec 8, 2016
airow pushed a commit to airow/kibana that referenced this pull request Feb 16, 2017
…8980)

Backports PR elastic#8976

**Commit 1:**
Allow patch level mismatch between Kibana and Elasticsearch

Kibana should be able to run against Elasticsearch nodes that are at the
same minor version regardless of whether they are at the same patch
version. In the event that their patch versions differ, we render a
warning.

* Original sha: 79ea67f
* Authored by Court Ewing <court@epixa.com> on 2016-11-04T21:28:46Z

Former-commit-id: 838b16e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants