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

Prefix dashboard IDs with package names #320

Merged
merged 3 commits into from
Oct 20, 2020

Conversation

ycombinator
Copy link
Contributor

What does this PR do?

This PR iterates over all integrations packages and checks if any of their dashboard assets have IDs that do not start with the package's name. If such assets are found, their IDs are fixed to start with the package name and any references to those IDs from other asset files are updated.

Script used to make this change: https://gist.github.com/ycombinator/ff4cd5cd4c1fca6f1ae82a496c02e190

Related issues

@ycombinator ycombinator requested review from mtojek and a team October 20, 2020 14:39
@@ -133,7 +133,7 @@
"title": "[Metrics Linux] Host Services Overview",
"version": 1
},
"id": "system-c431f410-f9ac-11e9-90e8-1fb18e796788",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@fearful-symmetry does this change look right to you?

cc: @urso @andresrc

@elasticmachine
Copy link

elasticmachine commented Oct 20, 2020

💚 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

Expand to view the summary

Build stats

  • Build Cause: [Pull request #320 updated]

  • Start Time: 2020-10-20T15:03:12.503+0000

  • Duration: 15 min 31 sec

Copy link
Contributor

@mtojek mtojek left a comment

Choose a reason for hiding this comment

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

CI build is green. LGTM!

@ycombinator ycombinator merged commit 59ced1a into elastic:master Oct 20, 2020
@ycombinator ycombinator deleted the fix-dashboard-ids branch October 20, 2020 15:23
@@ -8,7 +8,7 @@
"highlightAll": true,
"query": {
"language": "kuery",
"query": ""
"query": "(data_stream.dataset:windows.application OR data_stream.dataset:windows.forwarded OR data_stream.dataset:windows.powershell OR data_stream.dataset:windows.powershell_operational OR data_stream.dataset:windows.security OR data_stream.dataset:windows.sysmon_operational OR data_stream.dataset:windows.system)"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hey @leehinman, @narph, this PR has been merged but I just wanted to double check that this change to the windows package is okay.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think we can drop windows.application & windows.system, those will end up in the system package. This probably means I need to go through and fix up the others as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for checking, @leehinman. Would you mind putting up a PR with the relevant changes (and a package version bump)? That'll let me move forward with elastic/package-storage#495 for now, knowing that we'll end up with another, similar PR after your changes go in.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I guess a better question to ask is: given that this PR is merged and a new version of this package is about to be published to the snapshot package registry (elastic/package-storage#495), is it safe to go ahead with that publish PR that contains the above query?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yep, safe to go ahead.

@@ -121,6 +121,9 @@
"migrationVersion": {
"dashboard": "7.3.0"
},
"namespaces": [
"default"
],
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hey @leehinman, @narph, this PR has been merged but I just wanted to double check that this change to the windows package is okay.

Copy link
Contributor

Choose a reason for hiding this comment

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

LGTM

eyalkraft pushed a commit to build-security/integrations that referenced this pull request Mar 30, 2022
* Prefix dashboard IDs with package names

* Fixing formatting

* Bumping up affected packages' versions
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Prefix dashboard IDs with package names
4 participants