Skip to content

Commit d03d910

Browse files
openshift-merge-robotopenshift-merge-robot
authored
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
2 parents 502e1b3 + d33b06a commit d03d910

File tree

5 files changed

+261
-17
lines changed

5 files changed

+261
-17
lines changed

‎vendor/k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1/types.go

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/metrics/metrics.go

Lines changed: 72 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/server/stats/BUILD

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/server/stats/volume_stat_calculator.go

Lines changed: 36 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/server/stats/volume_stat_calculator_test.go

Lines changed: 141 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)