Merge pull request #16490 from gnufied/backport-volume-metrics

Automatic merge from submit-queue UPSTREAM: 50036: Bring volume operation metrics https://trello.com/c/vQi6UmsT/564-backport-metric-collection-from-volume-operations-to-openshift-37
openshift · Sep 25, 2017 · 2d54926 · 2d54926
2 parents b3475a3 + e937f8d
commit 2d54926
Show file tree

Hide file tree

Showing 9 changed files with 192 additions and 94 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/BUILD b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/BUILD
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/pv_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/pv_controller.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/BUILD b/vendor/k8s.io/kubernetes/pkg/volume/util/BUILD
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/metrics.go b/vendor/k8s.io/kubernetes/pkg/volume/util/metrics.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/util/nestedpendingoperations/nestedpendingoperations.go b/vendor/k8s.io/kubernetes/pkg/volume/util/nestedpendingoperations/nestedpendingoperations.go
diff --git a/...k8s.io/kubernetes/pkg/volume/util/nestedpendingoperations/nestedpendingoperations_test.go b/...k8s.io/kubernetes/pkg/volume/util/nestedpendingoperations/nestedpendingoperations_test.go