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

Merge feature arch v2 #33630

Merged
merged 17 commits into from
Nov 9, 2022
+1,885 −519
Merged

Merge feature arch v2 #33630

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a5acefb
Update Metricbeat, Filebeat, libbeat with elastic-agent V2 support (#…
fearful-symmetry Sep 6, 2022
07d43e3
V2 packetbeat support (#33041)
fearful-symmetry Sep 13, 2022
b5b8b0c
Merge remote-tracking branch 'upstream/main' into feature-arch-v2
fearful-symmetry Sep 15, 2022
a528bd2
Merge remote-tracking branch 'upstream/feature-arch-v2' into feature-…
fearful-symmetry Sep 15, 2022
6d52bd3
Merge remote-tracking branch 'upstream/main' into feature-arch-v2
fearful-symmetry Sep 22, 2022
6eecb84
First pass at auditbeat support (#33026)
fearful-symmetry Oct 4, 2022
8dc24d6
Add heartbeat support for V2 (#33157)
fearful-symmetry Oct 11, 2022
e48ea3b
Merge remote-tracking branch 'upstream/main' into feature-arch-v2
fearful-symmetry Oct 11, 2022
7cab218
fix go.mod
fearful-symmetry Oct 11, 2022
26ef6da
fix unchecked stream_id
fearful-symmetry Oct 12, 2022
c399a9d
fix unchecked stream_id (#33335)
fearful-symmetry Oct 13, 2022
cae33ef
Update elastic-agent-libs for output panic fix (#33336)
fearful-symmetry Oct 13, 2022
b02e6b6
Merge remote-tracking branch 'upstream/feature-arch-v2' into feature-…
fearful-symmetry Oct 19, 2022
6421c5c
Merge remote-tracking branch 'upstream/main' into feature-arch-v2
fearful-symmetry Oct 19, 2022
a65421a
Merge remote-tracking branch 'upstream/main' into feature-arch-v2
fearful-symmetry Nov 1, 2022
7d95704
update elastic-agent-client (#33552)
fearful-symmetry Nov 2, 2022
7bfe1c5
Merge remote-tracking branch 'upstream/main' into feature-arch-v2
fearful-symmetry Nov 9, 2022
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
update elastic-agent-client (#33552)
@fearful-symmetry
fearful-symmetry authored Nov 2, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit 7d95704002b953f4091ac2474e124b4a0ca2ba56
8 changes: 4 additions & 4 deletions NOTICE.txt
View file
Original file line number Diff line number Diff line change
@@ -9867,11 +9867,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-a

--------------------------------------------------------------------------------
Dependency : github.com/elastic/elastic-agent-client/v7
Version: v7.0.0-20220804181728-b0328d2fe484
Version: v7.0.0-20221028150015-05e494d37ccd
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/[email protected]20220804181728-b0328d2fe484/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/[email protected]20221028150015-05e494d37ccd/LICENSE.txt:

ELASTIC LICENSE AGREEMENT

@@ -17875,11 +17875,11 @@ THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/mitchellh/mapstructure
Version: v1.4.3
Version: v1.5.0
Licence type (autodetected): MIT
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/mitchellh/mapstructure@v1.4.3/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/mitchellh/mapstructure@v1.5.0/LICENSE:

The MIT License (MIT)

4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ require (
github.com/dustin/go-humanize v1.0.0
github.com/eapache/go-resiliency v1.2.0
github.com/eclipse/paho.mqtt.golang v1.3.5
github.com/elastic/elastic-agent-client/v7 v7.0.0-20220804181728-b0328d2fe484
github.com/elastic/elastic-agent-client/v7 v7.0.0-20221028150015-05e494d37ccd
github.com/elastic/go-concert v0.2.0
github.com/elastic/go-libaudit/v2 v2.3.2
github.com/elastic/go-licenser v0.4.0
@@ -123,7 +123,7 @@ require (
github.com/miekg/dns v1.1.42
github.com/mitchellh/gox v1.0.1
github.com/mitchellh/hashstructure v0.0.0-20170116052023-ab25296c0f51
github.com/mitchellh/mapstructure v1.4.3
github.com/mitchellh/mapstructure v1.5.0
github.com/olekukonko/tablewriter v0.0.5
github.com/osquery/osquery-go v0.0.0-20210622151333-99b4efa62ec5
github.com/otiai10/copy v1.2.0
7 changes: 4 additions & 3 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -615,8 +615,8 @@ github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3 h1:lnDkqiRFKm0rxdljqr
github.com/elastic/dhcp v0.0.0-20200227161230-57ec251c7eb3/go.mod h1:aPqzac6AYkipvp4hufTyMj5PDIphF3+At8zr7r51xjY=
github.com/elastic/elastic-agent-autodiscover v0.4.0 h1:R1JMLHQpH2KP3GXY8zmgV4dj39uoe1asyPPWGQbGgSk=
github.com/elastic/elastic-agent-autodiscover v0.4.0/go.mod h1:p3MSf9813JEnolCTD0GyVAr3+Eptg2zQ9aZVFjl4tJ4=
github.com/elastic/elastic-agent-client/v7 v7.0.0-20220804181728-b0328d2fe484 h1:uJIMfLgCenJvxsVmEjBjYGxt0JddCgw2IxgoNfcIXOk=
github.com/elastic/elastic-agent-client/v7 v7.0.0-20220804181728-b0328d2fe484/go.mod h1:fkvyUfFwyAG5OnMF0h+FV9sC0Xn9YLITwQpSuwungQs=
github.com/elastic/elastic-agent-client/v7 v7.0.0-20221028150015-05e494d37ccd h1:IuAuac3vcucBrjAXKPQlTJ22H7mBUsSnNWxa7GZYFEg=
github.com/elastic/elastic-agent-client/v7 v7.0.0-20221028150015-05e494d37ccd/go.mod h1:FEXUbFMfaV62S0CtJgD+FFHGY7+4o4fXkDicyONPSH8=
github.com/elastic/elastic-agent-libs v0.2.11/go.mod h1:chO3rtcLyGlKi9S0iGVZhYCzDfdDsAQYBc+ui588AFE=
github.com/elastic/elastic-agent-libs v0.2.13 h1:YQzhO8RaLosGlyt7IHtj/ZxigWiwLcXXlv3gS4QY9CA=
github.com/elastic/elastic-agent-libs v0.2.13/go.mod h1:0J9lzJh+BjttIiVjYDLncKYCEWUUHiiqnuI64y6C6ss=
@@ -1364,8 +1364,9 @@ github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/mapstructure v1.4.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs=
github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8=