Skip to content
Closed
Show file tree
Hide file tree
Changes from 4 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
312 changes: 277 additions & 35 deletions NOTICE.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"github.com/rcrowley/go-metrics"

"github.com/elastic/beats/v7/libbeat/monitoring/inputmon"
"github.com/elastic/elastic-agent-libs/logp"
"github.com/elastic/elastic-agent-libs/monitoring"
"github.com/elastic/elastic-agent-libs/monitoring/adapter"
)
Expand Down Expand Up @@ -82,7 +83,7 @@ func NewMetrics(id string) *Metrics {
HarvesterRunning: monitoring.NewInt(harvesterMetrics, "running"),
HarvesterOpenFiles: monitoring.NewInt(harvesterMetrics, "open_files"),
}
_ = adapter.NewGoMetrics(reg, "processing_time", adapter.Accept).
_ = adapter.NewGoMetrics(reg, "processing_time", logp.NewNopLogger(), adapter.Accept).
Register("histogram", metrics.NewHistogram(m.ProcessingTime))

return &m
Expand Down
1 change: 1 addition & 0 deletions filebeat/input/kafka/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ func newSaramaConfig(config kafkaInputConfig) (*sarama.Config, error) {
k.MetricRegistry = adapter.GetGoMetrics(
monitoring.Default,
"filebeat.inputs.kafka",
logp.NewLogger(""),
adapter.Rename("incoming-byte-rate", "bytes_read"),
adapter.Rename("outgoing-byte-rate", "bytes_write"),
adapter.GoMetricsNilify,
Expand Down
4 changes: 2 additions & 2 deletions filebeat/input/netmetrics/tcp.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ func NewTCP(inputName string, id string, device string, poll time.Duration, log
arrivalPeriod: metrics.NewUniformSample(1024),
processingTime: metrics.NewUniformSample(1024),
}
_ = adapter.NewGoMetrics(reg, "arrival_period", adapter.Accept).
_ = adapter.NewGoMetrics(reg, "arrival_period", logp.NewNopLogger(), adapter.Accept).
Register("histogram", metrics.NewHistogram(out.arrivalPeriod))
_ = adapter.NewGoMetrics(reg, "processing_time", adapter.Accept).
_ = adapter.NewGoMetrics(reg, "processing_time", log, adapter.Accept).
Register("histogram", metrics.NewHistogram(out.processingTime))

out.device.Set(device)
Expand Down
4 changes: 2 additions & 2 deletions filebeat/input/netmetrics/udp.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ func NewUDP(inputName string, id string, device string, buflen uint64, poll time
arrivalPeriod: metrics.NewUniformSample(1024),
processingTime: metrics.NewUniformSample(1024),
}
_ = adapter.NewGoMetrics(reg, "arrival_period", adapter.Accept).
_ = adapter.NewGoMetrics(reg, "arrival_period", logp.NewNopLogger(), adapter.Accept).
Register("histogram", metrics.NewHistogram(out.arrivalPeriod))
_ = adapter.NewGoMetrics(reg, "processing_time", adapter.Accept).
_ = adapter.NewGoMetrics(reg, "processing_time", log, adapter.Accept).
Register("histogram", metrics.NewHistogram(out.processingTime))

out.device.Set(device)
Expand Down
4 changes: 2 additions & 2 deletions filebeat/input/unix/input.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@ func newInputMetrics(id, path string, log *logp.Logger) *inputMetrics {
arrivalPeriod: metrics.NewUniformSample(1024),
processingTime: metrics.NewUniformSample(1024),
}
_ = adapter.NewGoMetrics(reg, "arrival_period", adapter.Accept).
_ = adapter.NewGoMetrics(reg, "arrival_period", log, adapter.Accept).
Register("histogram", metrics.NewHistogram(out.arrivalPeriod))
_ = adapter.NewGoMetrics(reg, "processing_time", adapter.Accept).
_ = adapter.NewGoMetrics(reg, "processing_time", log, adapter.Accept).
Register("histogram", metrics.NewHistogram(out.processingTime))

out.path.Set(path)
Expand Down
8 changes: 5 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,10 @@ require (
github.com/elastic/bayeux v1.0.5
github.com/elastic/ebpfevents v0.7.0
github.com/elastic/elastic-agent-autodiscover v0.9.0
github.com/elastic/elastic-agent-libs v0.21.5
github.com/elastic/elastic-agent-system-metrics v0.11.11
github.com/elastic/elastic-agent-libs v0.23.0
github.com/elastic/elastic-agent-system-metrics v0.13.2
github.com/elastic/go-elasticsearch/v8 v8.17.0
github.com/elastic/go-freelru v0.16.0
github.com/elastic/go-quark v0.2.0
github.com/elastic/go-sfdc v0.0.0-20241010131323-8e176480d727
github.com/elastic/mito v1.19.0
Expand All @@ -190,6 +191,7 @@ require (
github.com/elastic/toutoumomoma v0.0.0-20240626215117-76e39db18dfb
github.com/foxcpp/go-mockdns v0.0.0-20201212160233-ede2f9158d15
github.com/go-ldap/ldap/v3 v3.4.6
github.com/go-ole/go-ole v1.2.6
github.com/go-resty/resty/v2 v2.13.1
github.com/gofrs/uuid/v5 v5.2.0
github.com/golang-jwt/jwt/v5 v5.2.2
Expand All @@ -204,6 +206,7 @@ require (
github.com/klauspost/compress v1.18.0
github.com/meraki/dashboard-api-go/v3 v3.0.9
github.com/microsoft/go-mssqldb v1.8.2
github.com/microsoft/wmi v0.37.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.114.0
github.com/otiai10/copy v1.12.0
github.com/pierrec/lz4/v4 v4.1.21
Expand Down Expand Up @@ -302,7 +305,6 @@ require (
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-openapi/jsonpointer v0.20.2 // indirect
github.com/go-openapi/jsonreference v0.20.4 // indirect
github.com/go-openapi/swag v0.22.9 // indirect
Expand Down
12 changes: 8 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -332,10 +332,10 @@ github.com/elastic/elastic-agent-autodiscover v0.9.0 h1:+iWIKh0u3e8I+CJa3FfWe9h0
github.com/elastic/elastic-agent-autodiscover v0.9.0/go.mod h1:5iUxLHhVdaGSWYTveSwfJEY4RqPXTG13LPiFoxcpFd4=
github.com/elastic/elastic-agent-client/v7 v7.15.0 h1:nDB7v8TBoNuD6IIzC3z7Q0y+7bMgXoT2DsHfolO2CHE=
github.com/elastic/elastic-agent-client/v7 v7.15.0/go.mod h1:6h+f9QdIr3GO2ODC0Y8+aEXRwzbA5W4eV4dd/67z7nI=
github.com/elastic/elastic-agent-libs v0.21.5 h1:YTMwaBPgOPvQnxBPv7fLpUqjw2HgY3ymC9TwdzdOD8U=
github.com/elastic/elastic-agent-libs v0.21.5/go.mod h1:xSeIP3NtOIT4N2pPS4EyURmS1Q8mK0lWZ8Wd1Du6q3w=
github.com/elastic/elastic-agent-system-metrics v0.11.11 h1:Qjh3Zef23PfGlG91AF+9ciNLNQf/8cDJ4CalnLZtV3g=
github.com/elastic/elastic-agent-system-metrics v0.11.11/go.mod h1:GNqmKfvOt8PwORjbS6GllNdMfkLpOWyTa7P8oQq4E5o=
github.com/elastic/elastic-agent-libs v0.23.0 h1:xpMKkrw59QUYWUx/q2TMpJU+6vwB3Mw1VPhRPcGhBMo=
github.com/elastic/elastic-agent-libs v0.23.0/go.mod h1:xSeIP3NtOIT4N2pPS4EyURmS1Q8mK0lWZ8Wd1Du6q3w=
github.com/elastic/elastic-agent-system-metrics v0.13.2 h1:R4ogKHESuWhWTtopnw/aHnBxxSZbxd7KHV4GefdwT2M=
github.com/elastic/elastic-agent-system-metrics v0.13.2/go.mod h1:ezM1kzDUT+vWXFh5oK8QXB/AEB0UoLWqWA8rkRicFFo=
github.com/elastic/elastic-transport-go/v8 v8.6.1 h1:h2jQRqH6eLGiBSN4eZbQnJLtL4bC5b4lfVFRjw2R4e4=
github.com/elastic/elastic-transport-go/v8 v8.6.1/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270 h1:cWPqxlPtir4RoQVCpGSRXmLqjEHpJKbR60rxh1nQZY4=
Expand All @@ -350,6 +350,8 @@ github.com/elastic/go-elasticsearch/v7 v7.17.10 h1:TCQ8i4PmIJuBunvBS6bwT2ybzVFxx
github.com/elastic/go-elasticsearch/v7 v7.17.10/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4=
github.com/elastic/go-elasticsearch/v8 v8.17.0 h1:e9cWksE/Fr7urDRmGPGp47Nsp4/mvNOrU8As1l2HQQ0=
github.com/elastic/go-elasticsearch/v8 v8.17.0/go.mod h1:lGMlgKIbYoRvay3xWBeKahAiJOgmFDsjZC39nmO3H64=
github.com/elastic/go-freelru v0.16.0 h1:gG2HJ1WXN2tNl5/p40JS/l59HjvjRhjyAa+oFTRArYs=
github.com/elastic/go-freelru v0.16.0/go.mod h1:bSdWT4M0lW79K8QbX6XY2heQYSCqD7THoYf82pT/H3I=
github.com/elastic/go-libaudit/v2 v2.6.1 h1:eN7tobGizmB+OJpCuG7gvPX7Nxni//H47uvMDXlMrI0=
github.com/elastic/go-libaudit/v2 v2.6.1/go.mod h1:8205nkf2oSrXFlO4H5j8/cyVMoSF3Y7jt+FjgS4ubQU=
github.com/elastic/go-licenser v0.4.2 h1:bPbGm8bUd8rxzSswFOqvQh1dAkKGkgAmrPxbUi+Y9+A=
Expand Down Expand Up @@ -715,6 +717,8 @@ github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/microsoft/go-mssqldb v1.8.2 h1:236sewazvC8FvG6Dr3bszrVhMkAl4KYImryLkRMCd0I=
github.com/microsoft/go-mssqldb v1.8.2/go.mod h1:vp38dT33FGfVotRiTmDo3bFyaHq+p3LektQrjTULowo=
github.com/microsoft/wmi v0.37.0 h1:TQ0+JHz8ogtl6twPOOQXA2ON2ErUS8WyInSq+yY4AT4=
github.com/microsoft/wmi v0.37.0/go.mod h1:XF+cfluA15xGnSCYkJIYuj2vWzdm2YrNuvqlC+baWY0=
github.com/miekg/dns v1.1.22/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
Expand Down
2 changes: 1 addition & 1 deletion libbeat/outputs/elasticsearch/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func TestPublish(t *testing.T) {
reg := monitoring.NewRegistry()
client, err := NewClient(
clientSettings{
observer: outputs.NewStats(reg),
observer: outputs.NewStats(reg, logp.NewNopLogger()),
connection: eslegclient.ConnectionSettings{URL: url},
indexSelector: testIndexSelector{},
},
Expand Down
1 change: 1 addition & 0 deletions libbeat/outputs/kafka/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ func newSaramaConfig(log *logp.Logger, config *kafkaConfig) (*sarama.Config, err
k.MetricRegistry = adapter.GetGoMetrics(
monitoring.Default,
"libbeat.outputs",
log,
adapter.Rename("incoming-byte-rate", "read.bytes"),
adapter.Rename("outgoing-byte-rate", "write.bytes"),
adapter.Rename("request-latency-in-ms", "write.latency"),
Expand Down
5 changes: 3 additions & 2 deletions libbeat/outputs/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

"github.com/rcrowley/go-metrics"

"github.com/elastic/elastic-agent-libs/logp"
"github.com/elastic/elastic-agent-libs/monitoring"
"github.com/elastic/elastic-agent-libs/monitoring/adapter"
)
Expand Down Expand Up @@ -83,7 +84,7 @@ type Stats struct {
// NewStats creates a new Stats instance using a backing monitoring registry.
// This function will create and register a number of metrics with the registry passed.
// The registry must not be null.
func NewStats(reg *monitoring.Registry) *Stats {
func NewStats(reg *monitoring.Registry, logger *logp.Logger) *Stats {
obj := &Stats{
eventsBatches: monitoring.NewUint(reg, "events.batches"),
eventsTotal: monitoring.NewUint(reg, "events.total"),
Expand All @@ -105,7 +106,7 @@ func NewStats(reg *monitoring.Registry) *Stats {

sendLatencyMillis: metrics.NewUniformSample(1024),
}
_ = adapter.NewGoMetrics(reg, "write.latency", adapter.Accept).Register("histogram", metrics.NewHistogram(obj.sendLatencyMillis))
_ = adapter.NewGoMetrics(reg, "write.latency", logp.NewNopLogger(), adapter.Accept).Register("histogram", metrics.NewHistogram(obj.sendLatencyMillis))
return obj
}

Expand Down
2 changes: 1 addition & 1 deletion libbeat/processors/dns/dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func New(cfg *conf.C) (beat.Processor, error) {
)

log.Debugf("DNS processor config: %+v", c)
resolver, err := newMiekgResolver(metrics, c.Timeout, c.Transport, c.Nameservers...)
resolver, err := newMiekgResolver(metrics, c.Timeout, c.Transport, log, c.Nameservers...)
if err != nil {
return nil, err
}
Expand Down
7 changes: 5 additions & 2 deletions libbeat/processors/dns/resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
"github.com/miekg/dns"
"github.com/rcrowley/go-metrics"

"github.com/elastic/elastic-agent-libs/logp"
"github.com/elastic/elastic-agent-libs/monitoring"
"github.com/elastic/elastic-agent-libs/monitoring/adapter"
)
Expand All @@ -56,6 +57,7 @@ type miekgResolver struct {
registry *monitoring.Registry
nsStatsMutex sync.RWMutex
nsStats map[string]*nameserverStats
logger *logp.Logger
}

type nameserverStats struct {
Expand All @@ -66,7 +68,7 @@ type nameserverStats struct {

// newMiekgResolver returns a new miekgResolver. It returns an error if no
// nameserver are given and none can be read from /etc/resolv.conf.
func newMiekgResolver(reg *monitoring.Registry, timeout time.Duration, transport string, servers ...string) (*miekgResolver, error) {
func newMiekgResolver(reg *monitoring.Registry, timeout time.Duration, transport string, logger *logp.Logger, servers ...string) (*miekgResolver, error) {
// Use /etc/resolv.conf if no nameservers are given. (Won't work for Windows).
if len(servers) == 0 {
config, err := dns.ClientConfigFromFile(etcResolvConf)
Expand Down Expand Up @@ -118,6 +120,7 @@ func newMiekgResolver(reg *monitoring.Registry, timeout time.Duration, transport
servers: servers,
registry: reg,
nsStats: map[string]*nameserverStats{},
logger: logger,
}, nil
}

Expand Down Expand Up @@ -249,7 +252,7 @@ func (res *miekgResolver) getOrCreateNameserverStats(ns string) *nameserverStats
}

//nolint:errcheck // Register should never fail because this is a new empty registry.
adapter.NewGoMetrics(reg, "request_duration", adapter.Accept).
adapter.NewGoMetrics(reg, "request_duration", res.logger, adapter.Accept).
Register("histogram", metrics.NewHistogram(stats.requestDuration))
res.nsStats[ns] = stats

Expand Down
13 changes: 5 additions & 8 deletions libbeat/processors/dns/resolver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/elastic/elastic-agent-libs/logp"
"github.com/elastic/elastic-agent-libs/monitoring"
)

Expand All @@ -38,7 +39,7 @@ func TestNewMiekgResolverWithIPv6(t *testing.T) {
const addr = `fe80::1%en0` // Example IPv6 address with zone index.

reg := monitoring.NewRegistry()
_, err := newMiekgResolver(reg.NewRegistry(logName), 0, "udp", addr)
_, err := newMiekgResolver(reg.NewRegistry(logName), 0, "udp", logp.NewNopLogger(), addr)
assert.NoError(t, err)
}

Expand All @@ -52,12 +53,8 @@ func TestMiekgResolverLookupPTR(t *testing.T) {
}()

reg := monitoring.NewRegistry()
res, err := newMiekgResolver(reg.NewRegistry(logName), 0, "udp", addr)
if err != nil {
t.Fatal(err)
}

// Success
res, err := newMiekgResolver(reg.NewRegistry(logName), 0, "udp", logp.NewNopLogger(), addr)
t.Fatal(err)
ptr, err := res.Lookup("8.8.8.8", typePTR)
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -103,7 +100,7 @@ func TestMiekgResolverLookupPTRTLS(t *testing.T) {

reg := monitoring.NewRegistry()

res, err := newMiekgResolver(reg.NewRegistry(logName), 0, "tls", addr)
res, err := newMiekgResolver(reg.NewRegistry(logName), 0, "tls", logp.NewNopLogger(), addr)
if err != nil {
t.Fatal(err)
}
Expand Down
3 changes: 2 additions & 1 deletion libbeat/processors/script/javascript/javascript.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
"github.com/elastic/beats/v7/libbeat/beat"
"github.com/elastic/beats/v7/libbeat/common"
"github.com/elastic/elastic-agent-libs/config"
"github.com/elastic/elastic-agent-libs/logp"
"github.com/elastic/elastic-agent-libs/monitoring"
"github.com/elastic/elastic-agent-libs/monitoring/adapter"
"github.com/elastic/elastic-agent-libs/paths"
Expand Down Expand Up @@ -228,7 +229,7 @@ func getStats(id string, reg *monitoring.Registry) *processorStats {
exceptions: monitoring.NewInt(processorReg, "exceptions"),
processTime: metrics.NewUniformSample(2048),
}
_ = adapter.NewGoMetrics(processorReg, "histogram", adapter.Accept).
_ = adapter.NewGoMetrics(processorReg, "histogram", logp.NewLogger(""), adapter.Accept).
Register("process_time", metrics.NewHistogram(stats.processTime))

return stats
Expand Down
3 changes: 3 additions & 0 deletions libbeat/publisher/pipeline/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@
// Just fill out enough to confirm what's sent to the event consumer,
// we don't want to start up real helper routines.
controller := outputController{
beat: beat.Info{
Logger: logptest.NewTestingLogger(t, ""),

Check failure on line 127 in libbeat/publisher/pipeline/controller_test.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest)

undefined: logptest (typecheck)

Check failure on line 127 in libbeat/publisher/pipeline/controller_test.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest)

unknown field Logger in struct literal of type beat.Info
},
consumer: &eventConsumer{
targetChan: make(chan consumerTarget, 2),
},
Expand Down
2 changes: 1 addition & 1 deletion libbeat/publisher/pipeline/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func loadOutput(
} else {
metrics = monitors.Metrics.NewRegistry("output")
}
outStats = outputs.NewStats(metrics)
outStats = outputs.NewStats(metrics, monitors.Logger)
}

outName, out, err := makeOutput(outStats)
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/linux/iostat/iostat.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
// format. It publishes the event which is then forwarded to the output. In case
// of an error set the Error field of mb.Event or simply call report.Error().
func (m *MetricSet) Fetch(report mb.ReporterV2) error {
IOstats, err := diskio.IOCounters(m.includeDevices...)
IOstats, err := diskio.IOCounters(m.Logger(), m.includeDevices...)
if err != nil {
return fmt.Errorf("disk io counters: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/system/diskio/diskio.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {

// Fetch fetches disk IO metrics from the OS.
func (m *MetricSet) Fetch(r mb.ReporterV2) error {
stats, err := diskio.IOCounters(m.includeDevices...)
stats, err := diskio.IOCounters(m.Logger(), m.includeDevices...)
if err != nil {
return fmt.Errorf("disk io counters: %w", err)
}
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/system/load/load.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {

// Fetch fetches system load metrics.
func (m *MetricSet) Fetch(r mb.ReporterV2) error {
load, err := cpu.Load()
load, err := cpu.LoadWithLogger(m.Logger())
if err != nil {
return fmt.Errorf("failed to get CPU load values: %w", err)
}
Expand Down
1 change: 1 addition & 0 deletions metricbeat/module/system/process/process.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
RootfsMountpoint: sys,
IgnoreRootCgroups: true,
},
Logger: base.Logger(),
},
perCPU: config.IncludePerCPU,
degradeOnPartial: degradedConf.DegradeOnPartial,
Expand Down
Loading
Loading