From 0b8f7b508dee6f92cb86214e2b49989284d84dc6 Mon Sep 17 00:00:00 2001 From: Robert Li Date: Mon, 25 Nov 2024 15:16:42 -0500 Subject: [PATCH 1/4] [CODEOWNERS] Update processes to container-intake --- .github/CODEOWNERS | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6d75876625030..d81d684483677 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -218,7 +218,7 @@ /cmd/cws-instrumentation/ @DataDog/agent-security /cmd/dogstatsd/ @DataDog/agent-metrics-logs /cmd/otel-agent/ @DataDog/opentelemetry -/cmd/process-agent/ @DataDog/processes +/cmd/process-agent/ @DataDog/container-intake /cmd/serverless/ @DataDog/serverless @Datadog/serverless-aws /cmd/serverless/dependencies*.txt @DataDog/serverless @DataDog/agent-shared-components /cmd/serverless-init/ @DataDog/serverless @@ -228,12 +228,12 @@ /cmd/system-probe/config/adjust_security.go @DataDog/ebpf-platform @DataDog/agent-security /cmd/system-probe/modules/network_tracer* @DataDog/Networks /cmd/system-probe/modules/oom_kill_probe* @DataDog/container-integrations -/cmd/system-probe/modules/process* @DataDog/processes +/cmd/system-probe/modules/process* @DataDog/container-intake /cmd/system-probe/modules/eventmonitor* @DataDog/agent-security /cmd/system-probe/modules/tcp_queue_tracer* @DataDog/container-integrations /cmd/system-probe/modules/traceroute* @DataDog/network-device-monitoring @Datadog/Networks /cmd/system-probe/modules/ping* @DataDog/ndm-core -/cmd/system-probe/modules/language_detection* @DataDog/processes @DataDog/universal-service-monitoring +/cmd/system-probe/modules/language_detection* @DataDog/container-intake @DataDog/universal-service-monitoring /cmd/system-probe/modules/dynamic_instrumentation* @DataDog/debugger /cmd/system-probe/windows_resources/ @DataDog/windows-kernel-integrations /cmd/system-probe/main_windows*.go @DataDog/windows-kernel-integrations @@ -299,7 +299,7 @@ /comp/netflow @DataDog/ndm-integrations /comp/networkpath @DataDog/Networks @DataDog/network-device-monitoring /comp/otelcol @DataDog/opentelemetry -/comp/process @DataDog/processes +/comp/process @DataDog/container-intake /comp/remote-config @DataDog/remote-config /comp/snmptraps @DataDog/ndm-core /comp/systray @DataDog/windows-agent @@ -387,7 +387,7 @@ /pkg/collector/corechecks/ebpf/c/runtime/ebpf* @DataDog/ebpf-platform /pkg/collector/corechecks/embed/ @Datadog/agent-delivery /pkg/collector/corechecks/embed/apm/ @DataDog/agent-apm -/pkg/collector/corechecks/embed/process/ @DataDog/processes +/pkg/collector/corechecks/embed/process/ @DataDog/container-intake /pkg/collector/corechecks/gpu/ @DataDog/ebpf-platform /pkg/collector/corechecks/network-devices/ @DataDog/ndm-integrations /pkg/collector/corechecks/orchestrator/ @DataDog/container-app @@ -409,7 +409,7 @@ /pkg/config/autodiscovery/ @DataDog/container-integrations @DataDog/container-platform /pkg/config/env @DataDog/container-integrations @DataDog/container-platform /pkg/config/setup @DataDog/agent-shared-components -/pkg/config/setup/process*.go @DataDog/processes +/pkg/config/setup/process*.go @DataDog/container-intake /pkg/config/setup/system_probe.go @DataDog/ebpf-platform /pkg/config/setup/system_probe_cws.go @DataDog/agent-security /pkg/config/setup/system_probe_cws_notwin.go @DataDog/agent-security @@ -433,8 +433,8 @@ /pkg/pidfile/ @DataDog/agent-shared-components /pkg/persistentcache/ @DataDog/agent-metrics-logs /pkg/proto/ @DataDog/agent-shared-components -/pkg/proto/datadog/languagedetection @DataDog/processes -/pkg/proto/datadog/process @DataDog/processes +/pkg/proto/datadog/languagedetection @DataDog/container-intake +/pkg/proto/datadog/process @DataDog/container-intake /pkg/proto/datadog/trace @DataDog/agent-apm /pkg/proto/datadog/workloadmeta @DataDog/container-platform /pkg/remoteconfig/ @DataDog/remote-config @@ -466,7 +466,7 @@ /pkg/util/winutil/ @DataDog/windows-agent /pkg/util/testutil/flake @DataDog/agent-devx-loops /pkg/util/trie @DataDog/container-integrations -/pkg/languagedetection @DataDog/processes @DataDog/universal-service-monitoring +/pkg/languagedetection @DataDog/container-intake @DataDog/universal-service-monitoring /pkg/linters/ @DataDog/agent-devx-loops /pkg/linters/components/ @DataDog/agent-shared-components /pkg/logs/ @DataDog/agent-metrics-logs @@ -480,11 +480,11 @@ /pkg/logs/processor @DataDog/agent-processing-and-routing /pkg/logs/sds @DataDog/agent-processing-and-routing /pkg/logs/sender @DataDog/agent-processing-and-routing -/pkg/process/ @DataDog/processes +/pkg/process/ @DataDog/container-intake /pkg/process/util/address*.go @DataDog/Networks /pkg/process/checks/net*.go @DataDog/Networks -/pkg/process/metadata/parser/ @DataDog/universal-service-monitoring @DataDog/processes @DataDog/Networks -/pkg/process/metadata/parser/*windows* @DataDog/universal-service-monitoring @DataDog/processes @DataDog/Networks @DataDog/windows-kernel-integrations +/pkg/process/metadata/parser/ @DataDog/universal-service-monitoring @DataDog/container-intake @DataDog/Networks +/pkg/process/metadata/parser/*windows* @DataDog/universal-service-monitoring @DataDog/container-intake @DataDog/Networks @DataDog/windows-kernel-integrations /pkg/process/monitor/ @DataDog/universal-service-monitoring /pkg/process/net/ @DataDog/universal-service-monitoring @DataDog/Networks /pkg/process/net/common_windows.go @DataDog/windows-agent @@ -492,7 +492,7 @@ /pkg/proto/pbgo/ # do not notify anyone /pkg/proto/pbgo/trace @DataDog/agent-apm /pkg/proto/pbgo/languagedetection @DataDog/agent-apm -/pkg/proto/pbgo/process @DataDog/processes +/pkg/proto/pbgo/process @DataDog/container-intake /pkg/proto/pbgo/core @DataDog/agent-shared-components /pkg/proto/pbgo/core/remoteconfig.pb.go @DataDog/remote-config /pkg/proto/pbgo/core/remoteconfig_gen.go @DataDog/remote-config @@ -553,7 +553,7 @@ /tasks/unit_tests/update_go_tests.py @DataDog/agent-shared-components /tasks/cluster_agent_cloudfoundry.py @DataDog/platform-integrations /tasks/new_e2e_tests.py @DataDog/agent-e2e-testing @DataDog/agent-devx-loops -/tasks/process_agent.py @DataDog/processes +/tasks/process_agent.py @DataDog/container-intake /tasks/system_probe.py @DataDog/ebpf-platform /tasks/ebpf.py @DataDog/ebpf-platform /tasks/kmt.py @DataDog/ebpf-platform @@ -609,14 +609,14 @@ /test/new-e2e/tests/agent-subcommands @DataDog/agent-shared-components /test/new-e2e/tests/containers @DataDog/container-integrations @DataDog/container-platform /test/new-e2e/tests/discovery @DataDog/universal-service-monitoring -/test/new-e2e/tests/language-detection @DataDog/processes +/test/new-e2e/tests/language-detection @DataDog/container-intake /test/new-e2e/tests/ndm @DataDog/ndm-core /test/new-e2e/tests/ndm/netflow @DataDog/ndm-integrations /test/new-e2e/tests/npm @DataDog/Networks /test/new-e2e/tests/npm/ec2_1host_wkit_test.go @DataDog/Networks @DataDog/windows-kernel-integrations /test/new-e2e/tests/orchestrator @DataDog/container-app /test/new-e2e/tests/otel @DataDog/opentelemetry -/test/new-e2e/tests/process @DataDog/processes +/test/new-e2e/tests/process @DataDog/container-intake /test/new-e2e/tests/sysprobe-functional @DataDog/windows-kernel-integrations /test/new-e2e/tests/security-agent-functional @DataDog/windows-kernel-integrations @DataDog/agent-security /test/new-e2e/tests/cws @DataDog/agent-security From ad212e5351d1bdf7cfbc27a02cd2d2e93ce7b4b4 Mon Sep 17 00:00:00 2001 From: Robert Li Date: Mon, 25 Nov 2024 15:24:48 -0500 Subject: [PATCH 2/4] Update team metadata --- .ddqa/config.toml | 6 +++--- tasks/libs/pipeline/github_jira_map.yaml | 2 +- tasks/libs/pipeline/github_slack_map.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ddqa/config.toml b/.ddqa/config.toml index eac6d757e5282..60c08e3737b16 100644 --- a/.ddqa/config.toml +++ b/.ddqa/config.toml @@ -176,12 +176,12 @@ jira_statuses = ["To Do", "In Progress", "Done"] github_team = "agent-cspm" github_labels = ["team/agent-cspm"] -[teams."Processes"] +[teams."Container Intake"] jira_project = "PROCS" jira_issue_type = "Task" jira_statuses = ["TRIAGE", "In Progress", "Done"] -github_team = "processes" -github_labels = ["team/processes"] +github_team = "container-intake" +github_labels = ["team/container-intake"] [teams."Windows Agent"] jira_project = "WINA" diff --git a/tasks/libs/pipeline/github_jira_map.yaml b/tasks/libs/pipeline/github_jira_map.yaml index d3262de27a247..c91198595a28f 100644 --- a/tasks/libs/pipeline/github_jira_map.yaml +++ b/tasks/libs/pipeline/github_jira_map.yaml @@ -12,7 +12,7 @@ '@datadog/network-device-monitoring': NDMII '@datadog/ndm-core': NDMII '@datadog/ndm-integrations': NDINT -'@datadog/processes': PROCS +'@datadog/container-intake': PROCS '@datadog/agent-metrics-logs': AMLII '@datadog/agent-shared-components': ASCII '@datadog/container-app': CAP diff --git a/tasks/libs/pipeline/github_slack_map.yaml b/tasks/libs/pipeline/github_slack_map.yaml index 4e83262868150..d932ed5e96596 100644 --- a/tasks/libs/pipeline/github_slack_map.yaml +++ b/tasks/libs/pipeline/github_slack_map.yaml @@ -14,7 +14,7 @@ '@datadog/network-device-monitoring': '#network-device-monitoring' '@datadog/ndm-core': '#ndm-core' '@datadog/ndm-integrations': '#ndm-integrations' -'@datadog/processes': '#process-agent-ops' +'@datadog/container-intake': '#process-agent-ops' '@datadog/agent-metrics-logs': '#agent-metrics-logs' '@datadog/agent-processing-and-routing': '#agent-processing-and-routing' '@datadog/agent-shared-components': '#agent-shared-components-ops' From 8cefac63d06e9467fcf617de26e212e13829757e Mon Sep 17 00:00:00 2001 From: Robert Li Date: Mon, 25 Nov 2024 15:47:39 -0500 Subject: [PATCH 3/4] Update comp/process ownership --- comp/README.md | 2 +- comp/process/agent/component.go | 2 +- comp/process/apiserver/component.go | 2 +- comp/process/bundle.go | 2 +- comp/process/connectionscheck/component.go | 2 +- comp/process/containercheck/component.go | 2 +- comp/process/expvars/component.go | 2 +- comp/process/forwarders/component.go | 2 +- comp/process/hostinfo/component.go | 2 +- comp/process/processcheck/component.go | 2 +- comp/process/processdiscoverycheck/component.go | 2 +- comp/process/processeventscheck/component.go | 2 +- comp/process/profiler/component.go | 2 +- comp/process/rtcontainercheck/component.go | 2 +- comp/process/runner/component.go | 2 +- comp/process/status/component.go | 2 +- comp/process/submitter/component.go | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/comp/README.md b/comp/README.md index d9c2cf8ab27d4..f011bc57fe71d 100644 --- a/comp/README.md +++ b/comp/README.md @@ -392,7 +392,7 @@ Package logsagentpipeline contains logs agent pipeline component ## [comp/process](https://pkg.go.dev/github.com/DataDog/datadog-agent/comp/process) (Component Bundle) -*Datadog Team*: processes +*Datadog Team*: container-intake Package process implements the "process" bundle, providing components for the Process Agent diff --git a/comp/process/agent/component.go b/comp/process/agent/component.go index ecf92e3a5dfcc..1ac87a05c2dbc 100644 --- a/comp/process/agent/component.go +++ b/comp/process/agent/component.go @@ -6,7 +6,7 @@ // Package agent contains a process-agent component package agent -// team: processes +// team: container-intake // Component is the process agent component type type Component interface { diff --git a/comp/process/apiserver/component.go b/comp/process/apiserver/component.go index 112bf88bf9a80..81d857325094f 100644 --- a/comp/process/apiserver/component.go +++ b/comp/process/apiserver/component.go @@ -12,7 +12,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/fxutil" ) -// team: processes +// team: container-intake //nolint:revive // TODO(PROC) Fix revive linter type Component interface { diff --git a/comp/process/bundle.go b/comp/process/bundle.go index 73a8d9b7f5e81..96802180c2cce 100644 --- a/comp/process/bundle.go +++ b/comp/process/bundle.go @@ -29,7 +29,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/fxutil" ) -// team: processes +// team: container-intake // Bundle defines the fx options for this bundle. // Do not add modules not owned by the processes team here as it breaks fx best practices diff --git a/comp/process/connectionscheck/component.go b/comp/process/connectionscheck/component.go index 4f55a013d2a26..115312673119c 100644 --- a/comp/process/connectionscheck/component.go +++ b/comp/process/connectionscheck/component.go @@ -10,7 +10,7 @@ import ( "github.com/DataDog/datadog-agent/comp/process/types" ) -// team: processes +// team: container-intake //nolint:revive // TODO(PROC) Fix revive linter type Component interface { diff --git a/comp/process/containercheck/component.go b/comp/process/containercheck/component.go index 1fb5fa971c2df..0ff531c383215 100644 --- a/comp/process/containercheck/component.go +++ b/comp/process/containercheck/component.go @@ -10,7 +10,7 @@ import ( "github.com/DataDog/datadog-agent/comp/process/types" ) -// team: processes +// team: container-intake //nolint:revive // TODO(PROC) Fix revive linter type Component interface { diff --git a/comp/process/expvars/component.go b/comp/process/expvars/component.go index 542185936de3f..5297f4bb1dea2 100644 --- a/comp/process/expvars/component.go +++ b/comp/process/expvars/component.go @@ -6,7 +6,7 @@ // Package expvars initializes the expvar server of the process agent. package expvars -// team: processes +// team: container-intake //nolint:revive // TODO(PROC) Fix revive linter type Component interface { diff --git a/comp/process/forwarders/component.go b/comp/process/forwarders/component.go index 3d4cc9aa693ac..bcfdf5623f87e 100644 --- a/comp/process/forwarders/component.go +++ b/comp/process/forwarders/component.go @@ -10,7 +10,7 @@ import ( "github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder" ) -// team: processes +// team: container-intake //nolint:revive // TODO(PROC) Fix revive linter type Component interface { diff --git a/comp/process/hostinfo/component.go b/comp/process/hostinfo/component.go index df8e2d309ceb2..9cf8d7aa69b9a 100644 --- a/comp/process/hostinfo/component.go +++ b/comp/process/hostinfo/component.go @@ -10,7 +10,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/process/checks" ) -// team: processes +// team: container-intake //nolint:revive // TODO(PROC) Fix revive linter type Component interface { diff --git a/comp/process/processcheck/component.go b/comp/process/processcheck/component.go index fe7f2b848267f..b80668be29188 100644 --- a/comp/process/processcheck/component.go +++ b/comp/process/processcheck/component.go @@ -10,7 +10,7 @@ import ( "github.com/DataDog/datadog-agent/comp/process/types" ) -// team: processes +// team: container-intake //nolint:revive // TODO(PROC) Fix revive linter type Component interface { diff --git a/comp/process/processdiscoverycheck/component.go b/comp/process/processdiscoverycheck/component.go index 35c275ff7a58c..127c0273b0e2f 100644 --- a/comp/process/processdiscoverycheck/component.go +++ b/comp/process/processdiscoverycheck/component.go @@ -10,7 +10,7 @@ import ( "github.com/DataDog/datadog-agent/comp/process/types" ) -// team: processes +// team: container-intake //nolint:revive // TODO(PROC) Fix revive linter type Component interface { diff --git a/comp/process/processeventscheck/component.go b/comp/process/processeventscheck/component.go index 4b0d127049ca2..9e6835057b513 100644 --- a/comp/process/processeventscheck/component.go +++ b/comp/process/processeventscheck/component.go @@ -10,7 +10,7 @@ import ( "github.com/DataDog/datadog-agent/comp/process/types" ) -// team: processes +// team: container-intake //nolint:revive // TODO(PROC) Fix revive linter type Component interface { diff --git a/comp/process/profiler/component.go b/comp/process/profiler/component.go index 5f920f3f627af..5e89705a1cc80 100644 --- a/comp/process/profiler/component.go +++ b/comp/process/profiler/component.go @@ -6,7 +6,7 @@ // Package profiler implements a component to handle starting and stopping the internal profiler. package profiler -// team: processes +// team: container-intake //nolint:revive // TODO(PROC) Fix revive linter type Component interface { diff --git a/comp/process/rtcontainercheck/component.go b/comp/process/rtcontainercheck/component.go index d313aa8359888..3d3f73c9a2b80 100644 --- a/comp/process/rtcontainercheck/component.go +++ b/comp/process/rtcontainercheck/component.go @@ -10,7 +10,7 @@ import ( "github.com/DataDog/datadog-agent/comp/process/types" ) -// team: processes +// team: container-intake //nolint:revive // TODO(PROC) Fix revive linter type Component interface { diff --git a/comp/process/runner/component.go b/comp/process/runner/component.go index 598ddf3065ce1..e818cfc388267 100644 --- a/comp/process/runner/component.go +++ b/comp/process/runner/component.go @@ -11,7 +11,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/process/checks" ) -// team: processes +// team: container-intake // Component is the component type. type Component interface { diff --git a/comp/process/status/component.go b/comp/process/status/component.go index d08f20625b8ea..45fa3ff571d16 100644 --- a/comp/process/status/component.go +++ b/comp/process/status/component.go @@ -6,7 +6,7 @@ // Package status implements the core status component information provider interface package status -// team: processes +// team: container-intake // Component is the status interface. type Component interface { diff --git a/comp/process/submitter/component.go b/comp/process/submitter/component.go index 07359f6a2c306..26a88c6106017 100644 --- a/comp/process/submitter/component.go +++ b/comp/process/submitter/component.go @@ -11,7 +11,7 @@ import ( processRunner "github.com/DataDog/datadog-agent/pkg/process/runner" ) -// team: processes +// team: container-intake // Component is the component type. type Component interface { From 3f4f026c08042947b2a53c5db67c5229356fd1b1 Mon Sep 17 00:00:00 2001 From: Robert Li Date: Wed, 11 Dec 2024 14:01:06 -0500 Subject: [PATCH 4/4] Update PROCS Jira key to CTK --- .ddqa/config.toml | 2 +- tasks/libs/pipeline/github_jira_map.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ddqa/config.toml b/.ddqa/config.toml index 2928e2818af4f..bcb6804917e41 100644 --- a/.ddqa/config.toml +++ b/.ddqa/config.toml @@ -177,7 +177,7 @@ github_team = "agent-cspm" github_labels = ["team/agent-cspm"] [teams."Container Intake"] -jira_project = "PROCS" +jira_project = "CTK" jira_issue_type = "Task" jira_statuses = ["TRIAGE", "In Progress", "Done"] github_team = "container-intake" diff --git a/tasks/libs/pipeline/github_jira_map.yaml b/tasks/libs/pipeline/github_jira_map.yaml index c91198595a28f..d4bf1aefe502e 100644 --- a/tasks/libs/pipeline/github_jira_map.yaml +++ b/tasks/libs/pipeline/github_jira_map.yaml @@ -12,7 +12,7 @@ '@datadog/network-device-monitoring': NDMII '@datadog/ndm-core': NDMII '@datadog/ndm-integrations': NDINT -'@datadog/container-intake': PROCS +'@datadog/container-intake': CTK '@datadog/agent-metrics-logs': AMLII '@datadog/agent-shared-components': ASCII '@datadog/container-app': CAP