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.

Sign up for GitHub

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

Added k8s components to otel distribution #4908

Merged
merged 33 commits into from
Jun 20, 2024
Merged

Added k8s components to otel distribution #4908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
e51a7b0
Added k8s components to otel distribution
michalpristas Jun 11, 2024
3340f71
moved receiver to receivers
michalpristas Jun 11, 2024
4ca8b91
added k8sclusterreceiver
michalpristas Jun 12, 2024
d2c44b0
Merge branch 'main' into otel/added-k8s-comps
michalpristas Jun 12, 2024
783b625
Merge branch 'main' into otel/added-k8s-comps
michalpristas Jun 13, 2024
311f38f
added hostmetricsreceiver and resourcedetectionprocessor
michalpristas Jun 13, 2024
628555d
Merge branch 'otel/added-k8s-comps' of github.com:michalpristas/elast…
michalpristas Jun 13, 2024
90714ec
Merge branch 'main' into otel/added-k8s-comps
michalpristas Jun 13, 2024
8452072
Merge branch 'main' into otel/added-k8s-comps
michalpristas Jun 17, 2024
a923f16
resolved conflicts
michalpristas Jun 17, 2024
8524701
Merge branch 'otel/added-k8s-comps' of github.com:michalpristas/elast…
michalpristas Jun 17, 2024
ed871a4
Update rules.json
michalpristas Jun 17, 2024
6f58e33
dup entry in register
michalpristas Jun 17, 2024
9cabb70
Merge branch 'otel/added-k8s-comps' of github.com:michalpristas/elast…
michalpristas Jun 17, 2024
34b18bf
Merge branch 'main' into otel/added-k8s-comps
michalpristas Jun 17, 2024
75e86ab
Merge branch 'main' into otel/added-k8s-comps
michalpristas Jun 18, 2024
140c47a
Merge branch 'main' into otel/added-k8s-comps
michalpristas Jun 18, 2024
0a78a20
Merge branch 'main' of github.com:elastic/elastic-agent into otel/add…
michalpristas Jun 18, 2024
8911acd
Merge branch 'main' into otel/added-k8s-comps
michalpristas Jun 18, 2024
51f8139
resolved conflicts with main
michalpristas Jun 19, 2024
cbc984d
Merge branch 'otel/added-k8s-comps' of github.com:michalpristas/elast…
michalpristas Jun 19, 2024
c6f6a46
do not use otel for windows
michalpristas Jun 19, 2024
a2006cc
do not use otel for windows
michalpristas Jun 19, 2024
317c118
do not use otel for windows
michalpristas Jun 19, 2024
910bb8d
do not use otel for windows
michalpristas Jun 19, 2024
f68f9a6
do not use otel for windows
michalpristas Jun 19, 2024
c0c203b
config file fixed
michalpristas Jun 19, 2024
55d9c25
test coverage:nil check for windows
michalpristas Jun 20, 2024
d622e8a
test coverage
michalpristas Jun 20, 2024
0cfff08
test coverage
michalpristas Jun 20, 2024
58be04f
test coverage
michalpristas Jun 20, 2024
0769798
test coverage
michalpristas Jun 20, 2024
2394028
one more test
michalpristas Jun 20, 2024
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
12,180 changes: 7,671 additions & 4,509 deletions NOTICE.txt
View file
Open in desktop

Large diffs are not rendered by default.

61 changes: 36 additions & 25 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/elastic/elastic-agent
go 1.21.10

require (
github.com/Microsoft/go-winio v0.6.1
github.com/Microsoft/go-winio v0.6.2
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1
github.com/billgraziano/dpapi v0.4.0
github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2
Expand Down Expand Up @@ -42,23 +42,27 @@ require (
github.com/mitchellh/hashstructure v1.1.0
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c
github.com/oklog/ulid v1.3.1
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.102.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.102.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.102.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.102.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.102.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.102.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.102.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.102.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.102.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.103.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.103.0
github.com/otiai10/copy v1.14.0
github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0
github.com/pkg/errors v0.9.1
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
github.com/rs/zerolog v1.27.0
github.com/sajari/regression v1.0.1
github.com/schollz/progressbar/v3 v3.13.1
github.com/shirou/gopsutil/v3 v3.24.4
github.com/shirou/gopsutil/v3 v3.24.5
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.5
Expand Down Expand Up @@ -163,7 +167,7 @@ require (
github.com/google/licenseclassifier v0.0.0-20221004142553-c1ed8fcf4bab // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/hashicorp/consul/api v1.28.3 // indirect
github.com/hashicorp/consul/api v1.29.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.5.0 // indirect
Expand All @@ -173,7 +177,7 @@ require (
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/hashicorp/serf v0.10.1 // indirect
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/imdario/mergo v0.3.15 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jaypipes/pcidb v1.0.0 // indirect
github.com/jcchavezs/porto v0.1.0 // indirect
Expand All @@ -186,6 +190,7 @@ require (
github.com/knadh/koanf/v2 v2.1.1 // indirect
github.com/leodido/go-syslog/v4 v4.1.0 // indirect
github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b // indirect
github.com/leoluk/perflib_exporter v0.2.1 // indirect
github.com/lestrrat-go/strftime v1.0.6 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
Expand All @@ -205,16 +210,19 @@ require (
github.com/mostynb/go-grpc-compression v1.2.3 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.102.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.102.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.102.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.102.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.102.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.102.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.102.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.102.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.102.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.102.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.103.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.103.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/openshift/api v3.9.0+incompatible // indirect
Expand All @@ -224,7 +232,7 @@ require (
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.54.0 // indirect
github.com/prometheus/procfs v0.15.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rs/cors v1.10.1 // indirect
github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect
Expand All @@ -242,6 +250,7 @@ require (
go.elastic.co/apm/module/apmzap/v2 v2.6.0 // indirect
go.elastic.co/apm/v2 v2.6.0 // indirect
go.elastic.co/fastjson v1.3.0 // indirect
go.etcd.io/bbolt v1.3.10 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector v0.103.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.103.0 // indirect
Expand All @@ -257,6 +266,7 @@ require (
go.opentelemetry.io/collector/connector v0.103.0 // indirect
go.opentelemetry.io/collector/consumer v0.103.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.103.0 // indirect
go.opentelemetry.io/collector/filter v0.103.0 // indirect
go.opentelemetry.io/collector/pdata v1.10.0 // indirect
go.opentelemetry.io/collector/semconv v0.103.0 // indirect
go.opentelemetry.io/collector/service v0.103.0 // indirect
Expand Down Expand Up @@ -292,14 +302,15 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
howett.net/plist v1.0.1 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/kubelet v0.29.3 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

require (
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/json-iterator/go v1.1.12 // indirect; indirecthttps://github.com/elastic/ingest-dev/issues/3253
go.elastic.co/apm v1.15.0
go.elastic.co/apm/module/apmgrpc v1.15.0
k8s.io/klog/v2 v2.110.1 // indirect
Expand Down
Loading