Skip to content

[7.15](backport #27553) Follow up changes in dashboards in mage check && fix minor issue#27637

Merged
kvch merged 1 commit into7.15from
mergify/bp/7.15/pr-27553
Aug 31, 2021
Merged

[7.15](backport #27553) Follow up changes in dashboards in mage check && fix minor issue#27637
kvch merged 1 commit into7.15from
mergify/bp/7.15/pr-27553

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Aug 30, 2021

This is an automatic backport of pull request #27553 done by Mergify.

@mergify mergify bot requested a review from a team as a code owner August 30, 2021 06:23
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 30, 2021
@mergify mergify bot assigned kvch Aug 30, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 30, 2021
@botelastic
Copy link
Copy Markdown

botelastic bot commented Aug 30, 2021

This pull request doesn't have a Team:<team> label.

)

This PR follows up the missing dashboard checks in `mage check`. It also addresses a minor dashboard decoding issue in `-decode` flag of `export dashboard`.

Furthermore, assets from the Saved Objects API are separated into different JSON files. We went back to JSONs to make it more developer-friendly. By sticking with the more human-readable JSONs it helps people to review changes a bit better.

When exporting dashboards I suggest you use the `-folder` flag. You have to specify a root folder e.g. a module name and the Beat/exporter will create a `{foldername}/_meta/kibana/7` folder for you. The assets will be separated into different directories and the name of them will be the ID of the asset.

```sh
$ ./filebeat export dashboard --id Metricbeat-host-overview --folder system
$ tree metricbeat/module/system/_meta/kibana/7
metricbeat/module/system/_meta/kibana/7
├── dashboard
│   ├── 79ffd6e0-faa0-11e6-947f-177f697178b8-ecs.json
│   ├── c431f410-f9ac-11e9-90e8-1fb18e796788.json
│   ├── CPU-slash-Memory-per-container-ecs.json
│   └── Metricbeat-system-overview-ecs.json
└── visualization
    ├── 089b85d0-1b16-11e7-b09e-037021c4f8df-ecs.json
    ├── 19e123b0-4d5a-11e7-aee5-fdc812cc3bec-ecs.json
    ├── 1aae9140-1b93-11e7-8ada-3df93aab833e-ecs.json
    ├── 26732e20-1b91-11e7-bec4-a5e9ec5cab8b-ecs.json
    ├── 2e224660-1b19-11e7-b09e-037021c4f8df-ecs.json
    ├── 34f97ee0-1b96-11e7-8ada-3df93aab833e-ecs.json
    ├── 3d65d450-a9c3-11e7-af20-67db8aecb295-ecs.json
    ├── 4b254630-f998-11e9-90e8-1fb18e796788.json
    ├── 4d546850-1b15-11e7-b09e-037021c4f8df-ecs.json
    ├── 4e4bb1e0-1b1b-11e7-b09e-037021c4f8df-ecs.json
    ├── 522ee670-1b92-11e7-bec4-a5e9ec5cab8b-ecs.json
    ├── 590a60f0-5d87-11e7-8884-1bb4c3b890e4-ecs.json
    ├── 6b7b9a40-faa1-11e6-86b1-cd7735ff7e23-ecs.json
    ├── 7cdb1330-4d1a-11e7-a196-69b9a7a020a9-ecs.json
    ├── 825fdb80-4d1d-11e7-b5f2-2b7c1895bf32-ecs.json
    ├── 83e12df0-1b91-11e7-bec4-a5e9ec5cab8b-ecs.json
    ├── 855899e0-1b1c-11e7-b09e-037021c4f8df-ecs.json
    ├── 8c071e20-f999-11e9-90e8-1fb18e796788.json
    ├── 96976150-4d5d-11e7-aa29-87a97a796de6-ecs.json
    ├── 99381c80-4d60-11e7-9a4c-ed99bbcaa42b-ecs.json
    ├── 9c69cad0-f9b0-11e9-90e8-1fb18e796788.json
    ├── a30871f0-f98f-11e9-90e8-1fb18e796788.json
    ├── ab2d1e90-1b1a-11e7-b09e-037021c4f8df-ecs.json
    ├── bb3a8720-f991-11e9-90e8-1fb18e796788.json
    ├── bfa5e400-1b16-11e7-b09e-037021c4f8df-ecs.json
    ├── c5e3cf90-4d60-11e7-9a4c-ed99bbcaa42b-ecs.json
    ├── c6f2ffd0-4d17-11e7-a196-69b9a7a020a9-ecs.json
    ├── Container-Block-IO-ecs.json
    ├── Container-CPU-usage-ecs.json
    ├── Container-Memory-stats-ecs.json
    ├── d2e80340-4d5c-11e7-aa29-87a97a796de6-ecs.json
    ├── d3166e80-1b91-11e7-bec4-a5e9ec5cab8b-ecs.json
    ├── d3f51850-f9b6-11e9-90e8-1fb18e796788.json
    ├── e0f001c0-1b18-11e7-b09e-037021c4f8df-ecs.json
    ├── e6e639e0-f992-11e9-90e8-1fb18e796788.json
    ├── fe064790-1b1f-11e7-bec4-a5e9ec5cab8b-ecs.json
    └── System-Navigation-ecs.json
```

It adds extra checks that make sure dashboards are formatted correctly.

It also makes dashboard  exporting more developer friendly.

(cherry picked from commit c017771)
@kvch kvch force-pushed the mergify/bp/7.15/pr-27553 branch from fec48c0 to a4c172c Compare August 30, 2021 06:41
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Aug 30, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-08-31T10:39:23.801+0000

  • Duration: 170 min 59 sec

  • Commit: a4c172c

Test stats 🧪

Test Results
Failed 0
Passed 52982
Skipped 5268
Total 58250

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 52982
Skipped 5268
Total 58250

@kvch
Copy link
Copy Markdown
Contributor

kvch commented Aug 31, 2021

jenkins run tests

1 similar comment
@kvch
Copy link
Copy Markdown
Contributor

kvch commented Aug 31, 2021

jenkins run tests

@bmorelli25
Copy link
Copy Markdown
Member

@elasticmachine, run elasticsearch-ci/docs

@kvch kvch merged commit 39b52fd into 7.15 Aug 31, 2021
@mergify mergify bot deleted the mergify/bp/7.15/pr-27553 branch August 31, 2021 16:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants