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

Jump to bottom

Osquerybeat: Upgrade to osquery 5.10.2 #37115

Merged
merged 5 commits into from
Nov 15, 2023
Merged

Osquerybeat: Upgrade to osquery 5.10.2 #37115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29f9fdb
Osquerybeat: Upgrade to osquery 5.10.2
aleksmaus Nov 13, 2023
d14e60a
Update changelog
aleksmaus Nov 14, 2023
fc82f91
Merge branch 'main' into upgrade/oquery_5.10.2
aleksmaus Nov 14, 2023
4253d71
Merge branch 'main' into upgrade/oquery_5.10.2
aleksmaus Nov 14, 2023
9dc550a
Merge branch 'main' into upgrade/oquery_5.10.2
aleksmaus Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]

*Osquerybeat*

- Upgrade to osquery 5.10.2. {pull}37115[37115]

*Packetbeat*

Expand Down
4 changes: 2 additions & 2 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21198,11 +21198,11 @@ THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/osquery/osquery-go
Version: v0.0.0-20230707154813-2e4891a0f444
Version: v0.0.0-20231108163517-e3cde127e724
Licence type (autodetected): MIT
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/osquery/osquery-go@v0.0.0-20230707154813-2e4891a0f444/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/osquery/osquery-go@v0.0.0-20231108163517-e3cde127e724/LICENSE:

MIT License

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ require (
github.com/mitchellh/hashstructure v1.1.0
github.com/mitchellh/mapstructure v1.5.0
github.com/olekukonko/tablewriter v0.0.5
github.com/osquery/osquery-go v0.0.0-20230707154813-2e4891a0f444
github.com/osquery/osquery-go v0.0.0-20231108163517-e3cde127e724
github.com/pierrre/gotestcover v0.0.0-20160517101806-924dca7d15f0
github.com/pkg/errors v0.9.1
github.com/pmezard/go-difflib v1.0.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1566,8 +1566,8 @@ github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxS
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
github.com/osquery/osquery-go v0.0.0-20230707154813-2e4891a0f444 h1:UO3MEdZ4hkmAfhf7kXfuKR+e44gsHlEEsdWGOwZNLyQ=
github.com/osquery/osquery-go v0.0.0-20230707154813-2e4891a0f444/go.mod h1:mLJRc1Go8uP32LRALGvWj2lVJ+hDYyIfxDzVa+C5Yo8=
github.com/osquery/osquery-go v0.0.0-20231108163517-e3cde127e724 h1:z8XmnNQeCDZB3BwVoRxcqwo7MlDdsB6AJxqTap72S7w=
github.com/osquery/osquery-go v0.0.0-20231108163517-e3cde127e724/go.mod h1:mLJRc1Go8uP32LRALGvWj2lVJ+hDYyIfxDzVa+C5Yo8=
github.com/otiai10/copy v1.12.0 h1:cLMgSQnXBs1eehF0Wy/FAGsgDTDmAqFR7rQylBb1nDY=
github.com/otiai10/copy v1.12.0/go.mod h1:rSaLseMUsZFFbsFGc7wCJnnkTAvdc5L6VWxPE4308Ww=
github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=
Expand Down
10 changes: 5 additions & 5 deletions x-pack/osquerybeat/internal/distro/distro.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ const (
osqueryCertsDarwinPath = "private/var/osquery/certs/" + osqueryCertsPEM
osqueryCertsWindowsPath = "osquery/certs/" + osqueryCertsPEM

osqueryVersion = "5.8.2"
osqueryVersion = "5.10.2"
osqueryMSIExt = ".msi"
osqueryPkgExt = ".pkg"

osqueryDistroDarwinSHA256 = "1fea8ac9b603851d2e76c5fc73138a468a3075a3002c8cb1fd7fff53b889c4dd"
osqueryDistroLinuxSHA256 = "5bb2647b45a423e68d7dbc16ab2316c3f512d0944a56e4662c7010b59cddc721"
osqueryDistroLinuxARMSHA256 = "e51620928210970abb51d6ec79235bafff73bd354bdb54eec6e5969072d3d115"
osqueryDistroWindowsSHA256 = "d319837d4e95d1e477c2126d383501180925a29f488ff1164fa16d2e576f96dd"
osqueryDistroDarwinSHA256 = "a01d1f7da016f1e6bed54955e97982d491b7e55311433ff0fc985269160633af"
osqueryDistroLinuxSHA256 = "61ef2351a07dbc36ae9ebff605e8a7ecc4e09a07ac11f540d2aed78c143addbe"
osqueryDistroLinuxARMSHA256 = "106ea8a90dff0ccff852f44137848fe47ab9e8cfd27e5cd3a5ef963024b0564b"
osqueryDistroWindowsSHA256 = "f5a6955db724559638e43aef181e26eadfe4bfb827907ffd134d9abb0512cc58"
)

type OSArch struct {
Expand Down