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

Cherry-pick #15682 to 7.x: AWS Lambda: downgrade Kibana dashboard #15687

Merged
merged 2 commits into from
Jan 27, 2020
Merged

Cherry-pick #15682 to 7.x: AWS Lambda: downgrade Kibana dashboard #15687

merged 2 commits into from
Jan 27, 2020

Conversation

mtojek
Copy link
Contributor

@mtojek mtojek commented Jan 21, 2020

Cherry-pick of PR #15682 to 7.x branch. Original message:

This PR downgrades required Kibana version for AWS Lambda dashboard. It fixes error:

$ metricbeat setup --dashboards
Loading dashboards (Kibana must be running and reachable)
Exiting: Failed to import dashboard: Failed to load directory /Users/user/go/src/github.com/elastic/beats/x-pack/metricbeat/kibana/7/dashboard:
  error loading /Users/user/go/src/github.com/elastic/beats/x-pack/metricbeat/kibana/7/dashboard/Metricbeat-aws-lambda-overview.json: returned 422 to import file: <nil>. Response: {"statusCode":422,"error":"Unprocessable Entity","message":"Document \"deab0260-2981-11e9-86eb-a3a07a77f530\" has property \"visualization\" which belongs to a more recent version of Kibana (7.4.2)."}

... and fixes test_dashboards reported by Travis CI.

@mtojek
AWS Lambda: downgrade Kibana dashboard (elastic#15682)
f72124b 
* AWS Lambda: downgrade Kibana dashboard

* Downgrade other AWS dashboards

* Log command error if setup dashboards fails

* Another downgrade

(cherry picked from commit 1b0ea01)
@mtojek mtojek requested a review from a team as a code owner January 21, 2020 06:40
@jsoriano jsoriano mentioned this pull request Jan 22, 2020
Merged
@mtojek
Copy link
Contributor Author

mtojek commented Jan 27, 2020

I fixed merge conflicts. Let's wait for the CI to be sure.

jsoriano
jsoriano approved these changes Jan 27, 2020
View reviewed changes
metricbeat/tests/system/test_base.py
@@ -71,7 +71,7 @@ def test_dashboards(self):
)
exit_code = self.run_beat(extra_args=["setup", "--dashboards"])

assert exit_code == 0
assert exit_code == 0, 'Error output: ' + self.get_log()
Copy link
Member

Choose a reason for hiding this comment

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

Not related, but I guess it doesn't do any harm 🙂

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually it helps you finding the reason why the test_dashboards step has failed in the CI environment ;)

@mtojek
Copy link
Contributor Author

mtojek commented Jan 27, 2020

All checks are green. Resolving.

@mtojek mtojek merged commit 3cbc25f into elastic:7.x Jan 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsoriano jsoriano jsoriano approved these changes

Assignees
No one assigned
Labels
backport review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mtojek @jsoriano