diff --git a/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml b/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
index 90cceab86dbf7799758b214529e2793ffdad76dc..fb42470593eb5fe8ed120bbbe2fc7fe9d9bd7c25 100644
--- a/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_close_issue_week
 description: Number of users closing Jira issues by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml b/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
index 70a3b4b0fcb38fd31448e47981f9fff3363763c5..4ea0c3af989ade47da11f6c7295aa77dce0ed387 100644
--- a/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
+++ b/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_cross_reference_
 description: Number of users that cross-referenced Jira issues by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
index b074552087045380c74083c3178e2f810e97516d..eb25f3a384571884e3b34228c40afc289a6c2d90 100644
--- a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.ecosystem_total_unique_counts_weekly
 description: Number of users performing actions on Jira issues by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml b/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
index c96e9788e6d02b62c8b4a381a21577ab74226309..91776260a496b45730ad60b5a80db72f1b21ffa3 100644
--- a/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_issue_notificat
 description: Calculated unique users to trigger a Slack message by performing an action on an issue by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml b/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
index 123d8077a66a5401722f576f5d779697fd34e182..83e1df75fc1ad6d463d4a744ade33d1b5b61fbb7 100644
--- a/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_push_notificati
 description: Calculated unique users to trigger a Slack message by performing a Git push by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml b/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
index 4ae6853d08f84e21df2d2efd895cb82d1f501511..dede3daafcf01663296e7c85a4df27a43792a397 100644
--- a/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_deployment_noti
 description: Calculated unique users to trigger a Slack message by performing a deployment by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml b/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
index bff00f4f5a7d67db5749ab48eff36df375735e1a..d307378c7ffee62d158d582c489f467b6b526112 100644
--- a/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_wiki_page_notif
 description: Calculated unique users to trigger a Slack message by performing an action on a wiki page by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml b/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
index ef131a81f07f28dd69de83c20906bdd49ede87fe..ae30eb439a40cdae032ec63cf8f68c568f03a659 100644
--- a/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_merge_request_n
 description: Calculated unique users to trigger a Slack message by performing an action on a merge request by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml b/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
index 4823a57f853d87fc34bb11a24f61746258e2b349..d05bf537906ca96ce3ad9973e56b93e361ce3f99 100644
--- a/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_note_notificati
 description: Calculated unique users to trigger a Slack message by creating a note by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml b/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
index 3d0123024c07776db56fcadca1105718de04e14b..ae7bc8ecbff43edcf939cefb490c395b36befa39 100644
--- a/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_tag_push_notifi
 description: Calculated unique users to trigger a Slack message by performing a tag push by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml b/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
index 584b3daa51d04da5182c3b4dd3a1bb950bb2d831..5846c0deb445f77e2fe7b428f5aa02a434df16c7 100644
--- a/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_confidential_no
 description: Calculated unique users to trigger a Slack message by creating a confidential note by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml b/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
index f6a1f3c033d912a7946b23ac2f35907a0d2eed83..a815e631a08f9b778825d4cbd6d8ee1211cc936b 100644
--- a/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_confidential_is
 description: Calculated unique users to trigger a Slack message by performing an action on a confidential issue by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "13.10"
