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.

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

Continuation of: Adriansr fix mb windows procs #12301 (#12475) #12527

Closed
wants to merge 1 commit into from
Closed
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
2 changes: 2 additions & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fixed RabbitMQ `queue` metricset gathering when `consumer_utilisation` is set empty at the metrics source {pull}12089[12089]
- Fix direction of incoming IPv6 sockets. {pull}12248[12248]
- Ignore prometheus metrics when their values are NaN or Inf. {pull}12084[12084] {issue}10849[10849]
- In the kibana/stats metricset, only log error (don't also index it) if xpack is enabled. {pull}12265[12265]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This changelog entry sneaked in. Happens frequently with backports.

- Fix an issue listing all processes when run under Windows as a non-privileged user. {issue}12301[12301] {pull}12475[12475]
- Require client_auth by default when ssl is enabled for module http metricset server{pull}12333[12333]

*Packetbeat*
Expand Down
4 changes: 2 additions & 2 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -765,8 +765,8 @@ Elasticsearch, B.V. (https://www.elastic.co/).

--------------------------------------------------------------------
Dependency: github.com/elastic/gosigar
Version: v0.10.2
Revision: 1227b9d6877d126ad640087e44439d70dba2df4f
Version: v0.10.3
Revision: 99ed9cf55303a9d3936cb656b9a86a4a6e67b30a
License type (autodetected): Apache-2.0
./vendor/github.com/elastic/gosigar/LICENSE:
--------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion libbeat/metric/system/process/process.go
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ func (procStats *Stats) getSingleProcess(pid int, newProcs ProcsMap) *Process {

err = process.getDetails(procStats.isWhitelistedEnvVar)
if err != nil {
logp.Err("Error getting process details. pid=%d: %v", process.Pid, err)
logp.Debug("processes", "Error getting details for process %s with pid=%d: %v", process.Name, process.Pid, err)
return nil
}

Expand Down
5 changes: 5 additions & 0 deletions vendor/github.com/elastic/gosigar/CHANGELOG.md

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

17 changes: 7 additions & 10 deletions vendor/github.com/elastic/gosigar/sigar_windows.go

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

42 changes: 21 additions & 21 deletions vendor/vendor.json
Original file line number Diff line number Diff line change
Expand Up @@ -1246,44 +1246,44 @@
"revisionTime": "2018-08-31T13:10:45Z"
},
{
"checksumSHA1": "c1rU7WNZ+1AwZcRPBWhPBHcbZjg=",
"checksumSHA1": "tuhGcluN3UtoiFBovqsep6aPx3s=",
"path": "github.com/elastic/gosigar",
"revision": "1227b9d6877d126ad640087e44439d70dba2df4f",
"revisionTime": "2019-05-08T13:07:01Z",
"version": "v0.10.2",
"versionExact": "v0.10.2"
"revision": "99ed9cf55303a9d3936cb656b9a86a4a6e67b30a",
"revisionTime": "2019-05-27T11:32:19Z",
"version": "v0.10.3",
"versionExact": "v0.10.3"
},
{
"checksumSHA1": "TX9y4oPL5YmT4Gb/OU4GIPTdQB4=",
"path": "github.com/elastic/gosigar/cgroup",
"revision": "1227b9d6877d126ad640087e44439d70dba2df4f",
"revisionTime": "2019-05-08T13:07:01Z",
"version": "v0.10.2",
"versionExact": "v0.10.2"
"revision": "99ed9cf55303a9d3936cb656b9a86a4a6e67b30a",
"revisionTime": "2019-05-27T11:32:19Z",
"version": "v0.10.3",
"versionExact": "v0.10.3"
},
{
"checksumSHA1": "hPqGM3DENaGfipEODoyZ4mKogTQ=",
"path": "github.com/elastic/gosigar/sys",
"revision": "1227b9d6877d126ad640087e44439d70dba2df4f",
"revisionTime": "2019-05-08T13:07:01Z",
"version": "v0.10.2",
"versionExact": "v0.10.2"
"revision": "99ed9cf55303a9d3936cb656b9a86a4a6e67b30a",
"revisionTime": "2019-05-27T11:32:19Z",
"version": "v0.10.3",
"versionExact": "v0.10.3"
},
{
"checksumSHA1": "mLq5lOyD0ZU39ysXuf1ETOLJ+f0=",
"path": "github.com/elastic/gosigar/sys/linux",
"revision": "1227b9d6877d126ad640087e44439d70dba2df4f",
"revisionTime": "2019-05-08T13:07:01Z",
"version": "v0.10.2",
"versionExact": "v0.10.2"
"revision": "99ed9cf55303a9d3936cb656b9a86a4a6e67b30a",
"revisionTime": "2019-05-27T11:32:19Z",
"version": "v0.10.3",
"versionExact": "v0.10.3"
},
{
"checksumSHA1": "R70u1XUHH/t1pquvHEFDeUFtkFk=",
"path": "github.com/elastic/gosigar/sys/windows",
"revision": "1227b9d6877d126ad640087e44439d70dba2df4f",
"revisionTime": "2019-05-08T13:07:01Z",
"version": "v0.10.2",
"versionExact": "v0.10.2"
"revision": "99ed9cf55303a9d3936cb656b9a86a4a6e67b30a",
"revisionTime": "2019-05-27T11:32:19Z",
"version": "v0.10.3",
"versionExact": "v0.10.3"
},
{
"checksumSHA1": "Klc34HULvwvY4cGA/D8HmqtXLqw=",
Expand Down