[ES Query] Fix saving ECS group by fields for query DSL rule#203769
Merged
maryam-saeidi merged 7 commits intoelastic:mainfrom Dec 16, 2024
Merged
Conversation
maryam-saeidi
added
release_note:fix
backport:prev-major
ci:project-deploy-observability
Contributor
🤖 GitHub commentsExpand to view the GitHub comments
Just comment with:
|
maryam-saeidi
commented
Dec 12, 2024
| ruleId, | ||
| }); | ||
|
|
||
| expect(resp.hits.hits[0]._source).property('host.name', 'host-0'); |
Member
Author
There was a problem hiding this comment.
This part of the test fails without this fix.
Contributor
There was a problem hiding this comment.
Oh wow. I thought the change would just be to some grouping properties. I guess that termField also has some play in the "extra" properties we create, like host.name.
Member
Author
maryam-saeidi
added
backport:version
Contributor
Flaky Test Runner Stats🟠 Some tests failed. - kibana-flaky-test-suite-runner#7589[✅] x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts: 25/25 tests passed. |
pmuellr
approved these changes
Dec 12, 2024
Contributor
pmuellr
left a comment
pmuellr
left a comment
There was a problem hiding this comment.
LGTM
I'd like to get one more (quick!) set of eyes from ResponseOps though ...
| ruleId, | ||
| }); | ||
|
|
||
| expect(resp.hits.hits[0]._source).property('host.name', 'host-0'); |
Contributor
There was a problem hiding this comment.
Oh wow. I thought the change would just be to some grouping properties. I guess that termField also has some play in the "extra" properties we create, like host.name.
Contributor
Checked with team, LGTU (looks good to us) |
Member
Author
This test failure is not related to the test added in this PR:
|
fkanout
approved these changes
Dec 13, 2024
Contributor
Flaky Test Runner Stats🟠 Some tests failed. - kibana-flaky-test-suite-runner#7594[❌] x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts: 10/25 tests passed. |
Contributor
💚 Build Succeeded
Metrics [docs]
History
|
Contributor
|
Starting backport for target branches: 8.16, 8.17, 8.x https://github.com/elastic/kibana/actions/runs/12348532675 |
Contributor
💔 All backports failed
Manual backportTo create the backport manually run: Questions ?Please refer to the Backport tool documentation |
This was referenced Dec 16, 2024
maryam-saeidi
added a commit
to maryam-saeidi/kibana
that referenced
this pull request
Dec 16, 2024
…#203769) Fixes elastic#203472 ## Summary |Rule|Group info| |---|---| ||| @elastic/response-ops What sort of test do you suggest to add for this case? ### 🧪 How to run test #### Deployment agnostic - [x] Test on MKI ``` // Server node scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts // Test node scripts/functional_test_runner --config=x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts --grep="ElasticSearch query rule" ``` (cherry picked from commit a0fe4e6) # Conflicts: # x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/index.ts
maryam-saeidi
added a commit
to maryam-saeidi/kibana
that referenced
this pull request
Dec 16, 2024
…#203769) Fixes elastic#203472 ## Summary |Rule|Group info| |---|---| ||| @elastic/response-ops What sort of test do you suggest to add for this case? ### 🧪 How to run test #### Deployment agnostic - [x] Test on MKI ``` // Server node scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts // Test node scripts/functional_test_runner --config=x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts --grep="ElasticSearch query rule" ``` (cherry picked from commit a0fe4e6) # Conflicts: # x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/index.ts
Member
Author
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
maryam-saeidi
added a commit
to maryam-saeidi/kibana
that referenced
this pull request
Dec 16, 2024
…#203769) Fixes elastic#203472 ## Summary |Rule|Group info| |---|---| ||| @elastic/response-ops What sort of test do you suggest to add for this case? ### 🧪 How to run test #### Deployment agnostic - [x] Test on MKI ``` // Server node scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts // Test node scripts/functional_test_runner --config=x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts --grep="ElasticSearch query rule" ``` (cherry picked from commit a0fe4e6) # Conflicts: # x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/es_query/query_dsl.ts # x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/es_query_rule.ts # x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/index.ts # x-pack/test_serverless/api_integration/test_suites/observability/es_query_rule/es_query_rule.ts
maryam-saeidi
added a commit
that referenced
this pull request
Dec 16, 2024
…203769) (#204342) # Backport This will backport the following commits from `main` to `8.x`: - [[ES Query] Fix saving ECS group by fields for query DSL rule (#203769)](#203769) <!--- Backport version: 8.9.8 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Maryam Saeidi","email":"maryam.saeidi@elastic.co"},"sourceCommit":{"committedDate":"2024-12-16T08:16:43Z","message":"[ES Query] Fix saving ECS group by fields for query DSL rule (#203769)\n\nFixes #203472\r\n\r\n## Summary\r\n\r\n|Rule|Group info|\r\n|---|---|\r\n\r\n|||\r\n\r\n@elastic/response-ops What sort of test do you suggest to add for this\r\ncase?\r\n\r\n### 🧪 How to run test\r\n\r\n#### Deployment agnostic\r\n- [x] Test on MKI\r\n```\r\n// Server\r\nnode scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\r\n\r\n// Test\r\nnode scripts/functional_test_runner --config=x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts --grep=\"ElasticSearch query rule\"\r\n```","sha":"a0fe4e698a031cb36b9dc0c2f8450561f9ea888e","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","v9.0.0","backport:version","v8.18.0","v8.16.3","v8.17.1"],"number":203769,"url":"https://github.com/elastic/kibana/pull/203769","mergeCommit":{"message":"[ES Query] Fix saving ECS group by fields for query DSL rule (#203769)\n\nFixes #203472\r\n\r\n## Summary\r\n\r\n|Rule|Group info|\r\n|---|---|\r\n\r\n|||\r\n\r\n@elastic/response-ops What sort of test do you suggest to add for this\r\ncase?\r\n\r\n### 🧪 How to run test\r\n\r\n#### Deployment agnostic\r\n- [x] Test on MKI\r\n```\r\n// Server\r\nnode scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\r\n\r\n// Test\r\nnode scripts/functional_test_runner --config=x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts --grep=\"ElasticSearch query rule\"\r\n```","sha":"a0fe4e698a031cb36b9dc0c2f8450561f9ea888e"}},"sourceBranch":"main","suggestedTargetBranches":["8.x","8.16","8.17"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/203769","number":203769,"mergeCommit":{"message":"[ES Query] Fix saving ECS group by fields for query DSL rule (#203769)\n\nFixes #203472\r\n\r\n## Summary\r\n\r\n|Rule|Group info|\r\n|---|---|\r\n\r\n|||\r\n\r\n@elastic/response-ops What sort of test do you suggest to add for this\r\ncase?\r\n\r\n### 🧪 How to run test\r\n\r\n#### Deployment agnostic\r\n- [x] Test on MKI\r\n```\r\n// Server\r\nnode scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\r\n\r\n// Test\r\nnode scripts/functional_test_runner --config=x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts --grep=\"ElasticSearch query rule\"\r\n```","sha":"a0fe4e698a031cb36b9dc0c2f8450561f9ea888e"}},{"branch":"8.x","label":"v8.18.0","labelRegex":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.16","label":"v8.16.3","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.17","label":"v8.17.1","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT-->
maryam-saeidi
added a commit
that referenced
this pull request
Dec 16, 2024
…203769) (#204343) # Backport This will backport the following commits from `main` to `8.17`: - [[ES Query] Fix saving ECS group by fields for query DSL rule (#203769)](#203769) <!--- Backport version: 8.9.8 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Maryam Saeidi","email":"maryam.saeidi@elastic.co"},"sourceCommit":{"committedDate":"2024-12-16T08:16:43Z","message":"[ES Query] Fix saving ECS group by fields for query DSL rule (#203769)\n\nFixes #203472\r\n\r\n## Summary\r\n\r\n|Rule|Group info|\r\n|---|---|\r\n\r\n|||\r\n\r\n@elastic/response-ops What sort of test do you suggest to add for this\r\ncase?\r\n\r\n### 🧪 How to run test\r\n\r\n#### Deployment agnostic\r\n- [x] Test on MKI\r\n```\r\n// Server\r\nnode scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\r\n\r\n// Test\r\nnode scripts/functional_test_runner --config=x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts --grep=\"ElasticSearch query rule\"\r\n```","sha":"a0fe4e698a031cb36b9dc0c2f8450561f9ea888e","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","v9.0.0","backport:version","v8.18.0","v8.16.3","v8.17.1"],"number":203769,"url":"https://github.com/elastic/kibana/pull/203769","mergeCommit":{"message":"[ES Query] Fix saving ECS group by fields for query DSL rule (#203769)\n\nFixes #203472\r\n\r\n## Summary\r\n\r\n|Rule|Group info|\r\n|---|---|\r\n\r\n|||\r\n\r\n@elastic/response-ops What sort of test do you suggest to add for this\r\ncase?\r\n\r\n### 🧪 How to run test\r\n\r\n#### Deployment agnostic\r\n- [x] Test on MKI\r\n```\r\n// Server\r\nnode scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\r\n\r\n// Test\r\nnode scripts/functional_test_runner --config=x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts --grep=\"ElasticSearch query rule\"\r\n```","sha":"a0fe4e698a031cb36b9dc0c2f8450561f9ea888e"}},"sourceBranch":"main","suggestedTargetBranches":["8.x","8.16","8.17"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/203769","number":203769,"mergeCommit":{"message":"[ES Query] Fix saving ECS group by fields for query DSL rule (#203769)\n\nFixes #203472\r\n\r\n## Summary\r\n\r\n|Rule|Group info|\r\n|---|---|\r\n\r\n|||\r\n\r\n@elastic/response-ops What sort of test do you suggest to add for this\r\ncase?\r\n\r\n### 🧪 How to run test\r\n\r\n#### Deployment agnostic\r\n- [x] Test on MKI\r\n```\r\n// Server\r\nnode scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\r\n\r\n// Test\r\nnode scripts/functional_test_runner --config=x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts --grep=\"ElasticSearch query rule\"\r\n```","sha":"a0fe4e698a031cb36b9dc0c2f8450561f9ea888e"}},{"branch":"8.x","label":"v8.18.0","labelRegex":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.16","label":"v8.16.3","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.17","label":"v8.17.1","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT-->
maryam-saeidi
added a commit
that referenced
this pull request
Dec 17, 2024
…203769) (#204345) # Backport This will backport the following commits from `main` to `8.16`: - [[ES Query] Fix saving ECS group by fields for query DSL rule (#203769)](#203769) <!--- Backport version: 8.9.8 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Maryam Saeidi","email":"maryam.saeidi@elastic.co"},"sourceCommit":{"committedDate":"2024-12-16T08:16:43Z","message":"[ES Query] Fix saving ECS group by fields for query DSL rule (#203769)\n\nFixes #203472\r\n\r\n## Summary\r\n\r\n|Rule|Group info|\r\n|---|---|\r\n\r\n|||\r\n\r\n@elastic/response-ops What sort of test do you suggest to add for this\r\ncase?\r\n\r\n### 🧪 How to run test\r\n\r\n#### Deployment agnostic\r\n- [x] Test on MKI\r\n```\r\n// Server\r\nnode scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\r\n\r\n// Test\r\nnode scripts/functional_test_runner --config=x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts --grep=\"ElasticSearch query rule\"\r\n```","sha":"a0fe4e698a031cb36b9dc0c2f8450561f9ea888e","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","v9.0.0","backport:version","v8.18.0","v8.16.3","v8.17.1"],"number":203769,"url":"https://github.com/elastic/kibana/pull/203769","mergeCommit":{"message":"[ES Query] Fix saving ECS group by fields for query DSL rule (#203769)\n\nFixes #203472\r\n\r\n## Summary\r\n\r\n|Rule|Group info|\r\n|---|---|\r\n\r\n|||\r\n\r\n@elastic/response-ops What sort of test do you suggest to add for this\r\ncase?\r\n\r\n### 🧪 How to run test\r\n\r\n#### Deployment agnostic\r\n- [x] Test on MKI\r\n```\r\n// Server\r\nnode scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\r\n\r\n// Test\r\nnode scripts/functional_test_runner --config=x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts --grep=\"ElasticSearch query rule\"\r\n```","sha":"a0fe4e698a031cb36b9dc0c2f8450561f9ea888e"}},"sourceBranch":"main","suggestedTargetBranches":["8.x","8.16","8.17"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/203769","number":203769,"mergeCommit":{"message":"[ES Query] Fix saving ECS group by fields for query DSL rule (#203769)\n\nFixes #203472\r\n\r\n## Summary\r\n\r\n|Rule|Group info|\r\n|---|---|\r\n\r\n|||\r\n\r\n@elastic/response-ops What sort of test do you suggest to add for this\r\ncase?\r\n\r\n### 🧪 How to run test\r\n\r\n#### Deployment agnostic\r\n- [x] Test on MKI\r\n```\r\n// Server\r\nnode scripts/functional_tests_server --config x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts\r\n\r\n// Test\r\nnode scripts/functional_test_runner --config=x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts --grep=\"ElasticSearch query rule\"\r\n```","sha":"a0fe4e698a031cb36b9dc0c2f8450561f9ea888e"}},{"branch":"8.x","label":"v8.18.0","labelRegex":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.16","label":"v8.16.3","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.17","label":"v8.17.1","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}] BACKPORT-->
Contributor
|
This PR didn't make it on time to be in the latest 8.16.2 BC. Updating the labels. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #203472
Summary
@elastic/response-ops What sort of test do you suggest to add for this case?
🧪 How to run test
Deployment agnostic