Add geo_node_usage metric defintion

  - Add geo_node_usage metric definition as object
  - Add geo_node_usage json schema
  - geo_node_usage metric in tests
  - This fixing geo_node_usage missing metric
  in service ping payload

Changelog: fixed

ee/config/metrics/counts_7d/20210604110603_git_push_event_count_weekly.yml

----
-data_category: optional
-key_path: usage_activity_by_stage.enablement.counts.geo_node_usage.git_push_event_count_weekly
-description: Number of Git push events from Prometheus on the Geo secondary
-product_section: enablement
-product_stage: enablement
-product_group: group::geo
-product_category: geo_replication
-value_type: number
-status: data_available
-milestone: "14.0"
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63427/
-time_frame: 7d
-data_source: prometheus
-distribution:
-- ee
-tier:
-- premium
-- ultimate
-performance_indicator_type: []

ee/config/metrics/counts_7d/20210309194425_git_fetch_event_count_weekly.yml → ee/config/metrics/counts_all/20210910141355_geo_node_usage.yml

 ---
-data_category: optional
-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
+key_path: usage_activity_by_stage.enablement.geo_node_usage
+name: geo_node_usage
+description: Usage data for geo nodes
 product_section: enablement
 product_stage: enablement
 product_group: group::geo
 product_category: geo_replication
-value_type: number
-status: data_available
-milestone: '13.10'
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53888
-time_frame: 7d
-data_source: prometheus
+value_type: object
+status: active
+milestone: "14.3"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70062
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
 distribution:
-- ee
+- ce
 tier:
 - premium
 - ultimate
-performance_indicator_type: []
+value_json_schema: "ee/config/metrics/objects_schemas/geo_node_usage.json"

ee/config/metrics/object_schemas/geo_node_usage.json

