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

[Security Solution] adds missing dependency fieldFormats in kibana.jsonc #160445

Merged
merged 4 commits into from Jun 23, 2023
Merged

[Security Solution] adds missing dependency fieldFormats in kibana.jsonc #160445

merged 4 commits into from Jun 23, 2023

Conversation

dhurley14
Copy link
Contributor

@dhurley14 dhurley14 commented Jun 23, 2023 •
edited by kibanamachine

Summary

Adds missing dependency from this PR: #158594

@dhurley14 dhurley14 added review release_note:skip Skip the PR/issue when compiling release notes v8.9.0 v8.10.0 labels Jun 23, 2023
@dhurley14 dhurley14 self-assigned this Jun 23, 2023
@dhurley14 dhurley14 requested a review from a team as a code owner June 23, 2023 18:21
@dhurley14 dhurley14 mentioned this pull request Jun 23, 2023
Open
kqualters-elastic
kqualters-elastic approved these changes Jun 23, 2023
View reviewed changes
Copy link
Contributor

@kqualters-elastic kqualters-elastic left a comment •
edited

Choose a reason for hiding this comment

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

I must have forgot to commit the kibana.jsonc change, I'm sorry. But this also means that DataView types are incorrect, as the DataView is getting created just fine currently in main with fieldFormats as undefined 👍

@dhurley14 dhurley14 enabled auto-merge (squash) June 23, 2023 20:21
rylnd
rylnd approved these changes Jun 23, 2023
View reviewed changes
Copy link
Contributor

@rylnd rylnd left a comment

Choose a reason for hiding this comment

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

LGTM

x-pack/plugins/security_solution/kibana.jsonc
@@ -43,7 +41,7 @@
"files",
"controls",
"savedObjectsManagement",
"stackConnectors",
Copy link
Contributor

Choose a reason for hiding this comment

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

JSONC is the wild west with syntax, apparently 😅

x-pack/plugins/security_solution/public/types.ts
@@ -81,6 +81,15 @@ export interface SetupPlugins {
ml?: MlPluginSetup;
}

/**
* IMPORTANT - PLEASE READ: When adding new plugins to the
Copy link
Contributor

Choose a reason for hiding this comment

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

👍

@kibana-ci
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] Investigations - Security Solution Tests #2 / Detections : Page Filters Alert list is updated when the alerts are updated
  • [job] [logs] Investigations - Security Solution Tests #2 / Detections : Page Filters Impact of inputs should recover from invalide kql Query result

Metrics [docs]

Unknown metric groups

ESLint disabled line counts

id before after diff
enterpriseSearch 14 16 +2
securitySolution 416 420 +4
total +6

Total ESLint disabled count

id before after diff
enterpriseSearch 15 17 +2
securitySolution 497 501 +4
total +6

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @dhurley14

@dhurley14 dhurley14 merged commit 1ee60b0 into elastic:main Jun 23, 2023
26 checks passed
@kibanamachine kibanamachine mentioned this pull request Jun 23, 2023
Merged
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Jun 23, 2023
@dhurley14
[Security Solution] adds missing dependency fieldFormats in kibana.…
cf27a3f 
…jsonc (elastic#160445)

## Summary

Adds missing dependency from this PR:
elastic#158594

(cherry picked from commit 1ee60b0)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
✅ 8.9

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Jun 23, 2023
@kibanamachine @dhurley14
[8.9] [Security Solution] adds missing dependency fieldFormats in k…
3d73573 
…ibana.jsonc (#160445) (#160464)

# Backport

This will backport the following commits from `main` to `8.9`:
- [[Security Solution] adds missing dependency `fieldFormats` in
kibana.jsonc (#160445)](#160445)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Devin W.
Hurley","email":"devin.hurley@elastic.co"},"sourceCommit":{"committedDate":"2023-06-23T21:14:17Z","message":"[Security
Solution] adds missing dependency `fieldFormats` in kibana.jsonc
(#160445)\n\n## Summary\r\n\r\nAdds missing dependency from this
PR:\r\nhttps://github.com//pull/158594","sha":"1ee60b0ba85409aaca28d65dc70956b082e66a7a","branchLabelMapping":{"^v8.10.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["review","release_note:skip","v8.9.0","v8.10.0"],"number":160445,"url":"#160445
Solution] adds missing dependency `fieldFormats` in kibana.jsonc
(#160445)\n\n## Summary\r\n\r\nAdds missing dependency from this
PR:\r\nhttps://github.com//pull/158594","sha":"1ee60b0ba85409aaca28d65dc70956b082e66a7a"}},"sourceBranch":"main","suggestedTargetBranches":["8.9"],"targetPullRequestStates":[{"branch":"8.9","label":"v8.9.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.10.0","labelRegex":"^v8.10.0$","isSourceBranch":true,"state":"MERGED","url":"#160445
Solution] adds missing dependency `fieldFormats` in kibana.jsonc
(#160445)\n\n## Summary\r\n\r\nAdds missing dependency from this
PR:\r\nhttps://github.com//pull/158594","sha":"1ee60b0ba85409aaca28d65dc70956b082e66a7a"}}]}]
BACKPORT-->

Co-authored-by: Devin W. Hurley <devin.hurley@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rylnd rylnd rylnd approved these changes

@kqualters-elastic kqualters-elastic kqualters-elastic approved these changes

Assignees

@dhurley14 dhurley14

Labels
release_note:skip Skip the PR/issue when compiling release notes review v8.9.0 v8.10.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@dhurley14 @kibana-ci @kibanamachine @rylnd @kqualters-elastic