Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 11 insertions, 1 deletions

diff --git a/config/metrics/schema.json b/config/metrics/schema.json
index 4c10aca7061..e9a4a16ecd3 100644
--- a/config/metrics/schema.json
+++ b/config/metrics/schema.json
@@ -43,13 +43,20 @@
     "introduced_by_url": {
       "type": ["string", "null"]
     },
+    "extra": {
+      "type": "object"
+    },
     "time_frame": {
       "type": "string",
       "enum": ["7d", "28d", "all", "none"]
     },
     "data_source": {
       "type": "string",
-      "enum": ["database", "redis", "redis_hll", "prometheus", "ruby"]
+      "enum": ["database", "redis", "redis_hll", "prometheus", "system"]
+    },
+    "instrumentation_class": {
+      "type": "string",
+      "pattern": "^(([A-Z][a-z]+)+::)*(([A-Z][a-z]+)+)$"
     },
     "distribution": {
       "type": "array",
@@ -67,6 +74,9 @@
     },
     "skip_validation": {
       "type": "boolean"
+    },
+    "value_json_schema": {
+      "type": "string"
     }
   }
 }