+{
+  "type": "array",
+  "items": {
+    "type": "object",
+    "properties": {
+      "projects_count": { "type": "number", "description": "Projects count" },
+      "attachments_count": { "type": "number", "description": "Attachments count" },
+      "lfs_objects_count": { "type": "number" },
+      "wikis_failed_count": { "type": "number" },
+      "wikis_synced_count": { "type": "number" },
+      "job_artifacts_count": { "type": "number" },
+      "package_files_count": { "type": "number" },
+      "wikis_verified_count": { "type": "number" },
+      "pages_deployments_count": { "type": "number" },
+      "wikis_checksummed_count": { "type": "number" },
+      "attachments_failed_count": { "type": "number" },
+      "attachments_synced_count": { "type": "number" },
+      "lfs_objects_failed_count": { "type": "number" },
+      "lfs_objects_synced_count": { "type": "number" },
+      "pipeline_artifacts_count": { "type": "number" },
+      "design_repositories_count": { "type": "number" },
+      "merge_request_diffs_count": { "type": "number" },
+      "repositories_failed_count": { "type": "number" },
+      "repositories_synced_count": { "type": "number" },
+      "job_artifacts_failed_count": { "type": "number" },
+      "job_artifacts_synced_count": { "type": "number" },
+      "lfs_objects_registry_count": { "type": "number" },
+      "lfs_objects_verified_count": { "type": "number" },
+      "package_files_failed_count": { "type": "number" },
+      "package_files_synced_count": { "type": "number" },
+      "snippet_repositories_count": { "type": "number" },
+      "wikis_checksum_total_count": { "type": "number" },
+      "git_push_event_count_weekly": { "type": "number" },
+      "repositories_verified_count": { "type": "number" },
+      "wikis_checksum_failed_count": { "type": "number" },
+      "container_repositories_count": { "type": "number" },
+      "git_fetch_event_count_weekly": { "type": "number" },
+      "package_files_registry_count": { "type": "number" },
+      "package_files_verified_count": { "type": "number" },
+      "group_wiki_repositories_count": { "type": "number" },
+      "lfs_objects_checksummed_count": { "type": "number" },
+      "wikis_checksum_mismatch_count": { "type": "number" },
+      "pages_deployments_failed_count": { "type": "number" },
+      "pages_deployments_synced_count": { "type": "number" },
+      "repositories_checksummed_count": { "type": "number" },
+      "terraform_state_versions_count": { "type": "number" },
+      "wikis_verification_total_count": { "type": "number" },
+      "attachments_replication_enabled": { "type": "boolean" },
+      "package_files_checksummed_count": { "type": "number" },
+      "pipeline_artifacts_failed_count": { "type": "number" },
+      "pipeline_artifacts_synced_count": { "type": "number" },
+      "repository_verification_enabled": { "type": "boolean" },
+      "wikis_verification_failed_count": { "type": "number" },
+      "design_repositories_failed_count": { "type": "number" },
+      "design_repositories_synced_count": { "type": "number" },
+      "lfs_objects_checksum_total_count": { "type": "number" },
+      "merge_request_diffs_synced_count": { "type": "number" },
+      "pages_deployments_registry_count": { "type": "number" },
+      "pages_deployments_verified_count": { "type": "number" },
+      "repositories_replication_enabled": { "type": "boolean" },
+      "job_artifacts_replication_enabled": { "type": "boolean" },
+      "lfs_objects_checksum_failed_count": { "type": "number" },
+      "pipeline_artifacts_registry_count": { "type": "number" },
+      "pipeline_artifacts_verified_count": { "type": "number" },
+      "repositories_checksum_total_count": { "type": "number" },
+      "snippet_repositories_failed_count": { "type": "number" },
+      "snippet_repositories_synced_count": { "type": "number" },
+      "wikis_retrying_verification_count": { "type": "number" },
+      "merge_request_diffs_registry_count": { "type": "number" },
+      "merge_request_diffs_verified_count": { "type": "number" },
+      "package_files_checksum_total_count": { "type": "number" },
+      "repositories_checksum_failed_count": { "type": "number" },
+      "container_repositories_failed_count": { "type": "number" },
+      "container_repositories_synced_count": { "type": "number" },
+      "package_files_checksum_failed_count": { "type": "number" },
+      "pages_deployments_checksummed_count": { "type": "number" },
+      "snippet_repositories_registry_count": { "type": "number" },
+      "snippet_repositories_verified_count": { "type": "number" },
+      "group_wiki_repositories_failed_count": { "type": "number" },
+      "group_wiki_repositories_synced_count": { "type": "number" },
+      "lfs_objects_verification_total_count": { "type": "number" },
+      "pipeline_artifacts_checksummed_count": { "type": "number" },
+      "repositories_checksum_mismatch_count": { "type": "number" },
+      "container_repositories_registry_count": { "type": "number" },
+      "lfs_objects_verification_failed_count": { "type": "number" },
+      "merge_request_diffs_checksummed_count": { "type": "number" },
+      "repositories_verification_total_count": { "type": "number" },
+      "terraform_state_versions_failed_count": { "type": "number" },
+      "terraform_state_versions_synced_count": { "type": "number" },
+      "group_wiki_repositories_registry_count": { "type": "number" },
+      "group_wiki_repositories_verified_count": { "type": "number" },
+      "package_files_verification_total_count": { "type": "number" },
+      "pages_deployments_checksum_total_count": { "type": "number" },
+      "repositories_verification_failed_count": { "type": "number" },
+      "snippet_repositories_checksummed_count": { "type": "number" },
+      "design_repositories_replication_enabled": { "type": "boolean" },
+      "package_files_verification_failed_count": { "type": "number" },
+      "pages_deployments_checksum_failed_count": { "type": "number" },
+      "pipeline_artifacts_checksum_total_count": { "type": "number" },
+      "terraform_state_versions_registry_count": { "type": "number" },
+      "terraform_state_versions_verified_count": { "type": "number" },
+      "merge_request_diffs_checksum_total_count": { "type": "number" },
+      "pipeline_artifacts_checksum_failed_count": { "type": "number" },
+      "repositories_retrying_verification_count": { "type": "number" },
+      "group_wiki_repositories_checksummed_count": { "type": "number" },
+      "merge_request_diffs_checksum_failed_count": { "type": "number" },
+      "snippet_repositories_checksum_total_count": { "type": "number" },
+      "container_repositories_replication_enabled": { "type": "boolean" },
+      "pages_deployments_verification_total_count": { "type": "number" },
+      "snippet_repositories_checksum_failed_count": { "type": "number" },
+      "terraform_state_versions_checksummed_count": { "type": "number" },
+      "attachments_synced_missing_on_primary_count": { "type": "number" },
+      "pages_deployments_verification_failed_count": { "type": "number" },
+      "pipeline_artifacts_verification_total_count": { "type": "number" },
+      "group_wiki_repositories_checksum_total_count": { "type": "number" },
+      "merge_request_diffs_verification_total_count": { "type": "number" },
+      "pipeline_artifacts_verification_failed_count": { "type": "number" },
+      "group_wiki_repositories_checksum_failed_count": { "type": "number" },
+      "job_artifacts_synced_missing_on_primary_count": { "type": "number" },
+      "merge_request_diffs_verification_failed_count": { "type": "number" },
+      "snippet_repositories_verification_total_count": { "type": "number" },
+      "terraform_state_versions_checksum_total_count": { "type": "number" },
+      "snippet_repositories_verification_failed_count": { "type": "number" },
+      "terraform_state_versions_checksum_failed_count": { "type": "number" },
+      "group_wiki_repositories_verification_total_count": { "type": "number" },
+      "group_wiki_repositories_verification_failed_count": { "type": "number" },
+      "terraform_state_versions_verification_total_count": { "type": "number" },
+      "terraform_state_versions_verification_failed_count": { "type": "number" }
+    }
+  }
+}

spec/support/shared_contexts/services/service_ping/stubbed_service_ping_metrics_definitions_shared_context.rb

@@ -7,6 +7,7 @@
   let(:standard_metrics) do
     [
       metric_attributes('uuid', 'standard'),
+      metric_attributes('recorded_at', 'standard'),
       metric_attributes('settings.collected_data_categories', 'standard', 'object')
     ]
   end
@@ -23,7 +24,8 @@
       metric_attributes('counts.boards', 'optional', 'number'),
       metric_attributes('gitaly.filesystems', '').except('data_category'),
       metric_attributes('usage_activity_by_stage.monitor.projects_with_enabled_alert_integrations_histogram', 'optional', 'object'),
-      metric_attributes('topology', 'optional', 'object')
+      metric_attributes('topology', 'optional', 'object'),
+      metric_attributes('usage_activity_by_stage.enablement.geo_node_usage', 'optional', 'object')
     ]
   end