Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions NOTICE-fips.txt
Original file line number Diff line number Diff line change
Expand Up @@ -842,11 +842,19 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l

--------------------------------------------------------------------------------
Dependency : github.com/elastic/elastic-agent-system-metrics
<<<<<<< HEAD
Version: v0.14.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.14.0/LICENSE.txt:
=======
Version: v0.14.2
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.14.2/LICENSE.txt:
>>>>>>> 0f4d516 (build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.14.1 to 0.14.2 (#6440))

Apache License
Version 2.0, January 2004
Expand Down
8 changes: 8 additions & 0 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -842,11 +842,19 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l

--------------------------------------------------------------------------------
Dependency : github.com/elastic/elastic-agent-system-metrics
<<<<<<< HEAD
Version: v0.14.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.14.0/LICENSE.txt:
=======
Version: v0.14.2
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-system-metrics@v0.14.2/LICENSE.txt:
>>>>>>> 0f4d516 (build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.14.1 to 0.14.2 (#6440))

Apache License
Version 2.0, January 2004
Expand Down
4 changes: 4 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ require (
github.com/docker/go-units v0.5.0
github.com/elastic/elastic-agent-client/v7 v7.18.0
github.com/elastic/elastic-agent-libs v0.33.0
<<<<<<< HEAD
github.com/elastic/elastic-agent-system-metrics v0.14.0
=======
github.com/elastic/elastic-agent-system-metrics v0.14.2
>>>>>>> 0f4d516 (build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.14.1 to 0.14.2 (#6440))
github.com/elastic/go-elasticsearch/v8 v8.19.3
github.com/elastic/go-ucfg v0.8.8
github.com/fxamacker/cbor/v2 v2.8.0
Expand Down
5 changes: 5 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,13 @@ github.com/elastic/elastic-agent-client/v7 v7.18.0 h1:zXdoErqECfvRjj1c+1Ko4VGuUn
github.com/elastic/elastic-agent-client/v7 v7.18.0/go.mod h1:ChFjpIfSsQOnhWT3se5Euw/o8P4Vf77FxeObE/vUfSc=
github.com/elastic/elastic-agent-libs v0.33.0 h1:DbtU5N8ETw+YII4tqSQSoJcwKC1ReFoFRmCsRNs/lZc=
github.com/elastic/elastic-agent-libs v0.33.0/go.mod h1:0xUg7alsNE/WhY9DZRIdTYW75nqSHC1octIAg//j/PQ=
<<<<<<< HEAD
github.com/elastic/elastic-agent-system-metrics v0.14.0 h1:oqkUg5FZOJsfTptTYQcYh/wEMouYhosUJbNwi4z6OGA=
github.com/elastic/elastic-agent-system-metrics v0.14.0/go.mod h1:JNfnZrC0viAjlJRUzQKKuMpDlXgjXBn4WdWEXQF7jcA=
=======
github.com/elastic/elastic-agent-system-metrics v0.14.2 h1:OduTwpW4ZiEG3kzMGg31Y0ApJ5fABYFG1U8F5+J3svY=
github.com/elastic/elastic-agent-system-metrics v0.14.2/go.mod h1:JNfnZrC0viAjlJRUzQKKuMpDlXgjXBn4WdWEXQF7jcA=
>>>>>>> 0f4d516 (build(deps): bump github.com/elastic/elastic-agent-system-metrics from 0.14.1 to 0.14.2 (#6440))
github.com/elastic/elastic-transport-go/v8 v8.8.0 h1:7k1Ua+qluFr6p1jfJjGDl97ssJS/P7cHNInzfxgBQAo=
github.com/elastic/elastic-transport-go/v8 v8.8.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
github.com/elastic/go-elasticsearch/v8 v8.19.3 h1:5LDg0hfGJXBa9Y+2QlUgRTsNJ/7rm7oNidydtFAq0LI=
Expand Down
Loading