Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-08-18 13:50:51 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-08-18 13:50:51 +0300
commitdb384e6b19af03b4c3c82a5760d83a3fd79f7982 (patch)
tree34beaef37df5f47ccbcf5729d7583aae093cffa0 /generator_templates
parent54fd7b1bad233e3944434da91d257fa7f63c3996 (diff)
Add latest changes from gitlab-org/gitlab@16-3-stable-eev16.3.0-rc42
Diffstat (limited to 'generator_templates')
-rw-r--r--generator_templates/gitlab_internal_events/event_definition.yml2
-rw-r--r--generator_templates/gitlab_internal_events/metric_definition.yml6
-rw-r--r--generator_templates/usage_metric_definition/metric_definition.yml2
3 files changed, 8 insertions, 2 deletions
diff --git a/generator_templates/gitlab_internal_events/event_definition.yml b/generator_templates/gitlab_internal_events/event_definition.yml
index 26adc55726e..0c5399a3d1b 100644
--- a/generator_templates/gitlab_internal_events/event_definition.yml
+++ b/generator_templates/gitlab_internal_events/event_definition.yml
@@ -1,6 +1,6 @@
---
description: <%= args.last %>
-category: GitlabInternalEvents
+category: InternalEventTracking
action: <%= event %>
label_description:
property_description:
diff --git a/generator_templates/gitlab_internal_events/metric_definition.yml b/generator_templates/gitlab_internal_events/metric_definition.yml
index 108db77d0d0..e8c2cfb94db 100644
--- a/generator_templates/gitlab_internal_events/metric_definition.yml
+++ b/generator_templates/gitlab_internal_events/metric_definition.yml
@@ -15,3 +15,9 @@ data_category: optional
instrumentation_class: <%= class_name %>
distribution: <%= distributions %>
tier: <%= tiers %>
+options:
+ events:
+ - <%= event %>
+events:
+ - name: <%= event %>
+ unique: <%= options.fetch(:unique) %>
diff --git a/generator_templates/usage_metric_definition/metric_definition.yml b/generator_templates/usage_metric_definition/metric_definition.yml
index 7bb9fc87bdf..b864c5698d4 100644
--- a/generator_templates/usage_metric_definition/metric_definition.yml
+++ b/generator_templates/usage_metric_definition/metric_definition.yml
@@ -1,5 +1,5 @@
---
-key_path: <%= args.second %><%= metric_name_suggestion(args.second) %>
+key_path: <%= args.second %>
description:
product_section:
product_stage: