github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70848 from cofyc/fix64590

Browse Source 
Improve usability of CSI plugin metrics
This commit is contained in:
k8s-ci-robot
2018-11-13 19:45:43 -08:00
committed by GitHub
parent 54243e1921 dfe0a08f05
commit d3a21cf5a2
6 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/controller/volume/attachdetach/metrics/BUILD
View File

@@ -9,6 +9,7 @@ go_library(
"//pkg/controller/volume/attachdetach/cache:go_default_library",
"//pkg/controller/volume/attachdetach/util:go_default_library",
"//pkg/volume:go_default_library",
"//pkg/volume/util:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
"//staging/src/k8s.io/client-go/listers/core/v1:go_default_library",
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",

8
pkg/controller/volume/attachdetach/metrics/metrics.go
View File

@@ -26,6 +26,7 @@ import (
"k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache"
"k8s.io/kubernetes/pkg/controller/volume/attachdetach/util"
"k8s.io/kubernetes/pkg/volume"
volumeutil "k8s.io/kubernetes/pkg/volume/util"
)
const pluginNameNotAvailable = "N/A"
@@ -166,7 +167,8 @@ func (collector *attachDetachStateCollector) getVolumeInUseCount() volumeCount {
if err != nil {
continue
}
nodeVolumeMap.add(pod.Spec.NodeName, volumePlugin.GetPluginName())
pluginName := volumeutil.GetFullQualifiedPluginNameForVolume(volumePlugin.GetPluginName(), volumeSpec)
nodeVolumeMap.add(pod.Spec.NodeName, pluginName)
}
}
return nodeVolumeMap
@@ -178,7 +180,7 @@ func (collector *attachDetachStateCollector) getTotalVolumesCount() volumeCount
if plugin, err := collector.volumePluginMgr.FindPluginBySpec(v.VolumeSpec); err == nil {
pluginName := pluginNameNotAvailable
if plugin != nil {
pluginName = plugin.GetPluginName()
pluginName = volumeutil.GetFullQualifiedPluginNameForVolume(plugin.GetPluginName(), v.VolumeSpec)
}
stateVolumeMap.add("desired_state_of_world", pluginName)
}
@@ -187,7 +189,7 @@ func (collector *attachDetachStateCollector) getTotalVolumesCount() volumeCount
if plugin, err := collector.volumePluginMgr.FindPluginBySpec(v.VolumeSpec); err == nil {
pluginName := pluginNameNotAvailable
if plugin != nil {
pluginName = plugin.GetPluginName()
pluginName = volumeutil.GetFullQualifiedPluginNameForVolume(plugin.GetPluginName(), v.VolumeSpec)
}
stateVolumeMap.add("actual_state_of_world", pluginName)
}