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

[D4C] added orchestrator/cloud/container/process fields to prebuilt rules telemetry #157524

Merged
merged 9 commits into from
May 17, 2023

Conversation

mitodrummer
Copy link
Contributor

@mitodrummer mitodrummer commented May 12, 2023

Summary

Adds the following list of fields to the prebuilt_rules_alerts.ts telemetry whitelist.

Field Example
orchestrator.namespace default
orchestrator.resource.parent.type 'DaemonSet', 'ReplicaSet' etc...
orchestrator.resource.type pod
container.id nginx_1
container.image.name nginx
container.image.tag latest
cloud.availability_zone us-east-1c
cloud.provider aws
cloud.region 'us-east-1'
cloud_defend.matched_selectors ['interactiveSessions']
cloud_defend.package_policy_id '4c9cbba0-c812-11ed-a8dd-91ec403e4f03'
cloud_defend.package_policy_revision 2
cloud_defend.hook_point ['tracepoint__sched_process_fork','tracepoint__sched_process_exec', 'kprobe__taskstats_exit']
process.entry_leader:* Contains many of the same fields as process.*
process.session_leader:* Contains many of the same fields as process.*
process.interactive true/false
process.start date
process.end date
process.exit_code 0

@mitodrummer mitodrummer added backport:prev-minor Backport to (9.0) the previous minor version (i.e. one version back from main) Team: Cloud Native Integrations v8.8.0 labels May 12, 2023
@mitodrummer mitodrummer requested a review from norrietaylor May 12, 2023 17:02
@mitodrummer mitodrummer requested a review from a team as a code owner May 12, 2023 17:02
@mitodrummer mitodrummer added the release_note:skip Skip the PR/issue when compiling release notes label May 12, 2023
@mitodrummer mitodrummer requested a review from donaherc May 12, 2023 17:05
@imays11
Copy link
Contributor

imays11 commented May 15, 2023

Can we also add:
process.session_leader.*
process.interactive

@pjhampton pjhampton added v8.8.1 and removed v8.8.0 labels May 17, 2023
Copy link
Contributor

@pjhampton pjhampton left a comment

Choose a reason for hiding this comment

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

🌔 🚀 ✨ LGTM ✨ 🚀 🌔

Will release an OOB Kibana artifact tomorrow.

@pjhampton pjhampton enabled auto-merge (squash) May 17, 2023 16:41
@kibana-ci
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] Security Solution Tests #1 / Alerts cell actions Add to timeline "after each" hook for "should add a non-empty property to default timeline"
  • [job] [logs] Security Solution Tests #1 / Alerts cell actions Add to timeline should add a non-empty property to default timeline
  • [job] [logs] Security Solution Tests #1 / Alerts cell actions Copy to clipboard "after each" hook for "should copy to clipboard"
  • [job] [logs] Security Solution Tests #1 / Alerts cell actions Copy to clipboard should copy to clipboard
  • [job] [logs] Security Solution Tests #1 / Alerts cell actions Filter "after each" hook for "should filter out an empty property"
  • [job] [logs] Security Solution Tests #1 / Alerts cell actions Show Top N "after each" hook for "should show top for a property"
  • [job] [logs] Security Solution Tests #1 / Alerts cell actions Show Top N should show top for a property

Metrics [docs]

Unknown metric groups

ESLint disabled line counts

id before after diff
enterpriseSearch 19 21 +2
securitySolution 400 404 +4
total +6

Total ESLint disabled count

id before after diff
enterpriseSearch 20 22 +2
securitySolution 480 484 +4
total +6

History

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

