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

[es] upgrade to master #5656

Merged
merged 35 commits into from
Feb 9, 2016
Merged

Conversation

spalger
Copy link
Contributor

@spalger spalger commented Dec 11, 2015

Fixes #5649
Fixes #5658

Breaking Changes doc: https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking-changes-3.0.html

@LeeDr
Copy link

LeeDr commented Jan 4, 2016

jenkins, test it

@Bargs
Copy link
Contributor

Bargs commented Feb 4, 2016

@spalger is this still actively being worked on? Is there anything I could do to help move it along? Getting this PR merged would be great for the feature/ingest branch which relies on features in ES master.

@spalger spalger force-pushed the upgrade/elasticsearch/master branch from a008cad to 7aee4a5 Compare February 5, 2016 17:25
@w33ble
Copy link
Contributor

w33ble commented Feb 8, 2016

The changes look good and all, but I'd like to run this against master and verify functionality myself before I give you a seal of approval. Unfortunately, the configuration I need to run ES is currently broken in master, so I'm waiting on fixes before I can test this out.

@epixa
Copy link
Contributor

epixa commented Feb 8, 2016

I killed this jenkins job because it had a bunch of failures and was beginning to time out.

@Bargs
Copy link
Contributor

Bargs commented Feb 8, 2016

Getting the following error when trying to load Discover with a scripted field added to the index pattern:

Error: [parsing_exception] Unknown key for a VALUE_STRING in [lang]., with { line=1 col=704 }
    at respond (https://localhost:5601/flu/bundles/kibana.bundle.js?v=8467:69480:16)
    at checkRespForFailure (https://localhost:5601/flu/bundles/kibana.bundle.js?v=8467:69439:8)
    at https://localhost:5601/flu/bundles/kibana.bundle.js?v=8467:67957:8
    at processQueue (https://localhost:5601/flu/bundles/commons.bundle.js?v=8467:37112:29)
    at https://localhost:5601/flu/bundles/commons.bundle.js?v=8467:37128:28
    at Scope.$eval (https://localhost:5601/flu/bundles/commons.bundle.js?v=8467:38356:29)
    at Scope.$digest (https://localhost:5601/flu/bundles/commons.bundle.js?v=8467:38167:32)
    at Scope.$apply (https://localhost:5601/flu/bundles/commons.bundle.js?v=8467:38464:25)
    at done (https://localhost:5601/flu/bundles/commons.bundle.js?v=8467:32913:48)
    at completeRequest (https://localhost:5601/flu/bundles/commons.bundle.js?v=8467:33111:8)

@Bargs
Copy link
Contributor

Bargs commented Feb 8, 2016

Other than the above error, I haven't seen any glaring issues.

@@ -28,8 +28,8 @@ module.exports = function ({ Plugin }) {
cert: string(),
key: string()
}).default(),
apiVersion: string().default('2.0'),
engineVersion: string().valid('^2.1.0').default('^2.1.0')
apiVersion: Joi.string().default('master'),
Copy link
Contributor

Choose a reason for hiding this comment

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

How does the elasticsearch js client interpret master being passed as the API version? Wouldn't we still want to pin each version of Kibana to a specific version of the ES API?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Well, since the elasticsearch installation is pinned to master we need to use the same API version. The API in use in es master isn't shipping in any other version. "master" is the only option.

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe I missed a conversation about how all this is going to be handled. Is the plan to replace master everywhere with the correct version of ES when we cut a release?

Copy link
Contributor

Choose a reason for hiding this comment

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

We'd replace master with a specific version whenever we created the version branch, which generally happens at feature freeze.

Copy link
Contributor

Choose a reason for hiding this comment

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

Got it, makes sense

@spalger spalger removed the review label Feb 8, 2016
@spalger spalger assigned Bargs and unassigned spalger Feb 8, 2016
@spalger spalger added the review label Feb 8, 2016
@spalger spalger removed the review label Feb 8, 2016
@spalger spalger added the review label Feb 9, 2016
spalger added a commit that referenced this pull request Feb 9, 2016
@spalger spalger merged commit 4e27267 into elastic:master Feb 9, 2016
@spalger spalger deleted the upgrade/elasticsearch/master branch February 25, 2016 22:47
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.

Remove query filter Kibana master should track elasticsearch master
8 participants