diff --git a/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml b/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml
index 788652bf82a63bed84276712c0e6159d959c230a..78d131f6b194fb987da9ef10faa6cc12c3005c98 100644
--- a/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml
+++ b/config/metrics/counts_7d/20210916102312_templates_gitlab_slack_application_active.yml
@@ -3,7 +3,7 @@ key_path: counts.templates_gitlab_slack_application_active
 description: Count templates with active slack application
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: removed
 milestone: "14.3"
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_issue_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_issue_notification_weekly.yml
index 35d643068ca18875a68733f694a2f0ffb7f7b62d..b8a12583ce651f0a3e6550ab37a15910c5933f38 100644
--- a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_issue_notification_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_co
 description: Calculated unique users to trigger a Slack message by performing an action on a confidential issue by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "15.6"
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_note_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_note_notification_weekly.yml
index 5abf36162e4bcb065c756d9a7d857ebeabd0aee6..07662956c2a8350fab12a0add99fbf84090aff73 100644
--- a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_confidential_note_notification_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_co
 description: Calculated unique users to trigger a Slack message by creating a confidential note by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "15.6"
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_deployment_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_deployment_notification_weekly.yml
index 9c3e41827e988f39ecab4b676fcdd662275ec87c..6fa1a3e5d5bf49bf1c35c1fe0426f258c30d9d4b 100644
--- a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_deployment_notification_weekly.yml
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_deployment_notification_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_de
 description: Calculated unique users to trigger a Slack message by performing a deployment by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "15.6"
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_issue_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_issue_notification_weekly.yml
index 417308db301e6115b7ac11d1d3f22b1faa4de06e..1491ad3a9b4ef3dcbcf4204179922893d78c7215 100644
--- a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_issue_notification_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_is
 description: Calculated unique users to trigger a Slack message by performing an action on an issue by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "15.6"
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_merge_request_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_merge_request_notification_weekly.yml
index f74bf9e4877af378488de530dd0042a9623477de..4ae4348bfc266dea62b744ece7e666b40bc29c3b 100644
--- a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_merge_request_notification_weekly.yml
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_merge_request_notification_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_me
 description: Calculated unique users to trigger a Slack message by performing an action on a merge request by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "15.6"
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_note_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_note_notification_weekly.yml
index 951954de37bef5ba0f8a5cbfc6d256d72e861880..37fb9eded2b9a341f96a688b7c358f4ceafefcde 100644
--- a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_note_notification_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_no
 description: Calculated unique users to trigger a Slack message by creating a note by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "15.6"
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_push_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_push_notification_weekly.yml
index 5ad2211cf0232fb72d76040437f2cbde40aff92a..f77f6ab6b6a362553ba34c5e8ba3e64ae4b995ca 100644
--- a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_push_notification_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_pu
 description: Calculated unique users to trigger a Slack message by performing a Git push by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "15.6"
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_tag_push_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_tag_push_notification_weekly.yml
index db2e093039fd83bac3eb2c4970128014d80f5812..16dee599b0f887163c81bfcdc888c0fc471a4334 100644
--- a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_tag_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_tag_push_notification_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_ta
 description: Calculated unique users to trigger a Slack message by performing a tag push by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "15.6"
diff --git a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_wiki_page_notification_weekly.yml b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_wiki_page_notification_weekly.yml
index 6fc9cfa31b7b011682fdcbbd38a0bf5a41b61091..cadf10c4de42fb3d192c3a03e62512c1ff3e9c98 100644
--- a/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_wiki_page_notification_weekly.yml
+++ b/config/metrics/counts_7d/20221101213233_integrations_gitlab_for_slack_app_wiki_page_notification_weekly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.integrations.i_integrations_gitlab_for_slack_app_wi
 description: Calculated unique users to trigger a Slack message by performing an action on a wiki page by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "15.6"
diff --git a/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml b/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
index b38fb1669e09faffa902e7232df488fba6354638..3267b856ada452b370e91a4fac48f144e1e4fe52 100644
--- a/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_campfire_active
 description: Count of active groups inheriting integrations for Campfire
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175756_templates_discord_active.yml b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
index 25049d1497a521ebd059acb63d43c045d8d0b60b..a323f417ab0ce7dc72049f86e052bebd911e83b5 100644
--- a/config/metrics/counts_all/20210216175756_templates_discord_active.yml
+++ b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_discord_active
 description: Count of active service templates for Discord
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216175758_instances_discord_active.yml b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
index 7e325fbabc75686840fb29587030d8d643daf0b5..a33542adf7ba4bf0cfb0b47b0318f29ce76fe307 100644
--- a/config/metrics/counts_all/20210216175758_instances_discord_active.yml
+++ b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_discord_active
 description: Count of active instance-level integrations for Discord
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
index edcbc344d87be1c777f925e6acca620b881bcd29..bb454f748508534cdcd462c9c9cbeed7cafac74a 100644
--- a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_flowdock_active
 description: Count of projects with active integrations for Flowdock
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: removed
 removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102394
