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.

Sign up for GitHub

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

Jump to bottom

Bump elasticsearch client #9446

Merged
merged 2 commits into from
Dec 13, 2016
Merged

Bump elasticsearch client #9446

merged 2 commits into from
Dec 13, 2016

Conversation

jbudz
Copy link
Member

@jbudz jbudz commented Dec 12, 2016 •
edited
Loading

Closes #9442

callWithRequest expects err.statusCode to be defined here. In certain cases this metadata is not returned by the client resulting in defaulted 500 errors. This is fixed by elastic/elasticsearch-js@f9d2569.

@jbudz jbudz added the review label Dec 12, 2016
spalger
spalger approved these changes Dec 12, 2016
View reviewed changes
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

spalger
spalger reviewed Dec 12, 2016
View reviewed changes
src/core_plugins/tests_bundle/tests_entry_template.js
@@ -26,7 +26,7 @@ window.__KBN__ = {
vars: {
kbnIndex: '.kibana',
esShardTimeout: 1500,
esApiVersion: '2.0',
esApiVersion: 'master',
Copy link
Contributor

@spalger spalger Dec 12, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

This is less than idea, but ultimately true for master. @epixa can you think of a way to help remind whoever branches to 5.1, 5.2, etc. that this needs to be updated?

Copy link
Contributor

@epixa epixa Dec 12, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

I was thinking about creating a top level versions file in the root of the project that we can use to track all specific versions like this, so bumping the Kibana version would all be done in the same file. That's separate from this PR, though.

Thoughts?

Copy link
Contributor

Choose a reason for hiding this comment

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

maybe we should just store it in package.json?

Copy link
Contributor

Choose a reason for hiding this comment

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

We have to hard-code the version there anyway

Copy link
Contributor

Choose a reason for hiding this comment

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

@jbudz Just ignore this comment chain for the sake of this PR.

@spalger Why do we need to hardcode the version in package.json? The version requirement is there for npm, which we don't publish Kibana to. We should be able to mark the package.json as private and remove the version entirely.

Copy link
Contributor

@spalger spalger Dec 13, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

I'm pretty sure npm still complains, but I'm down. Then we can have a versions file separate from package.json

tylersmalley
tylersmalley approved these changes Dec 13, 2016
View reviewed changes
Copy link
Contributor

@tylersmalley tylersmalley left a comment

Choose a reason for hiding this comment

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

LGTM - verified running an nginx proxy with basic auth.

@jbudz jbudz merged commit e125db2 into elastic:master Dec 13, 2016
elastic-jasper added a commit that referenced this pull request Dec 13, 2016
@elastic-jasper
Bump elasticsearch client
cae069e 
Backports PR #9446

**Commit 1:**
Bump elasticsearch client

* Original sha: c007b55
* Authored by Jonathan Budzenski <jon@jbudz.me> on 2016-12-12T18:51:41Z

**Commit 2:**
Bump elasticsearch version in tests entry template to master

* Original sha: 2419fe3
* Authored by Jonathan Budzenski <jon@jbudz.me> on 2016-12-12T19:13:27Z
elastic-jasper added a commit that referenced this pull request Dec 13, 2016
@elastic-jasper
Bump elasticsearch client
c30ac50 
Backports PR #9446

**Commit 1:**
Bump elasticsearch client

* Original sha: c007b55
* Authored by Jonathan Budzenski <jon@jbudz.me> on 2016-12-12T18:51:41Z

**Commit 2:**
Bump elasticsearch version in tests entry template to master

* Original sha: 2419fe3
* Authored by Jonathan Budzenski <jon@jbudz.me> on 2016-12-12T19:13:27Z
This was referenced Dec 13, 2016
Merged
Merged
jbudz pushed a commit that referenced this pull request Dec 13, 2016
@elastic-jasper @jbudz
Bump elasticsearch client
caf221b 
Backports PR #9446

**Commit 1:**
Bump elasticsearch client

* Original sha: c007b55
* Authored by Jonathan Budzenski <jon@jbudz.me> on 2016-12-12T18:51:41Z

**Commit 2:**
Bump elasticsearch version in tests entry template to master

* Original sha: 2419fe3
* Authored by Jonathan Budzenski <jon@jbudz.me> on 2016-12-12T19:13:27Z
jbudz pushed a commit that referenced this pull request Dec 13, 2016
@elastic-jasper @jbudz
Bump elasticsearch client
12fe917 
Backports PR #9446

**Commit 1:**
Bump elasticsearch client

* Original sha: c007b55
* Authored by Jonathan Budzenski <jon@jbudz.me> on 2016-12-12T18:51:41Z

**Commit 2:**
Bump elasticsearch version in tests entry template to master

* Original sha: 2419fe3
* Authored by Jonathan Budzenski <jon@jbudz.me> on 2016-12-12T19:13:27Z
jbudz pushed a commit that referenced this pull request Dec 13, 2016
@elastic-jasper @jbudz
Bump elasticsearch client
a999451 
Backports PR #9446

**Commit 1:**
Bump elasticsearch client

* Original sha: c007b55
* Authored by Jonathan Budzenski <jon@jbudz.me> on 2016-12-12T18:51:41Z

**Commit 2:**
Bump elasticsearch version in tests entry template to master

* Original sha: 2419fe3
* Authored by Jonathan Budzenski <jon@jbudz.me> on 2016-12-12T19:13:27Z
jbudz pushed a commit that referenced this pull request Dec 13, 2016
@elastic-jasper @jbudz
Bump elasticsearch client (#9459)
aaa3f1f 
Backports PR #9446

**Commit 1:**
Bump elasticsearch client

* Original sha: c007b55
* Authored by Jonathan Budzenski <jon@jbudz.me> on 2016-12-12T18:51:41Z

**Commit 2:**
Bump elasticsearch version in tests entry template to master

* Original sha: 2419fe3
* Authored by Jonathan Budzenski <jon@jbudz.me> on 2016-12-12T19:13:27Z
jbudz pushed a commit that referenced this pull request Dec 13, 2016
@elastic-jasper @jbudz
Bump elasticsearch client (#9460)
67655da 
Backports PR #9446

**Commit 1:**
Bump elasticsearch client

* Original sha: c007b55
* Authored by Jonathan Budzenski <jon@jbudz.me> on 2016-12-12T18:51:41Z

**Commit 2:**
Bump elasticsearch version in tests entry template to master

* Original sha: 2419fe3
* Authored by Jonathan Budzenski <jon@jbudz.me> on 2016-12-12T19:13:27Z
@epixa epixa added the Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc label Dec 16, 2016
@jbudz jbudz mentioned this pull request Dec 26, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@epixa epixa epixa left review comments

@spalger spalger spalger approved these changes

@tylersmalley tylersmalley tylersmalley approved these changes

Assignees
No one assigned
Labels
review Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc v5.1.2 v5.2.0 v6.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Using basic authentication is not working since 5.0.2
4 participants
@jbudz @tylersmalley @epixa @spalger