diff options
author | Mario Trangoni <mario@mariotrangoni.de> | 2018-03-22 22:25:37 +0100 |
---|---|---|
committer | Tobias Schmidt <tobidt@gmail.com> | 2018-03-22 22:25:37 +0100 |
commit | 1f11a86d594173ca1146ac1d1715cd6263e9959d (patch) | |
tree | 7f6955962bc4655cb951429d8bf532e665836060 /vendor | |
parent | a310029890df6d558a8daa6d89c37ee144b482ef (diff) | |
download | prometheus_node_collector-1f11a86d594173ca1146ac1d1715cd6263e9959d.tar.bz2 prometheus_node_collector-1f11a86d594173ca1146ac1d1715cd6263e9959d.tar.xz prometheus_node_collector-1f11a86d594173ca1146ac1d1715cd6263e9959d.zip |
Fix nfs golint issues (#863)
* procfs: update vendoring
Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>
* procfs: fix e2e tests after nfs changes
Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>
Diffstat (limited to 'vendor')
-rw-r--r-- | vendor/github.com/prometheus/procfs/nfs/nfs.go | 20 | ||||
-rw-r--r-- | vendor/github.com/prometheus/procfs/nfs/parse.go | 16 | ||||
-rw-r--r-- | vendor/vendor.json | 26 |
3 files changed, 31 insertions, 31 deletions
diff --git a/vendor/github.com/prometheus/procfs/nfs/nfs.go b/vendor/github.com/prometheus/procfs/nfs/nfs.go index e2185b7..651bf68 100644 --- a/vendor/github.com/prometheus/procfs/nfs/nfs.go +++ b/vendor/github.com/prometheus/procfs/nfs/nfs.go | |||
@@ -11,7 +11,7 @@ | |||
11 | // See the License for the specific language governing permissions and | 11 | // See the License for the specific language governing permissions and |
12 | // limitations under the License. | 12 | // limitations under the License. |
13 | 13 | ||
14 | // Package nfsd implements parsing of /proc/net/rpc/nfsd. | 14 | // Package nfs implements parsing of /proc/net/rpc/nfsd. |
15 | // Fields are documented in https://www.svennd.be/nfsd-stats-explained-procnetrpcnfsd/ | 15 | // Fields are documented in https://www.svennd.be/nfsd-stats-explained-procnetrpcnfsd/ |
16 | package nfs | 16 | package nfs |
17 | 17 | ||
@@ -136,8 +136,8 @@ type ClientV4Stats struct { | |||
136 | Setattr uint64 | 136 | Setattr uint64 |
137 | FsInfo uint64 | 137 | FsInfo uint64 |
138 | Renew uint64 | 138 | Renew uint64 |
139 | SetClientId uint64 | 139 | SetClientID uint64 |
140 | SetClientIdConfirm uint64 | 140 | SetClientIDConfirm uint64 |
141 | Lock uint64 | 141 | Lock uint64 |
142 | Lockt uint64 | 142 | Lockt uint64 |
143 | Locku uint64 | 143 | Locku uint64 |
@@ -156,13 +156,13 @@ type ClientV4Stats struct { | |||
156 | ReadDir uint64 | 156 | ReadDir uint64 |
157 | ServerCaps uint64 | 157 | ServerCaps uint64 |
158 | DelegReturn uint64 | 158 | DelegReturn uint64 |
159 | GetAcl uint64 | 159 | GetACL uint64 |
160 | SetAcl uint64 | 160 | SetACL uint64 |
161 | FsLocations uint64 | 161 | FsLocations uint64 |
162 | ReleaseLockowner uint64 | 162 | ReleaseLockowner uint64 |
163 | Secinfo uint64 | 163 | Secinfo uint64 |
164 | FsidPresent uint64 | 164 | FsidPresent uint64 |
165 | ExchangeId uint64 | 165 | ExchangeID uint64 |
166 | CreateSession uint64 | 166 | CreateSession uint64 |
167 | DestroySession uint64 | 167 | DestroySession uint64 |
168 | Sequence uint64 | 168 | Sequence uint64 |
@@ -173,11 +173,11 @@ type ClientV4Stats struct { | |||
173 | LayoutCommit uint64 | 173 | LayoutCommit uint64 |
174 | LayoutReturn uint64 | 174 | LayoutReturn uint64 |
175 | SecinfoNoName uint64 | 175 | SecinfoNoName uint64 |
176 | TestStateId uint64 | 176 | TestStateID uint64 |
177 | FreeStateId uint64 | 177 | FreeStateID uint64 |
178 | GetDeviceList uint64 | 178 | GetDeviceList uint64 |
179 | BindConnToSession uint64 | 179 | BindConnToSession uint64 |
180 | DestroyClientId uint64 | 180 | DestroyClientID uint64 |
181 | Seek uint64 | 181 | Seek uint64 |
182 | Allocate uint64 | 182 | Allocate uint64 |
183 | DeAllocate uint64 | 183 | DeAllocate uint64 |
@@ -238,7 +238,7 @@ type V4Ops struct { | |||
238 | RelLockOwner uint64 | 238 | RelLockOwner uint64 |
239 | } | 239 | } |
240 | 240 | ||
241 | // RPCStats models all stats from /proc/net/rpc/nfs. | 241 | // ClientRPCStats models all stats from /proc/net/rpc/nfs. |
242 | type ClientRPCStats struct { | 242 | type ClientRPCStats struct { |
243 | Network Network | 243 | Network Network |
244 | ClientRPC ClientRPC | 244 | ClientRPC ClientRPC |
diff --git a/vendor/github.com/prometheus/procfs/nfs/parse.go b/vendor/github.com/prometheus/procfs/nfs/parse.go index 8f568f0..95a83cc 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) { | |||
204 | Setattr: v[10], | 204 | Setattr: v[10], |
205 | FsInfo: v[11], | 205 | FsInfo: v[11], |
206 | Renew: v[12], | 206 | Renew: v[12], |
207 | SetClientId: v[13], | 207 | SetClientID: v[13], |
208 | SetClientIdConfirm: v[14], | 208 | SetClientIDConfirm: v[14], |
209 | Lock: v[15], | 209 | Lock: v[15], |
210 | Lockt: v[16], | 210 | Lockt: v[16], |
211 | Locku: v[17], | 211 | Locku: v[17], |
@@ -224,13 +224,13 @@ func parseClientV4Stats(v []uint64) (ClientV4Stats, error) { | |||
224 | ReadDir: v[30], | 224 | ReadDir: v[30], |
225 | ServerCaps: v[31], | 225 | ServerCaps: v[31], |
226 | DelegReturn: v[32], | 226 | DelegReturn: v[32], |
227 | GetAcl: v[33], | 227 | GetACL: v[33], |
228 | SetAcl: v[34], | 228 | SetACL: v[34], |
229 | FsLocations: v[35], | 229 | FsLocations: v[35], |
230 | ReleaseLockowner: v[36], | 230 | ReleaseLockowner: v[36], |
231 | Secinfo: v[37], | 231 | Secinfo: v[37], |
232 | FsidPresent: v[38], | 232 | FsidPresent: v[38], |
233 | ExchangeId: v[39], | 233 | ExchangeID: v[39], |
234 | CreateSession: v[40], | 234 | CreateSession: v[40], |
235 | DestroySession: v[41], | 235 | DestroySession: v[41], |
236 | Sequence: v[42], | 236 | Sequence: v[42], |
@@ -241,11 +241,11 @@ func parseClientV4Stats(v []uint64) (ClientV4Stats, error) { | |||
241 | LayoutCommit: v[47], | 241 | LayoutCommit: v[47], |
242 | LayoutReturn: v[48], | 242 | LayoutReturn: v[48], |
243 | SecinfoNoName: v[49], | 243 | SecinfoNoName: v[49], |
244 | TestStateId: v[50], | 244 | TestStateID: v[50], |
245 | FreeStateId: v[51], | 245 | FreeStateID: v[51], |
246 | GetDeviceList: v[52], | 246 | GetDeviceList: v[52], |
247 | BindConnToSession: v[53], | 247 | BindConnToSession: v[53], |
248 | DestroyClientId: v[54], | 248 | DestroyClientID: v[54], |
249 | Seek: v[55], | 249 | Seek: v[55], |
250 | Allocate: v[56], | 250 | Allocate: v[56], |
251 | DeAllocate: v[57], | 251 | DeAllocate: v[57], |
diff --git a/vendor/vendor.json b/vendor/vendor.json index 3d8eec0..a147c7b 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json | |||
@@ -165,38 +165,38 @@ | |||
165 | { | 165 | { |
166 | "checksumSHA1": "Etvt6mgzvD7ARf4Ux03LHfgSlzU=", | 166 | "checksumSHA1": "Etvt6mgzvD7ARf4Ux03LHfgSlzU=", |
167 | "path": "github.com/prometheus/procfs", | 167 | "path": "github.com/prometheus/procfs", |
168 | "revision": "54d17b57dd7d4a3aa092476596b3f8a933bde349", | 168 | "revision": "780932d4fbbe0e69b84c34c20f5c8d0981e109ea", |
169 | "revisionTime": "2018-03-10T14:15:09Z" | 169 | "revisionTime": "2018-03-21T23:08:12Z" |
170 | }, | 170 | }, |
171 | { | 171 | { |
172 | "checksumSHA1": "O64FotgWPYIpl3m2gvTEPIem+xg=", | 172 | "checksumSHA1": "O64FotgWPYIpl3m2gvTEPIem+xg=", |
173 | "path": "github.com/prometheus/procfs/bcache", | 173 | "path": "github.com/prometheus/procfs/bcache", |
174 | "revision": "54d17b57dd7d4a3aa092476596b3f8a933bde349", | 174 | "revision": "780932d4fbbe0e69b84c34c20f5c8d0981e109ea", |
175 | "revisionTime": "2018-03-10T14:15:09Z" | 175 | "revisionTime": "2018-03-21T23:08:12Z" |
176 | }, | 176 | }, |
177 | { | 177 | { |
178 | "checksumSHA1": "lv9rIcjbVEGo8AT1UCUZXhXrfQc=", | 178 | "checksumSHA1": "lv9rIcjbVEGo8AT1UCUZXhXrfQc=", |
179 | "path": "github.com/prometheus/procfs/internal/util", | 179 | "path": "github.com/prometheus/procfs/internal/util", |
180 | "revision": "54d17b57dd7d4a3aa092476596b3f8a933bde349", | 180 | "revision": "780932d4fbbe0e69b84c34c20f5c8d0981e109ea", |
181 | "revisionTime": "2018-03-10T14:15:09Z" | 181 | "revisionTime": "2018-03-21T23:08:12Z" |
182 | }, | 182 | }, |
183 | { | 183 | { |
184 | "checksumSHA1": "EekY1iRG9JY74mDD0jsbFCWbAFs=", | 184 | "checksumSHA1": "HSP5hVT0CNMRa8+Xtz4z2Ic5U0E=", |
185 | "path": "github.com/prometheus/procfs/nfs", | 185 | "path": "github.com/prometheus/procfs/nfs", |
186 | "revision": "54d17b57dd7d4a3aa092476596b3f8a933bde349", | 186 | "revision": "780932d4fbbe0e69b84c34c20f5c8d0981e109ea", |
187 | "revisionTime": "2018-03-10T14:15:09Z" | 187 | "revisionTime": "2018-03-21T23:08:12Z" |
188 | }, | 188 | }, |
189 | { | 189 | { |
190 | "checksumSHA1": "pqTCYsAj0qGsfJTkrAVQPUMN2qU=", | 190 | "checksumSHA1": "pqTCYsAj0qGsfJTkrAVQPUMN2qU=", |
191 | "path": "github.com/prometheus/procfs/sysfs", | 191 | "path": "github.com/prometheus/procfs/sysfs", |
192 | "revision": "54d17b57dd7d4a3aa092476596b3f8a933bde349", | 192 | "revision": "780932d4fbbe0e69b84c34c20f5c8d0981e109ea", |
193 | "revisionTime": "2018-03-10T14:15:09Z" | 193 | "revisionTime": "2018-03-21T23:08:12Z" |
194 | }, | 194 | }, |
195 | { | 195 | { |
196 | "checksumSHA1": "yItvTQLUVqm/ArLEbvEhqG0T5a0=", | 196 | "checksumSHA1": "yItvTQLUVqm/ArLEbvEhqG0T5a0=", |
197 | "path": "github.com/prometheus/procfs/xfs", | 197 | "path": "github.com/prometheus/procfs/xfs", |
198 | "revision": "54d17b57dd7d4a3aa092476596b3f8a933bde349", | 198 | "revision": "780932d4fbbe0e69b84c34c20f5c8d0981e109ea", |
199 | "revisionTime": "2018-03-10T14:15:09Z" | 199 | "revisionTime": "2018-03-21T23:08:12Z" |
200 | }, | 200 | }, |
201 | { | 201 | { |
202 | "checksumSHA1": "ySaT8G3I3y4MmnoXOYAAX0rC+p8=", | 202 | "checksumSHA1": "ySaT8G3I3y4MmnoXOYAAX0rC+p8=", |