Merge branch '321802/update_geo_metrics' into 'master'

Updated geo team metrics.yml files as needed

See merge request gitlab-org/gitlab!57742

doc/development/usage_ping/dictionary.md

@@ -1028,18 +1028,6 @@ Status: `data_available`
 
 Tiers: `premium`, `ultimate`
 
-### `counts.geo_node_usage.git_fetch_event_count_weekly`
-
-Number of Git fetch events from Prometheus on the Geo secondary
-
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_7d/20210309194425_git_fetch_event_count_weekly.yml)
-
-Group: `group::geo`
-
-Status: `implemented`
-
-Tiers: `premium`, `ultimate`
-
 ### `counts.geo_nodes`
 
 Total number of sites in a Geo deployment
@@ -14818,6 +14806,18 @@ Status: `data_available`
 
 Tiers: `free`
 
+### `usage_activity_by_stage.enablement.counts.geo_node_usage.git_fetch_event_count_weekly`
+
+Number of Git fetch events from Prometheus on the Geo secondary
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_7d/20210309194425_git_fetch_event_count_weekly.yml)
+
+Group: `group::geo`
+
+Status: `implemented`
+
+Tiers: `premium`, `ultimate`
+
 ### `usage_activity_by_stage.manage.bulk_imports.gitlab`
 
 Distinct count of users that triggered an import using the Group Migration tool

ee/config/metrics/counts_7d/20210309194425_git_fetch_event_count_weekly.yml

 ---
-key_path: counts.geo_node_usage.git_fetch_event_count_weekly
+key_path: usage_activity_by_stage.enablement.counts.geo_node_usage.git_fetch_event_count_weekly
 description: Number of Git fetch events from Prometheus on the Geo secondary
 product_section: enablement
 product_stage: enablement
 product_group: group::geo
-product_category: disaster_recovery
+product_category: geo_replication
 value_type: number
 status: implemented
 milestone: "13.10"

ee/config/metrics/counts_all/20210216180405_geo_event_log_max_id.yml

@@ -14,4 +14,3 @@ distribution:
 tier:
 - premium
 - ultimate
-skip_validation: true

ee/config/metrics/settings/20210216180406_geo_enabled.yml

@@ -4,14 +4,13 @@ description: Is Geo enabled?
 product_section: enablement
 product_stage: enablement
 product_group: group::geo
-product_category: collection
+product_category: geo_replication
 value_type: boolean
 status: data_available
 time_frame: none
-data_source:
+data_source: database
 distribution:
 - ee
 tier:
 - premium
 - ultimate
-skip_validation: true