diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-03 18:10:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-03 18:10:09 +0300 |
| commit | c2d0d27f7f36aa1ed10870fec6ff53ba6d89e3e4 (patch) | |
| tree | fcba85600df8569fad605308842b90be464677e3 /config | |
| parent | b4c39709e346f437a85829f985f6596cb6209d35 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/print_wiki.yml | 8 | ||||
| -rw-r--r-- | config/feature_flags/experiment/disable_network_graph_notes_count.yml | 8 | ||||
| -rw-r--r-- | config/metrics/schema/internal_events.json | 32 | ||||
| -rw-r--r-- | config/metrics/schema/redis_hll.json | 38 |
4 files changed, 69 insertions, 17 deletions
diff --git a/config/feature_flags/development/print_wiki.yml b/config/feature_flags/development/print_wiki.yml deleted file mode 100644 index 75305425deb..00000000000 --- a/config/feature_flags/development/print_wiki.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: print_wiki -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/125260 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/414691 -milestone: '16.3' -type: development -group: group::knowledge -default_enabled: true diff --git a/config/feature_flags/experiment/disable_network_graph_notes_count.yml b/config/feature_flags/experiment/disable_network_graph_notes_count.yml deleted file mode 100644 index fa4e5b4e104..00000000000 --- a/config/feature_flags/experiment/disable_network_graph_notes_count.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: disable_network_graph_notes_count -introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103636" -rollout_issue_url: -milestone: '15.6' -type: experiment -group: group::source code -default_enabled: false diff --git a/config/metrics/schema/internal_events.json b/config/metrics/schema/internal_events.json index d925b8af1eb..75378db054d 100644 --- a/config/metrics/schema/internal_events.json +++ b/config/metrics/schema/internal_events.json @@ -63,9 +63,41 @@ "properties": { "instrumentation_class": { "const": "TotalCountMetric" + }, + "options": { + "type": "object", + "properties": { + "events": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "required": [ + "events" + ], + "additionalProperties": false + }, + "events": { + "type": "array", + "items": { + "type": "object", + "required": [ + "name" + ], + "properties": { + "name": { + "type": "string" + } + }, + "additionalProperties": false + } } }, "required": [ + "events", + "options", "instrumentation_class" ] } diff --git a/config/metrics/schema/redis_hll.json b/config/metrics/schema/redis_hll.json index 31de5d27e40..35d520a5833 100644 --- a/config/metrics/schema/redis_hll.json +++ b/config/metrics/schema/redis_hll.json @@ -38,10 +38,46 @@ "properties": { "instrumentation_class": { "const": "AggregatedMetric" + }, + "options": { + "type": "object", + "properties": { + "aggregate": { + "type": "object", + "properties": { + "operator": { + "enum": [ + "OR", + "AND" + ] + }, + "attribute": { + "type": "string" + } + }, + "required": [ + "operator", + "attribute" + ], + "additionalProperties": false + }, + "events": { + "type": "array", + "items": { + "type": "string" + } + } + }, + "required": [ + "aggregate", + "events" + ], + "additionalProperties": false } }, "required": [ - "instrumentation_class" + "instrumentation_class", + "options" ] }, { |