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

[Monitoring] Ensure we pass down the expiry_date for the license #21354

Merged
merged 9 commits into from Jul 31, 2018

Conversation

Projects
None yet
4 participants
@chrisronline
Copy link
Contributor

chrisronline commented Jul 27, 2018

Fixes #21308

Summary

Per this comment, it seems this accidentally broke a few months back where the expiry_date was no longer included in the API response, but the UI still expected it.

This PR addresses that by including it back into the API response.

A quick search indicates this key is used in at least another place.

@chrisronline chrisronline self-assigned this Jul 27, 2018

@chrisronline chrisronline requested a review from tsullivan Jul 27, 2018

@chrisronline chrisronline changed the title [WIP] [Monitoring] Ensure we pass down the expiry_date for the license [Monitoring] Ensure we pass down the expiry_date for the license Jul 27, 2018

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Jul 27, 2018

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Jul 27, 2018

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Jul 27, 2018

@chrisronline

This comment has been minimized.

Copy link
Contributor Author

chrisronline commented Jul 30, 2018

@pickypg do you mind quickly reviewing this if you have time?

chrisronline added some commits Jul 30, 2018

Revert "Update fixture"
This reverts commit 0a1e7a5.
Revert "Update fixtues"
This reverts commit b0c0e70.
Revert "Update tests"
This reverts commit 6a4421b.
@pickypg
Copy link
Member

pickypg left a comment

LGTM pending tests passing.

A separate PR should probably be created to add a UI test.

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Jul 30, 2018

@pickypg

This comment has been minimized.

Copy link
Member

pickypg commented Jul 30, 2018

18:47:48 Summary of all failing tests
18:47:48  FAIL  packages/kbn-plugin-helpers/tasks/build/create_build.test.js (11.51s)
18:47:48   ● creating the build › adds build metadata to package.json
18:47:48 
18:47:48     Timeout - Async callback was not invoked within the 5000ms timeout specified by jest.setTimeout.
18:47:48       
18:47:48       at node_modules/jest-jasmine2/build/queue_runner.js:68:21

jenkins test this

@elasticmachine

This comment has been minimized.

Copy link

elasticmachine commented Jul 30, 2018

@chrisronline chrisronline merged commit bacbf15 into elastic:master Jul 31, 2018

2 checks passed

CLA Commit author is a member of Elasticsearch
Details
kibana-ci Build finished.
Details

@chrisronline chrisronline deleted the chrisronline:monitoring/fix/21308 branch Jul 31, 2018

chrisronline added a commit to chrisronline/kibana that referenced this pull request Jul 31, 2018

[Monitoring] Ensure we pass down the expiry_date for the license (ela…
…stic#21354)

* Ensure we pass down the expiry_date for the license

* Update tests

* Update fixtues

* Update fixture

* Revert "Update fixture"

This reverts commit 0a1e7a5.

* Revert "Update fixtues"

This reverts commit b0c0e70.

* Revert "Update tests"

This reverts commit 6a4421b.

* Revert "Ensure we pass down the expiry_date for the license"

This reverts commit 2562395.

* Use expiry_date_in_millis value instead of expiry_date

chrisronline added a commit to chrisronline/kibana that referenced this pull request Jul 31, 2018

[Monitoring] Ensure we pass down the expiry_date for the license (ela…
…stic#21354)

* Ensure we pass down the expiry_date for the license

* Update tests

* Update fixtues

* Update fixture

* Revert "Update fixture"

This reverts commit 0a1e7a5.

* Revert "Update fixtues"

This reverts commit b0c0e70.

* Revert "Update tests"

This reverts commit 6a4421b.

* Revert "Ensure we pass down the expiry_date for the license"

This reverts commit 2562395.

* Use expiry_date_in_millis value instead of expiry_date

chrisronline added a commit that referenced this pull request Jul 31, 2018

[Monitoring] Ensure we pass down the expiry_date for the license (#21354
) (#21478)

* Ensure we pass down the expiry_date for the license

* Update tests

* Update fixtues

* Update fixture

* Revert "Update fixture"

This reverts commit 0a1e7a5.

* Revert "Update fixtues"

This reverts commit b0c0e70.

* Revert "Update tests"

This reverts commit 6a4421b.

* Revert "Ensure we pass down the expiry_date for the license"

This reverts commit 2562395.

* Use expiry_date_in_millis value instead of expiry_date

chrisronline added a commit that referenced this pull request Jul 31, 2018

[Monitoring] Ensure we pass down the expiry_date for the license (#21354
) (#21479)

* Ensure we pass down the expiry_date for the license

* Update tests

* Update fixtues

* Update fixture

* Revert "Update fixture"

This reverts commit 0a1e7a5.

* Revert "Update fixtues"

This reverts commit b0c0e70.

* Revert "Update tests"

This reverts commit 6a4421b.

* Revert "Ensure we pass down the expiry_date for the license"

This reverts commit 2562395.

* Use expiry_date_in_millis value instead of expiry_date
@chrisronline

This comment has been minimized.

Copy link
Contributor Author

chrisronline commented Jul 31, 2018

Backport:

6.x: b62148c
6.4: cf8dfbd

@spalger spalger removed the v6.6.0 label Aug 14, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.