pkg/metrics rename scrape to publish

Author: chrischdi

main.go

@@ -236,17 +236,17 @@ func updateMetrics(provider *gophercloud.ProviderClient, eo gophercloud.Endpoint
 		err := logError("creating openstack clients failed: %v", err)
 		errs = append(errs, err)
 	} else {
-		if err := metrics.ScrapeCinderMetrics(cinderClient, clientset, tenantID); err != nil {
+		if err := metrics.PublishCinderMetrics(cinderClient, clientset, tenantID); err != nil {
 			err := logError("scraping cinder metrics failed: %v", err)
 			errs = append(errs, err)
 		}
 
-		if err := metrics.ScrapeNeutronMetrics(neutronClient, tenantID); err != nil {
+		if err := metrics.PublishNeutronMetrics(neutronClient, tenantID); err != nil {
 			err := logError("scraping neutron metrics failed: %v", err)
 			errs = append(errs, err)
 		}
 
-		if err := metrics.ScrapeLoadBalancerMetrics(loadbalancerClient, tenantID); err != nil {
+		if err := metrics.PublishLoadBalancerMetrics(loadbalancerClient, tenantID); err != nil {
 			err := logError("scraping load balancer metrics failed: %v", err)
 			errs = append(errs, err)
 		}

pkg/metrics/cinder.go

@@ -90,9 +90,9 @@ func registerCinderMetrics() {
 	prometheus.MustRegister(cinderVolumeAttachedAt)
 }
 
-// ScrapeCinderMetrics makes the list request to the blockstorage api and passes
-// the result to a scrape function.
-func ScrapeCinderMetrics(client *gophercloud.ServiceClient, clientset *kubernetes.Clientset, tenantID string) error {
+// PublishCinderMetrics makes the list request to the blockstorage api and passes
+// the result to a publish function.
+func PublishCinderMetrics(client *gophercloud.ServiceClient, clientset *kubernetes.Clientset, tenantID string) error {
 	// get the cinder pvs to add metadata
 	pvs, err := getPVsByCinderID(clientset)
 	if err != nil {
@@ -106,31 +106,31 @@ func ScrapeCinderMetrics(client *gophercloud.ServiceClient, clientset *kubernete
 	cinderVolumeSize.Reset()
 	cinderVolumeAttachedAt.Reset()
 
-	// get all volumes and scrape them
+	// get all volumes and publish them
 	mc := newOpenStackMetric("volume", "list")
 	pager := volumes.List(client, volumes.ListOpts{})
 	err = pager.EachPage(func(page pagination.Page) (bool, error) {
-		return scrapeVolumesPage(page, pvs)
+		return publishVolumesPage(page, pvs)
 	})
 	if mc.Observe(err) != nil {
-		// only warn, maybe the next scrape will work.
-		klog.Warningf("Unable to scrape volumes: %v", err)
+		// only warn, maybe the next list will work.
+		klog.Warningf("Unable to list volumes: %v", err)
 		return err
 	}
 
 	mc = newOpenStackMetric("volume_quotasets_usage", "get")
 	q, err := quotasets.GetUsage(client, tenantID).Extract()
 	if mc.Observe(err) != nil {
-		// only warn, maybe the next scrape will work.
-		klog.Warningf("Unable to scrape quotas: %v", err)
+		// only warn, maybe the next get will work.
+		klog.Warningf("Unable to get quotas: %v", err)
 		return err
 	}
-	scrapeCinderQuotas(q)
+	publishCinderQuotas(q)
 	return nil
 }
 
-// scrapeCinderQuotas scrapes all cinder related quotas
-func scrapeCinderQuotas(q quotasets.QuotaUsageSet) {
+// publishCinderQuotas publishes all cinder related quotas
+func publishCinderQuotas(q quotasets.QuotaUsageSet) {
 	cinderQuotaVolumes.WithLabelValues("in-use").Set(float64(q.Volumes.InUse))
 	cinderQuotaVolumes.WithLabelValues("reserved").Set(float64(q.Volumes.Reserved))
 	cinderQuotaVolumes.WithLabelValues("limit").Set(float64(q.Volumes.Limit))
@@ -142,25 +142,25 @@ func scrapeCinderQuotas(q quotasets.QuotaUsageSet) {
 	cinderQuotaVolumesGigabyte.WithLabelValues("allocated").Set(float64(q.Gigabytes.Allocated))
 }
 
-// scrapeVolumesPage iterates over a page, the result of a list request
-func scrapeVolumesPage(page pagination.Page, pvs map[string]corev1.PersistentVolume) (bool, error) {
+// publishVolumesPage iterates over a page, the result of a list request
+func publishVolumesPage(page pagination.Page, pvs map[string]corev1.PersistentVolume) (bool, error) {
 	vList, err := volumes.ExtractVolumes(page)
 	if err != nil {
 		return false, err
 	}
 
 	for _, v := range vList {
 		if pv, ok := pvs[v.ID]; ok {
-			scrapeVolumeMetrics(v, &pv)
+			publishVolumeMetrics(v, &pv)
 		} else {
-			scrapeVolumeMetrics(v, nil)
+			publishVolumeMetrics(v, nil)
 		}
 	}
 	return true, nil
 }
 
-// scrapeVolumeMetrics extracts data from a volume and exposes the metrics via prometheus
-func scrapeVolumeMetrics(v volumes.Volume, pv *corev1.PersistentVolume) {
+// publishVolumeMetrics extracts data from a volume and exposes the metrics via prometheus
+func publishVolumeMetrics(v volumes.Volume, pv *corev1.PersistentVolume) {
 	labels := []string{v.ID, v.Description, v.Name, v.Status, v.AvailabilityZone, v.VolumeType}
 
 	k8sMetadata := extractK8sMetadata(pv)

pkg/metrics/loadbalancer.go

@@ -39,21 +39,21 @@ func registerLoadBalancerMetrics() {
 	prometheus.MustRegister(loadbalancerStatus)
 }
 
-// ScrapeLoadBalancerMetrics makes the list request to the load balancer api and
-// passes the result to a scrape function.
-func ScrapeLoadBalancerMetrics(client *gophercloud.ServiceClient, tenantID string) error {
+// PublishLoadBalancerMetrics makes the list request to the load balancer api and
+// passes the result to a publish function.
+func PublishLoadBalancerMetrics(client *gophercloud.ServiceClient, tenantID string) error {
 	// first step: gather the data
 	mc := newOpenStackMetric("loadbalancer", "list")
 	pages, err := loadbalancers.List(client, loadbalancers.ListOpts{}).AllPages()
 	if mc.Observe(err) != nil {
-		// only warn, maybe the next scrape will work.
-		klog.Warningf("Unable to scrape floating ips: %v", err)
+		// only warn, maybe the next list will work.
+		klog.Warningf("Unable to list load balancers: %v", err)
 		return err
 	}
 	loadBalancerList, err := loadbalancers.ExtractLoadBalancers(pages)
 	if err != nil {
-		// only warn, maybe the next scrape will work.
-		klog.Warningf("Unable to scrape load balancers: %v", err)
+		// only warn, maybe the next publish will work.
+		klog.Warningf("Unable to extract load balancers: %v", err)
 		return err
 	}
 
@@ -62,14 +62,14 @@ func ScrapeLoadBalancerMetrics(client *gophercloud.ServiceClient, tenantID strin
 
 	// third step: publish the metrics
 	for _, lb := range loadBalancerList {
-		scrapeLoadBalancerMetric(lb)
+		publishLoadBalancerMetric(lb)
 	}
 
 	return nil
 }
 
-// scrapeLoadBalancerMetric extracts data from a floating ip and exposes the metrics via prometheus
-func scrapeLoadBalancerMetric(lb loadbalancers.LoadBalancer) {
+// publishLoadBalancerMetric extracts data from a floating ip and exposes the metrics via prometheus
+func publishLoadBalancerMetric(lb loadbalancers.LoadBalancer) {
 	labels := []string{lb.ID, lb.VipAddress, lb.Provider, lb.VipPortID}
 
 	loadbalancerAdminStateUp.WithLabelValues(labels...).Set(boolFloat64(lb.AdminStateUp))

pkg/metrics/neutron.go

@@ -45,21 +45,21 @@ func registerNeutronMetrics() {
 	prometheus.MustRegister(neutronFloatingIPUpdatedAt)
 }
 
-// ScrapeNeutronMetrics makes the list request to the neutron api and passes
-// the result to a scrape function.
-func ScrapeNeutronMetrics(neutronClient *gophercloud.ServiceClient, tenantID string) error {
+// PublishNeutronMetrics makes the list request to the neutron api and passes
+// the result to a publish function.
+func PublishNeutronMetrics(neutronClient *gophercloud.ServiceClient, tenantID string) error {
 	// first step: gather the data
 	mc := newOpenStackMetric("floating_ip", "list")
 	pages, err := floatingips.List(neutronClient, floatingips.ListOpts{}).AllPages()
 	if mc.Observe(err) != nil {
-		// only warn, maybe the next scrape will work.
-		klog.Warningf("Unable to scrape floating ips: %v", err)
+		// only warn, maybe the next list will work.
+		klog.Warningf("Unable to list floating ips: %v", err)
 		return err
 	}
 	floatingIPList, err := floatingips.ExtractFloatingIPs(pages)
 	if err != nil {
-		// only warn, maybe the next scrape will work.
-		klog.Warningf("Unable to scrape floating ips: %v", err)
+		// only warn, maybe the next extract will work.
+		klog.Warningf("Unable to extract floating ips: %v", err)
 		return err
 	}
 
@@ -68,14 +68,14 @@ func ScrapeNeutronMetrics(neutronClient *gophercloud.ServiceClient, tenantID str
 
 	// third step: publish the metrics
 	for _, fip := range floatingIPList {
-		scrapeFloatingIPMetric(fip)
+		publishFloatingIPMetric(fip)
 	}
 
 	return nil
 }
 
-// scrapeFloatingIPMetric extracts data from a floating ip and exposes the metrics via prometheus
-func scrapeFloatingIPMetric(fip floatingips.FloatingIP) {
+// publishFloatingIPMetric extracts data from a floating ip and exposes the metrics via prometheus
+func publishFloatingIPMetric(fip floatingips.FloatingIP) {
 	labels := []string{fip.ID, fip.FloatingIP, fip.FixedIP, fip.PortID}
 
 	neutronFloatingIPStatus.WithLabelValues(labels...).Set(1)