Merge branch 'j_lar/tighten_metric_schema' into 'master'

Make events root property prohibited in redis_event metrics

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139241



Merged-by: Terri Chu <tchu@gitlab.com>
Approved-by: Michał Wielich <mwielich@gitlab.com>
Approved-by: Terri Chu <tchu@gitlab.com>
Co-authored-by: Jonas Larsen <jlarsen@gitlab.com>

config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml

@@ -8,7 +8,7 @@ product_group: source_code
 value_type: number
 status: active
 time_frame: 28d
-data_source: redis_hll
+data_source: internal_events
 instrumentation_class: RedisHLLMetric
 options:
   events:

config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml

@@ -9,7 +9,7 @@ status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 28d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
 instrumentation_class: RedisHLLMetric
 performance_indicator_type: []

config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml

@@ -9,7 +9,7 @@ status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 28d
-data_source: redis_hll
+data_source: internal_events
 data_category: operational
 instrumentation_class: RedisHLLMetric
 performance_indicator_type:

config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml

@@ -9,7 +9,7 @@ status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 28d
-data_source: redis_hll
+data_source: internal_events
 data_category: operational
 instrumentation_class: RedisHLLMetric
 performance_indicator_type:

config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml

@@ -8,7 +8,7 @@ product_group: source_code
 value_type: number
 status: active
 time_frame: 7d
-data_source: redis_hll
+data_source: internal_events
 instrumentation_class: RedisHLLMetric
 options:
   events:

config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml

@@ -9,7 +9,7 @@ status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 7d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
 instrumentation_class: RedisHLLMetric
 performance_indicator_type: []

config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml

@@ -9,7 +9,7 @@ status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 7d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
 instrumentation_class: RedisHLLMetric
 performance_indicator_type: []

config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml

@@ -9,7 +9,7 @@ status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 7d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
 instrumentation_class: RedisHLLMetric
 performance_indicator_type: []

config/metrics/schema/redis_hll.json

@@ -32,7 +32,12 @@
         "required": [
           "instrumentation_class",
           "options"
-        ]
+        ],
+        "not": {
+          "required": [
+            "events"
+          ]
+        }
       },
       {
         "properties": {