Merge pull request #42 from PureStorage-OpenConnect/41-report-s3-bucket-object-count

Add new metric - purefb_buckets_quota_space_bytes , purefb_buckets_object_count

Author: sdodsley

go.mod

@@ -15,8 +15,7 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
-	github.com/prometheus/common v0.45.0 // indirect
+	github.com/prometheus/common v0.46.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
 	golang.org/x/net v0.20.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect

go.sum

@@ -6,21 +6,27 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-resty/resty/v2 v2.11.0 h1:i7jMfNOJYMp69lq7qozJP+bjgzfAzeOhuGlyDrqxT/8=
 github.com/go-resty/resty/v2 v2.11.0/go.mod h1:iiP/OpA0CkcL3IGt1O0+/SIItFUbkkyw5BGXiVdTu+A=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
-github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
 github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA=
 github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
 github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
-github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM=
-github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY=
+github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqScV0Y=
+github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ=
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
@@ -69,9 +75,11 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
 google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/openmetrics-exporter/arrays_space_collector.go

@@ -31,31 +31,31 @@ func (c *ArraySpaceCollector) Collect(ch chan<- prometheus.Metric) {
 		ch <- prometheus.MustNewConstMetric(
 			c.ReductionDesc,
 			prometheus.GaugeValue,
-			as.Space.DataReduction,
+			float64(as.Space.DataReduction),
 			t,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.SpaceDesc,
 			prometheus.GaugeValue,
-			as.Space.Snapshots,
+			float64(as.Space.Snapshots),
 			t, "snapshots",
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.SpaceDesc,
 			prometheus.GaugeValue,
-			as.Space.TotalPhysical,
+			float64(as.Space.TotalPhysical),
 			t, "total_physical",
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.SpaceDesc,
 			prometheus.GaugeValue,
-			as.Space.Unique,
+			float64(as.Space.Unique),
 			t, "unique",
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.SpaceDesc,
 			prometheus.GaugeValue,
-			as.Space.Virtual,
+			float64(as.Space.Virtual),
 			t, "virtual",
 		)
 		ch <- prometheus.MustNewConstMetric(
@@ -67,21 +67,21 @@ func (c *ArraySpaceCollector) Collect(ch chan<- prometheus.Metric) {
 		ch <- prometheus.MustNewConstMetric(
 			c.SpaceDesc,
 			prometheus.GaugeValue,
-			as.Capacity,
+			float64(as.Capacity),
 			t, "capacity",
 		)
 
 		if t == "array" {
 			ch <- prometheus.MustNewConstMetric(
 				c.SpaceDesc,
 				prometheus.GaugeValue,
-				as.Capacity-as.Space.TotalPhysical,
+				float64(as.Capacity-as.Space.TotalPhysical),
 				t, "empty",
 			)
 			ch <- prometheus.MustNewConstMetric(
 				c.UtilizationDesc,
 				prometheus.GaugeValue,
-				as.Space.TotalPhysical/as.Capacity*100,
+				float64(as.Space.TotalPhysical)/float64(as.Capacity)*100,
 				t,
 			)
 		}

internal/openmetrics-exporter/buckets_space_collector.go

@@ -1,14 +1,19 @@
 package collectors
 
 import (
+	"strconv"
+
+	client "purestorage/fb-openmetrics-exporter/internal/rest-client"
+
 	"github.com/prometheus/client_golang/prometheus"
-	"purestorage/fb-openmetrics-exporter/internal/rest-client"
 )
 
 type BucketsSpaceCollector struct {
-	ReductionDesc *prometheus.Desc
-	SpaceDesc     *prometheus.Desc
-	Buckets       *client.BucketsList
+	ReductionDesc         *prometheus.Desc
+	SpaceDesc             *prometheus.Desc
+	BucketQuotaDesc       *prometheus.Desc
+	BucketObjectCountDesc *prometheus.Desc
+	Buckets               *client.BucketsList
 }
 
 func (c *BucketsSpaceCollector) Describe(ch chan<- *prometheus.Desc) {
@@ -23,31 +28,31 @@ func (c *BucketsSpaceCollector) Collect(ch chan<- prometheus.Metric) {
 		ch <- prometheus.MustNewConstMetric(
 			c.ReductionDesc,
 			prometheus.GaugeValue,
-			bucket.Space.DataReduction,
+			float64(bucket.Space.DataReduction),
 			bucket.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.SpaceDesc,
 			prometheus.GaugeValue,
-			bucket.Space.Snapshots,
+			float64(bucket.Space.Snapshots),
 			bucket.Name, "snapshots",
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.SpaceDesc,
 			prometheus.GaugeValue,
-			bucket.Space.TotalPhysical,
+			float64(bucket.Space.TotalPhysical),
 			bucket.Name, "total_physical",
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.SpaceDesc,
 			prometheus.GaugeValue,
-			bucket.Space.Unique,
+			float64(bucket.Space.Unique),
 			bucket.Name, "unique",
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.SpaceDesc,
 			prometheus.GaugeValue,
-			bucket.Space.Virtual,
+			float64(bucket.Space.Virtual),
 			bucket.Name, "virtual",
 		)
 		ch <- prometheus.MustNewConstMetric(
@@ -56,6 +61,18 @@ func (c *BucketsSpaceCollector) Collect(ch chan<- prometheus.Metric) {
 			float64(bucket.ObjectCount),
 			bucket.Name, "object_count",
 		)
+		ch <- prometheus.MustNewConstMetric(
+			c.BucketObjectCountDesc,
+			prometheus.GaugeValue,
+			float64(bucket.ObjectCount),
+			bucket.Name,
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.BucketQuotaDesc,
+			prometheus.GaugeValue,
+			float64(bucket.QuotaLimit),
+			bucket.Name, strconv.FormatBool(bucket.HardLimitEnabled),
+		)
 	}
 }
 
@@ -73,6 +90,18 @@ func NewBucketsSpaceCollector(bl *client.BucketsList) *BucketsSpaceCollector {
 			[]string{"name", "space"},
 			prometheus.Labels{},
 		),
+		BucketQuotaDesc: prometheus.NewDesc(
+			"purefb_buckets_quota_space_bytes",
+			"FlashBlade buckets quota space in bytes",
+			[]string{"name", "hard_limit_enabled"},
+			prometheus.Labels{},
+		),
+		BucketObjectCountDesc: prometheus.NewDesc(
+			"purefb_buckets_object_count",
+			"FlashBlade buckets object count",
+			[]string{"name"},
+			prometheus.Labels{},
+		),
 		Buckets: bl,
 	}
 }

internal/openmetrics-exporter/common_tests.go

@@ -2,7 +2,6 @@ package collectors
 
 import (
 	"testing"
-        "fmt"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/prometheus/client_golang/prometheus"
@@ -25,24 +24,3 @@ func metricsCheck(t *testing.T, c prometheus.Collector, want map[string]bool) {
 		t.Errorf("Mismatch (-want +got):\n%s", diff)
 	}
 }
-
-func metricsCheckP(t *testing.T, c prometheus.Collector, want map[string]bool) {
-	chM := make(chan prometheus.Metric)
-	go func() {
-		c.Collect(chM)
-		close(chM)
-	}()
-	var buff io_prometheus_client.Metric
-	metrics := make(map[string]bool)
-	for m := range chM {
-		m.Write(&buff)
-		metrics[buff.String()] = true
-	}
-        for a := range metrics {
-		fmt.Println(a)
-	}
-	fmt.Println("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++")
-        for a := range want {
-		fmt.Println(a)
-	}
-}

internal/openmetrics-exporter/file_systems_space_collector.go

@@ -1,9 +1,10 @@
 package collectors
 
 import (
-	"github.com/prometheus/client_golang/prometheus"
-	"purestorage/fb-openmetrics-exporter/internal/rest-client"
+	client "purestorage/fb-openmetrics-exporter/internal/rest-client"
 	"strings"
+
+	"github.com/prometheus/client_golang/prometheus"
 )
 
 type FileSystemsSpaceCollector struct {
@@ -44,7 +45,7 @@ func (c *FileSystemsSpaceCollector) Collect(ch chan<- prometheus.Metric) {
 		ch <- prometheus.MustNewConstMetric(
 			c.ReductionDesc,
 			prometheus.GaugeValue,
-			fs.Space.DataReduction,
+			float64(fs.Space.DataReduction),
 			fs.Name, nfs, smb,
 		)
 		ch <- prometheus.MustNewConstMetric(
@@ -56,25 +57,25 @@ func (c *FileSystemsSpaceCollector) Collect(ch chan<- prometheus.Metric) {
 		ch <- prometheus.MustNewConstMetric(
 			c.SpaceDesc,
 			prometheus.GaugeValue,
-			fs.Space.Snapshots,
+			float64(fs.Space.Snapshots),
 			fs.Name, nfs, smb, "snapshots",
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.SpaceDesc,
 			prometheus.GaugeValue,
-			fs.Space.TotalPhysical,
+			float64(fs.Space.TotalPhysical),
 			fs.Name, nfs, smb, "total_physical",
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.SpaceDesc,
 			prometheus.GaugeValue,
-			fs.Space.Unique,
+			float64(fs.Space.Unique),
 			fs.Name, nfs, smb, "unique",
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.SpaceDesc,
 			prometheus.GaugeValue,
-			fs.Space.Virtual,
+			float64(fs.Space.Virtual),
 			fs.Name, nfs, smb, "virtual",
 		)
 	}

internal/openmetrics-exporter/hardware_connectors_perf_collector.go

@@ -1,8 +1,9 @@
 package collectors
 
 import (
+	client "purestorage/fb-openmetrics-exporter/internal/rest-client"
+
 	"github.com/prometheus/client_golang/prometheus"
-	"purestorage/fb-openmetrics-exporter/internal/rest-client"
 )
 
 type HwConnectorsPerfCollector struct {
@@ -98,7 +99,7 @@ func NewHwConnectorsPerfCollector(fb *client.FBClient) *HwConnectorsPerfCollecto
 			prometheus.Labels{},
 		),
 		ErrorsDesc: prometheus.NewDesc(
-			"purefb_shardware_connectors_performance_errors",
+			"purefb_hardware_connectors_performance_errors",
 			"FlashBlade hardware connectors performance errors per sec",
 			[]string{"name", "dimension"},
 			prometheus.Labels{},

internal/rest-client/arrays_space.go

@@ -3,15 +3,15 @@ package client
 type ArraySpace struct {
 	Name     string  `json:"name"`
 	Id       string  `json:"id"`
-	Capacity float64 `json:"capacity"`
+	Capacity int64   `json:"capacity"`
 	Parity   float64 `json:"parity"`
 	Space    Space   `json:"space"`
-	Time     int     `json:"time"`
+	Time     int64   `json:"time"`
 }
 
 type ArraysSpaceList struct {
 	CntToken     string       `json:"continuation_token"`
-	TotalItemCnt int          `json:"total_item_count"`
+	TotalItemCnt int32        `json:"total_item_count"`
 	Items        []ArraySpace `json:"items"`
 }