diff options
author | John Cai <jcai@gitlab.com> | 2022-09-16 16:42:43 +0300 |
---|---|---|
committer | John Cai <jcai@gitlab.com> | 2022-09-16 16:42:43 +0300 |
commit | c50bede62279d2a0255ac425f2b63450374f8ab6 (patch) | |
tree | 5a4b547feedeb8d890295bfb5eef432e4bcb91b0 | |
parent | f3de6a1ae5be2fdc45205510c485d4493bf458c1 (diff) | |
parent | 0c5be70b4c0a7bda640696912555d6457eecb7a0 (diff) |
Merge branch 'jt-unavailable-repo-metric' into 'master'
metrics: Remove Praefect read-only metric
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4858
Merged-by: John Cai <jcai@gitlab.com>
Approved-by: Will Chandler <wchandler@gitlab.com>
Approved-by: John Cai <jcai@gitlab.com>
Co-authored-by: Justin Tobler <jtobler@gitlab.com>
-rw-r--r-- | internal/praefect/datastore/collector.go | 25 | ||||
-rw-r--r-- | internal/praefect/datastore/collector_test.go | 8 |
2 files changed, 5 insertions, 28 deletions
diff --git a/internal/praefect/datastore/collector.go b/internal/praefect/datastore/collector.go index af2b61553..5e1fdbd8e 100644 --- a/internal/praefect/datastore/collector.go +++ b/internal/praefect/datastore/collector.go @@ -11,16 +11,6 @@ import ( ) var ( - // This is kept for backwards compatibility as some alerting rules depend on this. - // The unavailable repositories is a more accurate description for the metric and - // is exported below so we can migrate to it. - descReadOnlyRepositories = prometheus.NewDesc( - "gitaly_praefect_read_only_repositories", - "Number of repositories in read-only mode within a virtual storage.", - []string{"virtual_storage"}, - nil, - ) - descUnavailableRepositories = prometheus.NewDesc( "gitaly_praefect_unavailable_repositories", "Number of repositories that have no healthy, up to date replicas.", @@ -34,11 +24,6 @@ var ( []string{"virtual_storage", "target_node", "state"}, nil, ) - - descriptions = []*prometheus.Desc{ - descReadOnlyRepositories, - descUnavailableRepositories, - } ) // RepositoryStoreCollector collects metrics from the RepositoryStore. @@ -66,9 +51,7 @@ func NewRepositoryStoreCollector( //nolint: stylecheck // This is unintentionally missing documentation. func (c *RepositoryStoreCollector) Describe(ch chan<- *prometheus.Desc) { - for _, desc := range descriptions { - ch <- desc - } + ch <- descUnavailableRepositories } //nolint: stylecheck // This is unintentionally missing documentation. @@ -78,14 +61,12 @@ func (c *RepositoryStoreCollector) Collect(ch chan<- prometheus.Metric) { unavailableCounts, err := CountUnavailableRepositories(ctx, c.db, c.virtualStorages) if err != nil { - c.log.WithError(err).Error("failed collecting read-only repository count metric") + c.log.WithError(err).Error("failed collecting unavailable repository count metric") return } for _, vs := range c.virtualStorages { - for _, desc := range descriptions { - ch <- prometheus.MustNewConstMetric(desc, prometheus.GaugeValue, float64(unavailableCounts[vs]), vs) - } + ch <- prometheus.MustNewConstMetric(descUnavailableRepositories, prometheus.GaugeValue, float64(unavailableCounts[vs]), vs) } } diff --git a/internal/praefect/datastore/collector_test.go b/internal/praefect/datastore/collector_test.go index 09b2a0fa9..e01f6cd53 100644 --- a/internal/praefect/datastore/collector_test.go +++ b/internal/praefect/datastore/collector_test.go @@ -206,17 +206,13 @@ func TestRepositoryStoreCollector(t *testing.T) { logger, hook := test.NewNullLogger() c := NewRepositoryStoreCollector(logger, []string{"virtual-storage-1", "virtual-storage-2"}, tx, timeout) err := testutil.CollectAndCompare(c, strings.NewReader(fmt.Sprintf(` -# HELP gitaly_praefect_read_only_repositories Number of repositories in read-only mode within a virtual storage. -# TYPE gitaly_praefect_read_only_repositories gauge -gitaly_praefect_read_only_repositories{virtual_storage="virtual-storage-1"} %d -gitaly_praefect_read_only_repositories{virtual_storage="virtual-storage-2"} 0 # HELP gitaly_praefect_unavailable_repositories Number of repositories that have no healthy, up to date replicas. # TYPE gitaly_praefect_unavailable_repositories gauge gitaly_praefect_unavailable_repositories{virtual_storage="virtual-storage-1"} %d gitaly_praefect_unavailable_repositories{virtual_storage="virtual-storage-2"} 0 - `, tc.count, tc.count))) + `, tc.count))) if tc.error != nil { - require.Equal(t, "failed collecting read-only repository count metric", hook.Entries[0].Message) + require.Equal(t, "failed collecting unavailable repository count metric", hook.Entries[0].Message) require.Equal(t, logrus.Fields{"error": tc.error, "component": "RepositoryStoreCollector"}, hook.Entries[0].Data) return } |