mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
Merge pull request #83269 from RainbowMango/pr_remove_direct_reference_to_promethues_from_openstack
Remove direct reference to prometheus from openstack
This commit is contained in:
commit
0a6a465cf9
@ -65,7 +65,6 @@ go_library(
|
||||
"//vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/ports:go_default_library",
|
||||
"//vendor/github.com/gophercloud/gophercloud/pagination:go_default_library",
|
||||
"//vendor/github.com/mitchellh/mapstructure:go_default_library",
|
||||
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
|
||||
"//vendor/gopkg.in/gcfg.v1:go_default_library",
|
||||
"//vendor/k8s.io/klog:go_default_library",
|
||||
"//vendor/k8s.io/utils/exec:go_default_library",
|
||||
|
@ -35,6 +35,7 @@ import (
|
||||
cloudvolume "k8s.io/cloud-provider/volume"
|
||||
volerr "k8s.io/cloud-provider/volume/errors"
|
||||
volumehelpers "k8s.io/cloud-provider/volume/helpers"
|
||||
"k8s.io/component-base/metrics"
|
||||
|
||||
"github.com/gophercloud/gophercloud"
|
||||
volumeexpand "github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/volumeactions"
|
||||
@ -42,8 +43,6 @@ import (
|
||||
volumes_v2 "github.com/gophercloud/gophercloud/openstack/blockstorage/v2/volumes"
|
||||
volumes_v3 "github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes"
|
||||
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/volumeattach"
|
||||
"github.com/prometheus/client_golang/prometheus"
|
||||
|
||||
"k8s.io/klog"
|
||||
)
|
||||
|
||||
@ -745,8 +744,8 @@ func (os *OpenStack) GetLabelsForVolume(ctx context.Context, pv *v1.PersistentVo
|
||||
// recordOpenstackOperationMetric records openstack operation metrics
|
||||
func recordOpenstackOperationMetric(operation string, timeTaken float64, err error) {
|
||||
if err != nil {
|
||||
openstackAPIRequestErrors.With(prometheus.Labels{"request": operation}).Inc()
|
||||
openstackAPIRequestErrors.With(metrics.Labels{"request": operation}).Inc()
|
||||
} else {
|
||||
openstackOperationsLatency.With(prometheus.Labels{"request": operation}).Observe(timeTaken)
|
||||
openstackOperationsLatency.With(metrics.Labels{"request": operation}).Observe(timeTaken)
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user