Add metrics of gophercloud (POST,UPDATE and DELETE) actions

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/onsi/ginkgo v1.16.1
 	github.com/onsi/gomega v1.11.0
 	github.com/pkg/errors v0.9.1
+	github.com/prometheus/client_golang v1.9.0
 	github.com/spf13/pflag v1.0.5
 	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
 	gopkg.in/ini.v1 v1.62.0

main.go

@@ -40,6 +40,7 @@ import (
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4"
 	"sigs.k8s.io/cluster-api-provider-openstack/controllers"
+	"sigs.k8s.io/cluster-api-provider-openstack/pkg/metrics"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/record"
 	"sigs.k8s.io/cluster-api-provider-openstack/version"
 )
@@ -72,6 +73,8 @@ func init() {
 	_ = clusterv1.AddToScheme(scheme)
 	_ = infrav1.AddToScheme(scheme)
 	// +kubebuilder:scaffold:scheme
+
+	metrics.RegisterAPIPrometheusMetrics()
 }
 
 // InitFlags initializes the flags.

pkg/cloud/services/compute/instance.go

@@ -45,6 +45,7 @@ import (
 	"sigs.k8s.io/cluster-api/util"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4"
+	"sigs.k8s.io/cluster-api-provider-openstack/pkg/metrics"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/record"
 	capoerrors "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/errors"
 )
