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

[Elastic Agent]-PR- Introduce log message for not supported annotations for Hints based autodiscover #4360

Merged
merged 56 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
c60baaa
first commit with checks for hints vocabulary
gizas Mar 5, 2024
2148751
updating code to postition in correct place and to be triggered only …
gizas Mar 5, 2024
664ebea
fixing to retrieve only keys keys
gizas Mar 5, 2024
f44c16f
updating comment
gizas Mar 5, 2024
56d5015
adding changelog fragment
gizas Mar 5, 2024
ffa6e15
fixing linting issues
gizas Mar 5, 2024
b0fd369
moved checks in elastic-agent-autodicover
gizas Mar 6, 2024
ea314f9
correcting namespace and adding comment
gizas Mar 6, 2024
5da1316
Merge branch 'main' into logshints
gizas Mar 6, 2024
6536f3a
adding checks also to containers
gizas Mar 6, 2024
2aea421
udpating comment
gizas Mar 7, 2024
bae96be
fixing forloop error with value
gizas Mar 7, 2024
531b0b7
updating print message
gizas Mar 7, 2024
aa14e07
updating go.mod with v0.6.9 autodiscovery library
gizas Mar 13, 2024
6b06af5
Merge branch 'main' into logshints
gizas Mar 13, 2024
a1fdd05
updating Notice.txt
gizas Mar 13, 2024
3d52fcc
Merge branch 'logshints' of github.com:elastic/elastic-agent into log…
gizas Mar 13, 2024
6eb8655
removing module from supported list
gizas Mar 13, 2024
c52caec
removing module from supported list and added package
gizas Mar 13, 2024
35231be
removing module from supported list and added package
gizas Mar 13, 2024
651f91c
correcting changelog for v0.6.12
gizas Apr 15, 2024
a5af235
fixing conflicts with main
gizas Apr 15, 2024
902b6c3
fixing conflicts with main
gizas Apr 15, 2024
2432e89
fixing notice.txt
gizas Apr 15, 2024
4cc176d
fixing test
gizas Apr 16, 2024
6d7906d
fixing conflicts with main
gizas Apr 16, 2024
d09e8bc
removing default_container_logs from allSupportedHints list
gizas Apr 16, 2024
890103c
updating to elastic-agent-autodiscovery v.0.6.13
gizas Apr 22, 2024
74df714
Merge branch 'main' of github.com:elastic/elastic-agent into logshints
gizas Apr 22, 2024
4f3d1be
merging with main
gizas Apr 22, 2024
f6fcf2e
Merge branch 'main' into logshints
gizas Apr 22, 2024
85e7d49
adding test TestGenerateHints
gizas Apr 22, 2024
98b7954
adding test TestGenerateHints
gizas Apr 22, 2024
5a5e0f3
fixing conflicts
gizas Apr 23, 2024
5310024
removing lables from test
gizas Apr 23, 2024
ff1ecf9
Update internal/pkg/composable/providers/kubernetes/hints.go
gizas Apr 23, 2024
62d1b2d
removing container id and changed typo label
gizas Apr 23, 2024
97491c3
Merge branch 'logshints' of github.com:elastic/elastic-agent into log…
gizas Apr 23, 2024
258aa5f
fixing conflicts
gizas Apr 24, 2024
725440b
Merge branch 'main' into logshints
gizas Apr 24, 2024
aca7696
fixing conflicts with main
gizas Apr 25, 2024
a44c62a
removing bin folder
gizas Apr 25, 2024
77ea366
Merge branch 'main' of github.com:elastic/elastic-agent into logshints
gizas Apr 29, 2024
4fdf8e0
Merge branch 'main' into logshints
rdner Apr 29, 2024
a221dee
Merge branch 'main' into logshints
gizas Apr 30, 2024
88cb012
adding function to override sonarcube
gizas Apr 30, 2024
fe3548f
adding function to override sonarcube
gizas Apr 30, 2024
2512f64
Merge branch 'main' into logshints
gizas May 1, 2024
dfb1945
Merge branch 'main' into logshints
gizas May 2, 2024
0cb2591
Merge branch 'main' into logshints
gizas May 2, 2024
e8318ae
Merge branch 'main' into logshints
gizas May 2, 2024
c191f4b
Merge branch 'main' into logshints
cmacknz May 7, 2024
d32fe34
merging with main
gizas May 8, 2024
fd7dcfd
Merge branch 'logshints' of github.com:elastic/elastic-agent into log…
gizas May 8, 2024
e6c8118
merging with main
gizas May 9, 2024
49af807
Merge branch 'main' into logshints
gizas May 9, 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
17,801 changes: 11,914 additions & 5,887 deletions NOTICE.txt

Large diffs are not rendered by default.

32 changes: 32 additions & 0 deletions changelog/fragments/1709656001-logshints.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Kind can be one of:
# - breaking-change: a change to previously-documented behavior
# - deprecation: functionality that is being removed in a later release
# - bug-fix: fixes a problem in a previous version
# - enhancement: extends functionality but does not break or fix existing behavior
# - feature: new functionality
# - known-issue: problems that we are aware of in a given version
# - security: impacts on the security of a product or a user’s deployment.
# - upgrade: important information for someone upgrading from a prior version
# - other: does not fit into any of the other categories
kind: enhancement

# Change summary; a 80ish characters long description of the change.
summary: Introduce log message for not supported annotations for Hints based autodiscover

# Long description; in case the summary is not enough to describe the change
# this field accommodate a description without length limits.
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
#description:

# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
component: elastic-agent

# PR URL; optional; the PR number that added the changeset.
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
# Please provide it if you are adding a fragment for a different PR.
pr: https://github.com/elastic/elastic-agent/pull/4360

# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
# If not present is automatically filled by the tooling with the issue linked to the PR number.
issue: https://github.com/elastic/elastic-agent/issues/3064
43 changes: 41 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@ require (
github.com/cenkalti/backoff/v4 v4.3.0
github.com/docker/go-units v0.5.0
github.com/dolmen-go/contextio v0.0.0-20200217195037-68fc5150bcd5
github.com/elastic/beats/v7 v7.17.20
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should not be here. Happens sometimes when the build directory has extracted beats in it. This needs to be cleaned up before merging.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @blakerouse, I cleaned /bin folder and made the update.
Seems that not got passed and check-ci does not fail

(The failures are not related with this changes I think)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@blakerouse I have tried to re-run the build with no luck.
I can see lots of ResourceExistsError

Also for the SonarQube Analysis do you have a suggestion?

github.com/elastic/e2e-testing v1.1.0
github.com/elastic/elastic-agent-autodiscover v0.6.8
github.com/elastic/elastic-agent-autodiscover v0.6.13
github.com/elastic/elastic-agent-client/v7 v7.8.1
github.com/elastic/elastic-agent-libs v0.9.4
github.com/elastic/elastic-agent-system-metrics v0.9.2
github.com/elastic/elastic-transport-go/v8 v8.5.0
github.com/elastic/go-elasticsearch/v8 v8.13.1
github.com/elastic/go-licenser v0.4.1
github.com/elastic/go-lookslike v1.0.1
github.com/elastic/go-sysinfo v1.14.0
github.com/elastic/go-ucfg v0.8.8
github.com/fatih/color v1.15.0
Expand Down Expand Up @@ -106,21 +108,33 @@ require (

require (
github.com/Jeffail/gabs/v2 v2.6.0 // indirect
github.com/Shopify/sarama v0.0.0-00010101000000-000000000000 // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/akavel/rsrc v0.8.0 // indirect
github.com/alecthomas/participle/v2 v2.1.1 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf // indirect
github.com/dnephin/pflag v1.0.7 // indirect
github.com/docker/docker v25.0.5+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/dop251/goja v0.0.0-20200831102558-9af81ddcf0e1 // indirect
github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/eapache/go-resiliency v1.2.0 // indirect
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
github.com/eapache/queue v1.1.0 // indirect
github.com/elastic/ecs v1.12.0 // indirect
github.com/elastic/go-concert v0.2.0 // indirect
github.com/elastic/go-lumber v0.1.0 // indirect
github.com/elastic/go-seccomp-bpf v1.2.0 // indirect
github.com/elastic/go-structform v0.0.10 // indirect
github.com/elastic/go-txfile v0.0.7 // indirect
github.com/elastic/go-windows v1.0.1 // indirect
github.com/elastic/gosigar v0.14.2 // indirect
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
Expand All @@ -134,26 +148,36 @@ require (
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-sourcemap/sourcemap v2.1.2+incompatible // indirect
github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
github.com/gobuffalo/here v0.6.0 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/gomodule/redigo v1.8.3 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
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.19.0 // indirect
github.com/h2non/filetype v1.1.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-uuid v1.0.2 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/influxdata/go-syslog/v3 v3.0.1-0.20230911200830-875f5bc594a4 // indirect
github.com/jaypipes/pcidb v1.0.0 // indirect
github.com/jcchavezs/porto v0.1.0 // indirect
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
github.com/jcmturner/gofork v1.0.0 // indirect
github.com/jcmturner/gokrb5/v8 v8.4.2 // indirect
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
github.com/jonboulle/clockwork v0.2.2 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/karrick/godirwalk v1.16.1 // indirect
github.com/klauspost/compress v1.17.8 // indirect
Expand All @@ -167,6 +191,7 @@ require (
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/miekg/dns v1.1.41 // indirect
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
Expand All @@ -186,12 +211,14 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.98.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/pierrec/lz4 v2.6.0+incompatible // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/prometheus/client_golang v1.19.0 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.13.0 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // 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 @@ -201,9 +228,16 @@ require (
github.com/stretchr/objx v0.5.2 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/urso/diag v0.0.0-20200210123136-21b3cc8eb797 // indirect
github.com/urso/go-bin v0.0.0-20180220135811-781c575c9f0e // indirect
github.com/urso/magetools v0.0.0-20190919040553-290c89e0c230 // indirect
github.com/urso/sderr v0.0.0-20210525210834-52b04e8f5c71 // indirect
github.com/valyala/fastjson v1.6.4 // indirect
github.com/xdg/scram v1.0.3 // indirect
github.com/xdg/stringprep v1.0.3 // indirect
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.elastic.co/apm/module/apmelasticsearch v1.10.0 // indirect
go.elastic.co/apm/module/apmhttp v1.15.0 // indirect
go.elastic.co/apm/module/apmhttp/v2 v2.0.0 // indirect
go.elastic.co/apm/v2 v2.0.0 // indirect
Expand Down Expand Up @@ -256,6 +290,11 @@ require (
google.golang.org/genproto/googleapis/rpc v0.0.0-20240412170617-26222e5d3d56 // indirect
google.golang.org/grpc/examples v0.0.0-20220304170021-431ea809a767 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect
gopkg.in/jcmturner/dnsutils.v1 v1.0.1 // indirect
gopkg.in/jcmturner/goidentity.v3 v3.0.0 // indirect
gopkg.in/jcmturner/gokrb5.v7 v7.5.0 // indirect
gopkg.in/jcmturner/rpc.v1 v1.1.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
howett.net/plist v1.0.1 // indirect
k8s.io/kube-openapi v0.0.0-20221207184640-f3cff1453715 // indirect
Expand Down
Loading
Loading