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

Added k8s components to otel distribution #4908

Merged
merged 33 commits into from
Jun 20, 2024
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
resolved conflicts
  • Loading branch information
michalpristas committed Jun 17, 2024
commit a923f163736bb1071f1304274db17003b486e96c
2 changes: 1 addition & 1 deletion dev-tools/notice/overrides.json
Original file line number Diff line number Diff line change
@@ -16,4 +16,4 @@
{"name": "kernel.org/pub/linux/libs/security/libcap/cap", "licenceType": "BSD-3-Clause", "note": "dual licensed as GPL-v2 and BSD"}
{"name": "kernel.org/pub/linux/libs/security/libcap/psx", "licenceType": "BSD-3-Clause", "note": "dual licensed as GPL-v2 and BSD"}
{"name": "github.com/awslabs/kinesis-aggregation/go", "licenceType": "Apache-2.0", "url": "https://github.com/awslabs/kinesis-aggregation/blob/master/LICENSE.txt"}
{"name": "github.com/pascaldekloe/goe", "licenceType": "CC0-1.0"}
{"name": "github.com/pascaldekloe/goe", "licenceFile": "LICENSE", "licenceType": "CC0-1.0"}
21 changes: 10 additions & 11 deletions go.mod
Original file line number Diff line number Diff line change
@@ -42,9 +42,19 @@ 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/extension/storage/filestorage 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/receiver/hostmetricsreceiver v0.102.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.102.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.102.0
github.com/otiai10/copy v1.14.0
github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0
github.com/pkg/errors v0.9.1
@@ -94,17 +104,6 @@ require (
require (
github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e // indirect
github.com/distribution/reference v0.5.0 // indirect
// open telemetry dependencies
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/extension/storage/filestorage 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/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/receiver/kubeletstatsreceiver v0.102.0
go.opentelemetry.io/collector/component v0.102.1
go.opentelemetry.io/collector/confmap v0.102.1
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.102.1
4 changes: 2 additions & 2 deletions internal/pkg/otel/README.md
Original file line number Diff line number Diff line change
@@ -31,9 +31,9 @@ This section provides a summary of components included in the Elastic Distributi

| Component | Version |
|---|---|
| filelogreceiver | v0.102.0|
| hostmetricsreceiver | v0.102.0|
| k8sclusterreceiver | v0.102.0|
| filelogreceiver | v0.102.0|
| kubeletstatsreceiver | v0.102.0|
| otlpreceiver | v0.102.1|

@@ -56,10 +56,10 @@ This section provides a summary of components included in the Elastic Distributi

| Component | Version |
|---|---|
| resourcedetectionprocessor | v0.102.0|
| attributesprocessor | v0.102.0|
| filterprocessor | v0.102.0|
| k8sattributesprocessor | v0.102.0|
| resourcedetectionprocessor | v0.102.0|
| resourceprocessor | v0.102.0|
| transformprocessor | v0.102.0|
| batchprocessor | v0.102.1|
2 changes: 1 addition & 1 deletion internal/pkg/otel/components.go
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ import (
attributesprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor" // for modifying signal attributes
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor"
k8sattributesprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor" // for adding k8s metadata
resourcedetectionprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor"
resourceprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor" // for modifying resource attributes
transformprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor" // for OTTL processing on logs
"go.opentelemetry.io/collector/processor/batchprocessor" // for batching events
You are viewing a condensed version of this merge commit. You can view the full changes here.