Skip to content

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

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

Merged
mtojek merged 2 commits into from
Jan 27, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f72124b
AWS Lambda: downgrade Kibana dashboard (#15682)
mtojek Jan 20, 2020
004cb96
Merge branch '7.x' into backport_15682_7.x
mtojek Jan 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion metricbeat/tests/system/test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy Markdown
Member

@jsoriano jsoriano Jan 27, 2020

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
Copy Markdown
Contributor Author

@mtojek mtojek Jan 27, 2020

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 ;)

assert self.log_contains("Kibana dashboards successfully loaded.")

@unittest.skipUnless(INTEGRATION_TESTS, "integration test")
Expand Down
10 changes: 5 additions & 5 deletions x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-billing-overview.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"panelIndex": "89dccfe8-a25e-44ea-afdb-ff01ab1f05d6",
"panelRefName": "panel_0",
"title": "AWS Account Filter",
"version": "7.5.0"
"version": "7.3.0"
},
{
"embeddableConfig": {
Expand All @@ -48,7 +48,7 @@
"panelIndex": "26670498-b079-4447-bbc8-e4ca8215898c",
"panelRefName": "panel_1",
"title": "Estimated Billing Chart",
"version": "7.5.0"
"version": "7.3.0"
},
{
"embeddableConfig": {
Expand All @@ -64,7 +64,7 @@
"panelIndex": "221aab02-2747-4d84-9dde-028ccd51bdce",
"panelRefName": "panel_2",
"title": "Total Estimated Charges",
"version": "7.5.0"
"version": "7.3.0"
},
{
"embeddableConfig": {
Expand All @@ -80,7 +80,7 @@
"panelIndex": "21e91e6b-0ff0-42ba-9132-6f30c5c6bbb7",
"panelRefName": "panel_3",
"title": "Top 5 Estimated Billing Per Service Name",
"version": "7.5.0"
"version": "7.3.0"
}
],
"timeRestore": false,
Expand Down Expand Up @@ -480,5 +480,5 @@
"version": "WzU2LDFd"
}
],
"version": "7.5.0"
"version": "7.3.0"
}
24 changes: 12 additions & 12 deletions x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-dynamodb-overview.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
"panelIndex": "9642fcd0-464b-46ea-815c-cd2d9efc056d",
"panelRefName": "panel_0",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -42,7 +42,7 @@
},
"panelIndex": "03807c37-c9dc-4b41-80ce-e28a13eb66e2",
"panelRefName": "panel_1",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -55,7 +55,7 @@
},
"panelIndex": "18810035-5e91-409a-98d7-c03166e1f9b3",
"panelRefName": "panel_2",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -68,7 +68,7 @@
},
"panelIndex": "60e6e6e4-3237-430e-80fc-63fe9b718a7e",
"panelRefName": "panel_3",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -81,7 +81,7 @@
},
"panelIndex": "5e5d6509-2889-4383-bef4-9c2da0e759c6",
"panelRefName": "panel_4",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -94,7 +94,7 @@
},
"panelIndex": "2db371a7-20c5-460a-a2f7-06b5b03d7b34",
"panelRefName": "panel_5",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -107,7 +107,7 @@
},
"panelIndex": "1cd72292-ecba-4008-bb3c-e76c7fb6b4f4",
"panelRefName": "panel_6",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -120,7 +120,7 @@
},
"panelIndex": "cea56791-2602-4079-977b-7d088727872c",
"panelRefName": "panel_7",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -133,7 +133,7 @@
},
"panelIndex": "fe509a4d-700b-4092-9aae-ce14e8de103e",
"panelRefName": "panel_8",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -146,7 +146,7 @@
},
"panelIndex": "3d6b1fa0-746f-40ed-8fcc-ae89013f632b",
"panelRefName": "panel_9",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -159,7 +159,7 @@
},
"panelIndex": "0f9a5223-3c63-405c-a5c4-ea15416bad4a",
"panelRefName": "panel_10",
"version": "7.4.0"
"version": "7.3.0"
}
],
"timeRestore": false,
Expand Down Expand Up @@ -1852,5 +1852,5 @@
"version": "WzUxMzMsMV0="
}
],
"version": "7.4.0"
"version": "7.3.0"
}
22 changes: 11 additions & 11 deletions x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-ebs-overview.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"panelIndex": "1",
"panelRefName": "panel_0",
"title": "Volume Write Ops",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -44,7 +44,7 @@
"panelIndex": "2",
"panelRefName": "panel_1",
"title": "Volume Read Ops",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -58,7 +58,7 @@
"panelIndex": "3",
"panelRefName": "panel_2",
"title": "Volume Write Bytes",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -72,7 +72,7 @@
"panelIndex": "4",
"panelRefName": "panel_3",
"title": "Volume Read Bytes",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -86,7 +86,7 @@
"panelIndex": "5",
"panelRefName": "panel_4",
"title": "Volume Queue Length",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -100,7 +100,7 @@
"panelIndex": "6",
"panelRefName": "panel_5",
"title": "Volume Total Write Time",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -114,7 +114,7 @@
"panelIndex": "7",
"panelRefName": "panel_6",
"title": "Volume Total Read Time",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -128,7 +128,7 @@
"panelIndex": "8",
"panelRefName": "panel_7",
"title": "Volume Idle Time",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -142,7 +142,7 @@
"panelIndex": "9",
"panelRefName": "panel_8",
"title": "EBS Volume ID Filter",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -155,7 +155,7 @@
},
"panelIndex": "10",
"panelRefName": "panel_9",
"version": "7.4.0"
"version": "7.3.0"
}
],
"timeRestore": false,
Expand Down Expand Up @@ -916,5 +916,5 @@
"version": "WzU2NTQsN10="
}
],
"version": "7.4.0"
"version": "7.3.0"
}
20 changes: 10 additions & 10 deletions x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-elb-overview.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"panelIndex": "2",
"panelRefName": "panel_0",
"title": "HTTP 5XX Errors",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -44,7 +44,7 @@
"panelIndex": "3",
"panelRefName": "panel_1",
"title": "Request Count",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -58,7 +58,7 @@
"panelIndex": "4",
"panelRefName": "panel_2",
"title": "Unhealthy Host Count",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -72,7 +72,7 @@
"panelIndex": "5",
"panelRefName": "panel_3",
"title": "Healthy Host Count",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -86,7 +86,7 @@
"panelIndex": "6",
"panelRefName": "panel_4",
"title": "Latency in Seconds",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -100,7 +100,7 @@
"panelIndex": "7",
"panelRefName": "panel_5",
"title": "HTTP Backend 4XX Errors",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -114,7 +114,7 @@
"panelIndex": "8",
"panelRefName": "panel_6",
"title": "Backend Connection Errors",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -127,7 +127,7 @@
},
"panelIndex": "9",
"panelRefName": "panel_7",
"version": "7.4.0"
"version": "7.3.0"
},
{
"embeddableConfig": {},
Expand All @@ -141,7 +141,7 @@
"panelIndex": "10",
"panelRefName": "panel_8",
"title": "HTTP Backend 2XX",
"version": "7.4.0"
"version": "7.3.0"
}
],
"timeRestore": false,
Expand Down Expand Up @@ -1006,5 +1006,5 @@
"version": "WzI0MTIsN10="
}
],
"version": "7.4.0"
"version": "7.3.0"
}
Loading