diff options
author | Jaime Martinez <jmartinez@gitlab.com> | 2020-09-09 09:23:02 +0300 |
---|---|---|
committer | Jaime Martinez <jmartinez@gitlab.com> | 2020-09-24 03:22:45 +0300 |
commit | 3e20c84456ec3194de8a35af3cd287a37c006549 (patch) | |
tree | 537e905021f4803bbb67c570136a0c0895ed1424 /metrics | |
parent | 7802bb75e8edafe05855fcbdb72aeea7bb906ae7 (diff) |
Rebase from base branch
Add vfs.VFS implementation for zip
Fix build errors
Clean zip vfs
Add tests for Root
Add zip serving metric
Return a zip.Instance() when source == zip
Add simple acceptance test for zip serving
Use correct contents
No need to start testServer in go routine
Diffstat (limited to 'metrics')
-rw-r--r-- | metrics/metrics.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/metrics/metrics.go b/metrics/metrics.go index cb4287c8..0f532144 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -78,7 +78,7 @@ var ( Help: "The time (in seconds) it takes to get a response from the GitLab domains API", }, []string{"status_code"}) - // DiskServingFileSize metric for file size serving. serving_types: disk and object_storage + // DiskServingFileSize metric for file size serving. DiskServingFileSize = prometheus.NewHistogram(prometheus.HistogramOpts{ Name: "gitlab_pages_disk_serving_file_size_bytes", Help: "The size in bytes for each file that has been served", @@ -86,6 +86,14 @@ var ( Buckets: prometheus.ExponentialBuckets(1.0, 10.0, 9), }) + // ZipServingFileSize metric for file size serving. + ZipServingFileSize = prometheus.NewHistogram(prometheus.HistogramOpts{ + Name: "gitlab_pages_zip_serving_file_size_bytes", + Help: "The size in bytes for each file that has been served", + // 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_seconds", |