Skip to content

Commit

Permalink
Merge branch 'main' into remove-coordinator
Browse files Browse the repository at this point in the history
  • Loading branch information
michel-laterman authored Apr 16, 2024
2 parents 6b3ab10 + 1186100 commit 9f3a479
Show file tree
Hide file tree
Showing 20 changed files with 762 additions and 113 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ updates:
reviewers:
- "elastic/fleet"
open-pull-requests-limit: 10
groups:
elastic-apm:
patterns:
- "go.elastic.co/apm/*"
32 changes: 16 additions & 16 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -460,11 +460,11 @@ SOFTWARE

--------------------------------------------------------------------------------
Dependency : github.com/elastic/elastic-agent-libs
Version: v0.9.1
Version: v0.9.4
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].1/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].4/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -882,11 +882,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-s

--------------------------------------------------------------------------------
Dependency : github.com/elastic/go-elasticsearch/v8
Version: v8.13.0
Version: v8.13.1
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/[email protected].0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/[email protected].1/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -3327,11 +3327,11 @@ SOFTWARE.

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmchiv5/v2
Version: v2.5.0
Version: v2.6.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmchiv5/v2@v2.5.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmchiv5/v2@v2.6.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -3538,11 +3538,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmchiv5/

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmelasticsearch/v2
Version: v2.5.0
Version: v2.6.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.5.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.6.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -3749,11 +3749,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasti

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmhttp/v2
Version: v2.5.0
Version: v2.6.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.5.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.6.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -3960,11 +3960,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmprometheus/v2
Version: v2.5.0
Version: v2.6.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmprometheus/v2@v2.5.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmprometheus/v2@v2.6.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -4171,11 +4171,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmpromet

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/module/apmzerolog/v2
Version: v2.5.0
Version: v2.6.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzerolog/v2@v2.5.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzerolog/v2@v2.6.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -4382,11 +4382,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzerolo

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm/v2
Version: v2.5.0
Version: v2.6.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.5.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.6.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# 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: feature

# Change summary; a 80ish characters long description of the change.
summary: Use policy outputs when running in agent-mode

# 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: |
Fleet-server will retrieve and use the output from the policy when running in agent-mode.
This allows the fleet-server to connect to multiple Elasticsearch hosts if it is successful when
connecting to the host provided at enrollment/installation.
We expect that the host provided during enrollment/installation is never removed as a valid output.
fleet-server does not persist output settings it retrieves locally so it must always be able to connect
with options specified at enrollment/installation.
# Affected component; a word indicating the component this changeset affects.
component:

# 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: 3411

