diff --git a/.yamllint b/.yamllint
index c4df8cce12272f4e29ce7439339487399dbaefbf..6547a1f7da6b5b6d18327cbb6209777f73f2a530 100644
--- a/.yamllint
+++ b/.yamllint
@@ -19,7 +19,6 @@ ignore: |
# Contains ruby code
config/mail_room.yml
- generator_templates/snowplow_event_definition/event_definition.yml
generator_templates/usage_metric_definition/metric_definition.yml
# Contains ERB code that keeps throwing syntax errors
diff --git a/generator_templates/usage_metric_definition/metric_definition.yml b/generator_templates/usage_metric_definition/metric_definition.yml
index b864c5698d4c2d8d9324cf705a4080d91ce38ee6..f231f74ea16a0296fd801965df5062ef333ce466 100644
--- a/generator_templates/usage_metric_definition/metric_definition.yml
+++ b/generator_templates/usage_metric_definition/metric_definition.yml
@@ -1,8 +1,6 @@
---
key_path: <%= args.second %>
description:
-product_section:
-product_stage:
product_group:
value_type: <%= value_type %>
status: active
diff --git a/spec/fixtures/lib/generators/gitlab/snowplow_event_definition_generator/sample_event.yml b/spec/fixtures/lib/generators/gitlab/snowplow_event_definition_generator/sample_event.yml
deleted file mode 100644
index 6c3a0ef5ed6e4bb871026d722ef0b47bffcf8bc5..0000000000000000000000000000000000000000
--- a/spec/fixtures/lib/generators/gitlab/snowplow_event_definition_generator/sample_event.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-description:
-category: Projects::Pipelines::EmailCampaignsController
-action: click
-label_description:
-property_description:
-value_description:
-extra_properties:
-identifiers:
-#- project
-#- user
-#- namespace
-product_section:
-product_stage:
-product_group:
-milestone: '13.11'
-introduced_by_url:
-distributions:
- - ce
- - ee
-tiers:
- - free
- - premium
- - ultimate
diff --git a/spec/fixtures/lib/generators/gitlab/snowplow_event_definition_generator/sample_event_ee.yml b/spec/fixtures/lib/generators/gitlab/snowplow_event_definition_generator/sample_event_ee.yml
deleted file mode 100644
index 3381c73f23ec4ce1af780efe58239e91d1551f2a..0000000000000000000000000000000000000000
--- a/spec/fixtures/lib/generators/gitlab/snowplow_event_definition_generator/sample_event_ee.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-description:
-category: Projects::Pipelines::EmailCampaignsController
-action: click
-label_description:
-property_description:
-value_description:
-extra_properties:
-identifiers:
-#- project
-#- user
-#- namespace
-product_section:
-product_stage:
-product_group:
-milestone: '13.11'
-introduced_by_url:
-distributions:
- - ee
-tiers:
- #- premium
- - ultimate
diff --git a/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric.yml b/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric.yml
index 64cf9371858590ad00ae9f34e4869146a564202f..717641e66674cdd7c5812bcdde0eadb704f4f7a2 100644
--- a/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric.yml
+++ b/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric.yml
@@ -2,8 +2,6 @@
# See Usage Ping metrics dictionary docs https://docs.gitlab.com/ee/development/internal_analytics/metrics/metrics_dictionary.html
key_path: counts_weekly.test_metric
description:
-product_section:
-product_stage:
product_group:
value_type: number
status: active
diff --git a/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric_with_ee.yml b/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric_with_ee.yml
index cf2a10a46d13fd45f629cb5346b887d8f298b9d2..7cf796f9fbf3c1df6c3931f5fb28bd593868d881 100644
--- a/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric_with_ee.yml
+++ b/spec/fixtures/lib/generators/gitlab/usage_metric_definition_generator/sample_metric_with_ee.yml
@@ -1,8 +1,6 @@
---
key_path: counts_weekly.test_metric
description:
-product_section:
-product_stage:
product_group:
value_type: number
status: active
diff --git a/spec/lib/gitlab/tracking/event_definition_spec.rb b/spec/lib/gitlab/tracking/event_definition_spec.rb
index 6b3d777eae3f98f8a25a6e387bb124a99da6e168..bd91ff2278b520cede3e998ca207eb7a49795367 100644
--- a/spec/lib/gitlab/tracking/event_definition_spec.rb
+++ b/spec/lib/gitlab/tracking/event_definition_spec.rb
@@ -12,8 +12,6 @@
property_description: 'The string "issue_id"',
value_description: 'ID of the issue',
extra_properties: { confidential: false },
- product_stage: 'growth',
- product_section: 'dev',
product_group: 'group::product analytics',
distributions: %w[ee ce],
tiers: %w[free premium ultimate],
@@ -89,8 +87,6 @@ def write_metric(metric, path, content)
:property_description | 1
:value_description | 1
:extra_properties | 'smth'
- :product_stage | 1
- :product_section | nil
:product_group | nil
:distributions | %(be eb)
:tiers | %(pro)
diff --git a/spec/lib/gitlab/usage/metric_definition_spec.rb b/spec/lib/gitlab/usage/metric_definition_spec.rb
index f0b470391602bae4e5b64c0d3a8bb6b6dd8ac1f7..6cf74d755fd88e7c1741c73cc248e795eb7a416d 100644
--- a/spec/lib/gitlab/usage/metric_definition_spec.rb
+++ b/spec/lib/gitlab/usage/metric_definition_spec.rb
@@ -7,8 +7,6 @@
{
description: 'GitLab instance unique identifier',
value_type: 'string',
- product_stage: 'growth',
- product_section: 'devops',
status: 'active',
milestone: '14.1',
default_generation: 'generation_1',
@@ -439,8 +437,6 @@ def write_metric(metric, path, content)
{
description: 'Test metric definition',
value_type: 'string',
- product_stage: 'growth',
- product_section: 'devops',
status: 'active',
milestone: '14.1',
default_generation: 'generation_1',
diff --git a/spec/lib/gitlab/usage/metric_spec.rb b/spec/lib/gitlab/usage/metric_spec.rb
index 42d2f394ce3de5623552ce196842bd1ace7d2b10..26f477b7f55c6c9bda5ae6c85ec56b2f6398ca9b 100644
--- a/spec/lib/gitlab/usage/metric_spec.rb
+++ b/spec/lib/gitlab/usage/metric_spec.rb
@@ -10,8 +10,6 @@
data_category: "Operational",
key_path: "counts.issues",
description: "Count of Issues created",
- product_section: "dev",
- product_stage: "plan",
product_group: "plan",
value_type: "number",
status: "active",
diff --git a/spec/scripts/internal_events/cli_spec.rb b/spec/scripts/internal_events/cli_spec.rb
index f6d268c2a3036248db83f91c9fc3de5c5d60aa55..b44c3bff618b887b39ad8d1019de1a0e6beb475e 100644
--- a/spec/scripts/internal_events/cli_spec.rb
+++ b/spec/scripts/internal_events/cli_spec.rb
@@ -221,7 +221,7 @@ def wait_for_cli_completion
context 'when product group for event no longer exists' do
let(:event) do
{
- action: '00_event1', product_section: 'other', product_stage: 'other', product_group: 'other'
+ action: '00_event1', product_group: 'other'
}
end
diff --git a/spec/tooling/danger/customer_success_spec.rb b/spec/tooling/danger/customer_success_spec.rb
index 40ab7c794186be9495f1b19f5e5be4eaaed6fd31..bdadced4680bceed63a91b952cbc69036a00961f 100644
--- a/spec/tooling/danger/customer_success_spec.rb
+++ b/spec/tooling/danger/customer_success_spec.rb
@@ -32,7 +32,7 @@
},
'with metric file changes and no data category changes' => {
modified_files: %w[config/metrics/20210216182127_user_secret_detection_jobs.yml],
- changed_lines: ['-product_stage: growth'],
+ changed_lines: ['-product_group: activation'],
customer_labeled: false,
impacted: false,
impacted_files: []
diff --git a/spec/tooling/danger/datateam_spec.rb b/spec/tooling/danger/datateam_spec.rb
index 30b029ec6af6086d430adb80d8a09d8925cdf315..8c465a409291304e5e006a412bf7216cd5237ec6 100644
--- a/spec/tooling/danger/datateam_spec.rb
+++ b/spec/tooling/danger/datateam_spec.rb
@@ -60,14 +60,14 @@
},
'with metric file changes and no performance indicator changes' => {
modified_files: %w[config/metrics/20210216182127_user_secret_detection_jobs.yml],
- changed_lines: ['-product_stage: growth'],
+ changed_lines: ['-product_group: activation'],
mr_labels: [],
impacted: false,
impacted_files: []
},
'with metric file changes and no performance indicator changes and other label' => {
modified_files: %w[config/metrics/20210216182127_user_secret_detection_jobs.yml],
- changed_lines: ['-product_stage: growth'],
+ changed_lines: ['-product_group: activation'],
mr_labels: ['type::maintenance'],
impacted: false,
impacted_files: []