diff options
author | Jaime Martinez <jmartinez@gitlab.com> | 2020-06-11 04:14:12 +0300 |
---|---|---|
committer | Jaime Martinez <jmartinez@gitlab.com> | 2020-06-11 04:14:12 +0300 |
commit | 1ba72226f30f15a6dcc7daf9e24353b7d07a6649 (patch) | |
tree | ef06e235089c67d768bab727fcd95f9716f362c7 | |
parent | cfce1b8522ce81f7987e940bde29a231b175b61e (diff) |
Add units to metric names
-rw-r--r-- | acceptance_test.go | 4 | ||||
-rw-r--r-- | metrics/metrics.go | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/acceptance_test.go b/acceptance_test.go index 7cd2d52d..9497511a 100644 --- a/acceptance_test.go +++ b/acceptance_test.go @@ -405,8 +405,8 @@ func TestPrometheusMetricsCanBeScraped(t *testing.T) { require.Contains(t, string(body), "gitlab_pages_domains_source_failures_total 0") require.Contains(t, string(body), "gitlab_pages_serverless_requests 0") require.Contains(t, string(body), "gitlab_pages_serverless_latency_sum 0") - require.Contains(t, string(body), "gitlab_pages_disk_serving_file_size_sum 0") - require.Contains(t, string(body), "gitlab_pages_serving_time_sum 0") + require.Contains(t, string(body), "gitlab_pages_disk_serving_file_size_bytes_sum 0") + require.Contains(t, string(body), "gitlab_pages_serving_time_seconds_sum 0") } func TestStatusPage(t *testing.T) { diff --git a/metrics/metrics.go b/metrics/metrics.go index b9916258..88636279 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -79,17 +79,17 @@ var ( // DiskServingFileSize metric for file size serving. serving_types: disk and object_storage DiskServingFileSize = prometheus.NewHistogram(prometheus.HistogramOpts{ - Name: "gitlab_pages_disk_serving_file_size", + Name: "gitlab_pages_disk_serving_file_size_bytes", Help: "The size in bytes for each file that has been served", - // From 1B to 100MB in *10 increments (1B 10B 100B 1KB 10KB 100KB 1MB 10MB 100MB) + // From 1B to 100MB in *10 increments (1 10 100 1,000 10,000 100,000 1'000,000 10'000,000 100'000,000) Buckets: prometheus.ExponentialBuckets(1.0, 10.0, 9), }) // ServingTime metric for time taken to find a file serving it or not found. ServingTime = prometheus.NewHistogram(prometheus.HistogramOpts{ - Name: "gitlab_pages_serving_time", + Name: "gitlab_pages_serving_time_seconds", Help: "The time (in seconds) taken to serve a file", - Buckets: []float64{0.1, 0.5, 1.0, 2.5, 5.0, 10.0}, + Buckets: []float64{0.1, 0.5, 1, 2.5, 5, 10, 60, 180}, }) ) |