From f35b4c7ce5fa89c0c7ef5a9378228c0007d9c8ad Mon Sep 17 00:00:00 2001 From: Michael Wolf Date: Wed, 17 Jan 2024 14:47:01 -0800 Subject: [PATCH] Rework directory structure --- .../add_session_metadata/add_session_metadata.go | 9 ++------- .../add_session_metadata_test.go | 4 ++-- .../{pkg => }/processdb/db.go | 2 ++ .../{pkg => }/processdb/db_test.go | 0 .../{pkg => }/processdb/entry_leader_test.go | 2 +- .../{pkg => }/processdb/simple.go | 4 ++-- .../{pkg => }/processdb/simple_test.go | 2 +- .../{pkg => }/procfs/mock.go | 0 .../{pkg => }/procfs/procfs.go | 16 ++++++++-------- .../provider/ebpf_provider/ebpf_provider.go | 2 +- .../{pkg => }/timeutils/time.go | 0 .../{pkg => }/timeutils/time_test.go | 0 12 files changed, 19 insertions(+), 22 deletions(-) rename x-pack/auditbeat/processors/add_session_metadata/{pkg => }/processdb/db.go (99%) rename x-pack/auditbeat/processors/add_session_metadata/{pkg => }/processdb/db_test.go (100%) rename x-pack/auditbeat/processors/add_session_metadata/{pkg => }/processdb/entry_leader_test.go (99%) rename x-pack/auditbeat/processors/add_session_metadata/{pkg => }/processdb/simple.go (99%) rename x-pack/auditbeat/processors/add_session_metadata/{pkg => }/processdb/simple_test.go (99%) rename x-pack/auditbeat/processors/add_session_metadata/{pkg => }/procfs/mock.go (100%) rename x-pack/auditbeat/processors/add_session_metadata/{pkg => }/procfs/procfs.go (94%) rename x-pack/auditbeat/processors/add_session_metadata/{pkg => }/timeutils/time.go (100%) rename x-pack/auditbeat/processors/add_session_metadata/{pkg => }/timeutils/time_test.go (100%) diff --git a/x-pack/auditbeat/processors/add_session_metadata/add_session_metadata.go b/x-pack/auditbeat/processors/add_session_metadata/add_session_metadata.go index 57d245d6f656..a9d333b3ce37 100644 --- a/x-pack/auditbeat/processors/add_session_metadata/add_session_metadata.go +++ b/x-pack/auditbeat/processors/add_session_metadata/add_session_metadata.go @@ -13,10 +13,8 @@ import ( "github.com/elastic/elastic-agent-libs/mapstr" - "github.com/elastic/elastic-agent-libs/monitoring" - - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/pkg/processdb" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/pkg/procfs" + "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/processdb" + "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/procfs" "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/provider" "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/provider/ebpf_provider" @@ -31,11 +29,8 @@ const ( logName = "processor." + processorName ) -var reg *monitoring.Registry - func init() { processors.RegisterPlugin(processorName, New) - reg = monitoring.Default.NewRegistry(logName, monitoring.DoNotReport) } type addSessionMetadata struct { diff --git a/x-pack/auditbeat/processors/add_session_metadata/add_session_metadata_test.go b/x-pack/auditbeat/processors/add_session_metadata/add_session_metadata_test.go index d476d558048f..e2089b8386ee 100644 --- a/x-pack/auditbeat/processors/add_session_metadata/add_session_metadata_test.go +++ b/x-pack/auditbeat/processors/add_session_metadata/add_session_metadata_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/pkg/processdb" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/pkg/procfs" + "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/processdb" + "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/procfs" "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/types" "github.com/stretchr/testify/assert" diff --git a/x-pack/auditbeat/processors/add_session_metadata/pkg/processdb/db.go b/x-pack/auditbeat/processors/add_session_metadata/processdb/db.go similarity index 99% rename from x-pack/auditbeat/processors/add_session_metadata/pkg/processdb/db.go rename to x-pack/auditbeat/processors/add_session_metadata/processdb/db.go index 4ed51ac3c00d..8ece5038510f 100644 --- a/x-pack/auditbeat/processors/add_session_metadata/pkg/processdb/db.go +++ b/x-pack/auditbeat/processors/add_session_metadata/processdb/db.go @@ -7,6 +7,8 @@ package processdb import ( "strings" + "slices" + "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/types" ) diff --git a/x-pack/auditbeat/processors/add_session_metadata/pkg/processdb/db_test.go b/x-pack/auditbeat/processors/add_session_metadata/processdb/db_test.go similarity index 100% rename from x-pack/auditbeat/processors/add_session_metadata/pkg/processdb/db_test.go rename to x-pack/auditbeat/processors/add_session_metadata/processdb/db_test.go diff --git a/x-pack/auditbeat/processors/add_session_metadata/pkg/processdb/entry_leader_test.go b/x-pack/auditbeat/processors/add_session_metadata/processdb/entry_leader_test.go similarity index 99% rename from x-pack/auditbeat/processors/add_session_metadata/pkg/processdb/entry_leader_test.go rename to x-pack/auditbeat/processors/add_session_metadata/processdb/entry_leader_test.go index ec2f4358f070..b8b5348df6a2 100644 --- a/x-pack/auditbeat/processors/add_session_metadata/pkg/processdb/entry_leader_test.go +++ b/x-pack/auditbeat/processors/add_session_metadata/processdb/entry_leader_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/pkg/procfs" + "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/procfs" "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/types" // "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/auditbeat/processors/add_session_metadata/pkg/processdb/simple.go b/x-pack/auditbeat/processors/add_session_metadata/processdb/simple.go similarity index 99% rename from x-pack/auditbeat/processors/add_session_metadata/pkg/processdb/simple.go rename to x-pack/auditbeat/processors/add_session_metadata/processdb/simple.go index acf9de5bf7ff..353927a0695b 100644 --- a/x-pack/auditbeat/processors/add_session_metadata/pkg/processdb/simple.go +++ b/x-pack/auditbeat/processors/add_session_metadata/processdb/simple.go @@ -17,8 +17,8 @@ import ( "sync" "time" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/pkg/procfs" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/pkg/timeutils" + "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/procfs" + "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/timeutils" "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/types" "github.com/elastic/elastic-agent-libs/logp" ) diff --git a/x-pack/auditbeat/processors/add_session_metadata/pkg/processdb/simple_test.go b/x-pack/auditbeat/processors/add_session_metadata/processdb/simple_test.go similarity index 99% rename from x-pack/auditbeat/processors/add_session_metadata/pkg/processdb/simple_test.go rename to x-pack/auditbeat/processors/add_session_metadata/processdb/simple_test.go index a5df2cd869c6..41691e209462 100644 --- a/x-pack/auditbeat/processors/add_session_metadata/pkg/processdb/simple_test.go +++ b/x-pack/auditbeat/processors/add_session_metadata/processdb/simple_test.go @@ -7,7 +7,7 @@ package processdb import ( "testing" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/pkg/procfs" + "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/procfs" "github.com/stretchr/testify/assert" "github.com/elastic/elastic-agent-libs/logp" diff --git a/x-pack/auditbeat/processors/add_session_metadata/pkg/procfs/mock.go b/x-pack/auditbeat/processors/add_session_metadata/procfs/mock.go similarity index 100% rename from x-pack/auditbeat/processors/add_session_metadata/pkg/procfs/mock.go rename to x-pack/auditbeat/processors/add_session_metadata/procfs/mock.go diff --git a/x-pack/auditbeat/processors/add_session_metadata/pkg/procfs/procfs.go b/x-pack/auditbeat/processors/add_session_metadata/procfs/procfs.go similarity index 94% rename from x-pack/auditbeat/processors/add_session_metadata/pkg/procfs/procfs.go rename to x-pack/auditbeat/processors/add_session_metadata/procfs/procfs.go index 388565e06912..2496479abe1c 100644 --- a/x-pack/auditbeat/processors/add_session_metadata/pkg/procfs/procfs.go +++ b/x-pack/auditbeat/processors/add_session_metadata/procfs/procfs.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - p "github.com/prometheus/procfs" + "github.com/prometheus/procfs" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/pkg/timeutils" + "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/timeutils" "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/types" "github.com/elastic/elastic-agent-libs/logp" @@ -42,7 +42,7 @@ func NewProcfsReader(logger logp.Logger) ProcfsReader { } } -type Stat p.ProcStat +type Stat procfs.ProcStat type ProcessInfo struct { Pids types.PidInfo @@ -55,7 +55,7 @@ type ProcessInfo struct { CGroupPath string } -func credsFromProc(proc p.Proc) (types.CredInfo, error) { +func credsFromProc(proc procfs.Proc) (types.CredInfo, error) { status, err := proc.NewStatus() if err != nil { return types.CredInfo{}, err @@ -118,7 +118,7 @@ func credsFromProc(proc p.Proc) (types.CredInfo, error) { }, nil } -func (r ProcfsReader) getProcessInfo(proc p.Proc) (ProcessInfo, error) { +func (r ProcfsReader) getProcessInfo(proc procfs.Proc) (ProcessInfo, error) { pid := uint32(proc.PID) // All other info can be best effort, but failing to get pid info and // start time is needed to register the process in the database @@ -200,7 +200,7 @@ func (r ProcfsReader) getProcessInfo(proc p.Proc) (ProcessInfo, error) { } func (r ProcfsReader) GetProcess(pid uint32) (ProcessInfo, error) { - proc, err := p.NewProc(int(pid)) + proc, err := procfs.NewProc(int(pid)) if err != nil { return ProcessInfo{}, err } @@ -208,7 +208,7 @@ func (r ProcfsReader) GetProcess(pid uint32) (ProcessInfo, error) { } // returns empty slice on error func (r ProcfsReader) GetAllProcesses() ([]ProcessInfo, error) { - procs, err := p.AllProcs() + procs, err := procfs.AllProcs() if err != nil { return nil, err } @@ -226,7 +226,7 @@ func (r ProcfsReader) GetAllProcesses() ([]ProcessInfo, error) { } func (r ProcfsReader) getEnviron(pid uint32) (map[string]string, error) { - proc, err := p.NewProc(int(pid)) + proc, err := procfs.NewProc(int(pid)) if err != nil { return nil, err } diff --git a/x-pack/auditbeat/processors/add_session_metadata/provider/ebpf_provider/ebpf_provider.go b/x-pack/auditbeat/processors/add_session_metadata/provider/ebpf_provider/ebpf_provider.go index c83fcf37cda3..4bcf73d4b679 100644 --- a/x-pack/auditbeat/processors/add_session_metadata/provider/ebpf_provider/ebpf_provider.go +++ b/x-pack/auditbeat/processors/add_session_metadata/provider/ebpf_provider/ebpf_provider.go @@ -11,7 +11,7 @@ import ( "github.com/elastic/beats/v7/libbeat/beat" - "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/pkg/processdb" + "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/processdb" "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/provider" "github.com/elastic/beats/v7/x-pack/auditbeat/processors/add_session_metadata/types" diff --git a/x-pack/auditbeat/processors/add_session_metadata/pkg/timeutils/time.go b/x-pack/auditbeat/processors/add_session_metadata/timeutils/time.go similarity index 100% rename from x-pack/auditbeat/processors/add_session_metadata/pkg/timeutils/time.go rename to x-pack/auditbeat/processors/add_session_metadata/timeutils/time.go diff --git a/x-pack/auditbeat/processors/add_session_metadata/pkg/timeutils/time_test.go b/x-pack/auditbeat/processors/add_session_metadata/timeutils/time_test.go similarity index 100% rename from x-pack/auditbeat/processors/add_session_metadata/pkg/timeutils/time_test.go rename to x-pack/auditbeat/processors/add_session_metadata/timeutils/time_test.go