# 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/2784
2 changes: 1 addition & 1 deletion dev-tools/integration/.env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# If you use change this version without a pinned one, please update
# .ci/bump-elastic-stack-snapshot.yml or .github/workflows/bump-golang.yml
ELASTICSEARCH_VERSION=8.14.0-34b4df0a-SNAPSHOT
ELASTICSEARCH_VERSION=8.14.0-cf1b0234-SNAPSHOT
ELASTICSEARCH_USERNAME=elastic
ELASTICSEARCH_PASSWORD=changeme
TEST_ELASTICSEARCH_HOSTS=localhost:9200
Expand Down
16 changes: 8 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ require (
github.com/Pallinder/go-randomdata v1.2.0
github.com/dgraph-io/ristretto v0.1.1
github.com/elastic/elastic-agent-client/v7 v7.8.1
github.com/elastic/elastic-agent-libs v0.9.1
github.com/elastic/elastic-agent-libs v0.9.4
github.com/elastic/elastic-agent-system-metrics v0.9.2
github.com/elastic/go-elasticsearch/v8 v8.13.0
github.com/elastic/go-elasticsearch/v8 v8.13.1
github.com/elastic/go-ucfg v0.8.8
github.com/fxamacker/cbor/v2 v2.6.0
github.com/go-chi/chi/v5 v5.0.12
Expand All @@ -26,12 +26,12 @@ require (
github.com/rs/zerolog v1.32.0
github.com/spf13/cobra v1.8.0
github.com/stretchr/testify v1.9.0
go.elastic.co/apm/module/apmchiv5/v2 v2.5.0
go.elastic.co/apm/module/apmelasticsearch/v2 v2.5.0
go.elastic.co/apm/module/apmhttp/v2 v2.5.0
go.elastic.co/apm/module/apmprometheus/v2 v2.5.0
go.elastic.co/apm/module/apmzerolog/v2 v2.5.0
go.elastic.co/apm/v2 v2.5.0
go.elastic.co/apm/module/apmchiv5/v2 v2.6.0
go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.0
go.elastic.co/apm/module/apmhttp/v2 v2.6.0
go.elastic.co/apm/module/apmprometheus/v2 v2.6.0
go.elastic.co/apm/module/apmzerolog/v2 v2.6.0
go.elastic.co/apm/v2 v2.6.0
go.elastic.co/ecszerolog v0.2.0
go.uber.org/zap v1.27.0
golang.org/x/sync v0.7.0
Expand Down
32 changes: 16 additions & 16 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
github.com/elastic/elastic-agent-client/v7 v7.8.1 h1:J9wZc/0mUvSEok0X5iR5+n60Jgb+AWooKddb3XgPWqM=
github.com/elastic/elastic-agent-client/v7 v7.8.1/go.mod h1:axl1nkdqc84YRFkeJGD9jExKNPUrOrzf3DFo2m653nY=
github.com/elastic/elastic-agent-libs v0.9.1 h1:vuvWNER0CS9zvHC9fT6zqEGWLPk9j/wbFbiC9GCMfps=
github.com/elastic/elastic-agent-libs v0.9.1/go.mod h1:pGMj5myawdqu+xE+WKvM5FQzKQ/MonikkWOzoFTJxaU=
github.com/elastic/elastic-agent-libs v0.9.4 h1:I6c1NAj3grJ1YZgo+U04w0csMAWGIn6eZTb23Z5MbAI=
github.com/elastic/elastic-agent-libs v0.9.4/go.mod h1:SkMnpLm+tXybBrIWK6f3rcOhrDIztLbYCV46m8gwc8g=
github.com/elastic/elastic-agent-system-metrics v0.9.2 h1:/tvTKOt55EerU0WwGFoDhBlyWLgxyv7d8xCbny0bciw=
github.com/elastic/elastic-agent-system-metrics v0.9.2/go.mod h1:VfJnKw4Jqrd9ddljXCwaGKJgN+7ADyyGk089NaXVsf0=
github.com/elastic/elastic-transport-go/v8 v8.5.0 h1:v5membAl7lvQgBTexPRDBO/RdnlQX+FM9fUVDyXxvH0=
github.com/elastic/elastic-transport-go/v8 v8.5.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
github.com/elastic/go-elasticsearch/v8 v8.13.0 h1:YXPAWpvbYX0mWSNG9tnEpvs4h1stgMy5JUeKZECYYB8=
github.com/elastic/go-elasticsearch/v8 v8.13.0/go.mod h1:DIn7HopJs4oZC/w0WoJR13uMUxtHeq92eI5bqv5CRfI=
github.com/elastic/go-elasticsearch/v8 v8.13.1 h1:du5F8IzUUyCkzxyHdrO9AtopcG95I/qwi2WK8Kf1xlg=
github.com/elastic/go-elasticsearch/v8 v8.13.1/go.mod h1:DIn7HopJs4oZC/w0WoJR13uMUxtHeq92eI5bqv5CRfI=
github.com/elastic/go-structform v0.0.10 h1:oy08o/Ih2hHTkNcRY/1HhaYvIp5z6t8si8gnCJPDo1w=
github.com/elastic/go-structform v0.0.10/go.mod h1:CZWf9aIRYY5SuKSmOhtXScE5uQiLZNqAFnwKR4OrIM4=
github.com/elastic/go-sysinfo v1.14.0 h1:dQRtiqLycoOOla7IflZg3aN213vqJmP0lpVpKQ9lUEY=
Expand Down Expand Up @@ -162,18 +162,18 @@ github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=
github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
go.elastic.co/apm/module/apmchiv5/v2 v2.5.0 h1:ZVSYUA1QkyfggUTNVBPq2t/10XK8Q8a+e0wkqOadksY=
go.elastic.co/apm/module/apmchiv5/v2 v2.5.0/go.mod h1:F+INFe6fTbvsrTNfjth19iFrcedlOjSiBG0et4/bSaY=
go.elastic.co/apm/module/apmelasticsearch/v2 v2.5.0 h1:0S5Vj5/L4EkXQS7YUr+1ylTuB3njTuBNzdmn3mjXAFI=
go.elastic.co/apm/module/apmelasticsearch/v2 v2.5.0/go.mod h1:zNEXwAPoThH/bAb3TWKD5Og0Zyk0OWURsEHAja1kra4=
go.elastic.co/apm/module/apmhttp/v2 v2.5.0 h1:4AWlw8giL7hRYBQiwF1/Thm0GDsbQH/Ofe4eySAnURo=
go.elastic.co/apm/module/apmhttp/v2 v2.5.0/go.mod h1:ZP7gLEzY/OAPTqNZjp8AzA06HF82zfwXEpKI2sSVTgk=
go.elastic.co/apm/module/apmprometheus/v2 v2.5.0 h1:ENXpoj80yWNDZAacsHAwWExx8XexPsNVRsLsH7DDatw=
go.elastic.co/apm/module/apmprometheus/v2 v2.5.0/go.mod h1:e6AflCHVCzeY65qPmpdK6qA9YLep0AcogjunRVXgSFQ=
go.elastic.co/apm/module/apmzerolog/v2 v2.5.0 h1:YG2KOhDqeXBsknl5TMGnqDUDbYmUOy05e6mDRPanniM=
go.elastic.co/apm/module/apmzerolog/v2 v2.5.0/go.mod h1:k0m0BKY4OITz5TUv/lbasLOCzOtVaJqCsqmZ1sP1AfU=
go.elastic.co/apm/v2 v2.5.0 h1:UYqdu/bjcubcP9BIy5+os2ExRzw03yOQFG+sRGGhVlQ=
go.elastic.co/apm/v2 v2.5.0/go.mod h1:+CiBUdrrAGnGCL9TNx7tQz3BrfYV23L8Ljvotoc87so=
go.elastic.co/apm/module/apmchiv5/v2 v2.6.0 h1:4vVas/Q1VCFGTTyA2a6x65nPa/axPjGIrt9RxbGPWKA=
go.elastic.co/apm/module/apmchiv5/v2 v2.6.0/go.mod h1:wW6HupDHgFvzynpDKcgxLP0v09139+/I8DpL4bnaiLA=
go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.0 h1:ukMcwyMaDXsS1dRK2qRYXT2AsfwaUy74TOOYCqkWJow=
go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.0/go.mod h1:YpfiTTrqX5LB/CKBwX89oDCBAxuLJTFv40gcfxJyehM=
go.elastic.co/apm/module/apmhttp/v2 v2.6.0 h1:s8UeNFQmVBCNd4eoz7KDD9rEFhQC0HeUFXz3z9gpAmQ=
go.elastic.co/apm/module/apmhttp/v2 v2.6.0/go.mod h1:D0GLppLuI0Ddwvtl595GUxRgn6Z8L5KaDFVMv2H3GK0=
go.elastic.co/apm/module/apmprometheus/v2 v2.6.0 h1:DQy/BCjruag0eUWtwrKAatm1phSljPhRZfws9zHMHhk=
go.elastic.co/apm/module/apmprometheus/v2 v2.6.0/go.mod h1:kF9aSA3UHPeCA8BSUUlphzNEx6CRn+gRODJfShEkHek=
go.elastic.co/apm/module/apmzerolog/v2 v2.6.0 h1:xptQjif1r0mwFYuf5FxrXu+rp7L5BxO4mxinprWqooM=
go.elastic.co/apm/module/apmzerolog/v2 v2.6.0/go.mod h1:6/Tp9r7D4QGp+fMlGhj6DiyczaB7gCkO8bJi/kTywKw=
go.elastic.co/apm/v2 v2.6.0 h1:VieBMLQFtXua2YxpYxaSdYGnmmxhLT46gosI5yErJgY=
go.elastic.co/apm/v2 v2.6.0/go.mod h1:33rOXgtHwbgZcDgi6I/GtCSMZQqgxkHC0IQT3gudKvo=
go.elastic.co/ecszap v1.0.2 h1:iW5OGx8IiokiUzx/shD4AJCPFMC9uUtr7ycaiEIU++I=
go.elastic.co/ecszap v1.0.2/go.mod h1:dJkSlK3BTiwG/qXhCwe50Mz/jwu854vSip8sIeQhNZg=
go.elastic.co/ecszerolog v0.2.0 h1:nbX4dQ08jb3+vsvACfmzAqGDoBh8F2HQDUgpqwAVTg0=
Expand Down
13 changes: 7 additions & 6 deletions internal/pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,13 @@ const kRedacted = "[redacted]"
// The env vars that `elastic-agent container` command uses are unrelated.
// The agent will do all substitutions before sending fleet-server the complete config.
type Config struct {
Fleet Fleet `config:"fleet"`
Output Output `config:"output"`
Inputs []Input `config:"inputs"`
Logging Logging `config:"logging"`
HTTP HTTP `config:"http"`
m sync.Mutex
Fleet Fleet `config:"fleet"`
Output Output `config:"output"`
Inputs []Input `config:"inputs"`
Logging Logging `config:"logging"`
HTTP HTTP `config:"http"`
RevisionIdx int64 `config:",ignore"`
m sync.Mutex
}

var deprecatedConfigOptions = map[string]string{
Expand Down
Loading

0 comments on commit 9f3a479

Please sign in to comment.