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

[CWS] turn fentry on by default #31630

Merged
merged 2 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 deletions .gitlab/kernel_matrix_testing/security_agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -216,26 +216,6 @@ kmt_run_secagent_tests_x64_ebpfless:
- !reference [.collect_outcomes_kmt]
- !reference [.upload_junit_kmt]

kmt_run_secagent_tests_x64_fentry:
extends:
- .kmt_run_secagent_tests
image: registry.ddbuild.io/ci/datadog-agent-buildimages/system-probe_x64$DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_SYSPROBE_BUILDIMAGES
tags: ["arch:amd64"]
needs:
- kmt_setup_env_secagent_x64
- upload_dependencies_secagent_x64
- upload_secagent_tests_x64
variables:
ARCH: "x86_64"
parallel:
matrix:
- TAG:
- "amazon_2023"
TEST_SET: [cws_fentry]
after_script:
- !reference [.collect_outcomes_kmt]
- !reference [.upload_junit_kmt]

kmt_run_secagent_tests_x64_docker:
extends:
- .kmt_run_secagent_tests
Expand Down Expand Up @@ -350,26 +330,6 @@ kmt_run_secagent_tests_arm64_ebpfless:
- !reference [.collect_outcomes_kmt]
- !reference [.upload_junit_kmt]

kmt_run_secagent_tests_arm64_fentry:
extends:
- .kmt_run_secagent_tests
image: registry.ddbuild.io/ci/datadog-agent-buildimages/system-probe_arm64$DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_SYSPROBE_BUILDIMAGES
tags: ["arch:arm64"]
needs:
- kmt_setup_env_secagent_arm64
- upload_dependencies_secagent_arm64
- upload_secagent_tests_arm64
variables:
ARCH: "arm64"
parallel:
matrix:
- TAG:
- "ubuntu_24.04"
TEST_SET: [cws_fentry]
after_script:
- !reference [.collect_outcomes_kmt]
- !reference [.upload_junit_kmt]

kmt_run_secagent_tests_arm64_docker:
extends:
- .kmt_run_secagent_tests
Expand Down Expand Up @@ -426,7 +386,6 @@ kmt_secagent_tests_join_arm64:
- kmt_run_secagent_tests_arm64
- kmt_run_secagent_tests_arm64_ad
- kmt_run_secagent_tests_arm64_ebpfless
- kmt_run_secagent_tests_arm64_fentry
- kmt_run_secagent_tests_arm64_docker

kmt_secagent_cleanup_arm64:
Expand All @@ -449,7 +408,6 @@ kmt_secagent_tests_join_x64:
- kmt_run_secagent_tests_x64_required
- kmt_run_secagent_tests_x64_ad
- kmt_run_secagent_tests_x64_ebpfless
- kmt_run_secagent_tests_x64_fentry
- kmt_run_secagent_tests_x64_docker

kmt_secagent_cleanup_x64:
Expand Down
6 changes: 3 additions & 3 deletions pkg/config/setup/system_probe.go
Original file line number Diff line number Diff line change
Expand Up @@ -371,9 +371,9 @@ func InitSystemProbeConfig(cfg pkgconfigmodel.Config) {
eventMonitorBindEnvAndSetDefault(cfg, join(evNS, "network.classifier_handle"), 0)
eventMonitorBindEnvAndSetDefault(cfg, join(evNS, "network.raw_classifier_handle"), 0)
eventMonitorBindEnvAndSetDefault(cfg, join(evNS, "event_stream.use_ring_buffer"), true)
eventMonitorBindEnvAndSetDefault(cfg, join(evNS, "event_stream.use_fentry"), false)
eventMonitorBindEnvAndSetDefault(cfg, join(evNS, "event_stream.use_fentry_amd64"), false)
eventMonitorBindEnvAndSetDefault(cfg, join(evNS, "event_stream.use_fentry_arm64"), false)
eventMonitorBindEnvAndSetDefault(cfg, join(evNS, "event_stream.use_fentry"), true)
eventMonitorBindEnv(cfg, join(evNS, "event_stream.use_fentry_amd64"))
eventMonitorBindEnv(cfg, join(evNS, "event_stream.use_fentry_arm64"))
eventMonitorBindEnv(cfg, join(evNS, "event_stream.buffer_size"))
eventMonitorBindEnvAndSetDefault(cfg, join(evNS, "envs_with_value"), []string{"LD_PRELOAD", "LD_LIBRARY_PATH", "PATH", "HISTSIZE", "HISTFILESIZE", "GLIBC_TUNABLES"})
eventMonitorBindEnvAndSetDefault(cfg, join(evNS, "runtime_compilation.enabled"), false)
Expand Down
10 changes: 0 additions & 10 deletions test/new-e2e/system-probe/test-runner/files/cws_fentry.json

This file was deleted.

Loading