Skip to content

Commit

Permalink
Switch elastic/procfs to prometheus/procfs
Browse files Browse the repository at this point in the history
All changes have been merged upstream.
  • Loading branch information
ruflin committed Mar 14, 2018
1 parent dd2983d commit 5ef4cc2
Show file tree
Hide file tree
Showing 38 changed files with 3,576 additions and 189 deletions.
34 changes: 17 additions & 17 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -401,23 +401,6 @@ This product includes a number of subcomponents with
separate copyright notices and license terms. Your use of these
subcomponents is subject to the terms and conditions of the
subcomponent's license, as noted in the LICENSE file.
--------------------------------------------------------------------
Dependency: github.com/elastic/procfs
Revision: 664e6bc79eb43c956507b6e20a867140516ad15a
License type (autodetected): Apache-2.0
./vendor/github.com/elastic/procfs/LICENSE:
--------------------------------------------------------------------
Apache License 2.0

-------NOTICE-----
procfs provides functions to retrieve system, kernel and process
metrics from the pseudo-filesystem proc.

Copyright 2014-2015 The Prometheus Authors

This product includes software developed at
SoundCloud Ltd. (http://soundcloud.com/).

--------------------------------------------------------------------
Dependency: github.com/ericchiang/k8s
Version: v1.0.0
Expand Down Expand Up @@ -2756,6 +2739,23 @@ Copyright 2015 The Prometheus Authors
This product includes software developed at
SoundCloud Ltd. (http://soundcloud.com/).

--------------------------------------------------------------------
Dependency: github.com/prometheus/procfs
Revision: 54d17b57dd7d4a3aa092476596b3f8a933bde349
License type (autodetected): Apache-2.0
./vendor/github.com/prometheus/procfs/LICENSE:
--------------------------------------------------------------------
Apache License 2.0

-------NOTICE-----
procfs provides functions to retrieve system, kernel and process
metrics from the pseudo-filesystem proc.

Copyright 2014-2015 The Prometheus Authors

This product includes software developed at
SoundCloud Ltd. (http://soundcloud.com/).

--------------------------------------------------------------------
Dependency: github.com/rcrowley/go-metrics
Revision: 1f30fe9094a513ce4c700b9a54458bbb0c96996c
Expand Down
3 changes: 2 additions & 1 deletion auditbeat/module/auditd/audit_linux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ import (

"github.com/stretchr/testify/assert"

"github.com/prometheus/procfs"

"github.com/elastic/beats/auditbeat/core"
"github.com/elastic/beats/libbeat/logp"
mbtest "github.com/elastic/beats/metricbeat/mb/testing"
"github.com/elastic/go-libaudit"
"github.com/elastic/go-libaudit/auparse"
"github.com/elastic/procfs"
)

// Specify the -audit flag when running these tests to interact with the real
Expand Down
6 changes: 3 additions & 3 deletions metricbeat/module/system/raid/raid.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ package raid
import (
"path/filepath"

"github.com/pkg/errors"
"github.com/prometheus/procfs"

"github.com/elastic/beats/libbeat/common"
"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/metricbeat/mb/parse"
"github.com/elastic/beats/metricbeat/module/system"
"github.com/elastic/procfs"

"github.com/pkg/errors"
)

func init() {
Expand Down
3 changes: 1 addition & 2 deletions metricbeat/module/system/socket/ptable.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ import (
"strings"

"github.com/joeshaw/multierror"

"github.com/elastic/procfs"
"github.com/prometheus/procfs"
)

// process tools
Expand Down
20 changes: 0 additions & 20 deletions vendor/github.com/elastic/procfs/AUTHORS.md

This file was deleted.

6 changes: 0 additions & 6 deletions vendor/github.com/elastic/procfs/Makefile

This file was deleted.

33 changes: 0 additions & 33 deletions vendor/github.com/elastic/procfs/fs.go

This file was deleted.

56 changes: 0 additions & 56 deletions vendor/github.com/elastic/procfs/stat.go

This file was deleted.

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

File renamed without changes.
1 change: 1 addition & 0 deletions vendor/github.com/prometheus/procfs/MAINTAINERS.md

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

71 changes: 71 additions & 0 deletions vendor/github.com/prometheus/procfs/Makefile

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

File renamed without changes.

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

95 changes: 95 additions & 0 deletions vendor/github.com/prometheus/procfs/buddyinfo.go

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

File renamed without changes.
Loading

0 comments on commit 5ef4cc2

Please sign in to comment.