@@ -217,11 +218,14 @@ func (s *Service) createInstance(eventObject runtime.Object, clusterName string,
 
 	serverCreateOpts = applyServerGroupID(serverCreateOpts, i.ServerGroupID)
 
+	mc := metrics.NewMetricPrometheusContext("server", "create")
+
 	server, err := servers.Create(s.computeClient, keypairs.CreateOptsExt{
 		CreateOptsBuilder: serverCreateOpts,
 		KeyName:           i.SSHKeyName,
 	}).Extract()
-	if err != nil {
+
+	if mc.ObserveRequest(err) != nil {
 		if err = s.deletePorts(eventObject, portList); err != nil {
 			return nil, err
 		}
@@ -400,8 +404,10 @@ func (s *Service) getOrCreatePort(eventObject runtime.Object, clusterName string
 	if net.Subnet.ID != "" {
 		portCreateOpts.FixedIPs = []ports.IP{{SubnetID: net.Subnet.ID}}
 	}
+	mc := metrics.NewMetricPrometheusContext("port", "create")
+
 	port, err := ports.Create(s.networkClient, portCreateOpts).Extract()
-	if err != nil {
+	if mc.ObserveRequest(err) != nil {
 		record.Warnf(eventObject, "FailedCreatePort", "Failed to create port %s: %v", portName, err)
 		return nil, err
 	}
@@ -431,8 +437,10 @@ func (s *Service) getOrCreateTrunk(eventObject runtime.Object, trunkName, portID
 		Name:   trunkName,
 		PortID: portID,
 	}
+	mc := metrics.NewMetricPrometheusContext("trunk", "create")
+
 	trunk, err := trunks.Create(s.networkClient, trunkCreateOpts).Extract()
-	if err != nil {
+	if mc.ObserveRequest(err) != nil {
 		record.Warnf(eventObject, "FailedCreateTrunk", "Failed to create trunk %s: %v", trunkName, err)
 		return nil, err
 	}
@@ -442,10 +450,11 @@ func (s *Service) getOrCreateTrunk(eventObject runtime.Object, trunkName, portID
 }
 
 func (s *Service) replaceAllAttributesTags(eventObject runtime.Object, trunkID string, tags []string) error {
+	mc := metrics.NewMetricPrometheusContext("trunk", "update")
 	_, err := attributestags.ReplaceAll(s.networkClient, "trunks", trunkID, attributestags.ReplaceAllOpts{
 		Tags: tags,
 	}).Extract()
-	if err != nil {
+	if mc.ObserveRequest(err) != nil {
 		record.Warnf(eventObject, "FailedReplaceAllAttributesTags", "Failed to replace all attributestags, trunk %s: %v", trunkID, err)
 		return err
 	}
@@ -488,8 +497,9 @@ func (s *Service) AssociateFloatingIP(instanceID, floatingIP string) error {
 	opts := floatingips.AssociateOpts{
 		FloatingIP: floatingIP,
 	}
+	mc := metrics.NewMetricPrometheusContext("floating_ip", "update")
 	err := floatingips.AssociateInstance(s.computeClient, instanceID, opts).ExtractErr()
-	if err != nil {
+	if mc.ObserveRequest(err) != nil {
 		return err
 	}
 	return nil
@@ -551,8 +561,9 @@ func (s *Service) deletePort(eventObject runtime.Object, portID string) error {
 	}
 
 	err = util.PollImmediate(RetryIntervalPortDelete, TimeoutPortDelete, func() (bool, error) {
+		mc := metrics.NewMetricPrometheusContext("port", "delete")
 		err := ports.Delete(s.networkClient, port.ID).ExtractErr()
-		if err != nil {
+		if mc.ObserveRequest(err) != nil {
 			if capoerrors.IsRetryable(err) {
 				return false, nil
 			}
@@ -595,8 +606,9 @@ func (s *Service) deleteAttachInterface(eventObject runtime.Object, instanceID,
 		return nil
 	}
 
+	mc := metrics.NewMetricPrometheusContext("router_interface", "delete")
 	err = attachinterfaces.Delete(s.computeClient, instanceID, portID).ExtractErr()
-	if err != nil {
+	if mc.ObserveRequest(err) != nil {
 		if capoerrors.IsNotFound(err) {
 			return nil
 		}
@@ -673,8 +685,9 @@ func (s *Service) deleteInstance(eventObject runtime.Object, instanceID string)
 	if instance == nil || instance.ID == "" {
 		return nil
 	}
-
-	if err = servers.Delete(s.computeClient, instance.ID).ExtractErr(); err != nil {
+	mc := metrics.NewMetricPrometheusContext("server", "delete")
+	err = servers.Delete(s.computeClient, instance.ID).ExtractErr()
+	if mc.ObserveRequest(err) != nil {
 		record.Warnf(eventObject, "FailedDeleteServer", "Failed to deleted server %s with id %s: %v", instance.Name, instance.ID, err)
 		return err
 	}

pkg/cloud/services/loadbalancer/loadbalancer.go

@@ -30,6 +30,7 @@ import (
 	"sigs.k8s.io/cluster-api/util"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4"
+	"sigs.k8s.io/cluster-api-provider-openstack/pkg/metrics"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/record"
 )
 
@@ -54,8 +55,10 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
 			VipSubnetID: openStackCluster.Status.Network.Subnet.ID,
 		}
 
+		mc := metrics.NewMetricPrometheusContext("loadbalancer", "create")
 		lb, err = loadbalancers.Create(s.loadbalancerClient, lbCreateOpts).Extract()
-		if err != nil {
+
+		if mc.ObserveRequest(err) != nil {
 			record.Warnf(openStackCluster, "FailedCreateLoadBalancer", "Failed to create load balancer %s: %v", loadBalancerName, err)
 			return err
 		}
@@ -95,8 +98,9 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
 				ProtocolPort:   port,
 				LoadbalancerID: lb.ID,
 			}
+			mc := metrics.NewMetricPrometheusContext("loadbalancer_listener", "create")
 			listener, err = listeners.Create(s.loadbalancerClient, listenerCreateOpts).Extract()
-			if err != nil {
+			if mc.ObserveRequest(err) != nil {
 				return fmt.Errorf("error creating listener: %s", err)
 			}
 		}
@@ -121,8 +125,9 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
 				LBMethod:   pools.LBMethodRoundRobin,
 				ListenerID: listener.ID,
 			}
+			mc := metrics.NewMetricPrometheusContext("loadbalancer_pool", "create")
 			pool, err = pools.Create(s.loadbalancerClient, poolCreateOpts).Extract()
-			if err != nil {
+			if mc.ObserveRequest(err) != nil {
 				return fmt.Errorf("error creating pool: %s", err)
 			}
 		}
@@ -145,8 +150,9 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
 				Timeout:    5,
 				MaxRetries: 3,
 			}
+			mc := metrics.NewMetricPrometheusContext("loadbalancer_healthmonitor", "create")
 			_, err = monitors.Create(s.loadbalancerClient, monitorCreateOpts).Extract()
-			if err != nil {
+			if mc.ObserveRequest(err) != nil {
 				return fmt.Errorf("error creating monitor: %s", err)
 			}
 		}
@@ -216,8 +222,9 @@ func (s *Service) ReconcileLoadBalancerMember(openStackCluster *infrav1.OpenStac
 			if err != nil {
 				return err
 			}
+			mc := metrics.NewMetricPrometheusContext("loadbalancer_member", "delete")
 			err = pools.DeleteMember(s.loadbalancerClient, pool.ID, lbMember.ID).ExtractErr()
-			if err != nil {
+			if mc.ObserveRequest(err) != nil {
 				return fmt.Errorf("error deleting lbmember: %s", err)
 			}
 			err = s.waitForLoadBalancerActive(lbID)
@@ -238,7 +245,9 @@ func (s *Service) ReconcileLoadBalancerMember(openStackCluster *infrav1.OpenStac
 		if err := s.waitForLoadBalancerActive(lbID); err != nil {
 			return err
 		}
-		if _, err := pools.CreateMember(s.loadbalancerClient, pool.ID, lbMemberOpts).Extract(); err != nil {
+		mc := metrics.NewMetricPrometheusContext("loadbalancer_member", "create")
+		_, err = pools.CreateMember(s.loadbalancerClient, pool.ID, lbMemberOpts).Extract()
+		if mc.ObserveRequest(err) != nil {
 			return fmt.Errorf("error create lbmember: %s", err)
 		}
 		if err := s.waitForLoadBalancerActive(lbID); err != nil {
@@ -279,8 +288,9 @@ func (s *Service) DeleteLoadBalancer(openStackCluster *infrav1.OpenStackCluster,
 		Cascade: true,
 	}
 	s.logger.Info("Deleting load balancer", "name", loadBalancerName, "cascade", deleteOpts.Cascade)
+	mc := metrics.NewMetricPrometheusContext("loadbalancer", "delete")
 	err = loadbalancers.Delete(s.loadbalancerClient, lb.ID, deleteOpts).ExtractErr()
-	if err != nil {
+	if mc.ObserveRequest(err) != nil {
 		record.Warnf(openStackCluster, "FailedDeleteLoadBalancer", "Failed to delete load balancer %s with id %s: %v", lb.Name, lb.ID, err)
 		return err
 	}
@@ -333,8 +343,9 @@ func (s *Service) DeleteLoadBalancerMember(openStackCluster *infrav1.OpenStackCl
 			if err != nil {
 				return err
 			}
+			mc := metrics.NewMetricPrometheusContext("loadbalancer_member", "delete")
 			err = pools.DeleteMember(s.loadbalancerClient, pool.ID, lbMember.ID).ExtractErr()
-			if err != nil {
+			if mc.ObserveRequest(err) != nil {
 				return fmt.Errorf("error deleting load balancer member: %s", err)
 			}
 			err = s.waitForLoadBalancerActive(lbID)

pkg/cloud/services/networking/floatingip.go

@@ -23,6 +23,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4"
+	"sigs.k8s.io/cluster-api-provider-openstack/pkg/metrics"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/record"
 )
 
@@ -45,8 +46,9 @@ func (s *Service) GetOrCreateFloatingIP(openStackCluster *infrav1.OpenStackClust
 
 	fpCreateOpts.FloatingNetworkID = openStackCluster.Status.ExternalNetwork.ID
 
+	mc := metrics.NewMetricPrometheusContext("floating_ip", "create")
 	fp, err = floatingips.Create(s.client, fpCreateOpts).Extract()
-	if err != nil {
+	if mc.ObserveRequest(err) != nil {
 		record.Warnf(openStackCluster, "FailedCreateFloatingIP", "Failed to create floating IP %s: %v", ip, err)
 		return nil, err
 	}
@@ -95,7 +97,9 @@ func (s *Service) DeleteFloatingIP(openStackCluster *infrav1.OpenStackCluster, i
 		return nil
 	}
 
-	if err = floatingips.Delete(s.client, fip.ID).ExtractErr(); err != nil {
+	mc := metrics.NewMetricPrometheusContext("floating_ip", "delete")
+	err = floatingips.Delete(s.client, fip.ID).ExtractErr()
+	if mc.ObserveRequest(err) != nil {
 		record.Warnf(openStackCluster, "FailedDeleteFloatingIP", "Failed to delete floating IP %s: %v", ip, err)
 		return err
 	}
@@ -116,8 +120,9 @@ func (s *Service) AssociateFloatingIP(openStackCluster *infrav1.OpenStackCluster
 	fpUpdateOpts := &floatingips.UpdateOpts{
 		PortID: &portID,
 	}
+	mc := metrics.NewMetricPrometheusContext("floating_ip", "update")
 	_, err := floatingips.Update(s.client, fp.ID, fpUpdateOpts).Extract()
-	if err != nil {
+	if mc.ObserveRequest(err) != nil {
 		record.Warnf(openStackCluster, "FailedAssociateFloatingIP", "Failed to associate floating IP %s with port %s: %v", fp.FloatingIP, portID, err)
 		return err
 	}
@@ -149,8 +154,9 @@ func (s *Service) DisassociateFloatingIP(openStackCluster *infrav1.OpenStackClus
 	fpUpdateOpts := &floatingips.UpdateOpts{
 		PortID: nil,
 	}
+	mc := metrics.NewMetricPrometheusContext("floating_ip", "update")
 	_, err = floatingips.Update(s.client, fip.ID, fpUpdateOpts).Extract()
-	if err != nil {
+	if mc.ObserveRequest(err) != nil {
 		record.Warnf(openStackCluster, "FailedDisassociateFloatingIP", "Failed to disassociate floating IP %s: %v", fip.FloatingIP, err)
 		return err
 	}

pkg/cloud/services/networking/network.go

@@ -27,6 +27,7 @@ import (
 	"github.com/gophercloud/gophercloud/pagination"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4"
+	"sigs.k8s.io/cluster-api-provider-openstack/pkg/metrics"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/record"
 )
 
@@ -122,8 +123,10 @@ func (s *Service) ReconcileNetwork(openStackCluster *infrav1.OpenStackCluster, c
 			Name:         networkName,
 		}
 	}
+
+	mc := metrics.NewMetricPrometheusContext("network", "create")
 	network, err := networks.Create(s.client, opts).Extract()
-	if err != nil {
+	if mc.ObserveRequest(err) != nil {
 		record.Warnf(openStackCluster, "FailedCreateNetwork", "Failed to create network %s: %v", networkName, err)
 		return err
 	}
@@ -156,7 +159,9 @@ func (s *Service) DeleteNetwork(openStackCluster *infrav1.OpenStackCluster, clus
 		return nil
 	}
 
-	if err = networks.Delete(s.client, network.ID).ExtractErr(); err != nil {
+	mc := metrics.NewMetricPrometheusContext("network", "delete")
+	err = networks.Delete(s.client, network.ID).ExtractErr()
+	if mc.ObserveRequest(err) != nil {
 		record.Warnf(openStackCluster, "FailedDeleteNetwork", "Failed to delete network %s with id %s: %v", network.Name, network.ID, err)
 		return err
 	}
@@ -220,18 +225,22 @@ func (s *Service) createSubnet(openStackCluster *infrav1.OpenStackCluster, name
 		CIDR:           openStackCluster.Spec.NodeCIDR,
 		DNSNameservers: openStackCluster.Spec.DNSNameservers,
 	}
+	mc := metrics.NewMetricPrometheusContext("subnet", "create")
+
 	subnet, err := subnets.Create(s.client, opts).Extract()
-	if err != nil {
+
+	if mc.ObserveRequest(err) != nil {
 		record.Warnf(openStackCluster, "FailedCreateSubnet", "Failed to create subnet %s: %v", name, err)
 		return nil, err
 	}
 	record.Eventf(openStackCluster, "SuccessfulCreateSubnet", "Created subnet %s with id %s", name, subnet.ID)
 
 	if len(openStackCluster.Spec.Tags) > 0 {
+		mc := metrics.NewMetricPrometheusContext("subnet", "update")
 		_, err = attributestags.ReplaceAll(s.client, "subnets", subnet.ID, attributestags.ReplaceAllOpts{
 			Tags: openStackCluster.Spec.Tags,
 		}).Extract()
-		if err != nil {
+		if mc.ObserveRequest(err) != nil {
 			return nil, err
 		}
 	}