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

[7.x] [Reporting/JobListing] fix user ID for non-security in queries (#75365) #75496

Merged
merged 3 commits into from
Aug 21, 2020
Merged

[7.x] [Reporting/JobListing] fix user ID for non-security in queries (#75365) #75496

merged 3 commits into from
Aug 21, 2020

Conversation

tsullivan
Copy link
Member

Backports the following commits to 7.x:

@tsullivan
[Reporting/JobListing] fix user ID for non-security in queries (elast…
ee1f704 
…ic#75365)

* [Reporting/JobListing] fix user ID for non-security in queries

* fix tests

* add fn api test

* fix ci

* revert TS exploration
# Conflicts:
#	x-pack/scripts/functional_tests.js
#	x-pack/test/reporting_api_integration/reporting_and_security/bwc_existing_indexes.ts
#	x-pack/test/reporting_api_integration/reporting_and_security/bwc_generation_urls.ts
@tsullivan
Copy link
Member Author

tsullivan commented Aug 20, 2020 •
edited
Loading

Failed due to unrelated test CI downtime:

               └- ✖ fail: detection engine api security and spaces enabled update_rules update rules should change other properties when it does updates and effectively delete them such as timeline_title
               │      Error: expected 200 "OK", got 503 "Service Unavailable"

@tsullivan
Copy link
Member Author

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Build metrics

✅ unchanged

History

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

@tsullivan tsullivan merged commit e8d1e9b into elastic:7.x Aug 21, 2020
@tsullivan tsullivan deleted the backport/7.x/pr-75365 branch August 21, 2020 18:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
backport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tsullivan @kibanamachine @elasticmachine