IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-13 06:34:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Google Cloud Monitoring: Fix bucket bound for distributions (#56565)

Browse Source
This commit is contained in:
Andres Martinez Gotor
2022-10-10 16:08:33 +02:00
committed by GitHub
parent d332747c38
commit 65e56c9fb8
3 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/cloudmonitoring/cloudmonitoring.go
+6 -1
View File
@@ -596,7 +596,12 @@ func calcBucketBound(bucketOptions cloudMonitoringBucketOptions, n int) string {
case bucketOptions.ExponentialBuckets != nil:
bucketBound = strconv.FormatInt(int64(bucketOptions.ExponentialBuckets.Scale*math.Pow(bucketOptions.ExponentialBuckets.GrowthFactor, float64(n-1))), 10)
case bucketOptions.ExplicitBuckets != nil:
bucketBound = fmt.Sprintf("%g", bucketOptions.ExplicitBuckets.Bounds[n])
if n < len(bucketOptions.ExplicitBuckets.Bounds) {
bucketBound = fmt.Sprintf("%g", bucketOptions.ExplicitBuckets.Bounds[n])
} else {
lastBound := bucketOptions.ExplicitBuckets.Bounds[len(bucketOptions.ExplicitBuckets.Bounds)-1]
bucketBound = fmt.Sprintf("%g+", lastBound)
}
}
return bucketBound
}
pkg/tsdb/cloudmonitoring/test-data/4-series-response-distribution-explicit.json
+20 -2
View File
@@ -103,7 +103,16 @@
"4",
"7",
"12",
"8"
"8",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0"
]
}
}
@@ -198,7 +207,16 @@
"5",
"7",
"11",
"8"
"8",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0"
]
}
}
pkg/tsdb/cloudmonitoring/time_series_filter_test.go
+2 -2
View File
@@ -185,8 +185,8 @@ func TestTimeSeriesFilter(t *testing.T) {
require.NoError(t, err)
frames := res.Frames
require.NoError(t, err)
assert.Equal(t, 33, len(frames))
for i := 0; i < 33; i++ {
assert.Equal(t, 42, len(frames))
for i := 0; i < 42; i++ {
if i == 0 {
assert.Equal(t, "0", frames[i].Fields[1].Name)
}