diff --git a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
index e65499a9402c3f79494d93ab5044dafd900ee397..a88796ecc7e1ac54709587bc96c7471ef1164bc9 100644
--- a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_hipchat_active
 description: Count of groups with active integrations for HipChat
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: removed
 milestone_removed: '13.11'
diff --git a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
index df8ac5fa50bc3692972a1bdf8219068e84bbbfeb..8729606563063aad6925142a56aca612ddd08de3 100644
--- a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_jenkins_active
 description: Count of groups with active integrations for Jenkins
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml b/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
index 69d892c7b3efbf5af5e914970cf0c2a664eba18a..fed41d0819d2184403efddebcc570d627692be69 100644
--- a/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_jenkins_active
 description: Count of active projects inheriting integrations for Jenkins
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216175946_templates_jira_active.yml b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
index ecfc4963f982faf4fefbf6e42a9a453a8190d38a..97634c7f46ed2d7f2193eed485e5f73d5c6814c9 100644
--- a/config/metrics/counts_all/20210216175946_templates_jira_active.yml
+++ b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_jira_active
 description: Count of active service templates for Jira
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml b/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
index fada3445343e9177d26733bb03b963d2a15dd4d4..0aef21e6442c23a5a59eb0ea853d99fbc8f8986c 100644
--- a/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_unify_circuit_active
 description: Count of groups with active integrations for Unifiy Circuit
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
index 4d6be9b294a1b72df1ab91c2a46640783c1a1c96..80b0d9bd3cd65878128ac232b8a150310e2c2006 100644
--- a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_ewm_active
 description: Count of active groups inheriting integrations for EWM
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/counts_all/20230515153834_projects_inheriting_clickup_active.yml b/config/metrics/counts_all/20230515153834_projects_inheriting_clickup_active.yml
index 1e45317f2a5a4f8f9cc5f5a0d7a4b6ddd83e4802..1ac61351c50032e2ece3e81cdce0a06ef5015b9b 100644
--- a/config/metrics/counts_all/20230515153834_projects_inheriting_clickup_active.yml
+++ b/config/metrics/counts_all/20230515153834_projects_inheriting_clickup_active.yml
@@ -3,7 +3,7 @@ key_path: counts.projects_inheriting_clickup_active
 description: Count of active projects inheriting integrations for ClickUp
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "16.1"
diff --git a/config/metrics/counts_all/20231205140200_groups_inheriting_diffblue_cover_active.yml b/config/metrics/counts_all/20231205140200_groups_inheriting_diffblue_cover_active.yml
index c8d5ceb83937242f9aca70088d8e06adfeb06125..763a7365c5dc70096c5e651cf490d1e6805f9929 100644
--- a/config/metrics/counts_all/20231205140200_groups_inheriting_diffblue_cover_active.yml
+++ b/config/metrics/counts_all/20231205140200_groups_inheriting_diffblue_cover_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_diffblue_cover_active
 description: Count of active groups inheriting integrations for Diffblue Cover
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/config/metrics/settings/20210204124908_mattermost_enabled.yml b/config/metrics/settings/20210204124908_mattermost_enabled.yml
index 1e8560ae6fd6eedea090b485971b883599d52f5b..6663b0fd233f169e41ab8d57ddacaa62b4853733 100644
--- a/config/metrics/settings/20210204124908_mattermost_enabled.yml
+++ b/config/metrics/settings/20210204124908_mattermost_enabled.yml
@@ -4,7 +4,7 @@ key_path: mattermost_enabled
 description: Whether Mattermost is enabled
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: boolean
 status: active
 time_frame: none
diff --git a/ee/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml b/ee/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
index 0c3b4aac093d073de6cfc5b4d411a324057f3767..17e582f380ecdbb407a34db4307815a4a7fe18f3 100644
--- a/ee/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_list_issues_mont
 description: Count of Jira Issue List visits by month
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: 28d
diff --git a/ee/config/metrics/counts_7d/20210216184947_i_ecosystem_jira_service_list_issues_weekly.yml b/ee/config/metrics/counts_7d/20210216184947_i_ecosystem_jira_service_list_issues_weekly.yml
index 5222b9f679f6c4d336786c67461515becd3b8c95..4116f53a2f1f9b0fcfb152aa25b774356f67355f 100644
--- a/ee/config/metrics/counts_7d/20210216184947_i_ecosystem_jira_service_list_issues_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184947_i_ecosystem_jira_service_list_issues_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_list_issues_week
 description: Count of Jira Issue List visits by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: 7d
