Merge pull request #16205 from wongma7/metrics

Automatic merge from submit-queue (batch tested with PRs 16205, 16423) UPSTREAM: PVC metrics in kubelet summary api + prometheus https://github.com/kubernetes/kubernetes/pull/51448/files https://github.com/kubernetes/kubernetes/pull/51553/files
openshift · Sep 20, 2017 · d03d910 · d03d910
2 parents 502e1b3 + d33b06a
commit d03d910
Show file tree

Hide file tree

Showing 5 changed files with 261 additions and 17 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1/types.go b/vendor/k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1/types.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/metrics/metrics.go b/vendor/k8s.io/kubernetes/pkg/kubelet/metrics/metrics.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/server/stats/BUILD b/vendor/k8s.io/kubernetes/pkg/kubelet/server/stats/BUILD
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/server/stats/volume_stat_calculator.go b/vendor/k8s.io/kubernetes/pkg/kubelet/server/stats/volume_stat_calculator.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/server/stats/volume_stat_calculator_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/server/stats/volume_stat_calculator_test.go