diff options
author | feistel <6742251-feistel@users.noreply.gitlab.com> | 2021-08-26 04:27:35 +0300 |
---|---|---|
committer | feistel <6742251-feistel@users.noreply.gitlab.com> | 2021-08-26 04:27:35 +0300 |
commit | 86499385a29d605cf523743aaee8e09354a640c4 (patch) | |
tree | 0c85abef0b49e225dbbb6c11819db5912e66cdfd | |
parent | 0ef975db7aaa3595ebf56fde4a91351aa0174f11 (diff) |
refactor: remove metrics for disk source
-rw-r--r-- | metrics/metrics.go | 36 | ||||
-rw-r--r-- | test/acceptance/metrics_test.go | 8 |
2 files changed, 1 insertions, 43 deletions
diff --git a/metrics/metrics.go b/metrics/metrics.go index 0ae9bc48..54b78fb6 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -4,38 +4,7 @@ import ( "github.com/prometheus/client_golang/prometheus" ) -// TODO: remove disk source metrics https://gitlab.com/gitlab-org/gitlab-pages/-/issues/382 var ( - // DomainsServed counts the total number of sites served - DomainsServed = prometheus.NewGauge(prometheus.GaugeOpts{ - Name: "gitlab_pages_served_domains", - Help: "The number of sites served by this Pages app", - }) - - // DomainFailedUpdates counts the number of failed site updates - DomainFailedUpdates = prometheus.NewCounter(prometheus.CounterOpts{ - Name: "gitlab_pages_domains_failed_total", - Help: "The total number of site updates that have failed since daemon start", - }) - - // DomainUpdates counts the number of site updates successfully processed - DomainUpdates = prometheus.NewCounter(prometheus.CounterOpts{ - Name: "gitlab_pages_domains_updated_total", - Help: "The total number of site updates successfully processed since daemon start", - }) - - // DomainLastUpdateTime is the UNIX timestamp of the last update - DomainLastUpdateTime = prometheus.NewGauge(prometheus.GaugeOpts{ - Name: "gitlab_pages_last_domain_update_seconds", - Help: "UNIX timestamp of the last update", - }) - - // DomainsConfigurationUpdateDuration is the time it takes to update domains configuration from disk - DomainsConfigurationUpdateDuration = prometheus.NewGauge(prometheus.GaugeOpts{ - Name: "gitlab_pages_domains_configuration_update_duration", - Help: "The time (in seconds) it takes to update domains configuration from disk", - }) - // DomainsSourceCacheHit is the number of GitLab API call cache hits DomainsSourceCacheHit = prometheus.NewCounter(prometheus.CounterOpts{ Name: "gitlab_pages_domains_source_cache_hit", @@ -220,11 +189,6 @@ var ( // MustRegister collectors with the Prometheus client func MustRegister() { prometheus.MustRegister( - DomainsServed, - DomainFailedUpdates, - DomainUpdates, - DomainLastUpdateTime, - DomainsConfigurationUpdateDuration, DomainsSourceCacheHit, DomainsSourceCacheMiss, DomainsSourceAPIReqTotal, diff --git a/test/acceptance/metrics_test.go b/test/acceptance/metrics_test.go index ab220c51..0e8237b7 100644 --- a/test/acceptance/metrics_test.go +++ b/test/acceptance/metrics_test.go @@ -32,13 +32,7 @@ func TestPrometheusMetricsCanBeScraped(t *testing.T) { require.NoError(t, err) require.Contains(t, string(body), "gitlab_pages_http_in_flight_requests 0") - // TODO: remove metrics for disk source https://gitlab.com/gitlab-org/gitlab-pages/-/issues/382 - require.Contains(t, string(body), "gitlab_pages_served_domains 0") - require.Contains(t, string(body), "gitlab_pages_domains_failed_total 0") - require.Contains(t, string(body), "gitlab_pages_domains_updated_total 0") - require.Contains(t, string(body), "gitlab_pages_last_domain_update_seconds gauge") - require.Contains(t, string(body), "gitlab_pages_domains_configuration_update_duration gauge") - // end TODO + require.Contains(t, string(body), "gitlab_pages_domains_source_cache_hit") require.Contains(t, string(body), "gitlab_pages_domains_source_cache_miss") require.Contains(t, string(body), "gitlab_pages_domains_source_failures_total") |