diff --git a/ee/config/metrics/counts_7d/20210216184951_i_ecosystem_jira_service_create_issue_weekly.yml b/ee/config/metrics/counts_7d/20210216184951_i_ecosystem_jira_service_create_issue_weekly.yml
index 651420d570157c2f8032c9e8542a73ad968aa11a..3c5b8b9fb498a75358cd22b8988dc15d8c1c5a5a 100644
--- a/ee/config/metrics/counts_7d/20210216184951_i_ecosystem_jira_service_create_issue_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184951_i_ecosystem_jira_service_create_issue_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_create_issue_wee
 description: Number of users creating Jira issues by week
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: 7d
diff --git a/ee/config/metrics/counts_all/20210216175848_projects_github_active.yml b/ee/config/metrics/counts_all/20210216175848_projects_github_active.yml
index f08c007cdfce84231120367b4d7f817d628043fd..8ba543a8f2ede95cad395445b54f7c3fab2e5ce3 100644
--- a/ee/config/metrics/counts_all/20210216175848_projects_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175848_projects_github_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_github_active
 description: Count of projects with active integrations for GitHub
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/ee/config/metrics/counts_all/20210216175850_groups_github_active.yml b/ee/config/metrics/counts_all/20210216175850_groups_github_active.yml
index 7475cf5dc62c3e342f906d28b7dc705337f9186b..50d222b8ed2779ea5c563f52b7c3f73fbeed24cc 100644
--- a/ee/config/metrics/counts_all/20210216175850_groups_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175850_groups_github_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_github_active
 description: Count of groups with active integrations for GitHub
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/ee/config/metrics/counts_all/20210216175851_templates_github_active.yml b/ee/config/metrics/counts_all/20210216175851_templates_github_active.yml
index 7d942e714b8b6301204d0b2e9174baf46c820eb6..40f7cd7b63b87e97b424235b441854b059ae48c7 100644
--- a/ee/config/metrics/counts_all/20210216175851_templates_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175851_templates_github_active.yml
@@ -4,7 +4,7 @@ key_path: counts.templates_github_active
 description: Count of active service templates for GitHub
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: removed
 milestone_removed: '14.4'
