Depenancy upgrades and movign to dep. (#8630)

4 files changed, 18 insertions, 519 deletions

diff --git a/vendor/github.com/prometheus/procfs/nfs/nfs.go b/vendor/github.com/prometheus/procfs/nfs/nfs.go
index e2185b782..651bf6819 100644
--- a/vendor/github.com/prometheus/procfs/nfs/nfs.go
+++ b/vendor/github.com/prometheus/procfs/nfs/nfs.go
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package nfsd implements parsing of /proc/net/rpc/nfsd.
+// Package nfs implements parsing of /proc/net/rpc/nfsd.
 // Fields are documented in https://www.svennd.be/nfsd-stats-explained-procnetrpcnfsd/
 package nfs
 
@@ -136,8 +136,8 @@ type ClientV4Stats struct {
 	Setattr            uint64
 	FsInfo             uint64
 	Renew              uint64
-	SetClientId        uint64
-	SetClientIdConfirm uint64
+	SetClientID        uint64
+	SetClientIDConfirm uint64
 	Lock               uint64
 	Lockt              uint64
 	Locku              uint64
@@ -156,13 +156,13 @@ type ClientV4Stats struct {
 	ReadDir            uint64
 	ServerCaps         uint64
 	DelegReturn        uint64
-	GetAcl             uint64
-	SetAcl             uint64
+	GetACL             uint64
+	SetACL             uint64
 	FsLocations        uint64
 	ReleaseLockowner   uint64
 	Secinfo            uint64
 	FsidPresent        uint64
-	ExchangeId         uint64
+	ExchangeID         uint64
 	CreateSession      uint64
 	DestroySession     uint64
 	Sequence           uint64
@@ -173,11 +173,11 @@ type ClientV4Stats struct {
 	LayoutCommit       uint64
 	LayoutReturn       uint64
 	SecinfoNoName      uint64
-	TestStateId        uint64
-	FreeStateId        uint64
+	TestStateID        uint64
+	FreeStateID        uint64
 	GetDeviceList      uint64
 	BindConnToSession  uint64
-	DestroyClientId    uint64
+	DestroyClientID    uint64
 	Seek               uint64
 	Allocate           uint64
 	DeAllocate         uint64
@@ -238,7 +238,7 @@ type V4Ops struct {
 	RelLockOwner uint64
 }
 
-// RPCStats models all stats from /proc/net/rpc/nfs.
+// ClientRPCStats models all stats from /proc/net/rpc/nfs.
 type ClientRPCStats struct {
 	Network       Network
 	ClientRPC     ClientRPC
diff --git a/vendor/github.com/prometheus/procfs/nfs/parse.go b/vendor/github.com/prometheus/procfs/nfs/parse.go
index 8f568f011..95a83cc5b 100644
--- a/vendor/github.com/prometheus/procfs/nfs/parse.go
+++ b/vendor/github.com/prometheus/procfs/nfs/parse.go
@@ -204,8 +204,8 @@ func parseClientV4Stats(v []uint64) (ClientV4Stats, error) {
 		Setattr:            v[10],
 		FsInfo:             v[11],
 		Renew:              v[12],
-		SetClientId:        v[13],
-		SetClientIdConfirm: v[14],
+		SetClientID:        v[13],
+		SetClientIDConfirm: v[14],
 		Lock:               v[15],
 		Lockt:              v[16],
 		Locku:              v[17],
@@ -224,13 +224,13 @@ func parseClientV4Stats(v []uint64) (ClientV4Stats, error) {
 		ReadDir:            v[30],
 		ServerCaps:         v[31],
 		DelegReturn:        v[32],
-		GetAcl:             v[33],
-		SetAcl:             v[34],
+		GetACL:             v[33],
+		SetACL:             v[34],
 		FsLocations:        v[35],
 		ReleaseLockowner:   v[36],
 		Secinfo:            v[37],
 		FsidPresent:        v[38],
-		ExchangeId:         v[39],
+		ExchangeID:         v[39],
 		CreateSession:      v[40],
 		DestroySession:     v[41],
 		Sequence:           v[42],
@@ -241,11 +241,11 @@ func parseClientV4Stats(v []uint64) (ClientV4Stats, error) {
 		LayoutCommit:       v[47],
 		LayoutReturn:       v[48],
 		SecinfoNoName:      v[49],
-		TestStateId:        v[50],
-		FreeStateId:        v[51],
+		TestStateID:        v[50],
+		FreeStateID:        v[51],
 		GetDeviceList:      v[52],
 		BindConnToSession:  v[53],
-		DestroyClientId:    v[54],
+		DestroyClientID:    v[54],
 		Seek:               v[55],
 		Allocate:           v[56],
 		DeAllocate:         v[57],
diff --git a/vendor/github.com/prometheus/procfs/nfs/parse_nfs_test.go b/vendor/github.com/prometheus/procfs/nfs/parse_nfs_test.go
deleted file mode 100644
index afe3db47e..000000000
--- a/vendor/github.com/prometheus/procfs/nfs/parse_nfs_test.go
+++ /dev/null
@@ -1,305 +0,0 @@
-// Copyright 2018 The Prometheus Authors
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package nfs_test
-
-import (
-	"reflect"
-	"strings"
-	"testing"
-
-	"github.com/prometheus/procfs/nfs"
-)
-
-func TestNewNFSClientRPCStats(t *testing.T) {
-	tests := []struct {
-		name    string
-		content string
-		stats   *nfs.ClientRPCStats
-		invalid bool
-	}{
-		{
-			name:    "invalid file",
-			content: "invalid",
-			invalid: true,
-		}, {
-			name: "good old kernel version file",
-			content: `net 70 70 69 45
-rpc 1218785755 374636 1218815394
-proc2 18 16 57 74 52 71 73 45 86 0 52 83 61 17 53 50 23 70 82
-proc3 22 0 1061909262 48906 4077635 117661341 5 29391916 2570425 2993289 590 0 0 7815 15 1130 0 3983 92385 13332 2 1 23729
-proc4 48 98 51 54 83 85 23 24 1 28 73 68 83 12 84 39 68 59 58 88 29 74 69 96 21 84 15 53 86 54 66 56 97 36 49 32 85 81 11 58 32 67 13 28 35 90 1 26 1337
-`,
-			stats: &nfs.ClientRPCStats{
-				Network: nfs.Network{
-					NetCount:   70,
-					UDPCount:   70,
-					TCPCount:   69,
-					TCPConnect: 45,
-				},
-				ClientRPC: nfs.ClientRPC{
-					RPCCount:        1218785755,
-					Retransmissions: 374636,
-					AuthRefreshes:   1218815394,
-				},
-				V2Stats: nfs.V2Stats{
-					Null:     16,
-					GetAttr:  57,
-					SetAttr:  74,
-					Root:     52,
-					Lookup:   71,
-					ReadLink: 73,
-					Read:     45,
-					WrCache:  86,
-					Write:    0,
-					Create:   52,
-					Remove:   83,
-					Rename:   61,
-					Link:     17,
-					SymLink:  53,
-					MkDir:    50,
-					RmDir:    23,
-					ReadDir:  70,
-					FsStat:   82,
-				},
-				V3Stats: nfs.V3Stats{
-					Null:        0,
-					GetAttr:     1061909262,
-					SetAttr:     48906,
-					Lookup:      4077635,
-					Access:      117661341,
-					ReadLink:    5,
-					Read:        29391916,
-					Write:       2570425,
-					Create:      2993289,
-					MkDir:       590,
-					SymLink:     0,
-					MkNod:       0,
-					Remove:      7815,
-					RmDir:       15,
-					Rename:      1130,
-					Link:        0,
-					ReadDir:     3983,
-					ReadDirPlus: 92385,
-					FsStat:      13332,
-					FsInfo:      2,
-					PathConf:    1,
-					Commit:      23729, },
-				ClientV4Stats: nfs.ClientV4Stats{
-					Null:               98,
-					Read:               51,
-					Write:              54,
-					Commit:             83,
-					Open:               85,
-					OpenConfirm:        23,
-					OpenNoattr:         24,
-					OpenDowngrade:      1,
-					Close:              28,
-					Setattr:            73,
-					FsInfo:             68,
-					Renew:              83,
-					SetClientId:        12,
-					SetClientIdConfirm: 84,
-					Lock:               39,
-					Lockt:              68,
-					Locku:              59,
-					Access:             58,
-					Getattr:            88,
-					Lookup:             29,
-					LookupRoot:         74,
-					Remove:             69,
-					Rename:             96,
-					Link:               21,
-					Symlink:            84,
-					Create:             15,
-					Pathconf:           53,
-					StatFs:             86,
-					ReadLink:           54,
-					ReadDir:            66,
-					ServerCaps:         56,
-					DelegReturn:        97,
-					GetAcl:             36,
-					SetAcl:             49,
-					FsLocations:        32,
-					ReleaseLockowner:   85,
-					Secinfo:            81,
-					FsidPresent:        11,
-					ExchangeId:         58,
-					CreateSession:      32,
-					DestroySession:     67,
-					Sequence:           13,
-					GetLeaseTime:       28,
-					ReclaimComplete:    35,
-					LayoutGet:          90,
-					GetDeviceInfo:      1,
-					LayoutCommit:       26,
-					LayoutReturn:       1337,
-					SecinfoNoName:      0,
-					TestStateId:        0,
-					FreeStateId:        0,
-					GetDeviceList:      0,
-					BindConnToSession:  0,
-					DestroyClientId:    0,
-					Seek:               0,
-					Allocate:           0,
-					DeAllocate:         0,
-					LayoutStats:        0,
-					Clone:              0,
-				},
-			},
-		}, {
-			name: "good file",
-			content: `net 18628 0 18628 6
-rpc 4329785 0 4338291
-proc2 18 2 69 0 0 4410 0 0 0 0 0 0 0 0 0 0 0 99 2
-proc3 22 1 4084749 29200 94754 32580 186 47747 7981 8639 0 6356 0 6962 0 7958 0 0 241 4 4 2 39
-proc4 61 1 0 0 0 0 0 0 0 0 0 0 0 1 1 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-`,
-			stats: &nfs.ClientRPCStats{
-				Network: nfs.Network{
-					NetCount:   18628,
-					UDPCount:   0,
-					TCPCount:   18628,
-					TCPConnect: 6,
-				},
-				ClientRPC: nfs.ClientRPC{
-					RPCCount:        4329785,
-					Retransmissions: 0,
-					AuthRefreshes:   4338291,
-				},
-				V2Stats: nfs.V2Stats{
-					Null:     2,
-					GetAttr:  69,
-					SetAttr:  0,
-					Root:     0,
-					Lookup:   4410,
-					ReadLink: 0,
-					Read:     0,
-					WrCache:  0,
-					Write:    0,
-					Create:   0,
-					Remove:   0,
-					Rename:   0,
-					Link:     0,
-					SymLink:  0,
-					MkDir:    0,
-					RmDir:    0,
-					ReadDir:  99,
-					FsStat:   2,
-				},
-				V3Stats: nfs.V3Stats{
-					Null:        1,
-					GetAttr:     4084749,
-					SetAttr:     29200,
-					Lookup:      94754,
-					Access:      32580,
-					ReadLink:    186,
-					Read:        47747,
-					Write:       7981,
-					Create:      8639,
-					MkDir:       0,
-					SymLink:     6356,
-					MkNod:       0,
-					Remove:      6962,
-					RmDir:       0,
-					Rename:      7958,
-					Link:        0,
-					ReadDir:     0,
-					ReadDirPlus: 241,
-					FsStat:      4,
-					FsInfo:      4,
-					PathConf:    2,
-					Commit:      39,
-				},
-				ClientV4Stats: nfs.ClientV4Stats{
-					Null:               1,
-					Read:               0,
-					Write:              0,
-					Commit:             0,
-					Open:               0,
-					OpenConfirm:        0,
-					OpenNoattr:         0,
-					OpenDowngrade:      0,
-					Close:              0,
-					Setattr:            0,
-					FsInfo:             0,
-					Renew:              0,
-					SetClientId:        1,
-					SetClientIdConfirm: 1,
-					Lock:               0,
-					Lockt:              0,
-					Locku:              0,
-					Access:             0,
-					Getattr:            0,
-					Lookup:             0,
-					LookupRoot:         0,
-					Remove:             2,
-					Rename:             0,
-					Link:               0,
-					Symlink:            0,
-					Create:             0,
-					Pathconf:           0,
-					StatFs:             0,
-					ReadLink:           0,
-					ReadDir:            0,
-					ServerCaps:         0,
-					DelegReturn:        0,
-					GetAcl:             0,
-					SetAcl:             0,
-					FsLocations:        0,
-					ReleaseLockowner:   0,
-					Secinfo:            0,
-					FsidPresent:        0,
-					ExchangeId:         0,
-					CreateSession:      0,
-					DestroySession:     0,
-					Sequence:           0,
-					GetLeaseTime:       0,
-					ReclaimComplete:    0,
-					LayoutGet:          0,
-					GetDeviceInfo:      0,
-					LayoutCommit:       0,
-					LayoutReturn:       0,
-					SecinfoNoName:      0,
-					TestStateId:        0,
-					FreeStateId:        0,
-					GetDeviceList:      0,
-					BindConnToSession:  0,
-					DestroyClientId:    0,
-					Seek:               0,
-					Allocate:           0,
-					DeAllocate:         0,
-					LayoutStats:        0,
-					Clone:              0,
-				},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			stats, err := nfs.ParseClientRPCStats(strings.NewReader(tt.content))
-
-			if tt.invalid && err == nil {
-				t.Fatal("expected an error, but none occurred")
-			}
-			if !tt.invalid && err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
-
-			if want, have := tt.stats, stats; !reflect.DeepEqual(want, have) {
-				t.Fatalf("unexpected NFS stats:\nwant:\n%v\nhave:\n%v", want, have)
-			}
-		})
-	}
-}
diff --git a/vendor/github.com/prometheus/procfs/nfs/parse_nfsd_test.go b/vendor/github.com/prometheus/procfs/nfs/parse_nfsd_test.go
deleted file mode 100644
index b09b3b580..000000000
--- a/vendor/github.com/prometheus/procfs/nfs/parse_nfsd_test.go
+++ /dev/null
@@ -1,196 +0,0 @@
-// Copyright 2018 The Prometheus Authors
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package nfs_test
-
-import (
-	"reflect"
-	"strings"
-	"testing"
-
-	"github.com/prometheus/procfs/nfs"
-)
-
-func TestNewNFSdServerRPCStats(t *testing.T) {
-	tests := []struct {
-		name    string
-		content string
-		stats   *nfs.ServerRPCStats
-		invalid bool
-	}{
-		{
-			name:    "invalid file",
-			content: "invalid",
-			invalid: true,
-		}, {
-			name: "good file",
-			content: `rc 0 6 18622
-fh 0 0 0 0 0
-io 157286400 0
-th 8 0 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000 0.000
-ra 32 0 0 0 0 0 0 0 0 0 0 0
-net 18628 0 18628 6
-rpc 18628 0 0 0 0
-proc2 18 2 69 0 0 4410 0 0 0 0 0 0 0 0 0 0 0 99 2
-proc3 22 2 112 0 2719 111 0 0 0 0 0 0 0 0 0 0 0 27 216 0 2 1 0
-proc4 2 2 10853
-proc4ops 72 0 0 0 1098 2 0 0 0 0 8179 5896 0 0 0 0 5900 0 0 2 0 2 0 9609 0 2 150 1272 0 0 0 1236 0 0 0 0 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-`,
-			stats: &nfs.ServerRPCStats{
-				ReplyCache: nfs.ReplyCache{
-					Hits:    0,
-					Misses:  6,
-					NoCache: 18622,
-				},
-				FileHandles: nfs.FileHandles{
-					Stale:        0,
-					TotalLookups: 0,
-					AnonLookups:  0,
-					DirNoCache:   0,
-					NoDirNoCache: 0,
-				},
-				InputOutput: nfs.InputOutput{
-					Read:  157286400,
-					Write: 0,
-				},
-				Threads: nfs.Threads{
-					Threads: 8,
-					FullCnt: 0,
-				},
-				ReadAheadCache: nfs.ReadAheadCache{
-					CacheSize:      32,
-					CacheHistogram: []uint64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-					NotFound:       0,
-				},
-				Network: nfs.Network{
-					NetCount:   18628,
-					UDPCount:   0,
-					TCPCount:   18628,
-					TCPConnect: 6,
-				},
-				ServerRPC: nfs.ServerRPC{
-					RPCCount: 18628,
-					BadCnt:   0,
-					BadFmt:   0,
-					BadAuth:  0,
-					BadcInt:  0,
-				},
-				V2Stats: nfs.V2Stats{
-					Null:     2,
-					GetAttr:  69,
-					SetAttr:  0,
-					Root:     0,
-					Lookup:   4410,
-					ReadLink: 0,
-					Read:     0,
-					WrCache:  0,
-					Write:    0,
-					Create:   0,
-					Remove:   0,
-					Rename:   0,
-					Link:     0,
-					SymLink:  0,
-					MkDir:    0,
-					RmDir:    0,
-					ReadDir:  99,
-					FsStat:   2,
-				},
-				V3Stats: nfs.V3Stats{
-					Null:        2,
-					GetAttr:     112,
-					SetAttr:     0,
-					Lookup:      2719,
-					Access:      111,
-					ReadLink:    0,
-					Read:        0,
-					Write:       0,
-					Create:      0,
-					MkDir:       0,
-					SymLink:     0,
-					MkNod:       0,
-					Remove:      0,
-					RmDir:       0,
-					Rename:      0,
-					Link:        0,
-					ReadDir:     27,
-					ReadDirPlus: 216,
-					FsStat:      0,
-					FsInfo:      2,
-					PathConf:    1,
-					Commit:      0,
-				},
-				ServerV4Stats: nfs.ServerV4Stats{
-					Null:     2,
-					Compound: 10853,
-				},
-				V4Ops: nfs.V4Ops{
-					Op0Unused:    0,
-					Op1Unused:    0,
-					Op2Future:    0,
-					Access:       1098,
-					Close:        2,
-					Commit:       0,
-					Create:       0,
-					DelegPurge:   0,
-					DelegReturn:  0,
-					GetAttr:      8179,
-					GetFH:        5896,
-					Link:         0,
-					Lock:         0,
-					Lockt:        0,
-					Locku:        0,
-					Lookup:       5900,
-					LookupRoot:   0,
-					Nverify:      0,
-					Open:         2,
-					OpenAttr:     0,
-					OpenConfirm:  2,
-					OpenDgrd:     0,
-					PutFH:        9609,
-					PutPubFH:     0,
-					PutRootFH:    2,
-					Read:         150,
-					ReadDir:      1272,
-					ReadLink:     0,
-					Remove:       0,
-					Rename:       0,
-					Renew:        1236,
-					RestoreFH:    0,
-					SaveFH:       0,
-					SecInfo:      0,
-					SetAttr:      0,
-					Verify:       3,
-					Write:        3,
-					RelLockOwner: 0,
-				},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			stats, err := nfs.ParseServerRPCStats(strings.NewReader(tt.content))
-
-			if tt.invalid && err == nil {
-				t.Fatal("expected an error, but none occurred")
-			}
-			if !tt.invalid && err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
-
-			if want, have := tt.stats, stats; !reflect.DeepEqual(want, have) {
-				t.Fatalf("unexpected NFS stats:\nwant:\n%v\nhave:\n%v", want, have)
-			}
-		})
-	}
-}