Skip to content

Commit

Permalink
Cherry-pick #11494 to 6.7: Update github.com/elastic/go-sysinfo (#11710)
Browse files Browse the repository at this point in the history
* Update github.com/elastic/go-sysinfo (#11494)

Fixes #11490
Fixes #9134

(cherry picked from commit e044c9c)
  • Loading branch information
andrewkroh committed Apr 9, 2019
1 parent b376389 commit e2ea061
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 21 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ https://github.com/elastic/beats/compare/v6.7.0...6.x[Check the HEAD diff]

- Relax validation of the X-Pack license UID value. {issue}11640[11640]
- Fix a parsing error with the X-Pack license check on 32-bit system. {issue}11650[11650]
- Fix OS family classification in `add_host_metadata` for Amazon Linux, Raspbian, and RedHat Linux. {issue}9134[9134] {pull}11494[11494]
- Fix false positives reported in the `host.containerized` field added by `add_host_metadata`. {pull}11494[11494]
- Fix the add_host_metadata's `host.id` field on older Linux versions. {pull}11494[11494]

*Auditbeat*

Expand Down
2 changes: 1 addition & 1 deletion NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ Apache License 2.0

--------------------------------------------------------------------
Dependency: github.com/elastic/go-sysinfo
Revision: 59ef8c0eae46c0929e3b219ac86368d4b5934f91
Revision: ab4f04edfc3d6b3864f5f06a068ddab9ad79774f
License type (autodetected): Apache-2.0
./vendor/github.com/elastic/go-sysinfo/LICENSE.txt:
--------------------------------------------------------------------
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 29 additions & 3 deletions vendor/github.com/elastic/go-sysinfo/providers/linux/machineid.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions vendor/github.com/elastic/go-sysinfo/providers/linux/os.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions vendor/vendor.json
Original file line number Diff line number Diff line change
Expand Up @@ -880,44 +880,44 @@
{
"checksumSHA1": "QhFIpuHPaV6hKejKcc2wm6y4MSQ=",
"path": "github.com/elastic/go-sysinfo",
"revision": "59ef8c0eae46c0929e3b219ac86368d4b5934f91",
"revisionTime": "2019-01-07T12:18:35Z"
"revision": "ab4f04edfc3d6b3864f5f06a068ddab9ad79774f",
"revisionTime": "2019-03-27T18:53:17Z"
},
{
"checksumSHA1": "GiZCjX17K265TtamGZZw4R2Jwbk=",
"path": "github.com/elastic/go-sysinfo/internal/registry",
"revision": "59ef8c0eae46c0929e3b219ac86368d4b5934f91",
"revisionTime": "2019-01-07T12:18:35Z"
"revision": "ab4f04edfc3d6b3864f5f06a068ddab9ad79774f",
"revisionTime": "2019-03-27T18:53:17Z"
},
{
"checksumSHA1": "ovafihHzpBx9Y7+lZh9X5KwNCvE=",
"path": "github.com/elastic/go-sysinfo/providers/darwin",
"revision": "59ef8c0eae46c0929e3b219ac86368d4b5934f91",
"revisionTime": "2019-01-07T12:18:35Z"
"revision": "ab4f04edfc3d6b3864f5f06a068ddab9ad79774f",
"revisionTime": "2019-03-27T18:53:17Z"
},
{
"checksumSHA1": "AK76ZxnuvK02Dfpmj7b2TD/aiSI=",
"checksumSHA1": "OyI+VwDiT4UZjncsDr1GYg1xcdw=",
"path": "github.com/elastic/go-sysinfo/providers/linux",
"revision": "59ef8c0eae46c0929e3b219ac86368d4b5934f91",
"revisionTime": "2019-01-07T12:18:35Z"
"revision": "ab4f04edfc3d6b3864f5f06a068ddab9ad79774f",
"revisionTime": "2019-03-27T18:53:17Z"
},
{
"checksumSHA1": "RWLvcP1w9ynKbuCqiW6prwd+EDU=",
"path": "github.com/elastic/go-sysinfo/providers/shared",
"revision": "59ef8c0eae46c0929e3b219ac86368d4b5934f91",
"revisionTime": "2019-01-07T12:18:35Z"
"revision": "ab4f04edfc3d6b3864f5f06a068ddab9ad79774f",
"revisionTime": "2019-03-27T18:53:17Z"
},
{
"checksumSHA1": "aF05MEkMjbRekzHlwFxmd5WBpeY=",
"path": "github.com/elastic/go-sysinfo/providers/windows",
"revision": "59ef8c0eae46c0929e3b219ac86368d4b5934f91",
"revisionTime": "2019-01-07T12:18:35Z"
"revision": "ab4f04edfc3d6b3864f5f06a068ddab9ad79774f",
"revisionTime": "2019-03-27T18:53:17Z"
},
{
"checksumSHA1": "MLQioPEjULYbNqqCjfB1/cux08E=",
"path": "github.com/elastic/go-sysinfo/types",
"revision": "59ef8c0eae46c0929e3b219ac86368d4b5934f91",
"revisionTime": "2019-01-07T12:18:35Z"
"revision": "ab4f04edfc3d6b3864f5f06a068ddab9ad79774f",
"revisionTime": "2019-03-27T18:53:17Z"
},
{
"checksumSHA1": "bNf3GDGhZh86bfCIMM5c5AYfo3g=",
Expand Down

0 comments on commit e2ea061

Please sign in to comment.