@pjhampton pjhampton merged commit 19b9a1d into elastic:main May 17, 2023
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request May 17, 2023
…ules telemetry (elastic#157524)

## Summary

Adds the following list of fields to the prebuilt_rules_alerts.ts
telemetry whitelist.

| Field | Example |
| ----- | --------- |
orchestrator.namespace | default
orchestrator.resource.parent.type | 'DaemonSet', 'ReplicaSet' etc...
orchestrator.resource.type | pod
container.id | nginx_1
container.image.name | nginx
container.image.tag | latest
cloud.availability_zone | us-east-1c
cloud.provider | aws
cloud.region | 'us-east-1'
cloud_defend.matched_selectors | ['interactiveSessions']
cloud_defend.package_policy_id | '4c9cbba0-c812-11ed-a8dd-91ec403e4f03'
cloud_defend.package_policy_revision | 2
cloud_defend.hook_point |
['tracepoint__sched_process_fork','tracepoint__sched_process_exec',
'kprobe__taskstats_exit']
process.entry_leader:* | Contains many of the same fields as process.* |
process.session_leader:* | Contains many of the same fields as process.*
|
process.interactive | true/false |
process.start | date |
process.end | date |
process.exit_code | 0 |

---------

Co-authored-by: Pete Hampton <pjhampton@users.noreply.github.com>
(cherry picked from commit 19b9a1d)
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.8

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 May 18, 2023
…uilt rules telemetry (#157524) (#158040)

# Backport

This will backport the following commits from `main` to `8.8`:
- [[D4C] added orchestrator/cloud/container/process fields to prebuilt
rules telemetry
(#157524)](#157524)

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

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

<!--BACKPORT [{"author":{"name":"Karl
Godard","email":"karl.godard@elastic.co"},"sourceCommit":{"committedDate":"2023-05-17T22:42:31Z","message":"[D4C]
added orchestrator/cloud/container/process fields to prebuilt rules
telemetry (#157524)\n\n## Summary\r\n\r\nAdds the following list of
fields to the prebuilt_rules_alerts.ts\r\ntelemetry whitelist.\r\n\r\n|
Field | Example |\r\n| ----- | --------- |\r\norchestrator.namespace |
default\r\norchestrator.resource.parent.type | 'DaemonSet', 'ReplicaSet'
etc...\r\norchestrator.resource.type | pod\r\ncontainer.id |
nginx_1\r\ncontainer.image.name | nginx\r\ncontainer.image.tag |
latest\r\ncloud.availability_zone | us-east-1c\r\ncloud.provider |
aws\r\ncloud.region | 'us-east-1'\r\ncloud_defend.matched_selectors |
['interactiveSessions']\r\ncloud_defend.package_policy_id |
'4c9cbba0-c812-11ed-a8dd-91ec403e4f03'\r\ncloud_defend.package_policy_revision
| 2\r\ncloud_defend.hook_point
|\r\n['tracepoint__sched_process_fork','tracepoint__sched_process_exec',\r\n'kprobe__taskstats_exit']\r\nprocess.entry_leader:*
| Contains many of the same fields as process.*
|\r\nprocess.session_leader:* | Contains many of the same fields as
process.*\r\n|\r\nprocess.interactive | true/false |\r\nprocess.start |
date |\r\nprocess.end | date |\r\nprocess.exit_code | 0
|\r\n\r\n---------\r\n\r\nCo-authored-by: Pete Hampton
<pjhampton@users.noreply.github.com>","sha":"19b9a1d1259fe124640ed9152212e3c761b82631","branchLabelMapping":{"^v8.9.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","backport:prev-minor","Team:
Cloud Native
Integrations","v8.9.0","v8.8.1"],"number":157524,"url":"https://github.com/elastic/kibana/pull/157524","mergeCommit":{"message":"[D4C]
added orchestrator/cloud/container/process fields to prebuilt rules
telemetry (#157524)\n\n## Summary\r\n\r\nAdds the following list of
fields to the prebuilt_rules_alerts.ts\r\ntelemetry whitelist.\r\n\r\n|
Field | Example |\r\n| ----- | --------- |\r\norchestrator.namespace |
default\r\norchestrator.resource.parent.type | 'DaemonSet', 'ReplicaSet'
etc...\r\norchestrator.resource.type | pod\r\ncontainer.id |
nginx_1\r\ncontainer.image.name | nginx\r\ncontainer.image.tag |
latest\r\ncloud.availability_zone | us-east-1c\r\ncloud.provider |
aws\r\ncloud.region | 'us-east-1'\r\ncloud_defend.matched_selectors |
['interactiveSessions']\r\ncloud_defend.package_policy_id |
'4c9cbba0-c812-11ed-a8dd-91ec403e4f03'\r\ncloud_defend.package_policy_revision
| 2\r\ncloud_defend.hook_point
|\r\n['tracepoint__sched_process_fork','tracepoint__sched_process_exec',\r\n'kprobe__taskstats_exit']\r\nprocess.entry_leader:*
| Contains many of the same fields as process.*
|\r\nprocess.session_leader:* | Contains many of the same fields as
process.*\r\n|\r\nprocess.interactive | true/false |\r\nprocess.start |
date |\r\nprocess.end | date |\r\nprocess.exit_code | 0
|\r\n\r\n---------\r\n\r\nCo-authored-by: Pete Hampton
<pjhampton@users.noreply.github.com>","sha":"19b9a1d1259fe124640ed9152212e3c761b82631"}},"sourceBranch":"main","suggestedTargetBranches":["8.8"],"targetPullRequestStates":[{"branch":"main","label":"v8.9.0","labelRegex":"^v8.9.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/157524","number":157524,"mergeCommit":{"message":"[D4C]
added orchestrator/cloud/container/process fields to prebuilt rules
telemetry (#157524)\n\n## Summary\r\n\r\nAdds the following list of
fields to the prebuilt_rules_alerts.ts\r\ntelemetry whitelist.\r\n\r\n|
Field | Example |\r\n| ----- | --------- |\r\norchestrator.namespace |
default\r\norchestrator.resource.parent.type | 'DaemonSet', 'ReplicaSet'
etc...\r\norchestrator.resource.type | pod\r\ncontainer.id |
nginx_1\r\ncontainer.image.name | nginx\r\ncontainer.image.tag |
latest\r\ncloud.availability_zone | us-east-1c\r\ncloud.provider |
aws\r\ncloud.region | 'us-east-1'\r\ncloud_defend.matched_selectors |
['interactiveSessions']\r\ncloud_defend.package_policy_id |
'4c9cbba0-c812-11ed-a8dd-91ec403e4f03'\r\ncloud_defend.package_policy_revision
| 2\r\ncloud_defend.hook_point
|\r\n['tracepoint__sched_process_fork','tracepoint__sched_process_exec',\r\n'kprobe__taskstats_exit']\r\nprocess.entry_leader:*
| Contains many of the same fields as process.*
|\r\nprocess.session_leader:* | Contains many of the same fields as
process.*\r\n|\r\nprocess.interactive | true/false |\r\nprocess.start |
date |\r\nprocess.end | date |\r\nprocess.exit_code | 0
|\r\n\r\n---------\r\n\r\nCo-authored-by: Pete Hampton
<pjhampton@users.noreply.github.com>","sha":"19b9a1d1259fe124640ed9152212e3c761b82631"}},{"branch":"8.8","label":"v8.8.1","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Karl Godard <karl.godard@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:prev-minor Backport to (9.0) the previous minor version (i.e. one version back from main) release_note:skip Skip the PR/issue when compiling release notes v8.8.0 v8.8.1 v8.9.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants