Merge branch 'PureStorage-OpenConnect:master' into make_containter_tokens

Author: chrroberts-pure

internal/openmetrics-exporter/alerts_collector_test.go

@@ -51,7 +51,8 @@ func TestAlertsCollector(t *testing.T) {
 	want := make(map[string]bool)
         for a, n := range al {
                 alert := strings.Split(a, ",")
-		want[fmt.Sprintf("label:<name:\"component_type\" value:\"%s\" > label:<name:\"severity\" value:\"%s\" > gauge:<value:%g > ", alert[0], alert[1], n)] = true
+//		want[fmt.Sprintf("label:{name:\"component_type\" value:\"%s\"} label:{name:\"severity\" value:\"%s\"} gauge:{value:%g}", alert[0], alert[1], n)] = true
+		want[fmt.Sprintf("label:{name:\"component_type\" value:\"%s\"} label:{name:\"severity\" value:\"%s\"} gauge:{value:%g}", alert[0], alert[1], n)] = true
 	}
         c := client.NewRestClient(e, "fake-api-token", "latest", false)
 	ac := NewAlertsCollector(c)

internal/openmetrics-exporter/arrays_collector_test.go

@@ -37,7 +37,7 @@ func TestArraysCollector(t *testing.T) {
         e := endp[len(endp)-1]
 	want := make(map[string]bool)
         for _, a := range arrs.Items {
-                want[fmt.Sprintf("label:<name:\"array_name\" value:\"%s\" > label:<name:\"os\" value:\"%s\" > label:<name:\"system_id\" value:\"%s\" > label:<name:\"version\" value:\"%s\" > gauge:<value:1 > ", a.Name, a.Os, a.Id, a.Version)] = true
+                want[fmt.Sprintf("label:{name:\"array_name\" value:\"%s\"} label:{name:\"os\" value:\"%s\"} label:{name:\"system_id\" value:\"%s\"} label:{name:\"version\" value:\"%s\"} gauge:{value:1}", a.Name, a.Os, a.Id, a.Version)] = true
         }
         defer server.Close()
 	c := client.NewRestClient(e, "fake-api-token", "latest", false)

internal/openmetrics-exporter/arrays_performance_collector_test.go

@@ -38,33 +38,33 @@ func TestArrayPerformanceCollector(t *testing.T) {
 	defer server.Close()
 	p := arrs.Items[0]
 	want := make(map[string]bool)
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"queue_usec_per_mirrored_write_op\" > gauge:<value:%g > ", p.QueueUsecPerMirroredWriteOp)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"queue_usec_per_read_op\" > gauge:<value:%g > ", p.QueueUsecPerReadOp)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"queue_usec_per_write_op\" > gauge:<value:%g > ", p.QueueUsecPerWriteOp)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"san_usec_per_mirrored_write_op\" > gauge:<value:%g > ", p.SanUsecPerMirroredWriteOp)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"san_usec_per_read_op\" > gauge:<value:%g > ", p.SanUsecPerReadOp)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"san_usec_per_write_op\" > gauge:<value:%g > ", p.SanUsecPerWriteOp)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"service_usec_per_mirrored_write_op\" > gauge:<value:%g > ", p.ServiceUsecPerMirroredWriteOp)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"service_usec_per_read_op\" > gauge:<value:%g > ", p.ServiceUsecPerReadOp)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"service_usec_per_write_op\" > gauge:<value:%g > ", p.ServiceUsecPerWriteOp)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"usec_per_mirrored_write_op\" > gauge:<value:%g > ", p.UsecPerMirroredWriteOp)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"usec_per_read_op\" > gauge:<value:%g > ", p.UsecPerReadOp)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"usec_per_write_op\" > gauge:<value:%g > ", p.UsecPerWriteOp)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"service_usec_per_read_op_cache_reduction\" > gauge:<value:%g > ", p.ServiceUsecPerReadOpCacheReduction)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"local_queue_usec_per_op\" > gauge:<value:%g > ", p.LocalQueueUsecPerOp)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"usec_per_other_op\" > gauge:<value:%g > ", p.UsecPerOtherOp)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"mirrored_write_bytes_per_sec\" > gauge:<value:%g > ", p.MirroredWriteBytesPerSec)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"read_bytes_per_sec\" > gauge:<value:%g > ", p.ReadBytesPerSec)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"write_bytes_per_sec\" > gauge:<value:%g > ", p.WriteBytesPerSec)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"mirrored_writes_per_sec\" > gauge:<value:%g > ", p.MirroredWritesPerSec)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"reads_per_sec\" > gauge:<value:%g > ", p.ReadsPerSec)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"writes_per_sec\" > gauge:<value:%g > ", p.WritesPerSec)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"others_per_sec\" > gauge:<value:%g > ", p.OthersPerSec)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"bytes_per_mirrored_write\" > gauge:<value:%g > ", p.BytesPerMirroredWrite)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"bytes_per_op\" > gauge:<value:%g > ", p.BytesPerOp)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"bytes_per_read\" > gauge:<value:%g > ", p.BytesPerRead)] = true
-	want[fmt.Sprintf("label:<name:\"dimension\" value:\"bytes_per_write\" > gauge:<value:%g > ", p.BytesPerWrite)] = true
-	want[fmt.Sprintf("gauge:<value:%g > ", p.QueueDepth)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"queue_usec_per_mirrored_write_op\"} gauge:{value:%g}", p.QueueUsecPerMirroredWriteOp)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"queue_usec_per_read_op\"} gauge:{value:%g}", p.QueueUsecPerReadOp)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"queue_usec_per_write_op\"} gauge:{value:%g}", p.QueueUsecPerWriteOp)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"san_usec_per_mirrored_write_op\"} gauge:{value:%g}", p.SanUsecPerMirroredWriteOp)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"san_usec_per_read_op\"} gauge:{value:%g}", p.SanUsecPerReadOp)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"san_usec_per_write_op\"} gauge:{value:%g}", p.SanUsecPerWriteOp)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"service_usec_per_mirrored_write_op\"} gauge:{value:%g}", p.ServiceUsecPerMirroredWriteOp)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"service_usec_per_read_op\"} gauge:{value:%g}", p.ServiceUsecPerReadOp)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"service_usec_per_write_op\"} gauge:{value:%g}", p.ServiceUsecPerWriteOp)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"usec_per_mirrored_write_op\"} gauge:{value:%g}", p.UsecPerMirroredWriteOp)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"usec_per_read_op\"} gauge:{value:%g}", p.UsecPerReadOp)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"usec_per_write_op\"} gauge:{value:%g}", p.UsecPerWriteOp)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"service_usec_per_read_op_cache_reduction\"} gauge:{value:%g}", p.ServiceUsecPerReadOpCacheReduction)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"local_queue_usec_per_op\"} gauge:{value:%g}", p.LocalQueueUsecPerOp)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"usec_per_other_op\"} gauge:{value:%g}", p.UsecPerOtherOp)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"mirrored_write_bytes_per_sec\"} gauge:{value:%g}", p.MirroredWriteBytesPerSec)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"read_bytes_per_sec\"} gauge:{value:%g}", p.ReadBytesPerSec)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"write_bytes_per_sec\"} gauge:{value:%g}", p.WriteBytesPerSec)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"mirrored_writes_per_sec\"} gauge:{value:%g}", p.MirroredWritesPerSec)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"reads_per_sec\"} gauge:{value:%g}", p.ReadsPerSec)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"writes_per_sec\"} gauge:{value:%g}", p.WritesPerSec)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"others_per_sec\"} gauge:{value:%g}", p.OthersPerSec)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"bytes_per_mirrored_write\"} gauge:{value:%g}", p.BytesPerMirroredWrite)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"bytes_per_op\"} gauge:{value:%g}", p.BytesPerOp)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"bytes_per_read\"} gauge:{value:%g}", p.BytesPerRead)] = true
+	want[fmt.Sprintf("label:{name:\"dimension\" value:\"bytes_per_write\"} gauge:{value:%g}", p.BytesPerWrite)] = true
+	want[fmt.Sprintf("gauge:{value:%g}", p.QueueDepth)] = true
 	c := client.NewRestClient(e, "fake-api-token", "latest", false)
 	pc := NewArraysPerformanceCollector(c)
 	metricsCheck(t, pc, want)

internal/openmetrics-exporter/arrays_space_collector_test.go

@@ -37,24 +37,24 @@ func TestArraySpaceCollector(t *testing.T) {
 	want := make(map[string]bool)
 	a := arrs.Items[0]
 	sp := arrs.Items[0].Space
-	want[fmt.Sprintf("gauge:<value:%g > ", sp.DataReduction)] = true
-	want[fmt.Sprintf("label:<name:\"space\" value:\"capacity\" > gauge:<value:%g > ", a.Capacity)] = true
-	want[fmt.Sprintf("label:<name:\"space\" value:\"shared\" > gauge:<value:%g > ", sp.Shared)] = true
-	want[fmt.Sprintf("label:<name:\"space\" value:\"snapshots\" > gauge:<value:%g > ", sp.Snapshots)] = true
-	want[fmt.Sprintf("label:<name:\"space\" value:\"system\" > gauge:<value:%g > ", sp.System)] = true
-	want[fmt.Sprintf("label:<name:\"space\" value:\"thin_provisioning\" > gauge:<value:%g > ", sp.ThinProvisioning)] = true
-	want[fmt.Sprintf("label:<name:\"space\" value:\"total_physical\" > gauge:<value:%g > ", sp.TotalPhysical)] = true
-	want[fmt.Sprintf("label:<name:\"space\" value:\"total_provisioned\" > gauge:<value:%g > ", sp.TotalProvisioned)] = true
-	want[fmt.Sprintf("label:<name:\"space\" value:\"total_reduction\" > gauge:<value:%g > ", sp.TotalReduction)] = true
-	want[fmt.Sprintf("label:<name:\"space\" value:\"unique\" > gauge:<value:%g > ", sp.Unique)] = true
-	want[fmt.Sprintf("label:<name:\"space\" value:\"virtual\" > gauge:<value:%g > ", sp.Virtual)] = true
-	want[fmt.Sprintf("label:<name:\"space\" value:\"replication\" > gauge:<value:%g > ", sp.Replication)] = true
-	want[fmt.Sprintf("label:<name:\"space\" value:\"shared_effective\" > gauge:<value:%g > ", sp.SharedEffective)] = true
-	want[fmt.Sprintf("label:<name:\"space\" value:\"snapshots_effective\" > gauge:<value:%g > ", sp.SnapshotsEffective)] = true
-	want[fmt.Sprintf("label:<name:\"space\" value:\"unique_effective\" > gauge:<value:%g > ", sp.UniqueEffective)] = true
-	want[fmt.Sprintf("label:<name:\"space\" value:\"total_effective\" > gauge:<value:%g > ", sp.TotalEffective)] = true
-	want[fmt.Sprintf("label:<name:\"space\" value:\"empty\" > gauge:<value:%g > ", a.Capacity-a.Space.System-a.Space.Replication-a.Space.Shared-a.Space.Snapshots-a.Space.Unique)] = true
-	want[fmt.Sprintf("gauge:<value:%g > ", (a.Space.System+a.Space.Replication+a.Space.Shared+a.Space.Snapshots+a.Space.Unique)/a.Capacity*100)] = true
+	want[fmt.Sprintf("gauge:{value:%g}", sp.DataReduction)] = true
+	want[fmt.Sprintf("label:{name:\"space\" value:\"capacity\"} gauge:{value:%g}", a.Capacity)] = true
+	want[fmt.Sprintf("label:{name:\"space\" value:\"shared\"} gauge:{value:%g}", sp.Shared)] = true
+	want[fmt.Sprintf("label:{name:\"space\" value:\"snapshots\"} gauge:{value:%g}", sp.Snapshots)] = true
+	want[fmt.Sprintf("label:{name:\"space\" value:\"system\"} gauge:{value:%g}", sp.System)] = true
+	want[fmt.Sprintf("label:{name:\"space\" value:\"thin_provisioning\"} gauge:{value:%g}", sp.ThinProvisioning)] = true
+	want[fmt.Sprintf("label:{name:\"space\" value:\"total_physical\"} gauge:{value:%g}", sp.TotalPhysical)] = true
+	want[fmt.Sprintf("label:{name:\"space\" value:\"total_provisioned\"} gauge:{value:%g}", sp.TotalProvisioned)] = true
+	want[fmt.Sprintf("label:{name:\"space\" value:\"total_reduction\"} gauge:{value:%g}", sp.TotalReduction)] = true
+	want[fmt.Sprintf("label:{name:\"space\" value:\"unique\"} gauge:{value:%g}", sp.Unique)] = true
+	want[fmt.Sprintf("label:{name:\"space\" value:\"virtual\"} gauge:{value:%g}", sp.Virtual)] = true
+	want[fmt.Sprintf("label:{name:\"space\" value:\"replication\"} gauge:{value:%g}", sp.Replication)] = true
+	want[fmt.Sprintf("label:{name:\"space\" value:\"shared_effective\"} gauge:{value:%g}", sp.SharedEffective)] = true
+	want[fmt.Sprintf("label:{name:\"space\" value:\"snapshots_effective\"} gauge:{value:%g}", sp.SnapshotsEffective)] = true
+	want[fmt.Sprintf("label:{name:\"space\" value:\"unique_effective\"} gauge:{value:%g}", sp.UniqueEffective)] = true
+	want[fmt.Sprintf("label:{name:\"space\" value:\"total_effective\"} gauge:{value:%g}", sp.TotalEffective)] = true
+	want[fmt.Sprintf("label:{name:\"space\" value:\"empty\"} gauge:{value:%g}", a.Capacity-a.Space.System-a.Space.Replication-a.Space.Shared-a.Space.Snapshots-a.Space.Unique)] = true
+	want[fmt.Sprintf("gauge:{value:%g}", (a.Space.System+a.Space.Replication+a.Space.Shared+a.Space.Snapshots+a.Space.Unique)/a.Capacity*100)] = true
 	defer server.Close()
 	c := client.NewRestClient(e, "fake-api-token", "latest", false)
 	ac := NewArraySpaceCollector(c)

internal/openmetrics-exporter/dirs_performance_collector_test.go

@@ -38,17 +38,17 @@ func TestDirectoriesPerformanceCollector(t *testing.T) {
 	defer server.Close()
 	want := make(map[string]bool)
 	for _, p := range dirs.Items {
-		want[fmt.Sprintf("label:<name:\"dimension\" value:\"usec_per_other_op\" > label:<name:\"name\" value:\"%s\" > gauge:<value:%g > ", p.Name, p.UsecPerOtherOp)] = true
-		want[fmt.Sprintf("label:<name:\"dimension\" value:\"usec_per_read_op\" > label:<name:\"name\" value:\"%s\" > gauge:<value:%g > ", p.Name, p.UsecPerReadOp)] = true
-		want[fmt.Sprintf("label:<name:\"dimension\" value:\"usec_per_write_op\" > label:<name:\"name\" value:\"%s\" > gauge:<value:%g > ", p.Name, p.UsecPerWriteOp)] = true
-		want[fmt.Sprintf("label:<name:\"dimension\" value:\"read_bytes_per_sec\" > label:<name:\"name\" value:\"%s\" > gauge:<value:%g > ", p.Name, p.ReadBytesPerSec)] = true
-		want[fmt.Sprintf("label:<name:\"dimension\" value:\"write_bytes_per_sec\" > label:<name:\"name\" value:\"%s\" > gauge:<value:%g > ", p.Name, p.WriteBytesPerSec)] = true
-		want[fmt.Sprintf("label:<name:\"dimension\" value:\"others_per_sec\" > label:<name:\"name\" value:\"%s\" > gauge:<value:%g > ", p.Name, p.OthersPerSec)] = true
-		want[fmt.Sprintf("label:<name:\"dimension\" value:\"reads_per_sec\" > label:<name:\"name\" value:\"%s\" > gauge:<value:%g > ", p.Name, p.ReadsPerSec)] = true
-		want[fmt.Sprintf("label:<name:\"dimension\" value:\"writes_per_sec\" > label:<name:\"name\" value:\"%s\" > gauge:<value:%g > ", p.Name, p.WritesPerSec)] = true
-		want[fmt.Sprintf("label:<name:\"dimension\" value:\"bytes_per_op\" > label:<name:\"name\" value:\"%s\" > gauge:<value:%g > ", p.Name, p.BytesPerOp)] = true
-		want[fmt.Sprintf("label:<name:\"dimension\" value:\"bytes_per_read\" > label:<name:\"name\" value:\"%s\" > gauge:<value:%g > ", p.Name, p.BytesPerRead)] = true
-		want[fmt.Sprintf("label:<name:\"dimension\" value:\"bytes_per_write\" > label:<name:\"name\" value:\"%s\" > gauge:<value:%g > ", p.Name, p.BytesPerWrite)] = true
+		want[fmt.Sprintf("label:{name:\"dimension\" value:\"usec_per_other_op\"} label:{name:\"name\" value:\"%s\"} gauge:{value:%g}", p.Name, p.UsecPerOtherOp)] = true
+		want[fmt.Sprintf("label:{name:\"dimension\" value:\"usec_per_read_op\"} label:{name:\"name\" value:\"%s\"} gauge:{value:%g}", p.Name, p.UsecPerReadOp)] = true
+		want[fmt.Sprintf("label:{name:\"dimension\" value:\"usec_per_write_op\"} label:{name:\"name\" value:\"%s\"} gauge:{value:%g}", p.Name, p.UsecPerWriteOp)] = true
+		want[fmt.Sprintf("label:{name:\"dimension\" value:\"read_bytes_per_sec\"} label:{name:\"name\" value:\"%s\"} gauge:{value:%g}", p.Name, p.ReadBytesPerSec)] = true
+		want[fmt.Sprintf("label:{name:\"dimension\" value:\"write_bytes_per_sec\"} label:{name:\"name\" value:\"%s\"} gauge:{value:%g}", p.Name, p.WriteBytesPerSec)] = true
+		want[fmt.Sprintf("label:{name:\"dimension\" value:\"others_per_sec\"} label:{name:\"name\" value:\"%s\"} gauge:{value:%g}", p.Name, p.OthersPerSec)] = true
+		want[fmt.Sprintf("label:{name:\"dimension\" value:\"reads_per_sec\"} label:{name:\"name\" value:\"%s\"} gauge:{value:%g}", p.Name, p.ReadsPerSec)] = true
+		want[fmt.Sprintf("label:{name:\"dimension\" value:\"writes_per_sec\"} label:{name:\"name\" value:\"%s\"} gauge:{value:%g}", p.Name, p.WritesPerSec)] = true
+		want[fmt.Sprintf("label:{name:\"dimension\" value:\"bytes_per_op\"} label:{name:\"name\" value:\"%s\"} gauge:{value:%g}", p.Name, p.BytesPerOp)] = true
+		want[fmt.Sprintf("label:{name:\"dimension\" value:\"bytes_per_read\"} label:{name:\"name\" value:\"%s\"} gauge:{value:%g}", p.Name, p.BytesPerRead)] = true
+		want[fmt.Sprintf("label:{name:\"dimension\" value:\"bytes_per_write\"} label:{name:\"name\" value:\"%s\"} gauge:{value:%g}", p.Name, p.BytesPerWrite)] = true
 	}
 	c := client.NewRestClient(e, "fake-api-token", "latest", false)
 	pc := NewDirectoriesPerformanceCollector(c)