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

[Metricbeat] Add a system/users metricset #16569

Merged
merged 25 commits into from
Mar 6, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
cb32015
fix file check bug, deal with logging
fearful-symmetry Jan 29, 2020
a59eda9
Merge remote-tracking branch 'upstream/master'
fearful-symmetry Jan 29, 2020
6d11a67
Merge remote-tracking branch 'upstream/master'
fearful-symmetry Jan 31, 2020
13d5113
Merge remote-tracking branch 'upstream/master'
fearful-symmetry Feb 4, 2020
35aef78
Merge remote-tracking branch 'upstream/master'
fearful-symmetry Feb 5, 2020
1767e21
Merge remote-tracking branch 'upstream/master'
fearful-symmetry Feb 7, 2020
abcbee2
Merge remote-tracking branch 'upstream/master'
fearful-symmetry Feb 12, 2020
81ba6a2
Merge remote-tracking branch 'upstream/master'
fearful-symmetry Feb 13, 2020
9a9aab5
Merge remote-tracking branch 'upstream/master'
fearful-symmetry Feb 14, 2020
961801d
init commit of users metricset
fearful-symmetry Feb 18, 2020
a1ddc9e
vendor new sub-systemd dep
fearful-symmetry Feb 18, 2020
b1d0e0d
refactor dbus calling code
fearful-symmetry Feb 25, 2020
17bd736
Revert "vendor new sub-systemd dep"
fearful-symmetry Feb 25, 2020
70f60d7
make fmt
fearful-symmetry Feb 25, 2020
080e9e7
cleanup, fix tests
fearful-symmetry Feb 25, 2020
9ea2202
fix cross-compile issues
fearful-symmetry Feb 26, 2020
133500b
update docs
fearful-symmetry Mar 2, 2020
8d9d42e
code quality cleanup
fearful-symmetry Mar 3, 2020
53e4836
merge from master
fearful-symmetry Mar 3, 2020
ed1aa4c
make update
fearful-symmetry Mar 3, 2020
c2720e6
fix deps, update vendor
fearful-symmetry Mar 4, 2020
7df7184
update notice
fearful-symmetry Mar 4, 2020
e60bec9
add changelog
fearful-symmetry Mar 5, 2020
f7acf43
Merge branch 'master' into users-metricset
fearful-symmetry Mar 5, 2020
328a848
fix changelog, add example config
fearful-symmetry Mar 5, 2020
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
fix deps, update vendor
  • Loading branch information
fearful-symmetry committed Mar 4, 2020
commit c2720e60c504811552d32a369885c72b7b653d8b
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ require (
github.com/go-sourcemap/sourcemap v2.1.2+incompatible // indirect
github.com/go-sql-driver/mysql v1.4.1
github.com/gocarina/gocsv v0.0.0-20170324095351-ffef3ffc77be
github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e
github.com/godror/godror v0.10.4
github.com/gofrs/flock v0.7.2-0.20190320160742-5135e617513b
github.com/gofrs/uuid v3.2.0+incompatible
Expand Down
6 changes: 3 additions & 3 deletions metricbeat/module/system/users/users.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"github.com/godbus/dbus"
"github.com/pkg/errors"

"github.com/elastic/beats/libbeat/common"
"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/v7/libbeat/common"
"github.com/elastic/beats/v7/libbeat/common/cfgwarn"
"github.com/elastic/beats/v7/metricbeat/mb"
)

// init registers the MetricSet with the central registry as soon as the program
Expand Down
46 changes: 46 additions & 0 deletions vendor/github.com/godbus/dbus/.travis.yml

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

50 changes: 50 additions & 0 deletions vendor/github.com/godbus/dbus/CONTRIBUTING.md

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

25 changes: 25 additions & 0 deletions vendor/github.com/godbus/dbus/LICENSE

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

3 changes: 3 additions & 0 deletions vendor/github.com/godbus/dbus/MAINTAINERS

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

44 changes: 44 additions & 0 deletions vendor/github.com/godbus/dbus/README.markdown

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

Loading