diff --git a/ee/config/metrics/counts_all/20210216175853_instances_github_active.yml b/ee/config/metrics/counts_all/20210216175853_instances_github_active.yml
index 0ec1269630f2e7e590ab867fc0ab8eaa255e6aa4..6e0aa0895f8f29e5eee0c02510deaab1d006124c 100644
--- a/ee/config/metrics/counts_all/20210216175853_instances_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175853_instances_github_active.yml
@@ -4,7 +4,7 @@ key_path: counts.instances_github_active
 description: Count of active instance-level integrations for GitHub
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/ee/config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml b/ee/config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml
index e2366137a2f88e8301b9fc970efb17f814435d52..7abe85bae318dbeb0d652d44569ddcb703a92095 100644
--- a/ee/config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_inheriting_github_active
 description: Count of active projects inheriting integrations for GitHub
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/ee/config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml b/ee/config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml
index a9a9540847d82bf4f97c73a544bddc0b802f178c..f3ccafa43efa70ec6778fb2f65cdedc115f3602e 100644
--- a/ee/config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml
@@ -4,7 +4,7 @@ key_path: counts.groups_inheriting_github_active
 description: Count of active groups inheriting integrations for GitHub
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/ee/config/metrics/counts_all/20210216180236_projects_jira_issuelist_active.yml b/ee/config/metrics/counts_all/20210216180236_projects_jira_issuelist_active.yml
index bbee0595a21ec9f17f05902beb6a4b605142e547..555d8f7b339b047925c6c33f65fd9ac92373399e 100644
--- a/ee/config/metrics/counts_all/20210216180236_projects_jira_issuelist_active.yml
+++ b/ee/config/metrics/counts_all/20210216180236_projects_jira_issuelist_active.yml
@@ -4,7 +4,7 @@ key_path: counts.projects_jira_issuelist_active
 description: Total Jira Issue feature enabled
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 time_frame: all
diff --git a/ee/config/metrics/counts_all/20240117150651_groups_git_guardian_active.yml b/ee/config/metrics/counts_all/20240117150651_groups_git_guardian_active.yml
index 16ba6a3f2cccb013a8748699cd52b510d3fff307..02ee73f4767c9be7b0e86afad8c7e0373986b383 100644
--- a/ee/config/metrics/counts_all/20240117150651_groups_git_guardian_active.yml
+++ b/ee/config/metrics/counts_all/20240117150651_groups_git_guardian_active.yml
@@ -3,7 +3,7 @@ key_path: counts.groups_git_guardian_active
 description: Count of groups with active integrations for GitGuardian
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "16.9"
diff --git a/ee/config/metrics/counts_all/20240117150651_groups_inheriting_git_guardian_active.yml b/ee/config/metrics/counts_all/20240117150651_groups_inheriting_git_guardian_active.yml
index 97500881a5a9439271460ce803a9d0a3ff8e77d5..108a47282911497a1a15209d0673ee31ea15b492 100644
--- a/ee/config/metrics/counts_all/20240117150651_groups_inheriting_git_guardian_active.yml
+++ b/ee/config/metrics/counts_all/20240117150651_groups_inheriting_git_guardian_active.yml
@@ -3,7 +3,7 @@ key_path: counts.groups_inheriting_git_guardian_active
 description: Count of active groups inheriting with active integrations for GitGuardian
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "16.9"
diff --git a/ee/config/metrics/counts_all/20240117150651_instances_git_guardian_active.yml b/ee/config/metrics/counts_all/20240117150651_instances_git_guardian_active.yml
index bf8b467059ac386ff85b919581ef67fc816a9af9..98bd5587ea19b78c69ed7c988e8826ea91f04a0e 100644
--- a/ee/config/metrics/counts_all/20240117150651_instances_git_guardian_active.yml
+++ b/ee/config/metrics/counts_all/20240117150651_instances_git_guardian_active.yml
@@ -3,7 +3,7 @@ key_path: counts.instances_git_guardian_active
 description: Count of active instances inheriting with active integrations for GitGuardian
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "16.9"
diff --git a/ee/config/metrics/counts_all/20240117150651_projects_git_guardian_active.yml b/ee/config/metrics/counts_all/20240117150651_projects_git_guardian_active.yml
index f778073805909268cee1d35539da609618f4fd70..44521c9a16ccd2ccbc411867b134aa7afcfc86b1 100644
--- a/ee/config/metrics/counts_all/20240117150651_projects_git_guardian_active.yml
+++ b/ee/config/metrics/counts_all/20240117150651_projects_git_guardian_active.yml
@@ -3,7 +3,7 @@ key_path: counts.projects_git_guardian_active
 description: Count of projects with active integrations for GitGuardian
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "16.9"
diff --git a/ee/config/metrics/counts_all/20240117150651_projects_inheriting_git_guardian_active.yml b/ee/config/metrics/counts_all/20240117150651_projects_inheriting_git_guardian_active.yml
index c58b7142eb27f42a95518facd026d2a5edd2ddea..33498b839b79eb5fd0731fc48a37ad54ff904387 100644
--- a/ee/config/metrics/counts_all/20240117150651_projects_inheriting_git_guardian_active.yml
+++ b/ee/config/metrics/counts_all/20240117150651_projects_inheriting_git_guardian_active.yml
@@ -3,7 +3,7 @@ key_path: counts.projects_inheriting_git_guardian_active
 description: Count of active projects inheriting with active integrations for GitGuardian
 product_section: dev
 product_stage: manage
-product_group: integrations
+product_group: import_and_integrate
 value_type: number
 status: active
 milestone: "16.9"