Skip to content

OCPBUGS-11294: Add CSI migration metric #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Apr 25, 2023
Merged

OCPBUGS-11294: Add CSI migration metric #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions pkg/operator/utils/metric.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import (
)

const (
failureReason = "failure_reason"
condition = "condition"
failureReason = "failure_reason"
condition = "condition"
migrationStatus = "status"

topologyTagSource = "source"
topologyTagSourceClusterCSIDriver = "clustercsidriver"
Expand Down Expand Up @@ -48,10 +49,19 @@ var (
},
[]string{domainScope},
)
CSIMigrationStatus = metrics.NewGaugeVec(
&metrics.GaugeOpts{
Name: "vsphere_csi_migration",
Help: "CSI migration status for vSphere volumes",
StabilityLevel: metrics.ALPHA,
},
[]string{migrationStatus},
)
)

func init() {
legacyregistry.MustRegister(InstallErrorMetric)
legacyregistry.MustRegister(TopologyTagsMetric)
legacyregistry.MustRegister(InfrastructureFailureDomains)
legacyregistry.MustRegister(CSIMigrationStatus)
}
11 changes: 10 additions & 1 deletion pkg/operator/utils/topology.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,16 @@ func GetDatacenters(config *vsphere.VSphereConfig) ([]string, error) {
return datacenters, nil
}

func UpdateMetrics(infra *cfgv1.Infrastructure, clusterCSIDriver *opv1.ClusterCSIDriver) {
func UpdateMetrics(infra *cfgv1.Infrastructure, clusterCSIDriver *opv1.ClusterCSIDriver, storage *opv1.Storage) {
var vSphereStorageDriverValues = []opv1.StorageDriverType{"", opv1.LegacyDeprecatedInTreeDriver, opv1.CSIWithMigrationDriver}
for _, value := range vSphereStorageDriverValues {
if storage.Spec.VSphereStorageDriver == value {
CSIMigrationStatus.WithLabelValues(string(value)).Set(1.0)
} else {
CSIMigrationStatus.WithLabelValues(string(value)).Set(0.0)
}
}

domains := GetCSIDriverTopologyCategories(clusterCSIDriver)
TopologyTagsMetric.WithLabelValues(topologyTagSourceClusterCSIDriver).Set(float64(len(domains)))
domains = GetInfraTopologyCategories(infra)
Expand Down
5 changes: 3 additions & 2 deletions pkg/operator/utils/topology_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (
)

func TestUpdateMetrics(t *testing.T) {
storage := &opv1.Storage{Spec: opv1.StorageSpec{VSphereStorageDriver: opv1.CSIWithMigrationDriver}}

emptyClusterCSIDriver := &opv1.ClusterCSIDriver{
Spec: opv1.ClusterCSIDriverSpec{
DriverConfig: opv1.CSIDriverConfigSpec{
Expand Down Expand Up @@ -375,8 +377,7 @@ vsphere_topology_tags{source="infrastructure"} 0
t.Run(test.name, func(t *testing.T) {
// Reset metrics from previous tests. Note: the tests can't run in parallel!
legacyregistry.Reset()

UpdateMetrics(test.infra, test.clusterCSIDriver)
UpdateMetrics(test.infra, test.clusterCSIDriver, storage)
if err := testutil.GatherAndCompare(legacyregistry.DefaultGatherer, strings.NewReader(test.expectedMetrics), "vsphere_topology_tags", "vsphere_infrastructure_failure_domains"); err != nil {
t.Errorf("Unexpected metric: %s", err)
}
Expand Down
8 changes: 7 additions & 1 deletion pkg/operator/vspherecontroller/vspherecontroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ type VSphereController struct {
const (
cloudConfigNamespace = "openshift-config"
infraGlobalName = "cluster"
storageOperatorName = "cluster"
secretName = "vmware-vsphere-cloud-credentials"
trustedCAConfigMap = "vmware-vsphere-csi-driver-trusted-ca-bundle"
defaultNamespace = "openshift-cluster-csi-drivers"
Expand Down Expand Up @@ -175,7 +176,12 @@ func (c *VSphereController) sync(ctx context.Context, syncContext factory.SyncCo
return err
}

utils.UpdateMetrics(infra, clusterCSIDriver)
storage, err := c.storageLister.Get(storageOperatorName)
if err != nil {
return err
}

utils.UpdateMetrics(infra, clusterCSIDriver, storage)

driverCheckFlag, err := c.driverAlreadyStarted(ctx)
if err != nil {
Expand Down