diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index c171e1b11df..935911e9273 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -57,64 +57,70 @@
   if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /devops::fulfillment/'
 
 .if-automated-merge-request: &if-automated-merge-request
-  if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-(ee|jh)$/'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && ($CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-(ee|jh)$/)'
 
 .if-merge-request-targeting-stable-branch: &if-merge-request-targeting-stable-branch
   if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^[\d-]+-stable(-ee|-jh)?$/'
 
 .if-merge-request-labels-as-if-foss: &if-merge-request-labels-as-if-foss
-  if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-as-if-foss/'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-as-if-foss/'
 
 .if-merge-request-labels-as-if-jh: &if-merge-request-labels-as-if-jh
-  if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-as-if-jh/'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-as-if-jh/'
 
 .if-merge-request-labels-force-as-if-jh: &if-merge-request-labels-force-as-if-jh
-  if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:force-run-as-if-jh/'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:force-run-as-if-jh/'
 
 .if-merge-request-labels-update-caches: &if-merge-request-labels-update-caches
-  if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:update-cache/'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:update-cache/'
 
 .if-merge-request-labels-run-all-rspec: &if-merge-request-labels-run-all-rspec
-  if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-all-rspec/'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-all-rspec/'
 
 .if-merge-request-labels-run-all-jest: &if-merge-request-labels-run-all-jest
-  if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-all-jest/'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-all-jest/'
 
 .if-merge-request-labels-run-all-e2e: &if-merge-request-labels-run-all-e2e
-  if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-all-e2e/'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-all-e2e/'
 
 .if-merge-request-labels-run-single-db: &if-merge-request-labels-run-single-db
-  if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-single-db/'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-single-db/'
 
 .if-merge-request-labels-run-clusterwide-db: &if-merge-request-labels-run-clusterwide-db
-  if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-clusterwide-db/'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-clusterwide-db/'
 
 .if-merge-request-labels-run-review-app: &if-merge-request-labels-run-review-app
-  if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-review-app/'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-review-app/'
 
 .if-merge-request-labels-run-cs-evaluation: &if-merge-request-labels-run-cs-evaluation
-  if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-CS-evaluation/'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-CS-evaluation/'
 
 .if-merge-request-labels-skip-undercoverage: &if-merge-request-labels-skip-undercoverage
-  if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:skip-undercoverage/'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:skip-undercoverage/'
 
 .if-merge-request-labels-jh-contribution: &if-merge-request-labels-jh-contribution
-  if: '$CI_MERGE_REQUEST_LABELS =~ /JiHu contribution/'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /JiHu contribution/'
 
 .if-merge-request-labels-group-global-search: &if-merge-request-labels-group-global-search
-  if: '$CI_MERGE_REQUEST_LABELS =~ /group::global search/'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /group::global search/'
 
 .if-merge-request-labels-pipeline-expedite: &if-merge-request-labels-pipeline-expedite
-  if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:expedite/'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:expedite/'
 
 .if-merge-request-labels-frontend-and-feature-flag: &if-merge-request-labels-frontend-and-feature-flag
-  if: '$CI_MERGE_REQUEST_LABELS =~ /frontend/ && $CI_MERGE_REQUEST_LABELS =~ /feature flag/'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /frontend/ && $CI_MERGE_REQUEST_LABELS =~ /feature flag/'
+
+.if-merge-request-labels-run-praefect-with-db: &if-merge-request-labels-run-praefect-with-db
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-praefect-with-db/'
+
+.if-merge-request-labels-run-run-without-gitaly-transactions: &if-merge-request-labels-run-run-without-gitaly-transactions
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /run-without-gitaly-transactions/'
 
 .if-security-merge-request: &if-security-merge-request
-  if: '$CI_PROJECT_NAMESPACE == "gitlab-org/security" && ($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached")'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_PROJECT_NAMESPACE == "gitlab-org/security"'
 
 .if-fork-merge-request: &if-fork-merge-request
-  if: '$CI_PROJECT_NAMESPACE !~ /^gitlab(-org)?($|\/)/ && ($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS !~ /pipeline:run-all-rspec/'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_PROJECT_NAMESPACE !~ /^gitlab(-org)?($|\/)/ && $CI_MERGE_REQUEST_LABELS !~ /pipeline:run-all-rspec/'
 
 .if-schedule-pipeline: &if-schedule-pipeline
   if: '$CI_PIPELINE_SOURCE == "schedule"'
@@ -150,16 +156,16 @@
   if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org" && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH'
 
 .if-dot-com-gitlab-org-merge-request: &if-dot-com-gitlab-org-merge-request
-  if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org" && ($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached")'
+  if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org"'
 
 .if-dot-com-gitlab-org-and-subgroups-merge-train: &if-dot-com-gitlab-org-and-subgroups-merge-train
-  if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org/ && $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"'
+  if: '$CI_MERGE_REQUEST_EVENT_TYPE == "merge_train" && $CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE =~ /^gitlab-org/'
 
 .if-dot-com-gitlab-org-ee-tag: &if-dot-com-gitlab-org-ee-tag
   if: '$CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_PATH == "gitlab-org/gitlab" && $CI_COMMIT_TAG =~ /^v?[\d]+\.[\d]+\.[\d]+[\d\w-]*-ee$/'
 
 .if-ruby-branch: &if-ruby-branch
-  if: '$CI_COMMIT_BRANCH =~ /^ruby\d+(_\d)*$/ || $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby\d+(_\d)*/'
+  if: '$CI_COMMIT_BRANCH =~ /^ruby\d+(_\d)*$/ || (($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS =~ /pipeline:run-in-ruby\d+(_\d)*/)'
 
 ####################
 # Changes patterns #
@@ -1998,13 +2004,13 @@
   rules:
     - if: '$ENABLE_RSPEC_PRAEFECT == "true"'
       allow_failure: true
-    - if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-praefect-with-db/'
+    - <<: *if-merge-request-labels-run-praefect-with-db
       allow_failure: true
 
 .rails:rules:gitaly-without-transactions:
   rules:
     - <<: *if-schedule-maintenance
-    - if: '$CI_MERGE_REQUEST_LABELS =~ /pipeline:run-without-gitaly-transactions/'
+    - <<: *if-merge-request-labels-run-run-without-gitaly-transactions
 
 .rails:rules:ee-and-foss-migration:
   rules:
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 633721311bf..1aaec104ae7 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-1fb4c252c713f33db2102315870c1936769319ac
+7664f8d2e7a364a9d8807790aec06e27903dd4e9
diff --git a/GITLAB_KAS_VERSION b/GITLAB_KAS_VERSION
index 3c74580b4b5..12706ced026 100644
--- a/GITLAB_KAS_VERSION
+++ b/GITLAB_KAS_VERSION
@@ -1 +1 @@
-v17.1.0-rc7
+v17.1.0-rc9
diff --git a/app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_linked_pipelines_mini_list.vue b/app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_linked_pipelines_mini_list.vue
new file mode 100644
index 00000000000..09a432e1b47
--- /dev/null
+++ b/app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_linked_pipelines_mini_list.vue
@@ -0,0 +1,118 @@
+<script>
+import { GlTooltipDirective } from '@gitlab/ui';
+import { sprintf, s__ } from '~/locale';
+import CiIcon from '~/vue_shared/components/ci_icon/ci_icon.vue';
+import { accessValue } from '../accessors/linked_pipelines_accessors';
+/**
+ * Renders the upstream/downstream portions of the pipeline mini graph.
+ */
+export default {
+  directives: {
+    GlTooltip: GlTooltipDirective,
+  },
+  components: {
+    CiIcon,
+  },
+  inject: {
+    dataMethod: {
+      default: 'rest',
+    },
+  },
+  props: {
+    triggeredBy: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
+    triggered: {
+      type: Array,
+      required: false,
+      default: () => [],
+    },
+    pipelinePath: {
+      type: String,
+      required: false,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      maxRenderedPipelines: 3,
+    };
+  },
+  computed: {
+    // Exactly one of these (triggeredBy and triggered) must be truthy. Never both. Never neither.
+    isUpstream() {
+      return Boolean(this.triggeredBy.length) && !this.triggered.length;
+    },
+    isDownstream() {
+      return !this.triggeredBy.length && Boolean(this.triggered.length);
+    },
+    linkedPipelines() {
+      return this.isUpstream ? this.triggeredBy : this.triggered;
+    },
+    totalPipelineCount() {
+      return this.linkedPipelines.length;
+    },
+    linkedPipelinesTrimmed() {
+      return this.totalPipelineCount > this.maxRenderedPipelines
+        ? this.linkedPipelines.slice(0, this.maxRenderedPipelines)
+        : this.linkedPipelines;
+    },
+    shouldRenderCounter() {
+      return this.isDownstream && this.linkedPipelines.length > this.maxRenderedPipelines;
+    },
+    counterLabel() {
+      return `+${this.linkedPipelines.length - this.maxRenderedPipelines}`;
+    },
+    counterTooltipText() {
+      return sprintf(s__('LinkedPipelines|%{counterLabel} more downstream pipelines'), {
+        counterLabel: this.counterLabel,
+      });
+    },
+  },
+  methods: {
+    pipelineTooltipText(pipeline) {
+      const { label } = accessValue(pipeline, this.dataMethod, 'detailedStatus');
+
+      return `${pipeline.project.name} - ${label}`;
+    },
+    pipelineStatus(pipeline) {
+      // detailedStatus is graphQL, details.status is REST
+      return pipeline?.detailedStatus || pipeline?.details?.status;
+    },
+  },
+};
+</script>
+
+<template>
+  <span
+    v-if="linkedPipelines"
+    :class="{
+      'is-upstream': isUpstream,
+      'is-downstream': isDownstream,
+    }"
+    class="linked-pipeline-mini-list gl-display-inline-flex gl-gap-2 gl-align-middle"
+  >
+    <ci-icon
+      v-for="pipeline in linkedPipelinesTrimmed"
+      :key="pipeline.id"
+      v-gl-tooltip="{ title: pipelineTooltipText(pipeline) }"
+      :status="pipelineStatus(pipeline)"
+      :show-tooltip="false"
+      class="linked-pipeline-mini-item gl-mb-0!"
+      data-testid="linked-pipeline-mini-item"
+    />
+
+    <a
+      v-if="shouldRenderCounter"
+      v-gl-tooltip="{ title: counterTooltipText }"
+      :title="counterTooltipText"
+      :href="pipelinePath"
+      class="gl-align-items-center gl-bg-gray-50 gl-display-inline-flex gl-font-sm gl-h-6 gl-justify-content-center gl-rounded-pill gl-text-decoration-none gl-text-gray-500 gl-w-7 linked-pipelines-counter linked-pipeline-mini-item"
+      data-testid="linked-pipeline-counter"
+    >
+      {{ counterLabel }}
+    </a>
+  </span>
+</template>
diff --git a/app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph.vue b/app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph.vue
index f3a681e8d26..8aa0c975b72 100644
--- a/app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph.vue
+++ b/app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph.vue
@@ -1,15 +1,15 @@
 <script>
 import { GlIcon } from '@gitlab/ui';
-import PipelineStages from '../pipeline_stages.vue';
-import LinkedPipelinesMiniList from '../linked_pipelines_mini_list.vue';
+import LegacyLinkedPipelinesMiniList from './legacy_linked_pipelines_mini_list.vue';
+import LegacyPipelineStages from './legacy_pipeline_stages.vue';
 /**
- * Renders the REST version of the pipeline mini graph.
+ * Renders the REST instance of the pipeline mini graph.
  */
 export default {
   components: {
     GlIcon,
-    LinkedPipelinesMiniList,
-    PipelineStages,
+    LegacyLinkedPipelinesMiniList,
+    LegacyPipelineStages,
   },
   arrowStyles: ['arrow-icon gl-display-inline-block gl-mx-1 gl-text-gray-500 !gl-align-middle'],
   props: {
@@ -18,11 +18,6 @@ export default {
       required: false,
       default: () => [],
     },
-    isGraphql: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
     isMergeTrain: {
       type: Boolean,
       required: false,
@@ -58,7 +53,7 @@ export default {
 </script>
 <template>
   <div data-testid="pipeline-mini-graph">
-    <linked-pipelines-mini-list
+    <legacy-linked-pipelines-mini-list
       v-if="upstreamPipeline"
       :triggered-by="/* eslint-disable @gitlab/vue-no-new-non-primitive-in-template */ [
         upstreamPipeline,
@@ -71,8 +66,7 @@ export default {
       name="long-arrow"
       data-testid="upstream-arrow-icon"
     />
-    <pipeline-stages
-      :is-graphql="isGraphql"
+    <legacy-pipeline-stages
       :is-merge-train="isMergeTrain"
       :stages="stages"
       :update-dropdown="updateDropdown"
@@ -84,7 +78,7 @@ export default {
       name="long-arrow"
       data-testid="downstream-arrow-icon"
     />
-    <linked-pipelines-mini-list
+    <legacy-linked-pipelines-mini-list
       v-if="hasDownstreamPipelines"
       :triggered="downstreamPipelines"
       :pipeline-path="pipelinePath"
diff --git a/app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_stages.vue b/app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_stages.vue
new file mode 100644
index 00000000000..1e08990ec91
--- /dev/null
+++ b/app/assets/javascripts/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_stages.vue
@@ -0,0 +1,43 @@
+<script>
+import LegacyPipelineStage from './legacy_pipeline_stage.vue';
+/**
+ * Renders the pipeline stages portion of the legacy pipeline mini graph.
+ */
+export default {
+  components: {
+    LegacyPipelineStage,
+  },
+  props: {
+    stages: {
+      type: Array,
+      required: true,
+    },
+    updateDropdown: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    isMergeTrain: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+  },
+};
+</script>
+<template>
+  <div class="gl-display-inline gl-align-middle">
+    <div
+      v-for="stage in stages"
+      :key="stage.name"
+      class="pipeline-mini-graph-stage-container dropdown gl-display-inline-flex gl-mr-2 gl-my-2 gl-align-middle"
+    >
+      <legacy-pipeline-stage
+        :stage="stage"
+        :update-dropdown="updateDropdown"
+        :is-merge-train="isMergeTrain"
+        @miniGraphStageClick="$emit('miniGraphStageClick')"
+      />
+    </div>
+  </div>
+</template>
diff --git a/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_mini_graph.vue b/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_mini_graph.vue
index d33b931d395..972448ea4da 100644
--- a/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_mini_graph.vue
+++ b/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_mini_graph.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlLoadingIcon } from '@gitlab/ui';
+import { GlIcon, GlLoadingIcon } from '@gitlab/ui';
 import { createAlert } from '~/alert';
 import { __ } from '~/locale';
 import { keepLatestDownstreamPipelines } from '~/ci/pipeline_details/utils/parsing_utils';
@@ -7,16 +7,22 @@ import { getQueryHeaders, toggleQueryPollingByVisibility } from '~/ci/pipeline_d
 import { PIPELINE_MINI_GRAPH_POLL_INTERVAL } from '~/ci/pipeline_details/constants';
 import getLinkedPipelinesQuery from '~/ci/pipeline_details/graphql/queries/get_linked_pipelines.query.graphql';
 import getPipelineStagesQuery from './graphql/queries/get_pipeline_stages.query.graphql';
-import LegacyPipelineMiniGraph from './legacy_pipeline_mini_graph/legacy_pipeline_mini_graph.vue';
-
+import LinkedPipelinesMiniList from './linked_pipelines_mini_list.vue';
+import PipelineStages from './pipeline_stages.vue';
+/**
+ * Renders the GraphQL instance of the pipeline mini graph.
+ */
 export default {
   i18n: {
     linkedPipelinesFetchError: __('There was a problem fetching linked pipelines.'),
     stagesFetchError: __('There was a problem fetching the pipeline stages.'),
   },
+  arrowStyles: ['arrow-icon gl-display-inline-block gl-mx-1 gl-text-gray-500 !gl-align-middle'],
   components: {
+    GlIcon,
     GlLoadingIcon,
-    LegacyPipelineMiniGraph,
+    LinkedPipelinesMiniList,
+    PipelineStages,
   },
   props: {
     pipelineEtag: {
@@ -116,6 +122,9 @@ export default {
         };
       });
     },
+    hasDownstreamPipelines() {
+      return Boolean(this.downstreamPipelines.length);
+    },
     pipelinePath() {
       return this.linkedPipelines?.path || '';
     },
@@ -133,15 +142,37 @@ export default {
 <template>
   <div>
     <gl-loading-icon v-if="$apollo.queries.pipelineStages.loading" />
-    <legacy-pipeline-mini-graph
-      v-else
-      data-testid="pipeline-mini-graph"
-      is-graphql
-      :downstream-pipelines="downstreamPipelines"
-      :is-merge-train="isMergeTrain"
-      :pipeline-path="pipelinePath"
-      :stages="formattedStages"
-      :upstream-pipeline="upstreamPipeline"
-    />
+    <div v-else data-testid="pipeline-mini-graph">
+      <linked-pipelines-mini-list
+        v-if="upstreamPipeline"
+        :triggered-by="/* eslint-disable @gitlab/vue-no-new-non-primitive-in-template */ [
+          upstreamPipeline,
+        ] /* eslint-enable @gitlab/vue-no-new-non-primitive-in-template */"
+        data-testid="pipeline-mini-graph-upstream"
+      />
+      <gl-icon
+        v-if="upstreamPipeline"
+        :class="$options.arrowStyles"
+        name="long-arrow"
+        data-testid="upstream-arrow-icon"
+      />
+      <pipeline-stages
+        :is-merge-train="isMergeTrain"
+        :stages="formattedStages"
+        @miniGraphStageClick="$emit('miniGraphStageClick')"
+      />
+      <gl-icon
+        v-if="hasDownstreamPipelines"
+        :class="$options.arrowStyles"
+        name="long-arrow"
+        data-testid="downstream-arrow-icon"
+      />
+      <linked-pipelines-mini-list
+        v-if="hasDownstreamPipelines"
+        :triggered="downstreamPipelines"
+        :pipeline-path="pipelinePath"
+        data-testid="pipeline-mini-graph-downstream"
+      />
+    </div>
   </div>
 </template>
diff --git a/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stages.vue b/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stages.vue
index d73a10566d0..07c0abb2a08 100644
--- a/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stages.vue
+++ b/app/assets/javascripts/ci/pipeline_mini_graph/pipeline_stages.vue
@@ -1,29 +1,18 @@
 <script>
 import PipelineStage from './pipeline_stage.vue';
-import LegacyPipelineStage from './legacy_pipeline_mini_graph/legacy_pipeline_stage.vue';
 /**
  * Renders the pipeline stages portion of the pipeline mini graph.
  */
 export default {
   components: {
-    LegacyPipelineStage,
     PipelineStage,
   },
   props: {
-    stages: {
-      type: Array,
-      required: true,
-    },
     updateDropdown: {
       type: Boolean,
       required: false,
       default: false,
     },
-    isGraphql: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
     isMergeTrain: {
       type: Boolean,
       required: false,
@@ -34,6 +23,10 @@ export default {
       required: false,
       default: '',
     },
+    stages: {
+      type: Array,
+      required: true,
+    },
   },
 };
 </script>
@@ -45,19 +38,11 @@ export default {
       class="pipeline-mini-graph-stage-container dropdown gl-display-inline-flex gl-mr-2 gl-my-2 gl-align-middle"
     >
       <pipeline-stage
-        v-if="isGraphql"
         :stage-id="stage.id"
         :is-merge-train="isMergeTrain"
         :pipeline-etag="pipelineEtag"
         @miniGraphStageClick="$emit('miniGraphStageClick')"
       />
-      <legacy-pipeline-stage
-        v-else
-        :stage="stage"
-        :update-dropdown="updateDropdown"
-        :is-merge-train="isMergeTrain"
-        @miniGraphStageClick="$emit('miniGraphStageClick')"
-      />
     </div>
   </div>
 </template>
diff --git a/app/assets/javascripts/editor/schema/ci.json b/app/assets/javascripts/editor/schema/ci.json
index a4f9bad94be..ccfbb40843c 100644
--- a/app/assets/javascripts/editor/schema/ci.json
+++ b/app/assets/javascripts/editor/schema/ci.json
@@ -1318,7 +1318,7 @@
           "type": "integer",
           "description": "Creates N instances of the job that run in parallel.",
           "default": 0,
-          "minimum": 2,
+          "minimum": 1,
           "maximum": 200
         },
         {
diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue
index 9b7ab224f3f..0043b60f245 100644
--- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue
+++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/components/list_page/image_list_row.vue
@@ -1,11 +1,12 @@
 <script>
-import { GlTooltipDirective, GlSprintf, GlSkeletonLoader, GlButton } from '@gitlab/ui';
+import { GlButton, GlTooltipDirective, GlSprintf, GlSkeletonLoader } from '@gitlab/ui';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { n__ } from '~/locale';
 import Tracking from '~/tracking';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import ListItem from '~/vue_shared/components/registry/list_item.vue';
 import { joinPaths } from '~/lib/utils/url_utility';
+import PublishMessage from '~/packages_and_registries/shared/components/publish_message.vue';
 import {
   LIST_DELETE_BUTTON_DISABLED,
   LIST_DELETE_BUTTON_DISABLED_FOR_MIGRATION,
@@ -31,6 +32,7 @@ export default {
     ListItem,
     GlSkeletonLoader,
     CleanupStatus,
+    PublishMessage,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -101,6 +103,12 @@ export default {
         ? LIST_DELETE_BUTTON_DISABLED_FOR_MIGRATION
         : LIST_DELETE_BUTTON_DISABLED;
     },
+    projectName() {
+      return this.config.isGroupPage ? this.item.project?.name : '';
+    },
+    projectUrl() {
+      return this.config.isGroupPage ? this.item.project?.webUrl : '';
+    },
   },
   methods: {
     hideButton() {
@@ -175,6 +183,15 @@ export default {
         </gl-skeleton-loader>
       </div>
     </template>
+    <template #right-primary> &nbsp; </template>
+    <template #right-secondary>
+      <publish-message
+        :project-name="projectName"
+        :project-url="projectUrl"
+        :publish-date="item.createdAt"
+      />
+    </template>
+
     <template #right-action>
       <delete-button
         :title="$options.i18n.REMOVE_REPOSITORY_LABEL"
diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/details/version_row.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/details/version_row.vue
index 8eeb4ea576a..272b0c08eb5 100644
--- a/app/assets/javascripts/packages_and_registries/package_registry/components/details/version_row.vue
+++ b/app/assets/javascripts/packages_and_registries/package_registry/components/details/version_row.vue
@@ -4,15 +4,14 @@ import {
   GlFormCheckbox,
   GlIcon,
   GlLink,
-  GlSprintf,
   GlTooltipDirective,
   GlTruncate,
 } from '@gitlab/ui';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import PackageTags from '~/packages_and_registries/shared/components/package_tags.vue';
+import PublishMessage from '~/packages_and_registries/shared/components/publish_message.vue';
 import PublishMethod from '~/packages_and_registries/shared/components/publish_method.vue';
 import ListItem from '~/vue_shared/components/registry/list_item.vue';
-import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import {
   DELETE_PACKAGE_TEXT,
   ERRORED_PACKAGE_TEXT,
@@ -28,12 +27,11 @@ export default {
     GlFormCheckbox,
     GlIcon,
     GlLink,
-    GlSprintf,
     GlTruncate,
     PackageTags,
+    PublishMessage,
     PublishMethod,
     ListItem,
-    TimeAgoTooltip,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -144,13 +142,7 @@ export default {
     </template>
 
     <template #right-secondary>
-      <span>
-        <gl-sprintf :message="__('Created %{timestamp}')">
-          <template #timestamp>
-            <time-ago-tooltip :time="packageEntity.createdAt" />
-          </template>
-        </gl-sprintf>
-      </span>
+      <publish-message :publish-date="packageEntity.createdAt" />
     </template>
 
     <template v-if="packageEntity.userPermissions.destroyPackage" #right-action>
diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/list/package_list_row.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/list/package_list_row.vue
index 7114072dbf7..10a60f0e552 100644
--- a/app/assets/javascripts/packages_and_registries/package_registry/components/list/package_list_row.vue
+++ b/app/assets/javascripts/packages_and_registries/package_registry/components/list/package_list_row.vue
@@ -4,9 +4,7 @@ import {
   GlDisclosureDropdownItem,
   GlFormCheckbox,
   GlIcon,
-  GlSprintf,
   GlTruncate,
-  GlLink,
   GlBadge,
   GlTooltipDirective,
 } from '@gitlab/ui';
@@ -22,9 +20,9 @@ import {
 } from '~/packages_and_registries/package_registry/constants';
 import { getPackageTypeLabel } from '~/packages_and_registries/package_registry/utils';
 import PackageTags from '~/packages_and_registries/shared/components/package_tags.vue';
+import PublishMessage from '~/packages_and_registries/shared/components/publish_message.vue';
 import PublishMethod from '~/packages_and_registries/package_registry/components/list/publish_method.vue';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
-import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
 export default {
@@ -34,14 +32,12 @@ export default {
     GlDisclosureDropdownItem,
     GlFormCheckbox,
     GlIcon,
-    GlSprintf,
     GlTruncate,
-    GlLink,
     GlBadge,
     PackageTags,
+    PublishMessage,
     PublishMethod,
     ListItem,
-    TimeagoTooltip,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -73,28 +69,14 @@ export default {
       return this.packageEntity?.pipelines?.nodes[0];
     },
     projectName() {
-      return this.packageEntity.project.name;
+      return this.isGroupPage ? this.packageEntity.project?.name : '';
     },
-    projectLink() {
-      return this.packageEntity.project.webUrl;
+    projectUrl() {
+      return this.isGroupPage ? this.packageEntity.project?.webUrl : '';
     },
     pipelineUser() {
       return this.pipeline?.user?.name;
     },
-    publishedMessage() {
-      if (this.isGroupPage) {
-        if (this.pipelineUser) {
-          return s__(`PackageRegistry|Published to %{projectName} by %{author}, %{date}`);
-        }
-        return s__(`PackageRegistry|Published to %{projectName}, %{date}`);
-      }
-
-      if (this.pipelineUser) {
-        return s__(`PackageRegistry|Published by %{author}, %{date}`);
-      }
-
-      return s__(`PackageRegistry|Published %{date}`);
-    },
     errorStatusRow() {
       return this.packageEntity.status === PACKAGE_ERROR_STATUS;
     },
@@ -209,22 +191,12 @@ export default {
     </template>
 
     <template v-if="!errorStatusRow" #right-secondary>
-      <span data-testid="right-secondary">
-        <gl-sprintf :message="publishedMessage">
-          <template v-if="isGroupPage" #projectName>
-            <gl-link
-              data-testid="root-link"
-              class="gl-text-decoration-underline"
-              :href="projectLink"
-              >{{ projectName }}</gl-link
-            >
-          </template>
-          <template #date>
-            <timeago-tooltip :time="packageEntity.createdAt" />
-          </template>
-          <template v-if="pipelineUser" #author>{{ pipelineUser }}</template>
-        </gl-sprintf>
-      </span>
+      <publish-message
+        :author="pipelineUser"
+        :project-name="projectName"
+        :project-url="projectUrl"
+        :publish-date="packageEntity.createdAt"
+      />
     </template>
 
     <template v-if="packageEntity.userPermissions.destroyPackage" #right-action>
diff --git a/app/assets/javascripts/packages_and_registries/shared/components/publish_message.vue b/app/assets/javascripts/packages_and_registries/shared/components/publish_message.vue
new file mode 100644
index 00000000000..3f3d948b116
--- /dev/null
+++ b/app/assets/javascripts/packages_and_registries/shared/components/publish_message.vue
@@ -0,0 +1,64 @@
+<script>
+import { GlLink, GlSprintf } from '@gitlab/ui';
+import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
+import { s__ } from '~/locale';
+
+export default {
+  components: {
+    GlLink,
+    GlSprintf,
+    TimeAgoTooltip,
+  },
+  props: {
+    author: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    projectName: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    projectUrl: {
+      type: String,
+      required: false,
+      default: '#',
+    },
+    publishDate: {
+      type: String,
+      required: true,
+    },
+  },
+  computed: {
+    publishedMessage() {
+      if (this.projectName) {
+        if (this.author) {
+          return s__('PackageRegistry|Published to %{projectName} by %{author}, %{date}');
+        }
+        return s__('PackageRegistry|Published to %{projectName}, %{date}');
+      }
+
+      if (this.author) {
+        return s__('PackageRegistry|Published by %{author}, %{date}');
+      }
+
+      return s__('PackageRegistry|Published %{date}');
+    },
+  },
+};
+</script>
+
+<template>
+  <span>
+    <gl-sprintf :message="publishedMessage">
+      <template v-if="projectName" #projectName>
+        <gl-link class="gl-text-decoration-underline" :href="projectUrl">{{ projectName }}</gl-link>
+      </template>
+      <template #date>
+        <time-ago-tooltip :time="publishDate" />
+      </template>
+      <template v-if="author" #author>{{ author }}</template>
+    </gl-sprintf>
+  </span>
+</template>
diff --git a/app/assets/javascripts/token_access/components/inbound_token_access.vue b/app/assets/javascripts/token_access/components/inbound_token_access.vue
index 5e462754f34..ae7158d73a0 100644
--- a/app/assets/javascripts/token_access/components/inbound_token_access.vue
+++ b/app/assets/javascripts/token_access/components/inbound_token_access.vue
@@ -117,7 +117,7 @@ export default {
       return this.targetPath === '';
     },
     ciJobTokenHelpPage() {
-      return helpPagePath('ci/jobs/ci_job_token#allow-access-to-your-project-with-a-job-token');
+      return helpPagePath('ci/jobs/ci_job_token#control-job-token-access-to-your-project');
     },
   },
   methods: {
diff --git a/app/graphql/queries/container_registry/get_container_repositories.query.graphql b/app/graphql/queries/container_registry/get_container_repositories.query.graphql
index c3aa9cbd2bc..5569323fa2f 100644
--- a/app/graphql/queries/container_registry/get_container_repositories.query.graphql
+++ b/app/graphql/queries/container_registry/get_container_repositories.query.graphql
@@ -74,7 +74,9 @@ query getProjectContainerRepositories(
         expirationPolicyCleanupStatus
         project {
           id
+          name
           path
+          webUrl
         }
         userPermissions {
           destroyContainerRepository
diff --git a/app/models/environment.rb b/app/models/environment.rb
index c78e25bf98e..0b0b0602df1 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -267,12 +267,6 @@ class Environment < ApplicationRecord
     last_deployment&.deployable
   end
 
-  # TODO: remove this method when legacy_last_deployment_group is removed
-  #       in https://gitlab.com/gitlab-org/gitlab/-/issues/439141
-  def last_deployment_pipeline
-    last_deployable&.pipeline
-  end
-
   def last_finished_deployable
     last_finished_deployment&.deployable
   end
@@ -285,21 +279,6 @@ class Environment < ApplicationRecord
     last_finished_pipeline&.latest_finished_jobs
   end
 
-  # This method returns the deployment records of the last deployment pipeline, that successfully executed to this environment.
-  # e.g.
-  # A pipeline contains
-  #   - deploy job A => production environment
-  #   - deploy job B => production environment
-  # In this case, `legacy_last_deployment_group` returns both deployments, whereas `last_deployable` returns only B.
-  #
-  # TODO: to be removed in https://gitlab.com/gitlab-org/gitlab/-/issues/439141
-  def legacy_last_deployment_group
-    return Deployment.none unless last_deployment_pipeline
-
-    successful_deployments.where(
-      deployable_id: last_deployment_pipeline.latest_builds.pluck(:id))
-  end
-
   def last_visible_deployable
     last_visible_deployment&.deployable
   end
diff --git a/app/models/namespace_setting.rb b/app/models/namespace_setting.rb
index 95ae0dc1eb4..3441792cf7a 100644
--- a/app/models/namespace_setting.rb
+++ b/app/models/namespace_setting.rb
@@ -28,9 +28,8 @@ class NamespaceSetting < ApplicationRecord
   validates :default_branch_protection_defaults, bytesize: { maximum: -> { DEFAULT_BRANCH_PROTECTIONS_DEFAULT_MAX_SIZE } }
   validates :remove_dormant_members, inclusion: { in: [false] }, if: :subgroup?
   validates :remove_dormant_members_period, numericality: { only_integer: true, greater_than_or_equal_to: 90 }
-
-  validate :allow_mfa_for_group
-  validate :allow_resource_access_token_creation_for_group
+  validates :allow_mfa_for_subgroups, presence: true, if: :subgroup?
+  validates :resource_access_token_creation_allowed, presence: true, if: :subgroup?
 
   sanitizes! :default_branch_name
 
@@ -126,18 +125,6 @@ class NamespaceSetting < ApplicationRecord
   def subgroup?
     !!namespace&.subgroup?
   end
-
-  def allow_mfa_for_group
-    if subgroup? && allow_mfa_for_subgroups == false
-      errors.add(:allow_mfa_for_subgroups, _('is not allowed since the group is not top-level group.'))
-    end
-  end
-
-  def allow_resource_access_token_creation_for_group
-    if subgroup? && !resource_access_token_creation_allowed
-      errors.add(:resource_access_token_creation_allowed, _('is not allowed since the group is not top-level group.'))
-    end
-  end
 end
 
 NamespaceSetting.prepend_mod_with('NamespaceSetting')
diff --git a/app/services/projects/lfs_pointers/lfs_link_service.rb b/app/services/projects/lfs_pointers/lfs_link_service.rb
index 852f5e0222e..30e2b89fc26 100644
--- a/app/services/projects/lfs_pointers/lfs_link_service.rb
+++ b/app/services/projects/lfs_pointers/lfs_link_service.rb
@@ -26,8 +26,12 @@ module Projects
       private
 
       def validate!(oids)
-        return if oids.size <= MAX_OIDS
+        if oids.size <= MAX_OIDS
+          Gitlab::Metrics::Lfs.validate_link_objects_error_rate.increment(error: false, labels: {})
+          return
+        end
 
+        Gitlab::Metrics::Lfs.validate_link_objects_error_rate.increment(error: true, labels: {})
         raise TooManyOidsError, 'Too many LFS object ids to link, please push them manually'
       end
 
diff --git a/app/views/namespaces/rate_limiter_mailer/project_or_group_emails.text.erb b/app/views/namespaces/rate_limiter_mailer/project_or_group_emails.text.erb
index bb3a56dbdca..f37ae9a366b 100644
--- a/app/views/namespaces/rate_limiter_mailer/project_or_group_emails.text.erb
+++ b/app/views/namespaces/rate_limiter_mailer/project_or_group_emails.text.erb
@@ -1,3 +1,3 @@
-<%= _('Notifications for %{project_or_group} are temporarily disabled due to excessive volume.') % { project_or_group: @project_or_group.full_name } %>
+<%= _('Notifications for %{project_or_group} are rate-limited due to the high volume of notifications sent.') % { project_or_group: @project_or_group.full_name } %>
 
-<%= _('To avoid future interruption to notifications for #{project_or_group}, update your notification preferences.') % { project_or_group: @project_or_group.full_name } %>
+<%= _('To avoid future interruption to notifications for %{project_or_group}, update your notification preferences.') % { project_or_group: @project_or_group.full_name } %>
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index fc4a0c388cf..706c4da5370 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -9,10 +9,11 @@
 - in_group_context_with_iterations = @project.group.present? && issuable_sidebar[:supports_iterations]
 - is_merge_request = issuable_type === 'merge_request'
 - add_page_specific_style 'page_bundles/labels'
+- sidebar_header_classes = 'gl-md-display-flex gl-justify-content-end gl-lg-display-none!' if is_merge_request
 
 %aside.right-sidebar.js-right-sidebar.js-issuable-sidebar{ data: { auto_collapse: true, always_show_toggle: true, signed: { in: signed_in }, issuable_type: issuable_type }, class: "#{sidebar_gutter_collapsed_class(is_merge_request)} #{'right-sidebar-merge-requests' if is_merge_request}", 'aria-live' => 'polite', 'aria-label': issuable_type }
   .issuable-sidebar{ class: "#{'is-merge-request' if is_merge_request}" }
-    .issuable-sidebar-header{ class: "#{'gl-pb-2! gl-md-display-flex gl-justify-content-end gl-lg-display-none!' if is_merge_request}" }
+    .issuable-sidebar-header{ class: sidebar_header_classes }
       = render Pajamas::ButtonComponent.new(button_options: { class: "gutter-toggle gl-float-right js-sidebar-toggle has-tooltip !gl-shadow-none gl-display-block #{'gl-mt-2' if notifications_todos_buttons_enabled?}" , type: 'button', 'aria-label' => _('Toggle sidebar'), title: sidebar_gutter_tooltip_text, data: { container: 'body', placement: 'left', boundary: 'viewport' } }) do
         = sidebar_gutter_toggle_icon
       - if signed_in
diff --git a/config/feature_flags/beta/prevent_issue_epic_search.yml b/config/feature_flags/beta/prevent_issue_epic_search.yml
new file mode 100644
index 00000000000..d6bdc28ac66
--- /dev/null
+++ b/config/feature_flags/beta/prevent_issue_epic_search.yml
@@ -0,0 +1,9 @@
+---
+name: prevent_issue_epic_search
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/457756
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153668
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/463698
+milestone: '17.1'
+group: group::duo chat
+type: beta
+default_enabled: false
diff --git a/config/feature_flags/gitlab_com_derisk/show_container_registry_tag_signatures.yml b/config/feature_flags/beta/show_container_registry_tag_signatures.yml
similarity index 82%
rename from config/feature_flags/gitlab_com_derisk/show_container_registry_tag_signatures.yml
rename to config/feature_flags/beta/show_container_registry_tag_signatures.yml
index 7effe6051b2..de1410b5033 100644
--- a/config/feature_flags/gitlab_com_derisk/show_container_registry_tag_signatures.yml
+++ b/config/feature_flags/beta/show_container_registry_tag_signatures.yml
@@ -3,7 +3,7 @@ name: show_container_registry_tag_signatures
 feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/442848
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/152135
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/460226
-milestone: '17.0'
+milestone: '17.1'
 group: group::container registry
-type: gitlab_com_derisk
-default_enabled: false
+type: beta
+default_enabled: true
diff --git a/config/initializers/zz_metrics.rb b/config/initializers/zz_metrics.rb
index ea9dd0d68cc..36b62da9b81 100644
--- a/config/initializers/zz_metrics.rb
+++ b/config/initializers/zz_metrics.rb
@@ -36,6 +36,7 @@ if Gitlab::Metrics.enabled? && Gitlab::Runtime.application?
     Gitlab::Metrics::GlobalSearchIndexingSlis.initialize_slis! if Gitlab.ee?
     Gitlab::Metrics::LooseForeignKeysSlis.initialize_slis!
     Gitlab::Metrics::Llm.initialize_slis! if Gitlab.ee?
+    Gitlab::Metrics::Lfs.initialize_slis!
   end
 
   GC::Profiler.enable
diff --git a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
index 63d43242477..094e0091049 100644
--- a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
+++ b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_design_management
 description: Monthly active users for design management
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181139_issues.yml b/config/metrics/counts_28d/20210216181139_issues.yml
index 931a6d2cfc0..4e4245a1f58 100644
--- a/config/metrics/counts_28d/20210216181139_issues.yml
+++ b/config/metrics/counts_28d/20210216181139_issues.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: usage_activity_by_stage_monthly.plan.issues
 description: Count of users creating Issues in last 28 days.
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181141_notes.yml b/config/metrics/counts_28d/20210216181141_notes.yml
index 553c49bfcf7..d91266351a4 100644
--- a/config/metrics/counts_28d/20210216181141_notes.yml
+++ b/config/metrics/counts_28d/20210216181141_notes.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage_monthly.plan.notes
 description: Count of MAU commenting on an issuable
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181143_projects.yml b/config/metrics/counts_28d/20210216181143_projects.yml
index fbd2f683914..f2930d8732f 100644
--- a/config/metrics/counts_28d/20210216181143_projects.yml
+++ b/config/metrics/counts_28d/20210216181143_projects.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage_monthly.plan.projects
 description: Count of MAU creating projects
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181145_todos.yml b/config/metrics/counts_28d/20210216181145_todos.yml
index cff427c9476..d9cdf08474e 100644
--- a/config/metrics/counts_28d/20210216181145_todos.yml
+++ b/config/metrics/counts_28d/20210216181145_todos.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage_monthly.plan.todos
 description: Count of MAU creating todos
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181158_epics.yml b/config/metrics/counts_28d/20210216181158_epics.yml
index 51eca7b3009..77cdee2a787 100644
--- a/config/metrics/counts_28d/20210216181158_epics.yml
+++ b/config/metrics/counts_28d/20210216181158_epics.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: usage_activity_by_stage_monthly.plan.epics
 description: Count distinct author ids from epics
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181200_label_lists.yml b/config/metrics/counts_28d/20210216181200_label_lists.yml
index c1d13515d21..25f898dc1c3 100644
--- a/config/metrics/counts_28d/20210216181200_label_lists.yml
+++ b/config/metrics/counts_28d/20210216181200_label_lists.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage_monthly.plan.label_lists
 description: Count of MAU creating label lists on Boards
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
index 7df9e24cb02..c62465b71e2 100644
--- a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_title_changed_monthly
 description: Count of MAU editing an issue title
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
index d55d67451f3..66b7bc8f574 100644
--- a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_description_changed_monthly
 description: Count of MAU editing an issue description
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
index b1c3d67522f..fd017f5161d 100644
--- a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_assignee_changed_monthly
 description: Count of MAU changing issue assignees
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
index 8b10613b36c..f5a02905475 100644
--- a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_made_confidential_monthly
 description: Count of MAU making an issue confidential
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
index bfe0eac91f8..582208a8e84 100644
--- a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
+++ b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_made_visible_monthly
 description: Count of MAU making an issue not confidential
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
index dfdce8285ab..9852776c66d 100644
--- a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_created_monthly
 description: Count of MAU creating new issues
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
index e523e447938..903124e2a6c 100644
--- a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_closed_monthly
 description: Count of MAU closing an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
index a5e09ec2304..a22fc301934 100644
--- a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
+++ b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_reopened_monthly
 description: Count of MAU re-opening a closed issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
index 848b41fcecd..818168f59ca 100644
--- a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_label_changed_monthly
 description: Count of MAU changing an issue's label
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
index 4d3763929a1..29fe9bfffae 100644
--- a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_milestone_changed_monthly
 description: Count of MAU changing an issue's milestone
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
index 35e39d38c56..44bd2c4f6d9 100644
--- a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
+++ b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_cross_referenced_monthly
 description: Count of MAU referencing an issue from somewhere else
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
index fe8f46ae093..b2fddf91fab 100644
--- a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
+++ b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_moved_monthly
 description: Count of MAU moving an issue to another project
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
index 807a162627f..0520d51b465 100644
--- a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
+++ b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_related_monthly
 description: Count of MAU relating an issue to another issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
index 0cc97abbc85..aaa0e86b1f6 100644
--- a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
+++ b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_unrelated_monthly
 description: Count of MAU unrelating an issue to another issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
index 8bc113117d0..27839417291 100644
--- a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_marked_as_duplicate_monthly
 description: Count of MAU marking an issue as a duplicate
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
index daab6e6388c..afcf902d683 100644
--- a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_locked_monthly
 description: Count of MAU locking an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
index 006f781d8b0..f6fb4e29faa 100644
--- a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_unlocked_monthly
 description: Count of MAU unlocking an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
index d6c8e734ae0..163c4d49f51 100644
--- a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_added_monthly
 description: Count of MAU adding a design to an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
index 1ea756614f0..ee4aa29d2bb 100644
--- a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
+++ b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_modified_monthly
 description: Count of MAU modifying a design on an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
index 47924ddf2ce..6123a227a69 100644
--- a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_removed_monthly
 description: Count of MAU removing a design from an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
index f8e5cb45f94..13b10a5c2bf 100644
--- a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_due_date_changed_monthly
 description: Count of MAU changing an issue due date
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
index 9b172d6d8d7..d94b0751fcb 100644
--- a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_time_estimate_changed_monthly
 description: Count of MAU changing an issue time estimate
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
index 5a15782d630..ff040f7650c 100644
--- a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_time_spent_changed_monthly
 description: Count of MAU recording time spent on an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
index f2bddd2124f..84f4cf59ffa 100644
--- a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_added_monthly
 description: Count of MAU commenting on an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
index 3f287846438..e7f708bad55 100644
--- a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_edited_monthly
 description: Count of MAU editing a comment on an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
index 42782a33972..92afa3afebd 100644
--- a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_removed_monthly
 description: Count of MAU deleting a comment from an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
index d7186adc0f5..e458cc0ee0d 100644
--- a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
+++ b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_cloned_monthly
 description: Count of MAU cloning an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
index 866d752fe4c..510ca1b6ae8 100644
--- a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: redis_hll_counters.issues_edit.issues_edit_total_unique_counts_monthly
 description: Aggregate count of MAU taking an action related to an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
index a27d6351c94..b80990cc304 100644
--- a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
+++ b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_approve_monthly
 description: Count of MAU using the `/approve` quick action
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml b/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
index 04836723d40..ee18d7d0982 100644
--- a/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
+++ b/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_single_monthly
 description: Count of MAU using the `/assign @user1` quick action to assign a single
   individual to an issuable
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml b/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
index 9a48aebf77f..68aa6750ec8 100644
--- a/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
+++ b/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_multiple_monthly
 description: Count of MAU using the `/assign @user1 @user2` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml b/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
index 7ed3a66af89..17fbe1f1a04 100644
--- a/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
+++ b/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_self_monthly
 description: Count of MAU using the `/assign me` quick action to assign self to an
   issuable
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
index 49e5f98fefb..01e3a939cb1 100644
--- a/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_reviewer_monthly
 description: Count of MAU using the `/assign_reviewer` or `request_reviewer` quick
   action
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
index 0d522959439..571813de8bc 100644
--- a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
+++ b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_award_monthly
 description: Count of MAU using the `/award` quick action to set an award emoji on
   an issuable
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml b/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
index a28aa9018e4..1bee47b8dcb 100644
--- a/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_board_move_monthly
 description: Count of MAU using the `/board_move` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
index 90d0389c8b1..11f8fd9a721 100644
--- a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_clone_monthly
 description: Count of MAU using the `/clone` quick action to clone an issue.
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
index abd86021fb8..ea0e80d9be5 100644
--- a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
+++ b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_close_monthly
 description: Count of MAU using the `/close` quick action to close an issuable
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
index fa7bac6904b..3aab6bcd644 100644
--- a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_confidential_monthly
 description: Count of MAU using the `/confidential` quick action to set an issue as
   confidential
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml b/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
index c313f5e5108..5e4dab1ea57 100644
--- a/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_copy_metadata_merge_request_monthly
 description: Count of MAU using the `/copy_metadata` quick action on a Merge Request
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml b/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
index 3baafede3c4..8d5cdace3af 100644
--- a/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_copy_metadata_issue_monthly
 description: Count of MAU using the `/copy_metadata` quick action on an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml b/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
index 993489a08c8..5e4f7a8c592 100644
--- a/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_create_merge_request_monthly
 description: Count of MAU using the `/create_merge_request` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
index d4b162a10a7..b24919cdcb9 100644
--- a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
+++ b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_done_monthly
 description: Count of MAU using the `/done` quick action to mark a todo as done
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
index a50bd036ddb..4b8d69cb0aa 100644
--- a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
+++ b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_due_monthly
 description: Count of MAU using the `/due` quick action to change the due date on
   an issuable
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
index e1a53fb0864..ae7a78474c4 100644
--- a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_duplicate_monthly
 description: Count of MAU using the `/duplicate` quick action to mark an issue as
   a duplicate of another
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
index 3de48247b40..27eac136a7b 100644
--- a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_estimate_monthly
 description: Count of MAU using the `/estimate` quick action to set a time estimate
   on an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
index 3c80afe9a4a..1a8d409f988 100644
--- a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
+++ b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_label_monthly
 description: Count of MAU using the `/label` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
index a0029941580..008192edf5d 100644
--- a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_lock_monthly
 description: Count of MAU using the `/lock` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
index fb8a1cc1168..dc7d0cfd515 100644
--- a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_milestone_monthly
 description: Count of MAU using the `/milestone` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
index f5d1a74e032..e79710e2db3 100644
--- a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_move_monthly
 description: Count of MAU using the `/move` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
index 0b1c9d29c40..06ab4bdd562 100644
--- a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
+++ b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_reassign_monthly
 description: Count of MAU using the `/reassign @user1` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
index 63722b97746..8cb5d1aea5c 100644
--- a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
+++ b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_relabel_monthly
 description: Count of MAU using the `/relabel` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
index 763f8e2a7ed..adf0ecc0600 100644
--- a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_relate_monthly
 description: Count of MAU using the `/relate` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml b/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
index 73f14879e36..d32a23cf72c 100644
--- a/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
+++ b/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_due_date_monthly
 description: Count of MAU using the `/remove_due_date` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml b/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
index f58931e1523..8af5d66bf84 100644
--- a/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_estimate_monthly
 description: Count of MAU using the `/remove_estimate` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml b/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
index 1e5453a643d..809cc76153c 100644
--- a/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_milestone_monthly
 description: Count of MAU using the `/remove_milestone` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml b/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
index b70537d3065..20afc3594ad 100644
--- a/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
+++ b/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_time_spent_monthly
 description: Count of MAU using the `/remove_time_spent` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml b/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
index b183df0c618..de4337fb9a7 100644
--- a/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_zoom_monthly
 description: Count of MAU using the `/remove_zoom` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
index a7c0758618a..9a77bd80b82 100644
--- a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
+++ b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_reopen_monthly
 description: Count of MAU using the `/reopen` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
index 1d608f2fda3..5550d9004d2 100644
--- a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
+++ b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_shrug_monthly
 description: Count of MAU using the `/shrug` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml b/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
index b431f76fce5..06f5d310d81 100644
--- a/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
+++ b/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_spend_subtract_monthly
 description: Count of MAU using the `/spend` quick action to subtract time spent
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml b/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
index e0f66641c21..910812f621f 100644
--- a/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
+++ b/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_spend_add_monthly
 description: Count of MAU using the `/spend` quick action to add time spent
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
index e0f1f69cf29..f5fcebdf696 100644
--- a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_subscribe_monthly
 description: Count of MAU using the `/subscribe` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
index a833675082f..c4ed36959b9 100644
--- a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_tableflip_monthly
 description: Count of MAU using the `/tableflip` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
index 913dbb249dd..cb791097bee 100644
--- a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_title_monthly
 description: Count of MAU using the `/title` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
index 106303b165c..f591f3fdd30 100644
--- a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_todo_monthly
 description: Count of MAU using the `/todo` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml b/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
index 92ad608b17f..1600c50bd9c 100644
--- a/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
+++ b/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_specific_monthly
 description: Count of MAU using the `/unlabel` or `/remove_label` quick action to
   remove one or more specific labels
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml b/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
index 0b77381cfb9..56a2abba10a 100644
--- a/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
+++ b/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_all_monthly
 description: Count of MAU using the `/unlabel` quick action to remove all labels
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
index f3a113c94e1..062cf05456a 100644
--- a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unlock_monthly
 description: Count of MAU using the `/unlock` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
index f04053ccbe6..05bfa1af39d 100644
--- a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unsubscribe_monthly
 description: Count of MAU using the `/unsubscribe` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
index 989754dd94c..306d80455d6 100644
--- a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_zoom_monthly
 description: Count of MAU using the `/zoom` quick action on Issues
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
index 56052ecb81a..85c2c29ec0a 100644
--- a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.source_code.wiki_action_monthly
 description: Count of unique actions done on a wiki (create, edit, delete)
-product_section: dev
-product_stage: plan
 product_group: knowledge
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
index 1e339465e20..f3a801965d6 100644
--- a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.quickactions_total_unique_counts_monthly
 description: Count of MAU using one or more quick actions
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml b/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
index 4339600f952..d8980a386b4 100644
--- a/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
+++ b/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_invite_email_single_monthly
 description: Unique users using the /invite_email quick action to add a single email participant to an issue within 28 days
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml b/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
index e26f47b3fee..8005a9b0afc 100644
--- a/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
+++ b/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_invite_email_multiple_monthly
 description: Unique users using the /invite_email quick action to add a multiple email participants to an issue within 28 days
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml b/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
index ec039160ab9..91b20e15f75 100644
--- a/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
+++ b/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts_monthly.projects
 description: 'Count number of projects created monthly'
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221242_p_ci_templates_terraform_base_monthly.yml b/config/metrics/counts_28d/20210901221242_p_ci_templates_terraform_base_monthly.yml
index 4fe5b4d680c..e2fc32d86c0 100644
--- a/config/metrics/counts_28d/20210901221242_p_ci_templates_terraform_base_monthly.yml
+++ b/config/metrics/counts_28d/20210901221242_p_ci_templates_terraform_base_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_base_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221251_p_ci_templates_dotnet_monthly.yml b/config/metrics/counts_28d/20210901221251_p_ci_templates_dotnet_monthly.yml
index 4ca18934251..859dedf8d9f 100644
--- a/config/metrics/counts_28d/20210901221251_p_ci_templates_dotnet_monthly.yml
+++ b/config/metrics/counts_28d/20210901221251_p_ci_templates_dotnet_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_dotnet_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221300_p_ci_templates_nodejs_monthly.yml b/config/metrics/counts_28d/20210901221300_p_ci_templates_nodejs_monthly.yml
index 959847158a0..9ae6c4754c3 100644
--- a/config/metrics/counts_28d/20210901221300_p_ci_templates_nodejs_monthly.yml
+++ b/config/metrics/counts_28d/20210901221300_p_ci_templates_nodejs_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_nodejs_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221308_p_ci_templates_openshift_monthly.yml b/config/metrics/counts_28d/20210901221308_p_ci_templates_openshift_monthly.yml
index 06a441b38ae..5fbfc1e4ba5 100644
--- a/config/metrics/counts_28d/20210901221308_p_ci_templates_openshift_monthly.yml
+++ b/config/metrics/counts_28d/20210901221308_p_ci_templates_openshift_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_openshift_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221317_p_ci_templates_bash_monthly.yml b/config/metrics/counts_28d/20210901221317_p_ci_templates_bash_monthly.yml
index 69aaf2cda19..d6a79c4992f 100644
--- a/config/metrics/counts_28d/20210901221317_p_ci_templates_bash_monthly.yml
+++ b/config/metrics/counts_28d/20210901221317_p_ci_templates_bash_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_bash_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221326_p_ci_templates_rust_monthly.yml b/config/metrics/counts_28d/20210901221326_p_ci_templates_rust_monthly.yml
index cd48e27806e..cce468beb22 100644
--- a/config/metrics/counts_28d/20210901221326_p_ci_templates_rust_monthly.yml
+++ b/config/metrics/counts_28d/20210901221326_p_ci_templates_rust_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_rust_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221335_p_ci_templates_elixir_monthly.yml b/config/metrics/counts_28d/20210901221335_p_ci_templates_elixir_monthly.yml
index 7c273625620..98fc7e12a8f 100644
--- a/config/metrics/counts_28d/20210901221335_p_ci_templates_elixir_monthly.yml
+++ b/config/metrics/counts_28d/20210901221335_p_ci_templates_elixir_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_elixir_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221343_p_ci_templates_clojure_monthly.yml b/config/metrics/counts_28d/20210901221343_p_ci_templates_clojure_monthly.yml
index d0429cc3b55..6b343be075c 100644
--- a/config/metrics/counts_28d/20210901221343_p_ci_templates_clojure_monthly.yml
+++ b/config/metrics/counts_28d/20210901221343_p_ci_templates_clojure_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_clojure_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221352_p_ci_templates_crystal_monthly.yml b/config/metrics/counts_28d/20210901221352_p_ci_templates_crystal_monthly.yml
index 2a885441c5b..8577bab4bf7 100644
--- a/config/metrics/counts_28d/20210901221352_p_ci_templates_crystal_monthly.yml
+++ b/config/metrics/counts_28d/20210901221352_p_ci_templates_crystal_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_crystal_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221401_p_ci_templates_getting_started_monthly.yml b/config/metrics/counts_28d/20210901221401_p_ci_templates_getting_started_monthly.yml
index 190393633f5..fbe9de757e3 100644
--- a/config/metrics/counts_28d/20210901221401_p_ci_templates_getting_started_monthly.yml
+++ b/config/metrics/counts_28d/20210901221401_p_ci_templates_getting_started_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_getting_started_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221410_p_ci_templates_code_quality_monthly.yml b/config/metrics/counts_28d/20210901221410_p_ci_templates_code_quality_monthly.yml
index 602c6aef977..10fab8699a6 100644
--- a/config/metrics/counts_28d/20210901221410_p_ci_templates_code_quality_monthly.yml
+++ b/config/metrics/counts_28d/20210901221410_p_ci_templates_code_quality_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_code_quality_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221418_p_ci_templates_verify_load_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901221418_p_ci_templates_verify_load_performance_testing_monthly.yml
index e02ffcf684a..02ac3004725 100644
--- a/config/metrics/counts_28d/20210901221418_p_ci_templates_verify_load_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901221418_p_ci_templates_verify_load_performance_testing_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_load_performance_testing_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221427_p_ci_templates_verify_accessibility_monthly.yml b/config/metrics/counts_28d/20210901221427_p_ci_templates_verify_accessibility_monthly.yml
index f597c919285..b08466a5cd2 100644
--- a/config/metrics/counts_28d/20210901221427_p_ci_templates_verify_accessibility_monthly.yml
+++ b/config/metrics/counts_28d/20210901221427_p_ci_templates_verify_accessibility_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_accessibility_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221436_p_ci_templates_verify_failfast_monthly.yml b/config/metrics/counts_28d/20210901221436_p_ci_templates_verify_failfast_monthly.yml
index d041534891e..f129fbb508a 100644
--- a/config/metrics/counts_28d/20210901221436_p_ci_templates_verify_failfast_monthly.yml
+++ b/config/metrics/counts_28d/20210901221436_p_ci_templates_verify_failfast_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_failfast_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221445_p_ci_templates_verify_browser_performance_monthly.yml b/config/metrics/counts_28d/20210901221445_p_ci_templates_verify_browser_performance_monthly.yml
index 1680ce7db03..09e038e1c75 100644
--- a/config/metrics/counts_28d/20210901221445_p_ci_templates_verify_browser_performance_monthly.yml
+++ b/config/metrics/counts_28d/20210901221445_p_ci_templates_verify_browser_performance_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_browser_performance_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221454_p_ci_templates_verify_browser_performance_latest_monthly.yml b/config/metrics/counts_28d/20210901221454_p_ci_templates_verify_browser_performance_latest_monthly.yml
index ee0485e18b3..8e953f77d71 100644
--- a/config/metrics/counts_28d/20210901221454_p_ci_templates_verify_browser_performance_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901221454_p_ci_templates_verify_browser_performance_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_browser_performance_latest_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221503_p_ci_templates_grails_monthly.yml b/config/metrics/counts_28d/20210901221503_p_ci_templates_grails_monthly.yml
index d714163e37d..9671f5a88f1 100644
--- a/config/metrics/counts_28d/20210901221503_p_ci_templates_grails_monthly.yml
+++ b/config/metrics/counts_28d/20210901221503_p_ci_templates_grails_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_grails_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221511_p_ci_templates_security_dast_runner_validation_monthly.yml b/config/metrics/counts_28d/20210901221511_p_ci_templates_security_dast_runner_validation_monthly.yml
index b1ad1d6dcda..981b2d201ac 100644
--- a/config/metrics/counts_28d/20210901221511_p_ci_templates_security_dast_runner_validation_monthly.yml
+++ b/config/metrics/counts_28d/20210901221511_p_ci_templates_security_dast_runner_validation_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_dast_runner_validation_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221520_p_ci_templates_security_dast_on_demand_scan_monthly.yml b/config/metrics/counts_28d/20210901221520_p_ci_templates_security_dast_on_demand_scan_monthly.yml
index 65651c05467..9744f88088b 100644
--- a/config/metrics/counts_28d/20210901221520_p_ci_templates_security_dast_on_demand_scan_monthly.yml
+++ b/config/metrics/counts_28d/20210901221520_p_ci_templates_security_dast_on_demand_scan_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_dast_on_demand_scan_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221529_p_ci_templates_security_license_scanning_monthly.yml b/config/metrics/counts_28d/20210901221529_p_ci_templates_security_license_scanning_monthly.yml
index d0179fd03b9..2b7f5af64a2 100644
--- a/config/metrics/counts_28d/20210901221529_p_ci_templates_security_license_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901221529_p_ci_templates_security_license_scanning_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_license_scanning_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221538_p_ci_templates_security_coverage_fuzzing_monthly.yml b/config/metrics/counts_28d/20210901221538_p_ci_templates_security_coverage_fuzzing_monthly.yml
index 2187e71127c..7f228131e04 100644
--- a/config/metrics/counts_28d/20210901221538_p_ci_templates_security_coverage_fuzzing_monthly.yml
+++ b/config/metrics/counts_28d/20210901221538_p_ci_templates_security_coverage_fuzzing_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_coverage_fuzzing_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221547_p_ci_templates_security_api_fuzzing_latest_monthly.yml b/config/metrics/counts_28d/20210901221547_p_ci_templates_security_api_fuzzing_latest_monthly.yml
index f16e2abe62f..d223acbb5ab 100644
--- a/config/metrics/counts_28d/20210901221547_p_ci_templates_security_api_fuzzing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901221547_p_ci_templates_security_api_fuzzing_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_api_fuzzing_latest_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221556_p_ci_templates_security_secure_binaries_monthly.yml b/config/metrics/counts_28d/20210901221556_p_ci_templates_security_secure_binaries_monthly.yml
index 3eae57f0483..2a45ce34b56 100644
--- a/config/metrics/counts_28d/20210901221556_p_ci_templates_security_secure_binaries_monthly.yml
+++ b/config/metrics/counts_28d/20210901221556_p_ci_templates_security_secure_binaries_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_secure_binaries_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221605_p_ci_templates_security_dast_api_monthly.yml b/config/metrics/counts_28d/20210901221605_p_ci_templates_security_dast_api_monthly.yml
index cfef669f946..93468b4dd19 100644
--- a/config/metrics/counts_28d/20210901221605_p_ci_templates_security_dast_api_monthly.yml
+++ b/config/metrics/counts_28d/20210901221605_p_ci_templates_security_dast_api_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_dast_api_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221614_p_ci_templates_security_container_scanning_monthly.yml b/config/metrics/counts_28d/20210901221614_p_ci_templates_security_container_scanning_monthly.yml
index 1ec8ce0614d..1dde0897dc1 100644
--- a/config/metrics/counts_28d/20210901221614_p_ci_templates_security_container_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901221614_p_ci_templates_security_container_scanning_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_container_scanning_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221623_p_ci_templates_security_dast_latest_monthly.yml b/config/metrics/counts_28d/20210901221623_p_ci_templates_security_dast_latest_monthly.yml
index f6b2c48098e..be117e3f0e0 100644
--- a/config/metrics/counts_28d/20210901221623_p_ci_templates_security_dast_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901221623_p_ci_templates_security_dast_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_dast_latest_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221632_p_ci_templates_security_dependency_scanning_monthly.yml b/config/metrics/counts_28d/20210901221632_p_ci_templates_security_dependency_scanning_monthly.yml
index dae052b06ac..3617d99fc6c 100644
--- a/config/metrics/counts_28d/20210901221632_p_ci_templates_security_dependency_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901221632_p_ci_templates_security_dependency_scanning_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_dependency_scanning_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221641_p_ci_templates_security_api_fuzzing_monthly.yml b/config/metrics/counts_28d/20210901221641_p_ci_templates_security_api_fuzzing_monthly.yml
index 1e4678c29a2..d06c8bf4404 100644
--- a/config/metrics/counts_28d/20210901221641_p_ci_templates_security_api_fuzzing_monthly.yml
+++ b/config/metrics/counts_28d/20210901221641_p_ci_templates_security_api_fuzzing_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_api_fuzzing_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221650_p_ci_templates_security_dast_monthly.yml b/config/metrics/counts_28d/20210901221650_p_ci_templates_security_dast_monthly.yml
index 8e3736b9eaa..e15765d0658 100644
--- a/config/metrics/counts_28d/20210901221650_p_ci_templates_security_dast_monthly.yml
+++ b/config/metrics/counts_28d/20210901221650_p_ci_templates_security_dast_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_dast_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221659_p_ci_templates_security_cluster_image_scanning_monthly.yml b/config/metrics/counts_28d/20210901221659_p_ci_templates_security_cluster_image_scanning_monthly.yml
index 08a2f9da350..113eae5c280 100644
--- a/config/metrics/counts_28d/20210901221659_p_ci_templates_security_cluster_image_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901221659_p_ci_templates_security_cluster_image_scanning_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_cluster_image_scanning_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: composition_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210901221708_p_ci_templates_ios_fastlane_monthly.yml b/config/metrics/counts_28d/20210901221708_p_ci_templates_ios_fastlane_monthly.yml
index d6f55fba2fd..1320b47b5b1 100644
--- a/config/metrics/counts_28d/20210901221708_p_ci_templates_ios_fastlane_monthly.yml
+++ b/config/metrics/counts_28d/20210901221708_p_ci_templates_ios_fastlane_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_ios_fastlane_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221717_p_ci_templates_composer_monthly.yml b/config/metrics/counts_28d/20210901221717_p_ci_templates_composer_monthly.yml
index 3bc3f1ccf25..c050d65af48 100644
--- a/config/metrics/counts_28d/20210901221717_p_ci_templates_composer_monthly.yml
+++ b/config/metrics/counts_28d/20210901221717_p_ci_templates_composer_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_composer_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221726_p_ci_templates_c_monthly.yml b/config/metrics/counts_28d/20210901221726_p_ci_templates_c_monthly.yml
index 0c8039c7393..73af1e74da1 100644
--- a/config/metrics/counts_28d/20210901221726_p_ci_templates_c_monthly.yml
+++ b/config/metrics/counts_28d/20210901221726_p_ci_templates_c_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_c_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221735_p_ci_templates_python_monthly.yml b/config/metrics/counts_28d/20210901221735_p_ci_templates_python_monthly.yml
index cee87796ffa..345372253a8 100644
--- a/config/metrics/counts_28d/20210901221735_p_ci_templates_python_monthly.yml
+++ b/config/metrics/counts_28d/20210901221735_p_ci_templates_python_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_python_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221744_p_ci_templates_android_fastlane_monthly.yml b/config/metrics/counts_28d/20210901221744_p_ci_templates_android_fastlane_monthly.yml
index 431ef7e773f..93e29d9890b 100644
--- a/config/metrics/counts_28d/20210901221744_p_ci_templates_android_fastlane_monthly.yml
+++ b/config/metrics/counts_28d/20210901221744_p_ci_templates_android_fastlane_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_android_fastlane_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221754_p_ci_templates_django_monthly.yml b/config/metrics/counts_28d/20210901221754_p_ci_templates_django_monthly.yml
index d84536fede2..7afdc9d5f5c 100644
--- a/config/metrics/counts_28d/20210901221754_p_ci_templates_django_monthly.yml
+++ b/config/metrics/counts_28d/20210901221754_p_ci_templates_django_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_django_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221803_p_ci_templates_maven_monthly.yml b/config/metrics/counts_28d/20210901221803_p_ci_templates_maven_monthly.yml
index 2d023b53096..5024e0fe668 100644
--- a/config/metrics/counts_28d/20210901221803_p_ci_templates_maven_monthly.yml
+++ b/config/metrics/counts_28d/20210901221803_p_ci_templates_maven_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_maven_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221812_p_ci_templates_flutter_monthly.yml b/config/metrics/counts_28d/20210901221812_p_ci_templates_flutter_monthly.yml
index b7899b8e585..820faae80cf 100644
--- a/config/metrics/counts_28d/20210901221812_p_ci_templates_flutter_monthly.yml
+++ b/config/metrics/counts_28d/20210901221812_p_ci_templates_flutter_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_flutter_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221822_p_ci_templates_workflows_branch_pipelines_monthly.yml b/config/metrics/counts_28d/20210901221822_p_ci_templates_workflows_branch_pipelines_monthly.yml
index af4948b0a0b..34786ed1e09 100644
--- a/config/metrics/counts_28d/20210901221822_p_ci_templates_workflows_branch_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20210901221822_p_ci_templates_workflows_branch_pipelines_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_workflows_branch_pipelines_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221831_p_ci_templates_workflows_mergerequest_pipelines_monthly.yml b/config/metrics/counts_28d/20210901221831_p_ci_templates_workflows_mergerequest_pipelines_monthly.yml
index 2ca3a6e3290..8ffbbafcad0 100644
--- a/config/metrics/counts_28d/20210901221831_p_ci_templates_workflows_mergerequest_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20210901221831_p_ci_templates_workflows_mergerequest_pipelines_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_workflows_mergerequest_pipelines_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221840_p_ci_templates_laravel_monthly.yml b/config/metrics/counts_28d/20210901221840_p_ci_templates_laravel_monthly.yml
index 3edd7c38a00..2ae79a865e5 100644
--- a/config/metrics/counts_28d/20210901221840_p_ci_templates_laravel_monthly.yml
+++ b/config/metrics/counts_28d/20210901221840_p_ci_templates_laravel_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_laravel_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221849_p_ci_templates_managed_cluster_applications_monthly.yml b/config/metrics/counts_28d/20210901221849_p_ci_templates_managed_cluster_applications_monthly.yml
index f5307b999bc..bc0aad8048d 100644
--- a/config/metrics/counts_28d/20210901221849_p_ci_templates_managed_cluster_applications_monthly.yml
+++ b/config/metrics/counts_28d/20210901221849_p_ci_templates_managed_cluster_applications_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_managed_cluster_applications_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: environments
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210901221857_p_ci_templates_php_monthly.yml b/config/metrics/counts_28d/20210901221857_p_ci_templates_php_monthly.yml
index 2c515dceb8b..e802a555ae1 100644
--- a/config/metrics/counts_28d/20210901221857_p_ci_templates_php_monthly.yml
+++ b/config/metrics/counts_28d/20210901221857_p_ci_templates_php_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_php_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221906_p_ci_templates_packer_monthly.yml b/config/metrics/counts_28d/20210901221906_p_ci_templates_packer_monthly.yml
index c8ec06ebac3..d676286276e 100644
--- a/config/metrics/counts_28d/20210901221906_p_ci_templates_packer_monthly.yml
+++ b/config/metrics/counts_28d/20210901221906_p_ci_templates_packer_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_packer_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221915_p_ci_templates_terraform_monthly.yml b/config/metrics/counts_28d/20210901221915_p_ci_templates_terraform_monthly.yml
index 420dd249eff..f3b416a1d7a 100644
--- a/config/metrics/counts_28d/20210901221915_p_ci_templates_terraform_monthly.yml
+++ b/config/metrics/counts_28d/20210901221915_p_ci_templates_terraform_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221923_p_ci_templates_mono_monthly.yml b/config/metrics/counts_28d/20210901221923_p_ci_templates_mono_monthly.yml
index 35d82e73dc2..963586ec586 100644
--- a/config/metrics/counts_28d/20210901221923_p_ci_templates_mono_monthly.yml
+++ b/config/metrics/counts_28d/20210901221923_p_ci_templates_mono_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_mono_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221932_p_ci_templates_serverless_monthly.yml b/config/metrics/counts_28d/20210901221932_p_ci_templates_serverless_monthly.yml
index 867bd5252a1..2f912b65fcd 100644
--- a/config/metrics/counts_28d/20210901221932_p_ci_templates_serverless_monthly.yml
+++ b/config/metrics/counts_28d/20210901221932_p_ci_templates_serverless_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_serverless_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210901221941_p_ci_templates_go_monthly.yml b/config/metrics/counts_28d/20210901221941_p_ci_templates_go_monthly.yml
index 7891ef85d55..ec7fff3a2ed 100644
--- a/config/metrics/counts_28d/20210901221941_p_ci_templates_go_monthly.yml
+++ b/config/metrics/counts_28d/20210901221941_p_ci_templates_go_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_go_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221950_p_ci_templates_scala_monthly.yml b/config/metrics/counts_28d/20210901221950_p_ci_templates_scala_monthly.yml
index 556c394c9a4..42c3a7dd1f3 100644
--- a/config/metrics/counts_28d/20210901221950_p_ci_templates_scala_monthly.yml
+++ b/config/metrics/counts_28d/20210901221950_p_ci_templates_scala_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_scala_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901221958_p_ci_templates_latex_monthly.yml b/config/metrics/counts_28d/20210901221958_p_ci_templates_latex_monthly.yml
index 9d6969a0140..1c3ec3d872b 100644
--- a/config/metrics/counts_28d/20210901221958_p_ci_templates_latex_monthly.yml
+++ b/config/metrics/counts_28d/20210901221958_p_ci_templates_latex_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_latex_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222007_p_ci_templates_android_monthly.yml b/config/metrics/counts_28d/20210901222007_p_ci_templates_android_monthly.yml
index af300129067..1b5799532a6 100644
--- a/config/metrics/counts_28d/20210901222007_p_ci_templates_android_monthly.yml
+++ b/config/metrics/counts_28d/20210901222007_p_ci_templates_android_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_android_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222016_p_ci_templates_indeni_cloudrail_monthly.yml b/config/metrics/counts_28d/20210901222016_p_ci_templates_indeni_cloudrail_monthly.yml
index f4144fe2488..cd4667a668e 100644
--- a/config/metrics/counts_28d/20210901222016_p_ci_templates_indeni_cloudrail_monthly.yml
+++ b/config/metrics/counts_28d/20210901222016_p_ci_templates_indeni_cloudrail_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_indeni_cloudrail_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222025_p_ci_templates_deploy_ecs_monthly.yml b/config/metrics/counts_28d/20210901222025_p_ci_templates_deploy_ecs_monthly.yml
index c5de6f812ab..524fc311194 100644
--- a/config/metrics/counts_28d/20210901222025_p_ci_templates_deploy_ecs_monthly.yml
+++ b/config/metrics/counts_28d/20210901222025_p_ci_templates_deploy_ecs_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_deploy_ecs_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222033_p_ci_templates_aws_cf_provision_and_deploy_ec2_monthly.yml b/config/metrics/counts_28d/20210901222033_p_ci_templates_aws_cf_provision_and_deploy_ec2_monthly.yml
index 5f2179bb68d..228f5e9cf4b 100644
--- a/config/metrics/counts_28d/20210901222033_p_ci_templates_aws_cf_provision_and_deploy_ec2_monthly.yml
+++ b/config/metrics/counts_28d/20210901222033_p_ci_templates_aws_cf_provision_and_deploy_ec2_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_cf_provision_and_deploy_ec2_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222042_p_ci_templates_gradle_monthly.yml b/config/metrics/counts_28d/20210901222042_p_ci_templates_gradle_monthly.yml
index 989abe05eec..ae79a3c58e5 100644
--- a/config/metrics/counts_28d/20210901222042_p_ci_templates_gradle_monthly.yml
+++ b/config/metrics/counts_28d/20210901222042_p_ci_templates_gradle_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_gradle_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222051_p_ci_templates_chef_monthly.yml b/config/metrics/counts_28d/20210901222051_p_ci_templates_chef_monthly.yml
index 1ab5b6b66a0..6690c683363 100644
--- a/config/metrics/counts_28d/20210901222051_p_ci_templates_chef_monthly.yml
+++ b/config/metrics/counts_28d/20210901222051_p_ci_templates_chef_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_chef_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222100_p_ci_templates_jobs_dast_default_branch_deploy_monthly.yml b/config/metrics/counts_28d/20210901222100_p_ci_templates_jobs_dast_default_branch_deploy_monthly.yml
index f1f957949d5..4fb2a43a122 100644
--- a/config/metrics/counts_28d/20210901222100_p_ci_templates_jobs_dast_default_branch_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210901222100_p_ci_templates_jobs_dast_default_branch_deploy_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_dast_default_branch_deploy_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222108_p_ci_templates_jobs_load_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901222108_p_ci_templates_jobs_load_performance_testing_monthly.yml
index 46534b7aa32..b5c048dbe1d 100644
--- a/config/metrics/counts_28d/20210901222108_p_ci_templates_jobs_load_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901222108_p_ci_templates_jobs_load_performance_testing_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_load_performance_testing_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222117_p_ci_templates_jobs_helm_2to3_monthly.yml b/config/metrics/counts_28d/20210901222117_p_ci_templates_jobs_helm_2to3_monthly.yml
index d05530d8a9b..69dc29cd4f4 100644
--- a/config/metrics/counts_28d/20210901222117_p_ci_templates_jobs_helm_2to3_monthly.yml
+++ b/config/metrics/counts_28d/20210901222117_p_ci_templates_jobs_helm_2to3_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_helm_2to3_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222126_p_ci_templates_jobs_sast_monthly.yml b/config/metrics/counts_28d/20210901222126_p_ci_templates_jobs_sast_monthly.yml
index 54367a017a0..570f6cf6f0b 100644
--- a/config/metrics/counts_28d/20210901222126_p_ci_templates_jobs_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210901222126_p_ci_templates_jobs_sast_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_sast_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222135_p_ci_templates_jobs_secret_detection_monthly.yml b/config/metrics/counts_28d/20210901222135_p_ci_templates_jobs_secret_detection_monthly.yml
index abd6a1c2ab8..bb1395f821f 100644
--- a/config/metrics/counts_28d/20210901222135_p_ci_templates_jobs_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210901222135_p_ci_templates_jobs_secret_detection_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_secret_detection_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222144_p_ci_templates_jobs_code_intelligence_monthly.yml b/config/metrics/counts_28d/20210901222144_p_ci_templates_jobs_code_intelligence_monthly.yml
index 232a5be1a65..f649438b96b 100644
--- a/config/metrics/counts_28d/20210901222144_p_ci_templates_jobs_code_intelligence_monthly.yml
+++ b/config/metrics/counts_28d/20210901222144_p_ci_templates_jobs_code_intelligence_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_code_intelligence_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222153_p_ci_templates_jobs_code_quality_monthly.yml b/config/metrics/counts_28d/20210901222153_p_ci_templates_jobs_code_quality_monthly.yml
index 33639ce4749..70431a89a7d 100644
--- a/config/metrics/counts_28d/20210901222153_p_ci_templates_jobs_code_quality_monthly.yml
+++ b/config/metrics/counts_28d/20210901222153_p_ci_templates_jobs_code_quality_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_code_quality_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222202_p_ci_templates_jobs_deploy_ecs_monthly.yml b/config/metrics/counts_28d/20210901222202_p_ci_templates_jobs_deploy_ecs_monthly.yml
index 9d158a32000..040cd39d68c 100644
--- a/config/metrics/counts_28d/20210901222202_p_ci_templates_jobs_deploy_ecs_monthly.yml
+++ b/config/metrics/counts_28d/20210901222202_p_ci_templates_jobs_deploy_ecs_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_deploy_ecs_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222211_p_ci_templates_jobs_deploy_ec2_monthly.yml b/config/metrics/counts_28d/20210901222211_p_ci_templates_jobs_deploy_ec2_monthly.yml
index d9b1b373ac3..747d0f98d3f 100644
--- a/config/metrics/counts_28d/20210901222211_p_ci_templates_jobs_deploy_ec2_monthly.yml
+++ b/config/metrics/counts_28d/20210901222211_p_ci_templates_jobs_deploy_ec2_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_deploy_ec2_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222220_p_ci_templates_jobs_deploy_monthly.yml b/config/metrics/counts_28d/20210901222220_p_ci_templates_jobs_deploy_monthly.yml
index 022908b10c6..d1d7f8b8068 100644
--- a/config/metrics/counts_28d/20210901222220_p_ci_templates_jobs_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210901222220_p_ci_templates_jobs_deploy_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_deploy_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222229_p_ci_templates_jobs_build_monthly.yml b/config/metrics/counts_28d/20210901222229_p_ci_templates_jobs_build_monthly.yml
index 9afb87aa0c3..16d23f2402b 100644
--- a/config/metrics/counts_28d/20210901222229_p_ci_templates_jobs_build_monthly.yml
+++ b/config/metrics/counts_28d/20210901222229_p_ci_templates_jobs_build_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_build_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222237_p_ci_templates_jobs_browser_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901222237_p_ci_templates_jobs_browser_performance_testing_monthly.yml
index 0b2287f1bfb..b8ff63220a6 100644
--- a/config/metrics/counts_28d/20210901222237_p_ci_templates_jobs_browser_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901222237_p_ci_templates_jobs_browser_performance_testing_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_browser_performance_testing_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222246_p_ci_templates_jobs_test_monthly.yml b/config/metrics/counts_28d/20210901222246_p_ci_templates_jobs_test_monthly.yml
index c9cd369e954..2411510a6c7 100644
--- a/config/metrics/counts_28d/20210901222246_p_ci_templates_jobs_test_monthly.yml
+++ b/config/metrics/counts_28d/20210901222246_p_ci_templates_jobs_test_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_test_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222256_p_ci_templates_jobs_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210901222256_p_ci_templates_jobs_deploy_latest_monthly.yml
index 0fa43623b9c..906c450b05a 100644
--- a/config/metrics/counts_28d/20210901222256_p_ci_templates_jobs_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901222256_p_ci_templates_jobs_deploy_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_deploy_latest_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222304_p_ci_templates_jobs_browser_performance_testing_latest_monthly.yml b/config/metrics/counts_28d/20210901222304_p_ci_templates_jobs_browser_performance_testing_latest_monthly.yml
index 983ac335ba6..e35bab69fea 100644
--- a/config/metrics/counts_28d/20210901222304_p_ci_templates_jobs_browser_performance_testing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901222304_p_ci_templates_jobs_browser_performance_testing_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_browser_performance_testing_latest_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222313_p_ci_templates_jobs_cf_provision_monthly.yml b/config/metrics/counts_28d/20210901222313_p_ci_templates_jobs_cf_provision_monthly.yml
index 2a77897a7d8..352edd12a4b 100644
--- a/config/metrics/counts_28d/20210901222313_p_ci_templates_jobs_cf_provision_monthly.yml
+++ b/config/metrics/counts_28d/20210901222313_p_ci_templates_jobs_cf_provision_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_cf_provision_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222322_p_ci_templates_jobs_build_latest_monthly.yml b/config/metrics/counts_28d/20210901222322_p_ci_templates_jobs_build_latest_monthly.yml
index bb1491b583b..7e6fb455cc9 100644
--- a/config/metrics/counts_28d/20210901222322_p_ci_templates_jobs_build_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901222322_p_ci_templates_jobs_build_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_build_latest_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222331_p_ci_templates_terraform_latest_monthly.yml b/config/metrics/counts_28d/20210901222331_p_ci_templates_terraform_latest_monthly.yml
index c4a178afddb..468489700aa 100644
--- a/config/metrics/counts_28d/20210901222331_p_ci_templates_terraform_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901222331_p_ci_templates_terraform_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_latest_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222341_p_ci_templates_swift_monthly.yml b/config/metrics/counts_28d/20210901222341_p_ci_templates_swift_monthly.yml
index c9a04386cae..8d0e077cf25 100644
--- a/config/metrics/counts_28d/20210901222341_p_ci_templates_swift_monthly.yml
+++ b/config/metrics/counts_28d/20210901222341_p_ci_templates_swift_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_swift_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222707_p_ci_templates_pages_jekyll_monthly.yml b/config/metrics/counts_28d/20210901222707_p_ci_templates_pages_jekyll_monthly.yml
index 5d511faa0b1..31cae6f101d 100644
--- a/config/metrics/counts_28d/20210901222707_p_ci_templates_pages_jekyll_monthly.yml
+++ b/config/metrics/counts_28d/20210901222707_p_ci_templates_pages_jekyll_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_jekyll_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901222742_p_ci_templates_pages_harp_monthly.yml b/config/metrics/counts_28d/20210901222742_p_ci_templates_pages_harp_monthly.yml
index 76d20b24fe1..01905ef1fcf 100644
--- a/config/metrics/counts_28d/20210901222742_p_ci_templates_pages_harp_monthly.yml
+++ b/config/metrics/counts_28d/20210901222742_p_ci_templates_pages_harp_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_harp_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223200_p_ci_templates_pages_octopress_monthly.yml b/config/metrics/counts_28d/20210901223200_p_ci_templates_pages_octopress_monthly.yml
index 4313f3be8cc..70dacbc3019 100644
--- a/config/metrics/counts_28d/20210901223200_p_ci_templates_pages_octopress_monthly.yml
+++ b/config/metrics/counts_28d/20210901223200_p_ci_templates_pages_octopress_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_octopress_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223210_p_ci_templates_pages_brunch_monthly.yml b/config/metrics/counts_28d/20210901223210_p_ci_templates_pages_brunch_monthly.yml
index 7b819d9c6ce..f41ad99df8f 100644
--- a/config/metrics/counts_28d/20210901223210_p_ci_templates_pages_brunch_monthly.yml
+++ b/config/metrics/counts_28d/20210901223210_p_ci_templates_pages_brunch_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_brunch_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223219_p_ci_templates_pages_doxygen_monthly.yml b/config/metrics/counts_28d/20210901223219_p_ci_templates_pages_doxygen_monthly.yml
index f59b9b5d6ee..313dc1fde75 100644
--- a/config/metrics/counts_28d/20210901223219_p_ci_templates_pages_doxygen_monthly.yml
+++ b/config/metrics/counts_28d/20210901223219_p_ci_templates_pages_doxygen_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_doxygen_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223227_p_ci_templates_pages_hyde_monthly.yml b/config/metrics/counts_28d/20210901223227_p_ci_templates_pages_hyde_monthly.yml
index 1f716c6faf2..1a18ea40304 100644
--- a/config/metrics/counts_28d/20210901223227_p_ci_templates_pages_hyde_monthly.yml
+++ b/config/metrics/counts_28d/20210901223227_p_ci_templates_pages_hyde_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_hyde_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223236_p_ci_templates_pages_lektor_monthly.yml b/config/metrics/counts_28d/20210901223236_p_ci_templates_pages_lektor_monthly.yml
index b09ffae3e36..ef610dd9589 100644
--- a/config/metrics/counts_28d/20210901223236_p_ci_templates_pages_lektor_monthly.yml
+++ b/config/metrics/counts_28d/20210901223236_p_ci_templates_pages_lektor_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_lektor_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223244_p_ci_templates_pages_jbake_monthly.yml b/config/metrics/counts_28d/20210901223244_p_ci_templates_pages_jbake_monthly.yml
index df16868f2e0..aab9f332fe2 100644
--- a/config/metrics/counts_28d/20210901223244_p_ci_templates_pages_jbake_monthly.yml
+++ b/config/metrics/counts_28d/20210901223244_p_ci_templates_pages_jbake_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_jbake_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223253_p_ci_templates_pages_hexo_monthly.yml b/config/metrics/counts_28d/20210901223253_p_ci_templates_pages_hexo_monthly.yml
index 4097f57a64b..266a189fdd7 100644
--- a/config/metrics/counts_28d/20210901223253_p_ci_templates_pages_hexo_monthly.yml
+++ b/config/metrics/counts_28d/20210901223253_p_ci_templates_pages_hexo_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_hexo_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223302_p_ci_templates_pages_middleman_monthly.yml b/config/metrics/counts_28d/20210901223302_p_ci_templates_pages_middleman_monthly.yml
index 9d5e022730f..2ec3d1c72d2 100644
--- a/config/metrics/counts_28d/20210901223302_p_ci_templates_pages_middleman_monthly.yml
+++ b/config/metrics/counts_28d/20210901223302_p_ci_templates_pages_middleman_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_middleman_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223311_p_ci_templates_pages_hugo_monthly.yml b/config/metrics/counts_28d/20210901223311_p_ci_templates_pages_hugo_monthly.yml
index b8f662f9158..e2f837ee1d5 100644
--- a/config/metrics/counts_28d/20210901223311_p_ci_templates_pages_hugo_monthly.yml
+++ b/config/metrics/counts_28d/20210901223311_p_ci_templates_pages_hugo_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_hugo_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223319_p_ci_templates_pages_pelican_monthly.yml b/config/metrics/counts_28d/20210901223319_p_ci_templates_pages_pelican_monthly.yml
index 618b90744e7..3b9e80e6a64 100644
--- a/config/metrics/counts_28d/20210901223319_p_ci_templates_pages_pelican_monthly.yml
+++ b/config/metrics/counts_28d/20210901223319_p_ci_templates_pages_pelican_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_pelican_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223328_p_ci_templates_pages_nanoc_monthly.yml b/config/metrics/counts_28d/20210901223328_p_ci_templates_pages_nanoc_monthly.yml
index fd8fc5a6521..cc383ad72cb 100644
--- a/config/metrics/counts_28d/20210901223328_p_ci_templates_pages_nanoc_monthly.yml
+++ b/config/metrics/counts_28d/20210901223328_p_ci_templates_pages_nanoc_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_nanoc_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223337_p_ci_templates_pages_swaggerui_monthly.yml b/config/metrics/counts_28d/20210901223337_p_ci_templates_pages_swaggerui_monthly.yml
index 4c5415115ab..da7443d5911 100644
--- a/config/metrics/counts_28d/20210901223337_p_ci_templates_pages_swaggerui_monthly.yml
+++ b/config/metrics/counts_28d/20210901223337_p_ci_templates_pages_swaggerui_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_swaggerui_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223346_p_ci_templates_pages_jigsaw_monthly.yml b/config/metrics/counts_28d/20210901223346_p_ci_templates_pages_jigsaw_monthly.yml
index 77c44bbd573..585544de04b 100644
--- a/config/metrics/counts_28d/20210901223346_p_ci_templates_pages_jigsaw_monthly.yml
+++ b/config/metrics/counts_28d/20210901223346_p_ci_templates_pages_jigsaw_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_jigsaw_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223354_p_ci_templates_pages_metalsmith_monthly.yml b/config/metrics/counts_28d/20210901223354_p_ci_templates_pages_metalsmith_monthly.yml
index 4f88ebda139..8f73104fd76 100644
--- a/config/metrics/counts_28d/20210901223354_p_ci_templates_pages_metalsmith_monthly.yml
+++ b/config/metrics/counts_28d/20210901223354_p_ci_templates_pages_metalsmith_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_metalsmith_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223403_p_ci_templates_pages_gatsby_monthly.yml b/config/metrics/counts_28d/20210901223403_p_ci_templates_pages_gatsby_monthly.yml
index 63a529d011f..b8b7bfb7d2a 100644
--- a/config/metrics/counts_28d/20210901223403_p_ci_templates_pages_gatsby_monthly.yml
+++ b/config/metrics/counts_28d/20210901223403_p_ci_templates_pages_gatsby_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_gatsby_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223412_p_ci_templates_pages_html_monthly.yml b/config/metrics/counts_28d/20210901223412_p_ci_templates_pages_html_monthly.yml
index c3a92661f73..691ced0e95e 100644
--- a/config/metrics/counts_28d/20210901223412_p_ci_templates_pages_html_monthly.yml
+++ b/config/metrics/counts_28d/20210901223412_p_ci_templates_pages_html_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_html_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223421_p_ci_templates_dart_monthly.yml b/config/metrics/counts_28d/20210901223421_p_ci_templates_dart_monthly.yml
index 1caa4e2c919..67bdb96f807 100644
--- a/config/metrics/counts_28d/20210901223421_p_ci_templates_dart_monthly.yml
+++ b/config/metrics/counts_28d/20210901223421_p_ci_templates_dart_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_dart_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223430_p_ci_templates_docker_monthly.yml b/config/metrics/counts_28d/20210901223430_p_ci_templates_docker_monthly.yml
index 462d703af0e..b5ae84d3cdf 100644
--- a/config/metrics/counts_28d/20210901223430_p_ci_templates_docker_monthly.yml
+++ b/config/metrics/counts_28d/20210901223430_p_ci_templates_docker_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_docker_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223439_p_ci_templates_julia_monthly.yml b/config/metrics/counts_28d/20210901223439_p_ci_templates_julia_monthly.yml
index d3dc2bcaed2..234457ea055 100644
--- a/config/metrics/counts_28d/20210901223439_p_ci_templates_julia_monthly.yml
+++ b/config/metrics/counts_28d/20210901223439_p_ci_templates_julia_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_julia_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223447_p_ci_templates_npm_monthly.yml b/config/metrics/counts_28d/20210901223447_p_ci_templates_npm_monthly.yml
index b2e99015910..7a0811eb685 100644
--- a/config/metrics/counts_28d/20210901223447_p_ci_templates_npm_monthly.yml
+++ b/config/metrics/counts_28d/20210901223447_p_ci_templates_npm_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_npm_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223456_p_ci_templates_dotnet_core_monthly.yml b/config/metrics/counts_28d/20210901223456_p_ci_templates_dotnet_core_monthly.yml
index 0abb09ec093..3f7f4b450ff 100644
--- a/config/metrics/counts_28d/20210901223456_p_ci_templates_dotnet_core_monthly.yml
+++ b/config/metrics/counts_28d/20210901223456_p_ci_templates_dotnet_core_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_dotnet_core_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223505_p_ci_templates_5_minute_production_app_monthly.yml b/config/metrics/counts_28d/20210901223505_p_ci_templates_5_minute_production_app_monthly.yml
index f633526f048..124e6682057 100644
--- a/config/metrics/counts_28d/20210901223505_p_ci_templates_5_minute_production_app_monthly.yml
+++ b/config/metrics/counts_28d/20210901223505_p_ci_templates_5_minute_production_app_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_5_minute_production_app_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223514_p_ci_templates_ruby_monthly.yml b/config/metrics/counts_28d/20210901223514_p_ci_templates_ruby_monthly.yml
index 0c34665ced1..40435231b3e 100644
--- a/config/metrics/counts_28d/20210901223514_p_ci_templates_ruby_monthly.yml
+++ b/config/metrics/counts_28d/20210901223514_p_ci_templates_ruby_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_ruby_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223523_p_ci_templates_implicit_jobs_dast_default_branch_deploy_monthly.yml b/config/metrics/counts_28d/20210901223523_p_ci_templates_implicit_jobs_dast_default_branch_deploy_monthly.yml
index e31b8e67b19..ef9782ffe4b 100644
--- a/config/metrics/counts_28d/20210901223523_p_ci_templates_implicit_jobs_dast_default_branch_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210901223523_p_ci_templates_implicit_jobs_dast_default_branch_deploy_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_dast_default_branch_deploy_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml
index a3f7e4310b6..01acd3e0edf 100644
--- a/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901223532_p_ci_templates_implicit_jobs_load_performance_testing_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_load_performance_testing_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210901223541_p_ci_templates_implicit_jobs_helm_2to3_monthly.yml b/config/metrics/counts_28d/20210901223541_p_ci_templates_implicit_jobs_helm_2to3_monthly.yml
index ceb497e1ded..be482677e87 100644
--- a/config/metrics/counts_28d/20210901223541_p_ci_templates_implicit_jobs_helm_2to3_monthly.yml
+++ b/config/metrics/counts_28d/20210901223541_p_ci_templates_implicit_jobs_helm_2to3_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_helm_2to3_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223550_p_ci_templates_implicit_jobs_sast_monthly.yml b/config/metrics/counts_28d/20210901223550_p_ci_templates_implicit_jobs_sast_monthly.yml
index 5b5da0766f0..0fbc14ee2b0 100644
--- a/config/metrics/counts_28d/20210901223550_p_ci_templates_implicit_jobs_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210901223550_p_ci_templates_implicit_jobs_sast_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_sast_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223559_p_ci_templates_implicit_jobs_secret_detection_monthly.yml b/config/metrics/counts_28d/20210901223559_p_ci_templates_implicit_jobs_secret_detection_monthly.yml
index 75d327b334f..b1c6a841ed1 100644
--- a/config/metrics/counts_28d/20210901223559_p_ci_templates_implicit_jobs_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210901223559_p_ci_templates_implicit_jobs_secret_detection_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_secret_detection_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223608_p_ci_templates_implicit_jobs_code_intelligence_monthly.yml b/config/metrics/counts_28d/20210901223608_p_ci_templates_implicit_jobs_code_intelligence_monthly.yml
index 33277d70e10..a5034fe4390 100644
--- a/config/metrics/counts_28d/20210901223608_p_ci_templates_implicit_jobs_code_intelligence_monthly.yml
+++ b/config/metrics/counts_28d/20210901223608_p_ci_templates_implicit_jobs_code_intelligence_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_code_intelligence_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223617_p_ci_templates_implicit_jobs_code_quality_monthly.yml b/config/metrics/counts_28d/20210901223617_p_ci_templates_implicit_jobs_code_quality_monthly.yml
index 6a90def4c44..3a5555fefde 100644
--- a/config/metrics/counts_28d/20210901223617_p_ci_templates_implicit_jobs_code_quality_monthly.yml
+++ b/config/metrics/counts_28d/20210901223617_p_ci_templates_implicit_jobs_code_quality_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_code_quality_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223626_p_ci_templates_implicit_jobs_deploy_ecs_monthly.yml b/config/metrics/counts_28d/20210901223626_p_ci_templates_implicit_jobs_deploy_ecs_monthly.yml
index 597af19dc3d..3ccc4ddb3ba 100644
--- a/config/metrics/counts_28d/20210901223626_p_ci_templates_implicit_jobs_deploy_ecs_monthly.yml
+++ b/config/metrics/counts_28d/20210901223626_p_ci_templates_implicit_jobs_deploy_ecs_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_deploy_ecs_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: environments
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223635_p_ci_templates_implicit_jobs_deploy_ec2_monthly.yml b/config/metrics/counts_28d/20210901223635_p_ci_templates_implicit_jobs_deploy_ec2_monthly.yml
index 8cf2a636201..1f1fa3b0b2c 100644
--- a/config/metrics/counts_28d/20210901223635_p_ci_templates_implicit_jobs_deploy_ec2_monthly.yml
+++ b/config/metrics/counts_28d/20210901223635_p_ci_templates_implicit_jobs_deploy_ec2_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_deploy_ec2_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: environments
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223644_p_ci_templates_implicit_jobs_browser_performance_testing_monthly.yml b/config/metrics/counts_28d/20210901223644_p_ci_templates_implicit_jobs_browser_performance_testing_monthly.yml
index a03b2b4b79a..c4076d1d59d 100644
--- a/config/metrics/counts_28d/20210901223644_p_ci_templates_implicit_jobs_browser_performance_testing_monthly.yml
+++ b/config/metrics/counts_28d/20210901223644_p_ci_templates_implicit_jobs_browser_performance_testing_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_browser_performance_testing_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223653_p_ci_templates_implicit_jobs_test_monthly.yml b/config/metrics/counts_28d/20210901223653_p_ci_templates_implicit_jobs_test_monthly.yml
index 7155d4ca709..cee1e54107e 100644
--- a/config/metrics/counts_28d/20210901223653_p_ci_templates_implicit_jobs_test_monthly.yml
+++ b/config/metrics/counts_28d/20210901223653_p_ci_templates_implicit_jobs_test_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_test_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml b/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml
index fc37bc2815d..94c76931c97 100644
--- a/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901223702_p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_browser_performance_testing_latest_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210901223711_p_ci_templates_implicit_jobs_cf_provision_monthly.yml b/config/metrics/counts_28d/20210901223711_p_ci_templates_implicit_jobs_cf_provision_monthly.yml
index 4dbfc413cab..e98f788c8a7 100644
--- a/config/metrics/counts_28d/20210901223711_p_ci_templates_implicit_jobs_cf_provision_monthly.yml
+++ b/config/metrics/counts_28d/20210901223711_p_ci_templates_implicit_jobs_cf_provision_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_cf_provision_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210901223721_p_ci_templates_implicit_jobs_build_latest_monthly.yml b/config/metrics/counts_28d/20210901223721_p_ci_templates_implicit_jobs_build_latest_monthly.yml
index 2f8bfb50552..8b7ea44ebd1 100644
--- a/config/metrics/counts_28d/20210901223721_p_ci_templates_implicit_jobs_build_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901223721_p_ci_templates_implicit_jobs_build_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_build_latest_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210901223730_p_ci_templates_implicit_security_dast_runner_validation_monthly.yml b/config/metrics/counts_28d/20210901223730_p_ci_templates_implicit_security_dast_runner_validation_monthly.yml
index 9f4247d42fc..bdb9ab3c23e 100644
--- a/config/metrics/counts_28d/20210901223730_p_ci_templates_implicit_security_dast_runner_validation_monthly.yml
+++ b/config/metrics/counts_28d/20210901223730_p_ci_templates_implicit_security_dast_runner_validation_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_dast_runner_validation_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210901223739_p_ci_templates_implicit_security_dast_on_demand_scan_monthly.yml b/config/metrics/counts_28d/20210901223739_p_ci_templates_implicit_security_dast_on_demand_scan_monthly.yml
index 2cc399708c3..ff7724468ed 100644
--- a/config/metrics/counts_28d/20210901223739_p_ci_templates_implicit_security_dast_on_demand_scan_monthly.yml
+++ b/config/metrics/counts_28d/20210901223739_p_ci_templates_implicit_security_dast_on_demand_scan_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_dast_on_demand_scan_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210901223748_p_ci_templates_implicit_security_license_scanning_monthly.yml b/config/metrics/counts_28d/20210901223748_p_ci_templates_implicit_security_license_scanning_monthly.yml
index 279b021aec1..0bb26f66b90 100644
--- a/config/metrics/counts_28d/20210901223748_p_ci_templates_implicit_security_license_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901223748_p_ci_templates_implicit_security_license_scanning_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_license_scanning_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223758_p_ci_templates_implicit_security_coverage_fuzzing_monthly.yml b/config/metrics/counts_28d/20210901223758_p_ci_templates_implicit_security_coverage_fuzzing_monthly.yml
index d757ef3ed1b..8b9a653ff0e 100644
--- a/config/metrics/counts_28d/20210901223758_p_ci_templates_implicit_security_coverage_fuzzing_monthly.yml
+++ b/config/metrics/counts_28d/20210901223758_p_ci_templates_implicit_security_coverage_fuzzing_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_coverage_fuzzing_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210901223806_p_ci_templates_implicit_security_api_fuzzing_latest_monthly.yml b/config/metrics/counts_28d/20210901223806_p_ci_templates_implicit_security_api_fuzzing_latest_monthly.yml
index 97c5dbd4540..f379cf97ec9 100644
--- a/config/metrics/counts_28d/20210901223806_p_ci_templates_implicit_security_api_fuzzing_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901223806_p_ci_templates_implicit_security_api_fuzzing_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_api_fuzzing_latest_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml b/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml
index 7ad8c0753d9..80899a7617f 100644
--- a/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml
+++ b/config/metrics/counts_28d/20210901223815_p_ci_templates_implicit_security_secure_binaries_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_secure_binaries_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: static_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210901223824_p_ci_templates_implicit_security_dast_api_monthly.yml b/config/metrics/counts_28d/20210901223824_p_ci_templates_implicit_security_dast_api_monthly.yml
index 56527164df1..f18fac37ab5 100644
--- a/config/metrics/counts_28d/20210901223824_p_ci_templates_implicit_security_dast_api_monthly.yml
+++ b/config/metrics/counts_28d/20210901223824_p_ci_templates_implicit_security_dast_api_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_dast_api_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210901223832_p_ci_templates_implicit_security_container_scanning_monthly.yml b/config/metrics/counts_28d/20210901223832_p_ci_templates_implicit_security_container_scanning_monthly.yml
index 3e6ceb38d5a..c9fdad800f8 100644
--- a/config/metrics/counts_28d/20210901223832_p_ci_templates_implicit_security_container_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901223832_p_ci_templates_implicit_security_container_scanning_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_container_scanning_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223841_p_ci_templates_implicit_security_dast_latest_monthly.yml b/config/metrics/counts_28d/20210901223841_p_ci_templates_implicit_security_dast_latest_monthly.yml
index 6776716bdfb..b14912c5769 100644
--- a/config/metrics/counts_28d/20210901223841_p_ci_templates_implicit_security_dast_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210901223841_p_ci_templates_implicit_security_dast_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_dast_latest_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210901223850_p_ci_templates_implicit_security_dependency_scanning_monthly.yml b/config/metrics/counts_28d/20210901223850_p_ci_templates_implicit_security_dependency_scanning_monthly.yml
index 7450c617b46..3ad5cb3c6ab 100644
--- a/config/metrics/counts_28d/20210901223850_p_ci_templates_implicit_security_dependency_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901223850_p_ci_templates_implicit_security_dependency_scanning_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_dependency_scanning_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223858_p_ci_templates_implicit_security_api_fuzzing_monthly.yml b/config/metrics/counts_28d/20210901223858_p_ci_templates_implicit_security_api_fuzzing_monthly.yml
index 4887020deba..ee89138fc88 100644
--- a/config/metrics/counts_28d/20210901223858_p_ci_templates_implicit_security_api_fuzzing_monthly.yml
+++ b/config/metrics/counts_28d/20210901223858_p_ci_templates_implicit_security_api_fuzzing_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_api_fuzzing_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210901223907_p_ci_templates_implicit_security_dast_monthly.yml b/config/metrics/counts_28d/20210901223907_p_ci_templates_implicit_security_dast_monthly.yml
index 0abaaed320e..750d07290da 100644
--- a/config/metrics/counts_28d/20210901223907_p_ci_templates_implicit_security_dast_monthly.yml
+++ b/config/metrics/counts_28d/20210901223907_p_ci_templates_implicit_security_dast_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_dast_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210901223916_p_ci_templates_implicit_security_cluster_image_scanning_monthly.yml b/config/metrics/counts_28d/20210901223916_p_ci_templates_implicit_security_cluster_image_scanning_monthly.yml
index 5e55d0b7f6d..8c243ded995 100644
--- a/config/metrics/counts_28d/20210901223916_p_ci_templates_implicit_security_cluster_image_scanning_monthly.yml
+++ b/config/metrics/counts_28d/20210901223916_p_ci_templates_implicit_security_cluster_image_scanning_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_cluster_image_scanning_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: composition_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210902000813_p_ci_templates_implicit_auto_devops_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210902000813_p_ci_templates_implicit_auto_devops_deploy_latest_monthly.yml
index dba607d78a7..8916183701d 100644
--- a/config/metrics/counts_28d/20210902000813_p_ci_templates_implicit_auto_devops_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210902000813_p_ci_templates_implicit_auto_devops_deploy_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_deploy_latest_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: environments
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210908093509_p_ci_templates_android_latest_monthly.yml b/config/metrics/counts_28d/20210908093509_p_ci_templates_android_latest_monthly.yml
index c3e4ea690bb..15189608b8f 100644
--- a/config/metrics/counts_28d/20210908093509_p_ci_templates_android_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210908093509_p_ci_templates_android_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_android_latest_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml b/config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml
index c4b5d95130b..f59a0e17730 100644
--- a/config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml
+++ b/config/metrics/counts_28d/20210929102434_p_ci_templates_implicit_jobs_build_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_build_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml
index 60b87714937..a9caad12ae3 100644
--- a/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210929102736_p_ci_templates_implicit_jobs_deploy_latest_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_deploy_latest_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: environments
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml b/config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml
index db806632af7..6192cb088ef 100644
--- a/config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210929103010_p_ci_templates_implicit_jobs_deploy_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_deploy_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: environments
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml b/config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml
index 64c8c78f3fb..744ff7d9769 100644
--- a/config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml
+++ b/config/metrics/counts_28d/20211109114953_i_quickactions_add_contacts_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_add_contacts_monthly
 description: Count of MAU using the `/add_contacts` quick action
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml b/config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml
index aae449dc7ff..9401267a153 100644
--- a/config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml
+++ b/config/metrics/counts_28d/20211109120251_i_quickactions_remove_contacts_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_contacts_monthly
 description: Count of MAU using the `/remove_contacts` quick action
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220119153911_p_ci_templates_qualys_iac_security_monthly.yml b/config/metrics/counts_28d/20220119153911_p_ci_templates_qualys_iac_security_monthly.yml
index d607bffb157..1aa776a9161 100644
--- a/config/metrics/counts_28d/20220119153911_p_ci_templates_qualys_iac_security_monthly.yml
+++ b/config/metrics/counts_28d/20220119153911_p_ci_templates_qualys_iac_security_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_qualys_iac_security_monthly
 description: ""
-product_section: ""
-product_stage: ""
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml b/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml
index 084c8364ad4..65c50c90a6c 100644
--- a/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml
+++ b/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_updating_work_item_title_monthly
 description: Unique users updating a work item's title
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml b/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml
index 775ac392583..e9d479096bc 100644
--- a/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml
+++ b/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_creating_work_items_monthly
 description: Unique users creating work items
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220222215951_xmau_plan.yml b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
index 9c8a6883ffa..763883f7b33 100644
--- a/config/metrics/counts_28d/20220222215951_xmau_plan.yml
+++ b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts_monthly.aggregated_metrics.xmau_plan
 description: Removed as duplicate of counts_monthly.aggregated_metrics.users_work_items
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
index c3b9a9f4acd..72dc4a76c7f 100644
--- a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
+++ b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts_monthly.aggregated_metrics.xmau_project_management
 description: Removed as duplicate of counts_monthly.aggregated_metrics.users_work_items
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: removed
diff --git a/config/metrics/counts_28d/20220222215955_users_work_items.yml b/config/metrics/counts_28d/20220222215955_users_work_items.yml
index a910afb3f65..803b3c11dff 100644
--- a/config/metrics/counts_28d/20220222215955_users_work_items.yml
+++ b/config/metrics/counts_28d/20220222215955_users_work_items.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts_monthly.aggregated_metrics.users_work_items
 description: Unique users interacting with work items
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220307150912_p_ci_templates_database_liquibase_monthly.yml b/config/metrics/counts_28d/20220307150912_p_ci_templates_database_liquibase_monthly.yml
index 651b1005428..2dfe78b4bd2 100644
--- a/config/metrics/counts_28d/20220307150912_p_ci_templates_database_liquibase_monthly.yml
+++ b/config/metrics/counts_28d/20220307150912_p_ci_templates_database_liquibase_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_liquibase_monthly
 description: ""
-product_section: ""
-product_stage: ""
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220310184327_p_ci_templates_matlab_monthly.yml b/config/metrics/counts_28d/20220310184327_p_ci_templates_matlab_monthly.yml
index c55d6eff4fe..b4c98b2f438 100644
--- a/config/metrics/counts_28d/20220310184327_p_ci_templates_matlab_monthly.yml
+++ b/config/metrics/counts_28d/20220310184327_p_ci_templates_matlab_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_matlab_monthly
 description: ""
-product_section: ""
-product_stage: ""
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220407125907_p_ci_templates_themekit_monthly.yml b/config/metrics/counts_28d/20220407125907_p_ci_templates_themekit_monthly.yml
index 18a5331a2a3..bdae921fd8f 100644
--- a/config/metrics/counts_28d/20220407125907_p_ci_templates_themekit_monthly.yml
+++ b/config/metrics/counts_28d/20220407125907_p_ci_templates_themekit_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_themekit_monthly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220707022802_users_updating_weight_estimate_monthly.yml b/config/metrics/counts_28d/20220707022802_users_updating_weight_estimate_monthly.yml
index fb8411e6377..b6e20352861 100644
--- a/config/metrics/counts_28d/20220707022802_users_updating_weight_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20220707022802_users_updating_weight_estimate_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_updating_weight_estimate_monthly
 description: Unique users updating a work item's weight estimate
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220725193059_users_updating_work_item_dates_monthly.yml b/config/metrics/counts_28d/20220725193059_users_updating_work_item_dates_monthly.yml
index 41a9f40eb63..9ea199261db 100644
--- a/config/metrics/counts_28d/20220725193059_users_updating_work_item_dates_monthly.yml
+++ b/config/metrics/counts_28d/20220725193059_users_updating_work_item_dates_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_updating_work_item_dates_monthly
 description: Unique users updating a work item's date
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20220907032044_i_quickactions_ready_monthly.yml b/config/metrics/counts_28d/20220907032044_i_quickactions_ready_monthly.yml
index 05683fbce5f..906df954354 100644
--- a/config/metrics/counts_28d/20220907032044_i_quickactions_ready_monthly.yml
+++ b/config/metrics/counts_28d/20220907032044_i_quickactions_ready_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.project_management.i_quickactions_ready_monthly
 description: Count of MAU using the `/ready` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 data_source: redis_hll
diff --git a/config/metrics/counts_28d/20221007011350_users_updating_work_item_labels_monthly.yml b/config/metrics/counts_28d/20221007011350_users_updating_work_item_labels_monthly.yml
index 67156594fb7..ade5a4e3dd0 100644
--- a/config/metrics/counts_28d/20221007011350_users_updating_work_item_labels_monthly.yml
+++ b/config/metrics/counts_28d/20221007011350_users_updating_work_item_labels_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_updating_work_item_labels_monthly
 description: Unique users updating a work item's labels
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20221031070329_users_updating_work_item_milestone_monthly.yml b/config/metrics/counts_28d/20221031070329_users_updating_work_item_milestone_monthly.yml
index af4ef68c9ea..d965b69fa2c 100644
--- a/config/metrics/counts_28d/20221031070329_users_updating_work_item_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20221031070329_users_updating_work_item_milestone_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_updating_work_item_milestone_monthly
 description: Unique users updating a work item's milestone
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml b/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml
index 4ae5242067c..73e032b082d 100644
--- a/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml
+++ b/config/metrics/counts_28d/20230105222225_g_project_management_issue_design_comments_removed_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_design_comments_removed_monthly
 description: Count of unique users per month who removed a comment on a design
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20230420160442_i_quickactions_type_monthly.yml b/config/metrics/counts_28d/20230420160442_i_quickactions_type_monthly.yml
index f18f890904e..50a9f34e984 100644
--- a/config/metrics/counts_28d/20230420160442_i_quickactions_type_monthly.yml
+++ b/config/metrics/counts_28d/20230420160442_i_quickactions_type_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_type_monthly
 description: Count of MAU using the `/type` quick action
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20230527152402_p_ci_templates_pages_zola_monthly.yml b/config/metrics/counts_28d/20230527152402_p_ci_templates_pages_zola_monthly.yml
index 70625b446ff..79347c561e9 100644
--- a/config/metrics/counts_28d/20230527152402_p_ci_templates_pages_zola_monthly.yml
+++ b/config/metrics/counts_28d/20230527152402_p_ci_templates_pages_zola_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_zola_monthly
 description: Count of pipelines using the Zola Pages template
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20230613085814_i_quickactions_unlink_monthly.yml b/config/metrics/counts_28d/20230613085814_i_quickactions_unlink_monthly.yml
index ff405926ba8..e0a3cc148d7 100644
--- a/config/metrics/counts_28d/20230613085814_i_quickactions_unlink_monthly.yml
+++ b/config/metrics/counts_28d/20230613085814_i_quickactions_unlink_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_unlink_monthly
 description: Count of MAU using the `/unlink` quick action
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20230922165305_i_quickactions_set_parent_monthly.yml b/config/metrics/counts_28d/20230922165305_i_quickactions_set_parent_monthly.yml
index 9af8f83ce79..2f9cd7bd4cf 100644
--- a/config/metrics/counts_28d/20230922165305_i_quickactions_set_parent_monthly.yml
+++ b/config/metrics/counts_28d/20230922165305_i_quickactions_set_parent_monthly.yml
@@ -2,8 +2,6 @@
 key_path: redis_hll_counters.quickactions.i_quickactions_set_parent_monthly
 name: quickactions_set_parent_monthly
 description: Count of MAU using the `/set_parent` quick action
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20230927152527_i_quickactions_add_child_monthly.yml b/config/metrics/counts_28d/20230927152527_i_quickactions_add_child_monthly.yml
index bef39963b56..4b47bb41828 100644
--- a/config/metrics/counts_28d/20230927152527_i_quickactions_add_child_monthly.yml
+++ b/config/metrics/counts_28d/20230927152527_i_quickactions_add_child_monthly.yml
@@ -2,8 +2,6 @@
 key_path: redis_hll_counters.quickactions.i_quickactions_add_child_monthly
 name: quickactions_add_child_monthly
 description: Count of MAU using the `/add_child` quick action
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20231219135715_users_updating_work_item_todo_monthly.yml b/config/metrics/counts_28d/20231219135715_users_updating_work_item_todo_monthly.yml
index 40b8fadf5a5..905b97ade36 100644
--- a/config/metrics/counts_28d/20231219135715_users_updating_work_item_todo_monthly.yml
+++ b/config/metrics/counts_28d/20231219135715_users_updating_work_item_todo_monthly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_updating_work_item_todo_monthly
 description: Unique users marking a work item as todo.
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20240118133234_i_quickactions_remove_parent_monthly.yml b/config/metrics/counts_28d/20240118133234_i_quickactions_remove_parent_monthly.yml
index 642cab9b642..057bde14c37 100644
--- a/config/metrics/counts_28d/20240118133234_i_quickactions_remove_parent_monthly.yml
+++ b/config/metrics/counts_28d/20240118133234_i_quickactions_remove_parent_monthly.yml
@@ -2,8 +2,6 @@
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_parent_monthly
 name: quickactions_remove_parent_monthly
 description: Count of MAU using the `/remove_parent` quick action
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_28d/20240208152527_i_quickactions_remove_child_monthly.yml b/config/metrics/counts_28d/20240208152527_i_quickactions_remove_child_monthly.yml
index d62c49435ea..902e447c84e 100644
--- a/config/metrics/counts_28d/20240208152527_i_quickactions_remove_child_monthly.yml
+++ b/config/metrics/counts_28d/20240208152527_i_quickactions_remove_child_monthly.yml
@@ -2,8 +2,6 @@
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_child_monthly
 name: quickactions_remove_child_monthly
 description: Count of MAU using the `/remove_child` quick action
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
index e4fe3fd0182..6adcbc8fe3c 100644
--- a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
@@ -2,9 +2,7 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_title_changed_weekly
 description: Count of WAU editing an issue title
-product_stage: plan
 product_group: project_management
-product_section: 'TBD'
 value_type: number
 status: active
 milestone: "13.6"
diff --git a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
index 97f960d6cd8..65f68d2df06 100644
--- a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_description_changed_weekly
 description: Count of WAU editing an issue description
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
index 588de265698..4c14126d997 100644
--- a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_assignee_changed_weekly
 description: Count of WAU changing issue assignees
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
index b84038b48f7..4ea4201cbc4 100644
--- a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_made_confidential_weekly
 description: Count of WAU making an issue confidential
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
index 39e5c713aef..1b6d683e952 100644
--- a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
+++ b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_made_visible_weekly
 description: Count of WAU making an issue not confidential
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
index a4c96743ec3..f3d7e5c88a6 100644
--- a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
+++ b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_created_weekly
 description: Count of WAU creating issues
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
index a455d43ded5..632ec264319 100644
--- a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_closed_weekly
 description: Count of WAU closing an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
index 21b326a9153..1597bf71845 100644
--- a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
+++ b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_reopened_weekly
 description: Count of WAU re-opening a closed issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
index b1202a8e560..6c7790434c0 100644
--- a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_label_changed_weekly
 description: Count of WAU changing an issue's label
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
index 6ca1c48b93b..e8e5809ed8d 100644
--- a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_milestone_changed_weekly
 description: Count of WAU changing an issue's milestone
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
index 4b7c83348ea..e396a74042a 100644
--- a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
+++ b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_cross_referenced_weekly
 description: Count of WAU referencing an issue from somewhere else
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
index ed7cbfe2c20..72472a3785d 100644
--- a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
+++ b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_moved_weekly
 description: Count of WAU moving an issue to another project
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
index 161aecc7540..ac2e7e8f17d 100644
--- a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
+++ b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_related_weekly
 description: Count of WAU relating an issue to another issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
index a99355e7078..056e8b88f2c 100644
--- a/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
+++ b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_unrelated_weekly
 description: Count of WAU unrelating an issue to another issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
index 3305826598c..062ad0644d8 100644
--- a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_marked_as_duplicate_weekly
 description: Count of WAU marking an issue as a duplicate
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
index 1b28a6e44ba..68f720abdb7 100644
--- a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_locked_weekly
 description: Count of WAU locking an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
index ab457b9630e..9470f3f8930 100644
--- a/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_unlocked_weekly
 description: Count of WAU unlocking an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
index 5327ab6e4e5..321ead354f0 100644
--- a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_added_weekly
 description: Count of WAU adding a design to an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
index b1a80f40d31..b41d1f0b7a7 100644
--- a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
+++ b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_modified_weekly
 description: Count of WAU modifying a design on an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
index b8a611e7767..f71847a5d0c 100644
--- a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_removed_weekly
 description: Count of WAU removing a design from an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
index 8666aec2ad0..7f0c85ec4ac 100644
--- a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_due_date_changed_weekly
 description: Count of WAU changing an issue due date
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
index 303575e5830..0406d24f3bd 100644
--- a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_time_estimate_changed_weekly
 description: Count of WAU changing an issue time estimate
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
index 8ee490ee609..c480548e08f 100644
--- a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_time_spent_changed_weekly
 description: Count of WAU recording time spent on an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
index ffc87bc0ac6..378c65db171 100644
--- a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_added_weekly
 description: Count of WAU commenting on an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
index 7329d1435ee..a6604a14bf6 100644
--- a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
+++ b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_edited_weekly
 description: Count of WAU editing a comment on an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
index 12af8e5ead6..1a1e6f48cbe 100644
--- a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_removed_weekly
 description: Count of WAU deleting a comment from an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
index ba2aebcc459..dc9aa10599b 100644
--- a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
+++ b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_cloned_weekly
 description: Count of WAU cloning an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
index c8bb69e2119..4c2234851b4 100644
--- a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.issues_edit.issues_edit_total_unique_counts_weekly
 description: Aggregate count of WAU taking an action related to an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml b/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
index 045a9f902a0..40a2e0ab553 100644
--- a/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
+++ b/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_single_weekly
 description: Count of WAU using the `/assign @user1` quick action to assign a single
   individual to an issuable
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml b/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
index 7e431fdbec6..e5479b007a3 100644
--- a/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
+++ b/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_multiple_weekly
 description: Count of WAU using the `/assign @user1 @user2` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml b/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
index 85c653b9807..2294594e46f 100644
--- a/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
+++ b/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_self_weekly
 description: Count of WAU using the `/assign me` quick action to assign self to an
   issuable
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml b/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
index 5008c48922f..bcab97cb686 100644
--- a/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
+++ b/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_award_weekly
 description: Count of WAU using the `/award` quick action to set an award emoji on
   an issuable
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml b/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
index 38ea07b6020..460a3e20ae6 100644
--- a/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
+++ b/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_board_move_weekly
 description: Count of WAU using the `/board_move` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml b/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
index 24e8c851811..2bdb0f2ee77 100644
--- a/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_clone_weekly
 description: Count of WAU using the `/clone` quick action to clone an issue.
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml b/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
index 6eb1d9bfd1c..4fe58b746ba 100644
--- a/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
+++ b/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_close_weekly
 description: Count of WAU using the `/close` quick action to close an issuable
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml b/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
index 06fd4b538cb..929d05d5fe9 100644
--- a/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_confidential_weekly
 description: Count of WAU using the `/confidential` quick action to set an issue as
   confidential
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml b/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
index 55b9720333a..888e04cd7a3 100644
--- a/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_copy_metadata_issue_weekly
 description: Count of WAU using the `/copy_metadata` quick action on an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml b/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
index 1db25e7826a..388a393a4c2 100644
--- a/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_create_merge_request_weekly
 description: Count of WAU using the `/create_merge_request` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml b/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
index 97e12085fbe..e88991d508c 100644
--- a/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
+++ b/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_done_weekly
 description: Count of WAU using the `/done` quick action to mark a todo as done
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml b/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
index f20c0e36ab2..c49f5ed5152 100644
--- a/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
+++ b/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_due_weekly
 description: Count of WAU using the `/due` quick action to change the due date on
   an issuable
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
index 9c223c90a38..42360506b9c 100644
--- a/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_duplicate_weekly
 description: Count of WAU using the `/duplicate` quick action to mark an issue as
   a duplicate of another
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml b/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
index 94753292f22..fa9c89a7dea 100644
--- a/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_estimate_weekly
 description: Count of WAU using the `/estimate` quick action to set a time estimate
   on an issue
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml b/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
index 533e5ad8f85..7a91ec85f97 100644
--- a/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
+++ b/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_label_weekly
 description: Count of WAU using the `/label` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml b/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
index 08cd4a64365..c521ab98dfa 100644
--- a/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_lock_weekly
 description: Count of WAU using the `/lock` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml b/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
index 8eff93b562e..40073321ccc 100644
--- a/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_milestone_weekly
 description: Count of WAU using the `/milestone` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml b/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
index 92eda899a36..9a334db0b8b 100644
--- a/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
+++ b/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_move_weekly
 description: Count of WAU using the `/move` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml b/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
index 1bf03fc1339..d4e5351a87b 100644
--- a/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
+++ b/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_reassign_weekly
 description: Count of WAU using the `/reassign @user1` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml b/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
index 30444a60ad5..26f07463c8e 100644
--- a/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
+++ b/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_relabel_weekly
 description: Count of WAU using the `/relabel` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml b/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
index 3b293d9ad26..e6c1893e2ea 100644
--- a/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_relate_weekly
 description: Count of WAU using the `/relate` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml b/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
index de974d4fa3f..949d7bb5b6f 100644
--- a/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
+++ b/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_due_date_weekly
 description: Count of WAU using the `/remove_due_date` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml b/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
index 4dcc0843134..57cdce67990 100644
--- a/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_estimate_weekly
 description: Count of WAU using the `/remove_estimate` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml b/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
index 54db78851fc..b2ddfa0a4ad 100644
--- a/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_milestone_weekly
 description: Count of WAU using the `/remove_milestone` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml b/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
index 64144163995..733a1a88f9c 100644
--- a/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
+++ b/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_time_spent_weekly
 description: Count of WAU using the `/remove_time_spent` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml b/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
index 8fa1cdbf48f..a7a0fb7cd15 100644
--- a/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
+++ b/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_zoom_weekly
 description: Count of WAU using the `/remove_zoom` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml b/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
index 73c4b090324..5985a0aa66d 100644
--- a/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
+++ b/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_reopen_weekly
 description: Count of WAU using the `/reopen` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml b/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
index 263ea183d4e..3a87a765f78 100644
--- a/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
+++ b/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_shrug_weekly
 description: Count of WAU using the `/shrug` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml b/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
index 14b38ffc69f..540af29c9bd 100644
--- a/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
+++ b/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_spend_subtract_weekly
 description: Count of WAU using the `/spend` quick action to subtract time spent
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml b/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
index 11785ba504a..728f0e0a75f 100644
--- a/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
+++ b/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_spend_add_weekly
 description: Count of WAU using the `/spend` quick action to add time spent
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml b/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
index 25312a6b141..a8b96a4ddd2 100644
--- a/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_subscribe_weekly
 description: Count of WAU using the `/subscribe` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml b/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
index f9c1aeb4c14..e2dc3adfe8a 100644
--- a/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
+++ b/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_tableflip_weekly
 description: Count of WAU using the `/tableflip` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml b/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
index 33c21de6c3b..efc004a361b 100644
--- a/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
+++ b/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_title_weekly
 description: Count of WAU using the `/title` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml b/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
index cc5a60ee233..59a4cea8f5f 100644
--- a/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_todo_weekly
 description: Count of WAU using the `/todo` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml b/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
index a284a0d8431..6b7878e3a78 100644
--- a/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
+++ b/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_specific_weekly
 description: Count of WAU using the `/unlabel` or `/remove_label` quick action to
   remove one or more specific labels
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml b/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
index 77478783baf..5db8f917f5d 100644
--- a/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
+++ b/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_all_weekly
 description: Count of WAU using the `/unlabel` quick action to remove all labels
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml b/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
index cc382ff215e..812927e3862 100644
--- a/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unlock_weekly
 description: Count of WAU using the `/unlock` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml b/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
index 7730da6efe3..45727080f17 100644
--- a/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unsubscribe_weekly
 description: Count of WAU using the `/unsubscribe` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml b/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
index b9d07941ac9..6c9178fede9 100644
--- a/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
+++ b/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_zoom_weekly
 description: Count of WAU using the `/zoom` quick action on Issues
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
index f10eb6110b3..f61da2def7f 100644
--- a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.source_code.wiki_action_weekly
 description: Count of unique actions done on a wiki (create, edit, delete)
-product_section: dev
-product_stage: plan
 product_group: knowledge
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
index eb7a22fdbdc..6796d3f88fc 100644
--- a/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.quickactions_total_unique_counts_weekly
 description: Count of WAU using one or more quick actions
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml b/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
index df87cbc7212..7b50bf557e8 100644
--- a/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
+++ b/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_invite_email_single_weekly
 description: Unique users using the /invite_email quick action to add a single email participant to an issue within 7 days
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml b/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
index d79b4877cf7..f6e3c4e3355 100644
--- a/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
+++ b/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_invite_email_multiple_weekly
 description: Unique users using the /invite_email quick action to add a multiple email participants to an issue within 7 days
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221237_p_ci_templates_terraform_base_weekly.yml b/config/metrics/counts_7d/20210901221237_p_ci_templates_terraform_base_weekly.yml
index ce7a9feab4f..7ee9eb9dcea 100644
--- a/config/metrics/counts_7d/20210901221237_p_ci_templates_terraform_base_weekly.yml
+++ b/config/metrics/counts_7d/20210901221237_p_ci_templates_terraform_base_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_base_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221246_p_ci_templates_dotnet_weekly.yml b/config/metrics/counts_7d/20210901221246_p_ci_templates_dotnet_weekly.yml
index ef66ac5e71c..051568bc1e8 100644
--- a/config/metrics/counts_7d/20210901221246_p_ci_templates_dotnet_weekly.yml
+++ b/config/metrics/counts_7d/20210901221246_p_ci_templates_dotnet_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_dotnet_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221255_p_ci_templates_nodejs_weekly.yml b/config/metrics/counts_7d/20210901221255_p_ci_templates_nodejs_weekly.yml
index 30988503817..6b54d2b2add 100644
--- a/config/metrics/counts_7d/20210901221255_p_ci_templates_nodejs_weekly.yml
+++ b/config/metrics/counts_7d/20210901221255_p_ci_templates_nodejs_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_nodejs_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221304_p_ci_templates_openshift_weekly.yml b/config/metrics/counts_7d/20210901221304_p_ci_templates_openshift_weekly.yml
index deab69606a7..fe46e8568c7 100644
--- a/config/metrics/counts_7d/20210901221304_p_ci_templates_openshift_weekly.yml
+++ b/config/metrics/counts_7d/20210901221304_p_ci_templates_openshift_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_openshift_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221313_p_ci_templates_bash_weekly.yml b/config/metrics/counts_7d/20210901221313_p_ci_templates_bash_weekly.yml
index 21f109ee315..334e57e771e 100644
--- a/config/metrics/counts_7d/20210901221313_p_ci_templates_bash_weekly.yml
+++ b/config/metrics/counts_7d/20210901221313_p_ci_templates_bash_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_bash_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221322_p_ci_templates_rust_weekly.yml b/config/metrics/counts_7d/20210901221322_p_ci_templates_rust_weekly.yml
index 89ba27cc82f..8124e71bcce 100644
--- a/config/metrics/counts_7d/20210901221322_p_ci_templates_rust_weekly.yml
+++ b/config/metrics/counts_7d/20210901221322_p_ci_templates_rust_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_rust_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221330_p_ci_templates_elixir_weekly.yml b/config/metrics/counts_7d/20210901221330_p_ci_templates_elixir_weekly.yml
index 95659ebc452..cd32119e56d 100644
--- a/config/metrics/counts_7d/20210901221330_p_ci_templates_elixir_weekly.yml
+++ b/config/metrics/counts_7d/20210901221330_p_ci_templates_elixir_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_elixir_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221339_p_ci_templates_clojure_weekly.yml b/config/metrics/counts_7d/20210901221339_p_ci_templates_clojure_weekly.yml
index 0c4879966bc..63f44d88ce6 100644
--- a/config/metrics/counts_7d/20210901221339_p_ci_templates_clojure_weekly.yml
+++ b/config/metrics/counts_7d/20210901221339_p_ci_templates_clojure_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_clojure_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221348_p_ci_templates_crystal_weekly.yml b/config/metrics/counts_7d/20210901221348_p_ci_templates_crystal_weekly.yml
index 64568f2cb2a..998108ab6a2 100644
--- a/config/metrics/counts_7d/20210901221348_p_ci_templates_crystal_weekly.yml
+++ b/config/metrics/counts_7d/20210901221348_p_ci_templates_crystal_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_crystal_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221357_p_ci_templates_getting_started_weekly.yml b/config/metrics/counts_7d/20210901221357_p_ci_templates_getting_started_weekly.yml
index cff2a754e31..d2ea802e4ba 100644
--- a/config/metrics/counts_7d/20210901221357_p_ci_templates_getting_started_weekly.yml
+++ b/config/metrics/counts_7d/20210901221357_p_ci_templates_getting_started_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_getting_started_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221405_p_ci_templates_code_quality_weekly.yml b/config/metrics/counts_7d/20210901221405_p_ci_templates_code_quality_weekly.yml
index 2748bd1c01b..d5f1e82d1a8 100644
--- a/config/metrics/counts_7d/20210901221405_p_ci_templates_code_quality_weekly.yml
+++ b/config/metrics/counts_7d/20210901221405_p_ci_templates_code_quality_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_code_quality_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml
index 6582538f56f..a4d44d7fce9 100644
--- a/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901221414_p_ci_templates_verify_load_performance_testing_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_load_performance_testing_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml b/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml
index cfc5e049149..d2b322d190f 100644
--- a/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml
+++ b/config/metrics/counts_7d/20210901221423_p_ci_templates_verify_accessibility_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_accessibility_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml b/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml
index 4423e8c9c31..1c2eca52d1d 100644
--- a/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml
+++ b/config/metrics/counts_7d/20210901221432_p_ci_templates_verify_failfast_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_failfast_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml b/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml
index e11332f34f2..9e53727c006 100644
--- a/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml
+++ b/config/metrics/counts_7d/20210901221440_p_ci_templates_verify_browser_performance_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_browser_performance_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml b/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml
index ac1abc043c4..9458a487c6f 100644
--- a/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901221449_p_ci_templates_verify_browser_performance_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_verify_browser_performance_latest_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221458_p_ci_templates_grails_weekly.yml b/config/metrics/counts_7d/20210901221458_p_ci_templates_grails_weekly.yml
index 8974e423365..337d661217b 100644
--- a/config/metrics/counts_7d/20210901221458_p_ci_templates_grails_weekly.yml
+++ b/config/metrics/counts_7d/20210901221458_p_ci_templates_grails_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_grails_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221507_p_ci_templates_security_dast_runner_validation_weekly.yml b/config/metrics/counts_7d/20210901221507_p_ci_templates_security_dast_runner_validation_weekly.yml
index 25ec4f7fc36..1afa26eaa8f 100644
--- a/config/metrics/counts_7d/20210901221507_p_ci_templates_security_dast_runner_validation_weekly.yml
+++ b/config/metrics/counts_7d/20210901221507_p_ci_templates_security_dast_runner_validation_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_dast_runner_validation_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221516_p_ci_templates_security_dast_on_demand_scan_weekly.yml b/config/metrics/counts_7d/20210901221516_p_ci_templates_security_dast_on_demand_scan_weekly.yml
index 1dcb61b9650..390ac73c23a 100644
--- a/config/metrics/counts_7d/20210901221516_p_ci_templates_security_dast_on_demand_scan_weekly.yml
+++ b/config/metrics/counts_7d/20210901221516_p_ci_templates_security_dast_on_demand_scan_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_dast_on_demand_scan_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221525_p_ci_templates_security_license_scanning_weekly.yml b/config/metrics/counts_7d/20210901221525_p_ci_templates_security_license_scanning_weekly.yml
index b42912129e8..85135d5cdb6 100644
--- a/config/metrics/counts_7d/20210901221525_p_ci_templates_security_license_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901221525_p_ci_templates_security_license_scanning_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_license_scanning_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221534_p_ci_templates_security_coverage_fuzzing_weekly.yml b/config/metrics/counts_7d/20210901221534_p_ci_templates_security_coverage_fuzzing_weekly.yml
index 7a480a7772b..44b93d4350e 100644
--- a/config/metrics/counts_7d/20210901221534_p_ci_templates_security_coverage_fuzzing_weekly.yml
+++ b/config/metrics/counts_7d/20210901221534_p_ci_templates_security_coverage_fuzzing_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_coverage_fuzzing_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221542_p_ci_templates_security_api_fuzzing_latest_weekly.yml b/config/metrics/counts_7d/20210901221542_p_ci_templates_security_api_fuzzing_latest_weekly.yml
index 73fb45d6ed6..f116ffd2695 100644
--- a/config/metrics/counts_7d/20210901221542_p_ci_templates_security_api_fuzzing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901221542_p_ci_templates_security_api_fuzzing_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_api_fuzzing_latest_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml b/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml
index fcd5111a50e..ede1e0fb8c8 100644
--- a/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml
+++ b/config/metrics/counts_7d/20210901221551_p_ci_templates_security_secure_binaries_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_secure_binaries_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221600_p_ci_templates_security_dast_api_weekly.yml b/config/metrics/counts_7d/20210901221600_p_ci_templates_security_dast_api_weekly.yml
index ee303567195..557e0b0e7eb 100644
--- a/config/metrics/counts_7d/20210901221600_p_ci_templates_security_dast_api_weekly.yml
+++ b/config/metrics/counts_7d/20210901221600_p_ci_templates_security_dast_api_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_dast_api_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221609_p_ci_templates_security_container_scanning_weekly.yml b/config/metrics/counts_7d/20210901221609_p_ci_templates_security_container_scanning_weekly.yml
index 0c75d6c20c7..97a251657fb 100644
--- a/config/metrics/counts_7d/20210901221609_p_ci_templates_security_container_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901221609_p_ci_templates_security_container_scanning_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_container_scanning_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221618_p_ci_templates_security_dast_latest_weekly.yml b/config/metrics/counts_7d/20210901221618_p_ci_templates_security_dast_latest_weekly.yml
index 86d6a9b9329..9403485a841 100644
--- a/config/metrics/counts_7d/20210901221618_p_ci_templates_security_dast_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901221618_p_ci_templates_security_dast_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_dast_latest_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221627_p_ci_templates_security_dependency_scanning_weekly.yml b/config/metrics/counts_7d/20210901221627_p_ci_templates_security_dependency_scanning_weekly.yml
index dc58b9c39e4..2ffd6585bcb 100644
--- a/config/metrics/counts_7d/20210901221627_p_ci_templates_security_dependency_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901221627_p_ci_templates_security_dependency_scanning_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_dependency_scanning_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221636_p_ci_templates_security_api_fuzzing_weekly.yml b/config/metrics/counts_7d/20210901221636_p_ci_templates_security_api_fuzzing_weekly.yml
index 80a223e83c5..5da1c0bbc74 100644
--- a/config/metrics/counts_7d/20210901221636_p_ci_templates_security_api_fuzzing_weekly.yml
+++ b/config/metrics/counts_7d/20210901221636_p_ci_templates_security_api_fuzzing_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_api_fuzzing_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221645_p_ci_templates_security_dast_weekly.yml b/config/metrics/counts_7d/20210901221645_p_ci_templates_security_dast_weekly.yml
index 5a43aa506d9..b4a0540997f 100644
--- a/config/metrics/counts_7d/20210901221645_p_ci_templates_security_dast_weekly.yml
+++ b/config/metrics/counts_7d/20210901221645_p_ci_templates_security_dast_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_dast_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml b/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml
index 2d8f8dd3a6b..f053c319563 100644
--- a/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_cluster_image_scanning_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: composition_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210901221703_p_ci_templates_ios_fastlane_weekly.yml b/config/metrics/counts_7d/20210901221703_p_ci_templates_ios_fastlane_weekly.yml
index adef872d9e7..8867a365a5d 100644
--- a/config/metrics/counts_7d/20210901221703_p_ci_templates_ios_fastlane_weekly.yml
+++ b/config/metrics/counts_7d/20210901221703_p_ci_templates_ios_fastlane_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_ios_fastlane_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221712_p_ci_templates_composer_weekly.yml b/config/metrics/counts_7d/20210901221712_p_ci_templates_composer_weekly.yml
index a2402806f7b..ad0468fae1e 100644
--- a/config/metrics/counts_7d/20210901221712_p_ci_templates_composer_weekly.yml
+++ b/config/metrics/counts_7d/20210901221712_p_ci_templates_composer_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_composer_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221722_p_ci_templates_c_weekly.yml b/config/metrics/counts_7d/20210901221722_p_ci_templates_c_weekly.yml
index 16f00e7c92e..9475cf06b12 100644
--- a/config/metrics/counts_7d/20210901221722_p_ci_templates_c_weekly.yml
+++ b/config/metrics/counts_7d/20210901221722_p_ci_templates_c_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_c_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221731_p_ci_templates_python_weekly.yml b/config/metrics/counts_7d/20210901221731_p_ci_templates_python_weekly.yml
index 2e3f8c06c05..7dc37fe7587 100644
--- a/config/metrics/counts_7d/20210901221731_p_ci_templates_python_weekly.yml
+++ b/config/metrics/counts_7d/20210901221731_p_ci_templates_python_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_python_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221740_p_ci_templates_android_fastlane_weekly.yml b/config/metrics/counts_7d/20210901221740_p_ci_templates_android_fastlane_weekly.yml
index 2dc6206580c..d3c27e20f46 100644
--- a/config/metrics/counts_7d/20210901221740_p_ci_templates_android_fastlane_weekly.yml
+++ b/config/metrics/counts_7d/20210901221740_p_ci_templates_android_fastlane_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_android_fastlane_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221749_p_ci_templates_django_weekly.yml b/config/metrics/counts_7d/20210901221749_p_ci_templates_django_weekly.yml
index 5be4a9da661..f3bcb9e4292 100644
--- a/config/metrics/counts_7d/20210901221749_p_ci_templates_django_weekly.yml
+++ b/config/metrics/counts_7d/20210901221749_p_ci_templates_django_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_django_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221758_p_ci_templates_maven_weekly.yml b/config/metrics/counts_7d/20210901221758_p_ci_templates_maven_weekly.yml
index 14bfb180c72..a67100bef77 100644
--- a/config/metrics/counts_7d/20210901221758_p_ci_templates_maven_weekly.yml
+++ b/config/metrics/counts_7d/20210901221758_p_ci_templates_maven_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_maven_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221807_p_ci_templates_flutter_weekly.yml b/config/metrics/counts_7d/20210901221807_p_ci_templates_flutter_weekly.yml
index bbc999b5d42..d160e262103 100644
--- a/config/metrics/counts_7d/20210901221807_p_ci_templates_flutter_weekly.yml
+++ b/config/metrics/counts_7d/20210901221807_p_ci_templates_flutter_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_flutter_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221817_p_ci_templates_workflows_branch_pipelines_weekly.yml b/config/metrics/counts_7d/20210901221817_p_ci_templates_workflows_branch_pipelines_weekly.yml
index b67e7f7d219..c0bd6323d93 100644
--- a/config/metrics/counts_7d/20210901221817_p_ci_templates_workflows_branch_pipelines_weekly.yml
+++ b/config/metrics/counts_7d/20210901221817_p_ci_templates_workflows_branch_pipelines_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_workflows_branch_pipelines_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221826_p_ci_templates_workflows_mergerequest_pipelines_weekly.yml b/config/metrics/counts_7d/20210901221826_p_ci_templates_workflows_mergerequest_pipelines_weekly.yml
index 3301cf81dd9..d6b10d94e5b 100644
--- a/config/metrics/counts_7d/20210901221826_p_ci_templates_workflows_mergerequest_pipelines_weekly.yml
+++ b/config/metrics/counts_7d/20210901221826_p_ci_templates_workflows_mergerequest_pipelines_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_workflows_mergerequest_pipelines_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221836_p_ci_templates_laravel_weekly.yml b/config/metrics/counts_7d/20210901221836_p_ci_templates_laravel_weekly.yml
index 6e46fae4775..d2bc798bc14 100644
--- a/config/metrics/counts_7d/20210901221836_p_ci_templates_laravel_weekly.yml
+++ b/config/metrics/counts_7d/20210901221836_p_ci_templates_laravel_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_laravel_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml b/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml
index 65f9c7f07b1..a4dd1c97395 100644
--- a/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml
+++ b/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_managed_cluster_applications_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: environments
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210901221853_p_ci_templates_php_weekly.yml b/config/metrics/counts_7d/20210901221853_p_ci_templates_php_weekly.yml
index d3094b7bdbe..fa3c681f45a 100644
--- a/config/metrics/counts_7d/20210901221853_p_ci_templates_php_weekly.yml
+++ b/config/metrics/counts_7d/20210901221853_p_ci_templates_php_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_php_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221902_p_ci_templates_packer_weekly.yml b/config/metrics/counts_7d/20210901221902_p_ci_templates_packer_weekly.yml
index 9c9250d7dc3..0dd71b62405 100644
--- a/config/metrics/counts_7d/20210901221902_p_ci_templates_packer_weekly.yml
+++ b/config/metrics/counts_7d/20210901221902_p_ci_templates_packer_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_packer_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221910_p_ci_templates_terraform_weekly.yml b/config/metrics/counts_7d/20210901221910_p_ci_templates_terraform_weekly.yml
index 4f02165f6cc..d581a6fc727 100644
--- a/config/metrics/counts_7d/20210901221910_p_ci_templates_terraform_weekly.yml
+++ b/config/metrics/counts_7d/20210901221910_p_ci_templates_terraform_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221919_p_ci_templates_mono_weekly.yml b/config/metrics/counts_7d/20210901221919_p_ci_templates_mono_weekly.yml
index ffb3b150ce5..8d4d0284261 100644
--- a/config/metrics/counts_7d/20210901221919_p_ci_templates_mono_weekly.yml
+++ b/config/metrics/counts_7d/20210901221919_p_ci_templates_mono_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_mono_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml b/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml
index 90a645d51bd..5718d6fa63f 100644
--- a/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml
+++ b/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_serverless_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210901221936_p_ci_templates_go_weekly.yml b/config/metrics/counts_7d/20210901221936_p_ci_templates_go_weekly.yml
index 83691c6c41b..7621ef26e3b 100644
--- a/config/metrics/counts_7d/20210901221936_p_ci_templates_go_weekly.yml
+++ b/config/metrics/counts_7d/20210901221936_p_ci_templates_go_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_go_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221945_p_ci_templates_scala_weekly.yml b/config/metrics/counts_7d/20210901221945_p_ci_templates_scala_weekly.yml
index 890681f824c..986cbe84d63 100644
--- a/config/metrics/counts_7d/20210901221945_p_ci_templates_scala_weekly.yml
+++ b/config/metrics/counts_7d/20210901221945_p_ci_templates_scala_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_scala_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901221954_p_ci_templates_latex_weekly.yml b/config/metrics/counts_7d/20210901221954_p_ci_templates_latex_weekly.yml
index bed299a0ca3..cfdccb4747e 100644
--- a/config/metrics/counts_7d/20210901221954_p_ci_templates_latex_weekly.yml
+++ b/config/metrics/counts_7d/20210901221954_p_ci_templates_latex_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_latex_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222003_p_ci_templates_android_weekly.yml b/config/metrics/counts_7d/20210901222003_p_ci_templates_android_weekly.yml
index 0d257db8c94..bf08ef41aee 100644
--- a/config/metrics/counts_7d/20210901222003_p_ci_templates_android_weekly.yml
+++ b/config/metrics/counts_7d/20210901222003_p_ci_templates_android_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_android_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222011_p_ci_templates_indeni_cloudrail_weekly.yml b/config/metrics/counts_7d/20210901222011_p_ci_templates_indeni_cloudrail_weekly.yml
index 32fbe076d2b..2cb4cb1b966 100644
--- a/config/metrics/counts_7d/20210901222011_p_ci_templates_indeni_cloudrail_weekly.yml
+++ b/config/metrics/counts_7d/20210901222011_p_ci_templates_indeni_cloudrail_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_indeni_cloudrail_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222020_p_ci_templates_deploy_ecs_weekly.yml b/config/metrics/counts_7d/20210901222020_p_ci_templates_deploy_ecs_weekly.yml
index e28c57cff30..dac8c1aa907 100644
--- a/config/metrics/counts_7d/20210901222020_p_ci_templates_deploy_ecs_weekly.yml
+++ b/config/metrics/counts_7d/20210901222020_p_ci_templates_deploy_ecs_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_deploy_ecs_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222029_p_ci_templates_aws_cf_provision_and_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210901222029_p_ci_templates_aws_cf_provision_and_deploy_ec2_weekly.yml
index dd7aa51fa52..16f507f4be0 100644
--- a/config/metrics/counts_7d/20210901222029_p_ci_templates_aws_cf_provision_and_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210901222029_p_ci_templates_aws_cf_provision_and_deploy_ec2_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_cf_provision_and_deploy_ec2_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222038_p_ci_templates_gradle_weekly.yml b/config/metrics/counts_7d/20210901222038_p_ci_templates_gradle_weekly.yml
index 4fda25715ae..af0d9f350a1 100644
--- a/config/metrics/counts_7d/20210901222038_p_ci_templates_gradle_weekly.yml
+++ b/config/metrics/counts_7d/20210901222038_p_ci_templates_gradle_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_gradle_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222046_p_ci_templates_chef_weekly.yml b/config/metrics/counts_7d/20210901222046_p_ci_templates_chef_weekly.yml
index cd0aafc126e..89d02de9a42 100644
--- a/config/metrics/counts_7d/20210901222046_p_ci_templates_chef_weekly.yml
+++ b/config/metrics/counts_7d/20210901222046_p_ci_templates_chef_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_chef_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222055_p_ci_templates_jobs_dast_default_branch_deploy_weekly.yml b/config/metrics/counts_7d/20210901222055_p_ci_templates_jobs_dast_default_branch_deploy_weekly.yml
index e1855908914..bb5408b3e0a 100644
--- a/config/metrics/counts_7d/20210901222055_p_ci_templates_jobs_dast_default_branch_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210901222055_p_ci_templates_jobs_dast_default_branch_deploy_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_dast_default_branch_deploy_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml
index 5d91d52b3ab..81bb3ecaaca 100644
--- a/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901222104_p_ci_templates_jobs_load_performance_testing_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_load_performance_testing_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222113_p_ci_templates_jobs_helm_2to3_weekly.yml b/config/metrics/counts_7d/20210901222113_p_ci_templates_jobs_helm_2to3_weekly.yml
index dacce37d1c8..5a2b48efb58 100644
--- a/config/metrics/counts_7d/20210901222113_p_ci_templates_jobs_helm_2to3_weekly.yml
+++ b/config/metrics/counts_7d/20210901222113_p_ci_templates_jobs_helm_2to3_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_helm_2to3_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222122_p_ci_templates_jobs_sast_weekly.yml b/config/metrics/counts_7d/20210901222122_p_ci_templates_jobs_sast_weekly.yml
index b7d31eae4e2..5c506c9e5b4 100644
--- a/config/metrics/counts_7d/20210901222122_p_ci_templates_jobs_sast_weekly.yml
+++ b/config/metrics/counts_7d/20210901222122_p_ci_templates_jobs_sast_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_sast_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml b/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml
index dbcab54cc69..dcfc5fc6cb5 100644
--- a/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml
+++ b/config/metrics/counts_7d/20210901222131_p_ci_templates_jobs_secret_detection_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_secret_detection_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222139_p_ci_templates_jobs_code_intelligence_weekly.yml b/config/metrics/counts_7d/20210901222139_p_ci_templates_jobs_code_intelligence_weekly.yml
index 1e2624484f5..d7679e4c900 100644
--- a/config/metrics/counts_7d/20210901222139_p_ci_templates_jobs_code_intelligence_weekly.yml
+++ b/config/metrics/counts_7d/20210901222139_p_ci_templates_jobs_code_intelligence_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_code_intelligence_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222148_p_ci_templates_jobs_code_quality_weekly.yml b/config/metrics/counts_7d/20210901222148_p_ci_templates_jobs_code_quality_weekly.yml
index ae24b124c4c..41e1e052863 100644
--- a/config/metrics/counts_7d/20210901222148_p_ci_templates_jobs_code_quality_weekly.yml
+++ b/config/metrics/counts_7d/20210901222148_p_ci_templates_jobs_code_quality_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_code_quality_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222157_p_ci_templates_jobs_deploy_ecs_weekly.yml b/config/metrics/counts_7d/20210901222157_p_ci_templates_jobs_deploy_ecs_weekly.yml
index d7da3276218..2e3ea3b85b1 100644
--- a/config/metrics/counts_7d/20210901222157_p_ci_templates_jobs_deploy_ecs_weekly.yml
+++ b/config/metrics/counts_7d/20210901222157_p_ci_templates_jobs_deploy_ecs_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_deploy_ecs_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222206_p_ci_templates_jobs_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210901222206_p_ci_templates_jobs_deploy_ec2_weekly.yml
index d88513d22c9..c5269ce858b 100644
--- a/config/metrics/counts_7d/20210901222206_p_ci_templates_jobs_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210901222206_p_ci_templates_jobs_deploy_ec2_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_deploy_ec2_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222215_p_ci_templates_jobs_deploy_weekly.yml b/config/metrics/counts_7d/20210901222215_p_ci_templates_jobs_deploy_weekly.yml
index 0bb6706247a..d398c128913 100644
--- a/config/metrics/counts_7d/20210901222215_p_ci_templates_jobs_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210901222215_p_ci_templates_jobs_deploy_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_deploy_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222224_p_ci_templates_jobs_build_weekly.yml b/config/metrics/counts_7d/20210901222224_p_ci_templates_jobs_build_weekly.yml
index 0f46f74fb99..05dbfae6352 100644
--- a/config/metrics/counts_7d/20210901222224_p_ci_templates_jobs_build_weekly.yml
+++ b/config/metrics/counts_7d/20210901222224_p_ci_templates_jobs_build_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_build_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml
index 1e3e19895f8..b6e551bb741 100644
--- a/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901222233_p_ci_templates_jobs_browser_performance_testing_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_browser_performance_testing_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222242_p_ci_templates_jobs_test_weekly.yml b/config/metrics/counts_7d/20210901222242_p_ci_templates_jobs_test_weekly.yml
index 1a664b1d32d..963cb7457e8 100644
--- a/config/metrics/counts_7d/20210901222242_p_ci_templates_jobs_test_weekly.yml
+++ b/config/metrics/counts_7d/20210901222242_p_ci_templates_jobs_test_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_test_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222251_p_ci_templates_jobs_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210901222251_p_ci_templates_jobs_deploy_latest_weekly.yml
index 4ac616a4f46..9066f9d2b17 100644
--- a/config/metrics/counts_7d/20210901222251_p_ci_templates_jobs_deploy_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901222251_p_ci_templates_jobs_deploy_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_deploy_latest_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml b/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml
index 7e7b3225966..719da2298a5 100644
--- a/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901222300_p_ci_templates_jobs_browser_performance_testing_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_browser_performance_testing_latest_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222309_p_ci_templates_jobs_cf_provision_weekly.yml b/config/metrics/counts_7d/20210901222309_p_ci_templates_jobs_cf_provision_weekly.yml
index bcca4d944e8..1a3c064828e 100644
--- a/config/metrics/counts_7d/20210901222309_p_ci_templates_jobs_cf_provision_weekly.yml
+++ b/config/metrics/counts_7d/20210901222309_p_ci_templates_jobs_cf_provision_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_cf_provision_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222318_p_ci_templates_jobs_build_latest_weekly.yml b/config/metrics/counts_7d/20210901222318_p_ci_templates_jobs_build_latest_weekly.yml
index 8f5c17a9676..e5e75ffe9f0 100644
--- a/config/metrics/counts_7d/20210901222318_p_ci_templates_jobs_build_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901222318_p_ci_templates_jobs_build_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_build_latest_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222327_p_ci_templates_terraform_latest_weekly.yml b/config/metrics/counts_7d/20210901222327_p_ci_templates_terraform_latest_weekly.yml
index 2ca8d6a4047..0a5ae3bf5a0 100644
--- a/config/metrics/counts_7d/20210901222327_p_ci_templates_terraform_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901222327_p_ci_templates_terraform_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_latest_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222336_p_ci_templates_swift_weekly.yml b/config/metrics/counts_7d/20210901222336_p_ci_templates_swift_weekly.yml
index 51bb4741ef9..03fcb9e7453 100644
--- a/config/metrics/counts_7d/20210901222336_p_ci_templates_swift_weekly.yml
+++ b/config/metrics/counts_7d/20210901222336_p_ci_templates_swift_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_swift_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222703_p_ci_templates_pages_jekyll_weekly.yml b/config/metrics/counts_7d/20210901222703_p_ci_templates_pages_jekyll_weekly.yml
index affa3cf08a2..141182a81c3 100644
--- a/config/metrics/counts_7d/20210901222703_p_ci_templates_pages_jekyll_weekly.yml
+++ b/config/metrics/counts_7d/20210901222703_p_ci_templates_pages_jekyll_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_jekyll_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901222719_p_ci_templates_pages_harp_weekly.yml b/config/metrics/counts_7d/20210901222719_p_ci_templates_pages_harp_weekly.yml
index 2bf25c067ff..31714c0163b 100644
--- a/config/metrics/counts_7d/20210901222719_p_ci_templates_pages_harp_weekly.yml
+++ b/config/metrics/counts_7d/20210901222719_p_ci_templates_pages_harp_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_harp_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223156_p_ci_templates_pages_octopress_weekly.yml b/config/metrics/counts_7d/20210901223156_p_ci_templates_pages_octopress_weekly.yml
index 7e8949ba91b..f93d9ea6a11 100644
--- a/config/metrics/counts_7d/20210901223156_p_ci_templates_pages_octopress_weekly.yml
+++ b/config/metrics/counts_7d/20210901223156_p_ci_templates_pages_octopress_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_octopress_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223206_p_ci_templates_pages_brunch_weekly.yml b/config/metrics/counts_7d/20210901223206_p_ci_templates_pages_brunch_weekly.yml
index bf355db68aa..ab75ba8b12a 100644
--- a/config/metrics/counts_7d/20210901223206_p_ci_templates_pages_brunch_weekly.yml
+++ b/config/metrics/counts_7d/20210901223206_p_ci_templates_pages_brunch_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_brunch_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223215_p_ci_templates_pages_doxygen_weekly.yml b/config/metrics/counts_7d/20210901223215_p_ci_templates_pages_doxygen_weekly.yml
index ebe585286e1..e741ceda696 100644
--- a/config/metrics/counts_7d/20210901223215_p_ci_templates_pages_doxygen_weekly.yml
+++ b/config/metrics/counts_7d/20210901223215_p_ci_templates_pages_doxygen_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_doxygen_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223223_p_ci_templates_pages_hyde_weekly.yml b/config/metrics/counts_7d/20210901223223_p_ci_templates_pages_hyde_weekly.yml
index 7d2f731d86e..28993d10d31 100644
--- a/config/metrics/counts_7d/20210901223223_p_ci_templates_pages_hyde_weekly.yml
+++ b/config/metrics/counts_7d/20210901223223_p_ci_templates_pages_hyde_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_hyde_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223232_p_ci_templates_pages_lektor_weekly.yml b/config/metrics/counts_7d/20210901223232_p_ci_templates_pages_lektor_weekly.yml
index 74cc5f7c0bf..2098c74b757 100644
--- a/config/metrics/counts_7d/20210901223232_p_ci_templates_pages_lektor_weekly.yml
+++ b/config/metrics/counts_7d/20210901223232_p_ci_templates_pages_lektor_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_lektor_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223240_p_ci_templates_pages_jbake_weekly.yml b/config/metrics/counts_7d/20210901223240_p_ci_templates_pages_jbake_weekly.yml
index 1a200dfc046..bfe066fa514 100644
--- a/config/metrics/counts_7d/20210901223240_p_ci_templates_pages_jbake_weekly.yml
+++ b/config/metrics/counts_7d/20210901223240_p_ci_templates_pages_jbake_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_jbake_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223249_p_ci_templates_pages_hexo_weekly.yml b/config/metrics/counts_7d/20210901223249_p_ci_templates_pages_hexo_weekly.yml
index 05b35d11e29..e15d11ca2ab 100644
--- a/config/metrics/counts_7d/20210901223249_p_ci_templates_pages_hexo_weekly.yml
+++ b/config/metrics/counts_7d/20210901223249_p_ci_templates_pages_hexo_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_hexo_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223257_p_ci_templates_pages_middleman_weekly.yml b/config/metrics/counts_7d/20210901223257_p_ci_templates_pages_middleman_weekly.yml
index 295c72719a5..593512c8022 100644
--- a/config/metrics/counts_7d/20210901223257_p_ci_templates_pages_middleman_weekly.yml
+++ b/config/metrics/counts_7d/20210901223257_p_ci_templates_pages_middleman_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_middleman_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223306_p_ci_templates_pages_hugo_weekly.yml b/config/metrics/counts_7d/20210901223306_p_ci_templates_pages_hugo_weekly.yml
index 3277d73c606..bdef46156b4 100644
--- a/config/metrics/counts_7d/20210901223306_p_ci_templates_pages_hugo_weekly.yml
+++ b/config/metrics/counts_7d/20210901223306_p_ci_templates_pages_hugo_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_hugo_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223315_p_ci_templates_pages_pelican_weekly.yml b/config/metrics/counts_7d/20210901223315_p_ci_templates_pages_pelican_weekly.yml
index 34bd586207c..73cadc1f59d 100644
--- a/config/metrics/counts_7d/20210901223315_p_ci_templates_pages_pelican_weekly.yml
+++ b/config/metrics/counts_7d/20210901223315_p_ci_templates_pages_pelican_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_pelican_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223324_p_ci_templates_pages_nanoc_weekly.yml b/config/metrics/counts_7d/20210901223324_p_ci_templates_pages_nanoc_weekly.yml
index 91ae7e87ab7..34d1428d842 100644
--- a/config/metrics/counts_7d/20210901223324_p_ci_templates_pages_nanoc_weekly.yml
+++ b/config/metrics/counts_7d/20210901223324_p_ci_templates_pages_nanoc_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_nanoc_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223332_p_ci_templates_pages_swaggerui_weekly.yml b/config/metrics/counts_7d/20210901223332_p_ci_templates_pages_swaggerui_weekly.yml
index ca4d25437b5..6075653cb92 100644
--- a/config/metrics/counts_7d/20210901223332_p_ci_templates_pages_swaggerui_weekly.yml
+++ b/config/metrics/counts_7d/20210901223332_p_ci_templates_pages_swaggerui_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_swaggerui_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223341_p_ci_templates_pages_jigsaw_weekly.yml b/config/metrics/counts_7d/20210901223341_p_ci_templates_pages_jigsaw_weekly.yml
index 9572ccdcd63..194a2991ea8 100644
--- a/config/metrics/counts_7d/20210901223341_p_ci_templates_pages_jigsaw_weekly.yml
+++ b/config/metrics/counts_7d/20210901223341_p_ci_templates_pages_jigsaw_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_jigsaw_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223350_p_ci_templates_pages_metalsmith_weekly.yml b/config/metrics/counts_7d/20210901223350_p_ci_templates_pages_metalsmith_weekly.yml
index b7978a84f8c..ddfdb6c5899 100644
--- a/config/metrics/counts_7d/20210901223350_p_ci_templates_pages_metalsmith_weekly.yml
+++ b/config/metrics/counts_7d/20210901223350_p_ci_templates_pages_metalsmith_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_metalsmith_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223359_p_ci_templates_pages_gatsby_weekly.yml b/config/metrics/counts_7d/20210901223359_p_ci_templates_pages_gatsby_weekly.yml
index a8779e4d3dc..9ed63864df0 100644
--- a/config/metrics/counts_7d/20210901223359_p_ci_templates_pages_gatsby_weekly.yml
+++ b/config/metrics/counts_7d/20210901223359_p_ci_templates_pages_gatsby_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_gatsby_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223408_p_ci_templates_pages_html_weekly.yml b/config/metrics/counts_7d/20210901223408_p_ci_templates_pages_html_weekly.yml
index 66499a8ead6..d63d7f41dd7 100644
--- a/config/metrics/counts_7d/20210901223408_p_ci_templates_pages_html_weekly.yml
+++ b/config/metrics/counts_7d/20210901223408_p_ci_templates_pages_html_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_html_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223416_p_ci_templates_dart_weekly.yml b/config/metrics/counts_7d/20210901223416_p_ci_templates_dart_weekly.yml
index 2d029adb8d0..4da187737a1 100644
--- a/config/metrics/counts_7d/20210901223416_p_ci_templates_dart_weekly.yml
+++ b/config/metrics/counts_7d/20210901223416_p_ci_templates_dart_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_dart_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223425_p_ci_templates_docker_weekly.yml b/config/metrics/counts_7d/20210901223425_p_ci_templates_docker_weekly.yml
index 772c4cb0674..a03f666f29d 100644
--- a/config/metrics/counts_7d/20210901223425_p_ci_templates_docker_weekly.yml
+++ b/config/metrics/counts_7d/20210901223425_p_ci_templates_docker_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_docker_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223434_p_ci_templates_julia_weekly.yml b/config/metrics/counts_7d/20210901223434_p_ci_templates_julia_weekly.yml
index 9c44319336a..ccaae5af39a 100644
--- a/config/metrics/counts_7d/20210901223434_p_ci_templates_julia_weekly.yml
+++ b/config/metrics/counts_7d/20210901223434_p_ci_templates_julia_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_julia_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223443_p_ci_templates_npm_weekly.yml b/config/metrics/counts_7d/20210901223443_p_ci_templates_npm_weekly.yml
index 22a08586b23..1b4750dda46 100644
--- a/config/metrics/counts_7d/20210901223443_p_ci_templates_npm_weekly.yml
+++ b/config/metrics/counts_7d/20210901223443_p_ci_templates_npm_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_npm_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223452_p_ci_templates_dotnet_core_weekly.yml b/config/metrics/counts_7d/20210901223452_p_ci_templates_dotnet_core_weekly.yml
index a5a33b784ac..83ae87743ad 100644
--- a/config/metrics/counts_7d/20210901223452_p_ci_templates_dotnet_core_weekly.yml
+++ b/config/metrics/counts_7d/20210901223452_p_ci_templates_dotnet_core_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_dotnet_core_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223501_p_ci_templates_5_minute_production_app_weekly.yml b/config/metrics/counts_7d/20210901223501_p_ci_templates_5_minute_production_app_weekly.yml
index 187e9c85d4d..c8bbfb178ae 100644
--- a/config/metrics/counts_7d/20210901223501_p_ci_templates_5_minute_production_app_weekly.yml
+++ b/config/metrics/counts_7d/20210901223501_p_ci_templates_5_minute_production_app_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_5_minute_production_app_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223510_p_ci_templates_ruby_weekly.yml b/config/metrics/counts_7d/20210901223510_p_ci_templates_ruby_weekly.yml
index c46ffa16532..3f44d40daea 100644
--- a/config/metrics/counts_7d/20210901223510_p_ci_templates_ruby_weekly.yml
+++ b/config/metrics/counts_7d/20210901223510_p_ci_templates_ruby_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_ruby_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223519_p_ci_templates_implicit_jobs_dast_default_branch_deploy_weekly.yml b/config/metrics/counts_7d/20210901223519_p_ci_templates_implicit_jobs_dast_default_branch_deploy_weekly.yml
index 71ff82ebeaa..39b63d8c565 100644
--- a/config/metrics/counts_7d/20210901223519_p_ci_templates_implicit_jobs_dast_default_branch_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210901223519_p_ci_templates_implicit_jobs_dast_default_branch_deploy_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_dast_default_branch_deploy_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml
index 815a74875f5..f7c6aa8ddc5 100644
--- a/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223528_p_ci_templates_implicit_jobs_load_performance_testing_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_load_performance_testing_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210901223537_p_ci_templates_implicit_jobs_helm_2to3_weekly.yml b/config/metrics/counts_7d/20210901223537_p_ci_templates_implicit_jobs_helm_2to3_weekly.yml
index 257b8bc71e9..4e9537f24ad 100644
--- a/config/metrics/counts_7d/20210901223537_p_ci_templates_implicit_jobs_helm_2to3_weekly.yml
+++ b/config/metrics/counts_7d/20210901223537_p_ci_templates_implicit_jobs_helm_2to3_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_helm_2to3_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223546_p_ci_templates_implicit_jobs_sast_weekly.yml b/config/metrics/counts_7d/20210901223546_p_ci_templates_implicit_jobs_sast_weekly.yml
index 19624d13929..691125ca2e9 100644
--- a/config/metrics/counts_7d/20210901223546_p_ci_templates_implicit_jobs_sast_weekly.yml
+++ b/config/metrics/counts_7d/20210901223546_p_ci_templates_implicit_jobs_sast_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_sast_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223554_p_ci_templates_implicit_jobs_secret_detection_weekly.yml b/config/metrics/counts_7d/20210901223554_p_ci_templates_implicit_jobs_secret_detection_weekly.yml
index 5c0b53cf4b0..38fdab1ae2f 100644
--- a/config/metrics/counts_7d/20210901223554_p_ci_templates_implicit_jobs_secret_detection_weekly.yml
+++ b/config/metrics/counts_7d/20210901223554_p_ci_templates_implicit_jobs_secret_detection_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_secret_detection_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223603_p_ci_templates_implicit_jobs_code_intelligence_weekly.yml b/config/metrics/counts_7d/20210901223603_p_ci_templates_implicit_jobs_code_intelligence_weekly.yml
index ad2a68566ff..a15ca23533e 100644
--- a/config/metrics/counts_7d/20210901223603_p_ci_templates_implicit_jobs_code_intelligence_weekly.yml
+++ b/config/metrics/counts_7d/20210901223603_p_ci_templates_implicit_jobs_code_intelligence_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_code_intelligence_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223612_p_ci_templates_implicit_jobs_code_quality_weekly.yml b/config/metrics/counts_7d/20210901223612_p_ci_templates_implicit_jobs_code_quality_weekly.yml
index da9939db3d0..8046ac9692d 100644
--- a/config/metrics/counts_7d/20210901223612_p_ci_templates_implicit_jobs_code_quality_weekly.yml
+++ b/config/metrics/counts_7d/20210901223612_p_ci_templates_implicit_jobs_code_quality_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_code_quality_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223621_p_ci_templates_implicit_jobs_deploy_ecs_weekly.yml b/config/metrics/counts_7d/20210901223621_p_ci_templates_implicit_jobs_deploy_ecs_weekly.yml
index 23a198bcc22..bdc002d6723 100644
--- a/config/metrics/counts_7d/20210901223621_p_ci_templates_implicit_jobs_deploy_ecs_weekly.yml
+++ b/config/metrics/counts_7d/20210901223621_p_ci_templates_implicit_jobs_deploy_ecs_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_deploy_ecs_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: environments
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223630_p_ci_templates_implicit_jobs_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210901223630_p_ci_templates_implicit_jobs_deploy_ec2_weekly.yml
index a3c7c39dd7c..0e9e227b011 100644
--- a/config/metrics/counts_7d/20210901223630_p_ci_templates_implicit_jobs_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210901223630_p_ci_templates_implicit_jobs_deploy_ec2_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_deploy_ec2_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: environments
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml b/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml
index e068c986533..2e5a9f3a45d 100644
--- a/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223639_p_ci_templates_implicit_jobs_browser_performance_testing_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_browser_performance_testing_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223649_p_ci_templates_implicit_jobs_test_weekly.yml b/config/metrics/counts_7d/20210901223649_p_ci_templates_implicit_jobs_test_weekly.yml
index 0bb11912c12..49847cc71fc 100644
--- a/config/metrics/counts_7d/20210901223649_p_ci_templates_implicit_jobs_test_weekly.yml
+++ b/config/metrics/counts_7d/20210901223649_p_ci_templates_implicit_jobs_test_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_test_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml b/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml
index 6c97dfef370..c4a1906ded7 100644
--- a/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223658_p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_browser_performance_testing_latest_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml b/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml
index f46da353390..07314cc9a46 100644
--- a/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml
+++ b/config/metrics/counts_7d/20210901223707_p_ci_templates_implicit_jobs_cf_provision_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_cf_provision_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml b/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml
index 28b26758a90..86964253dba 100644
--- a/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223716_p_ci_templates_implicit_jobs_build_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_build_latest_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml b/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml
index 506a6ce589d..9df3e21bce6 100644
--- a/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml
+++ b/config/metrics/counts_7d/20210901223725_p_ci_templates_implicit_security_dast_runner_validation_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_dast_runner_validation_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml b/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml
index 8dcd4242cd0..b58748626a6 100644
--- a/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml
+++ b/config/metrics/counts_7d/20210901223735_p_ci_templates_implicit_security_dast_on_demand_scan_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_dast_on_demand_scan_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210901223744_p_ci_templates_implicit_security_license_scanning_weekly.yml b/config/metrics/counts_7d/20210901223744_p_ci_templates_implicit_security_license_scanning_weekly.yml
index 493f44626ca..eb8c3dfaceb 100644
--- a/config/metrics/counts_7d/20210901223744_p_ci_templates_implicit_security_license_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901223744_p_ci_templates_implicit_security_license_scanning_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_license_scanning_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml b/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml
index 96f03b7488f..ab9d5288f44 100644
--- a/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223753_p_ci_templates_implicit_security_coverage_fuzzing_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_coverage_fuzzing_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml b/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml
index 45c165f0b63..b4b3dfda114 100644
--- a/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223802_p_ci_templates_implicit_security_api_fuzzing_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_api_fuzzing_latest_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml b/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml
index fdbfb9407c1..b1d816d7a9c 100644
--- a/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml
+++ b/config/metrics/counts_7d/20210901223811_p_ci_templates_implicit_security_secure_binaries_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_secure_binaries_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: static_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml b/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml
index a36f7f91e82..d1d44c712f2 100644
--- a/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml
+++ b/config/metrics/counts_7d/20210901223819_p_ci_templates_implicit_security_dast_api_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_dast_api_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210901223828_p_ci_templates_implicit_security_container_scanning_weekly.yml b/config/metrics/counts_7d/20210901223828_p_ci_templates_implicit_security_container_scanning_weekly.yml
index d0028529cc3..d8ea5d396ad 100644
--- a/config/metrics/counts_7d/20210901223828_p_ci_templates_implicit_security_container_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901223828_p_ci_templates_implicit_security_container_scanning_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_container_scanning_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml b/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml
index 6ab56c68d3f..7648dddf712 100644
--- a/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210901223837_p_ci_templates_implicit_security_dast_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_dast_latest_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210901223845_p_ci_templates_implicit_security_dependency_scanning_weekly.yml b/config/metrics/counts_7d/20210901223845_p_ci_templates_implicit_security_dependency_scanning_weekly.yml
index f6ff0718228..127efa2b5cf 100644
--- a/config/metrics/counts_7d/20210901223845_p_ci_templates_implicit_security_dependency_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901223845_p_ci_templates_implicit_security_dependency_scanning_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_dependency_scanning_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: composition_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml b/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml
index 7c08c8616f0..1d7976dd216 100644
--- a/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml
+++ b/config/metrics/counts_7d/20210901223854_p_ci_templates_implicit_security_api_fuzzing_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_api_fuzzing_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210901223903_p_ci_templates_implicit_security_dast_weekly.yml b/config/metrics/counts_7d/20210901223903_p_ci_templates_implicit_security_dast_weekly.yml
index 3bbccdf30fa..ca7713f0e91 100644
--- a/config/metrics/counts_7d/20210901223903_p_ci_templates_implicit_security_dast_weekly.yml
+++ b/config/metrics/counts_7d/20210901223903_p_ci_templates_implicit_security_dast_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_dast_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: dynamic_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml b/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml
index 683ad000700..7c9785a4968 100644
--- a/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_cluster_image_scanning_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: composition_analysis
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210908093503_p_ci_templates_android_latest_weekly.yml b/config/metrics/counts_7d/20210908093503_p_ci_templates_android_latest_weekly.yml
index 88ff86a082b..e7e9fe55f30 100644
--- a/config/metrics/counts_7d/20210908093503_p_ci_templates_android_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210908093503_p_ci_templates_android_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_android_latest_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml b/config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml
index 4c625575c07..ed389f43a38 100644
--- a/config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml
+++ b/config/metrics/counts_7d/20210929102429_p_ci_templates_implicit_jobs_build_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_build_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml b/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml
index 703f2ce7dc2..c08e87ae7d1 100644
--- a/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml
+++ b/config/metrics/counts_7d/20210929102731_p_ci_templates_implicit_jobs_deploy_latest_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_deploy_latest_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: environments
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml b/config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml
index 59b1d2c0c87..fcbeacc4b91 100644
--- a/config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml
+++ b/config/metrics/counts_7d/20210929103006_p_ci_templates_implicit_jobs_deploy_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_deploy_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: environments
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20211109114948_i_quickactions_add_contacts_weekly.yml b/config/metrics/counts_7d/20211109114948_i_quickactions_add_contacts_weekly.yml
index 23843626b34..905444194c1 100644
--- a/config/metrics/counts_7d/20211109114948_i_quickactions_add_contacts_weekly.yml
+++ b/config/metrics/counts_7d/20211109114948_i_quickactions_add_contacts_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_add_contacts_weekly
 description: Count of WAU using the `/add_contacts` quick action
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml b/config/metrics/counts_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml
index 7560e92696f..bd405ba95e1 100644
--- a/config/metrics/counts_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml
+++ b/config/metrics/counts_7d/20211109120245_i_quickactions_remove_contacts_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_contacts_weekly
 description: Count of WAU using the `/remove_contacts` quick action
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml b/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml
index 2d863b3e3f3..813a715fbc7 100644
--- a/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml
+++ b/config/metrics/counts_7d/20220119153904_p_ci_templates_qualys_iac_security_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_qualys_iac_security_weekly
 description: ""
-product_section: ""
-product_stage: ""
 product_group: static_analysis
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml b/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml
index 8a0200f6bf3..822797a8bf1 100644
--- a/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml
+++ b/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_updating_work_item_title_weekly
 description: Unique users updating a work item's title
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml b/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml
index d5c0eb786a5..b80e911b8b1 100644
--- a/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml
+++ b/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_creating_work_items_weekly
 description: Unique users creating work items
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220222215851_xmau_plan.yml b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
index e80c220ba93..ce35f82dc8e 100644
--- a/config/metrics/counts_7d/20220222215851_xmau_plan.yml
+++ b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts_weekly.aggregated_metrics.xmau_plan
 description: Removed as duplicate was counts_weekly.aggregated_metrics.users_work_items
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
index 02d857761ac..5e22035e7fb 100644
--- a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
+++ b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts_weekly.aggregated_metrics.xmau_project_management
 description: Removed as duplicate was counts_weekly.aggregated_metrics.users_work_items
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20220222215855_users_work_items.yml b/config/metrics/counts_7d/20220222215855_users_work_items.yml
index 2f83f469a5d..00072b58f2b 100644
--- a/config/metrics/counts_7d/20220222215855_users_work_items.yml
+++ b/config/metrics/counts_7d/20220222215855_users_work_items.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts_weekly.aggregated_metrics.users_work_items
 description: Unique users interacting with work items
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml b/config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml
index 6589f82ace3..1e5af37c961 100644
--- a/config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml
+++ b/config/metrics/counts_7d/20220307150854_p_ci_templates_database_liquibase_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_liquibase_weekly
 description: ""
-product_section: ""
-product_stage: ""
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml b/config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml
index aace87f773f..4281ddd172d 100644
--- a/config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml
+++ b/config/metrics/counts_7d/20220310184320_p_ci_templates_matlab_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_matlab_weekly
 description: ""
-product_section: ""
-product_stage: ""
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml b/config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml
index 4b4dd913647..e6b4061b9c5 100644
--- a/config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml
+++ b/config/metrics/counts_7d/20220407125901_p_ci_templates_themekit_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_themekit_weekly
 description: ''
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220707022758_users_updating_weight_estimate_weekly.yml b/config/metrics/counts_7d/20220707022758_users_updating_weight_estimate_weekly.yml
index 9c2272233fb..8f25d225018 100644
--- a/config/metrics/counts_7d/20220707022758_users_updating_weight_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20220707022758_users_updating_weight_estimate_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_updating_weight_estimate_weekly
 description: Unique users updating a work item's weight estimate
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220725201348_users_updating_work_item_dates_weekly.yml b/config/metrics/counts_7d/20220725201348_users_updating_work_item_dates_weekly.yml
index d9cf5c6fb15..03d363c26a4 100644
--- a/config/metrics/counts_7d/20220725201348_users_updating_work_item_dates_weekly.yml
+++ b/config/metrics/counts_7d/20220725201348_users_updating_work_item_dates_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_updating_work_item_dates_weekly
 description: Unique users updating a work item's date
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220727045311_i_code_review_merge_request_widget_terraform_expand_failed_weekly.yml b/config/metrics/counts_7d/20220727045311_i_code_review_merge_request_widget_terraform_expand_failed_weekly.yml
index 18488c3bc24..483a01dd988 100644
--- a/config/metrics/counts_7d/20220727045311_i_code_review_merge_request_widget_terraform_expand_failed_weekly.yml
+++ b/config/metrics/counts_7d/20220727045311_i_code_review_merge_request_widget_terraform_expand_failed_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_terraform_expand_failed_weekly
 description: The count of unique users (weekly) who expanded the Terraform widget extension while it is in its Failed state
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20220830104410_i_code_review_merge_request_widget_license_compliance_view_weekly.yml b/config/metrics/counts_7d/20220830104410_i_code_review_merge_request_widget_license_compliance_view_weekly.yml
index 6bbb544f64e..c066a925584 100644
--- a/config/metrics/counts_7d/20220830104410_i_code_review_merge_request_widget_license_compliance_view_weekly.yml
+++ b/config/metrics/counts_7d/20220830104410_i_code_review_merge_request_widget_license_compliance_view_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_license_compliance_view_weekly
 description: The count of unique users (weekly) who were able to see the License Compliance widget extension
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20220830104418_i_code_review_merge_request_widget_license_compliance_full_report_clicked_weekly.yml b/config/metrics/counts_7d/20220830104418_i_code_review_merge_request_widget_license_compliance_full_report_clicked_weekly.yml
index 6b0864b5df5..69bb8f914ab 100644
--- a/config/metrics/counts_7d/20220830104418_i_code_review_merge_request_widget_license_compliance_full_report_clicked_weekly.yml
+++ b/config/metrics/counts_7d/20220830104418_i_code_review_merge_request_widget_license_compliance_full_report_clicked_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_license_compliance_full_report_clicked_weekly
 description: The count of unique users (weekly) who clicked the Full Report button on the License Compliance widget extension
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20220830104424_i_code_review_merge_request_widget_license_compliance_expand_weekly.yml b/config/metrics/counts_7d/20220830104424_i_code_review_merge_request_widget_license_compliance_expand_weekly.yml
index 1c06a874f36..4c064f787dc 100644
--- a/config/metrics/counts_7d/20220830104424_i_code_review_merge_request_widget_license_compliance_expand_weekly.yml
+++ b/config/metrics/counts_7d/20220830104424_i_code_review_merge_request_widget_license_compliance_expand_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_license_compliance_expand_weekly
 description: The count of unique users (weekly) who expanded the License Compliance widget extension
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20220830104431_i_code_review_merge_request_widget_license_compliance_expand_success_weekly.yml b/config/metrics/counts_7d/20220830104431_i_code_review_merge_request_widget_license_compliance_expand_success_weekly.yml
index f4ab26ffbc5..fc950a6cc99 100644
--- a/config/metrics/counts_7d/20220830104431_i_code_review_merge_request_widget_license_compliance_expand_success_weekly.yml
+++ b/config/metrics/counts_7d/20220830104431_i_code_review_merge_request_widget_license_compliance_expand_success_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_license_compliance_expand_success_weekly
 description: The count of unique users (weekly) who expanded the License Compliance widget extension while it is in its Success state
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20220830104438_i_code_review_merge_request_widget_license_compliance_expand_warning_weekly.yml b/config/metrics/counts_7d/20220830104438_i_code_review_merge_request_widget_license_compliance_expand_warning_weekly.yml
index 91a08ce480f..7598a1f6552 100644
--- a/config/metrics/counts_7d/20220830104438_i_code_review_merge_request_widget_license_compliance_expand_warning_weekly.yml
+++ b/config/metrics/counts_7d/20220830104438_i_code_review_merge_request_widget_license_compliance_expand_warning_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_license_compliance_expand_warning_weekly
 description: The count of unique users (weekly) who expanded the License Compliance widget extension while it is in its Warning state
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20220830104446_i_code_review_merge_request_widget_license_compliance_expand_failed_weekly.yml b/config/metrics/counts_7d/20220830104446_i_code_review_merge_request_widget_license_compliance_expand_failed_weekly.yml
index 8dc64a66319..61c3b21a650 100644
--- a/config/metrics/counts_7d/20220830104446_i_code_review_merge_request_widget_license_compliance_expand_failed_weekly.yml
+++ b/config/metrics/counts_7d/20220830104446_i_code_review_merge_request_widget_license_compliance_expand_failed_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_license_compliance_expand_failed_weekly
 description: The count of unique users (weekly) who expanded the License Compliance widget extension while it is in its Failed state
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: removed
diff --git a/config/metrics/counts_7d/20220907032041_i_quickactions_ready_weekly.yml b/config/metrics/counts_7d/20220907032041_i_quickactions_ready_weekly.yml
index d3a774495b9..aea6e7a77b5 100644
--- a/config/metrics/counts_7d/20220907032041_i_quickactions_ready_weekly.yml
+++ b/config/metrics/counts_7d/20220907032041_i_quickactions_ready_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.project_management.i_quickactions_ready_weekly
 description: Count of WAU using the `/ready` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 data_source: redis_hll
diff --git a/config/metrics/counts_7d/20221007010950_users_updating_work_item_labels_weekly.yml b/config/metrics/counts_7d/20221007010950_users_updating_work_item_labels_weekly.yml
index 3f7ab5e152e..d3a26dfc2c9 100644
--- a/config/metrics/counts_7d/20221007010950_users_updating_work_item_labels_weekly.yml
+++ b/config/metrics/counts_7d/20221007010950_users_updating_work_item_labels_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_updating_work_item_labels_weekly
 description: Unique users updating a work item's labels
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20221031065930_users_updating_work_item_milestone_weekly.yml b/config/metrics/counts_7d/20221031065930_users_updating_work_item_milestone_weekly.yml
index 0d3e375fa83..6c9f52d18c6 100644
--- a/config/metrics/counts_7d/20221031065930_users_updating_work_item_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20221031065930_users_updating_work_item_milestone_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_updating_work_item_milestone_weekly
 description: Unique users updating a work item's milestone
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20221121115618_i_code_review_merge_request_widget_security_reports_view_weekly.yml b/config/metrics/counts_7d/20221121115618_i_code_review_merge_request_widget_security_reports_view_weekly.yml
index 9a7b2ae4b8c..ef304999b51 100644
--- a/config/metrics/counts_7d/20221121115618_i_code_review_merge_request_widget_security_reports_view_weekly.yml
+++ b/config/metrics/counts_7d/20221121115618_i_code_review_merge_request_widget_security_reports_view_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_view_weekly
 description: The count of unique users (weekly) who were able to see the Security Reports widget extension
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_expand_weekly.yml b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_expand_weekly.yml
index 02fb440839d..3b39d08aa0b 100644
--- a/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_expand_weekly.yml
+++ b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_expand_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_expand_weekly
 description: The count of unique users (weekly) who expanded the Security Reports widget extension
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly.yml b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly.yml
index 307022719ba..f2fd6d05b47 100644
--- a/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly.yml
+++ b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly
 description: The count of unique users (weekly) who clicked the Full Report button on the Security Reports widget extension
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20221121115620_i_code_review_merge_request_widget_security_reports_expand_success_weekly.yml b/config/metrics/counts_7d/20221121115620_i_code_review_merge_request_widget_security_reports_expand_success_weekly.yml
index 65962e2fd05..44563992bcb 100644
--- a/config/metrics/counts_7d/20221121115620_i_code_review_merge_request_widget_security_reports_expand_success_weekly.yml
+++ b/config/metrics/counts_7d/20221121115620_i_code_review_merge_request_widget_security_reports_expand_success_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_expand_success_weekly
 description: The count of unique users (weekly) who expanded the Security Reports widget extension while it is in its Success state
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_failed_weekly.yml b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_failed_weekly.yml
index 7dc18545ecf..f2f3e764ca5 100644
--- a/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_failed_weekly.yml
+++ b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_failed_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_expand_failed_weekly
 description: The count of unique users (weekly) who expanded the Security Reports widget extension while it is in its Failed state
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_warning_weekly.yml b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_warning_weekly.yml
index e42e0949b07..13f05b6eba8 100644
--- a/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_warning_weekly.yml
+++ b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_warning_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_expand_warning_weekly
 description: The count of unique users (weekly) who expanded the Security Reports widget extension while it is in its Warning state
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml b/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml
index d13732b61e3..4fe59d60577 100644
--- a/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml
+++ b/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_create_mr_weekly
 description: Count of unique merge requests created per week
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml b/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml
index 8ace22e91df..4c0651282cf 100644
--- a/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml
+++ b/config/metrics/counts_7d/20230105222224_g_project_management_issue_design_comments_removed_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_design_comments_removed_weekly
 description: Count of unique users per week who removed a comment on a design
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230420160441_i_quickactions_type_weekly.yml b/config/metrics/counts_7d/20230420160441_i_quickactions_type_weekly.yml
index 0e7e540885c..d30e9dde0f8 100644
--- a/config/metrics/counts_7d/20230420160441_i_quickactions_type_weekly.yml
+++ b/config/metrics/counts_7d/20230420160441_i_quickactions_type_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_type_weekly
 description: Count of MAU using the `/type` quick action
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230509085219_i_quickactions_blocked_by_weekly.yml b/config/metrics/counts_7d/20230509085219_i_quickactions_blocked_by_weekly.yml
index 1fb82a45976..9a776c02630 100644
--- a/config/metrics/counts_7d/20230509085219_i_quickactions_blocked_by_weekly.yml
+++ b/config/metrics/counts_7d/20230509085219_i_quickactions_blocked_by_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_blocked_by_weekly
 description: Count of MAU using the `/blocked_by` quick action
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230509090906_i_quickactions_blocks_weekly.yml b/config/metrics/counts_7d/20230509090906_i_quickactions_blocks_weekly.yml
index bb14f26dbe5..0d47297cfe2 100644
--- a/config/metrics/counts_7d/20230509090906_i_quickactions_blocks_weekly.yml
+++ b/config/metrics/counts_7d/20230509090906_i_quickactions_blocks_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_blocks_weekly
 description: Count of MAU using the `/blocks` quick action
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230527152358_p_ci_templates_pages_zola_weekly.yml b/config/metrics/counts_7d/20230527152358_p_ci_templates_pages_zola_weekly.yml
index 55788b5d118..a0769730a48 100644
--- a/config/metrics/counts_7d/20230527152358_p_ci_templates_pages_zola_weekly.yml
+++ b/config/metrics/counts_7d/20230527152358_p_ci_templates_pages_zola_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_zola_weekly
 description: Count of pipelines using the Zola Pages template
-product_section: ''
-product_stage: ''
 product_group: pipeline_authoring
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230606094621_i_quickactions_unlink_weekly.yml b/config/metrics/counts_7d/20230606094621_i_quickactions_unlink_weekly.yml
index 1fae5e95512..46a791d9951 100644
--- a/config/metrics/counts_7d/20230606094621_i_quickactions_unlink_weekly.yml
+++ b/config/metrics/counts_7d/20230606094621_i_quickactions_unlink_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_unlink_weekly
 description: Count of WAU using the `/unlink` quick action
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230607110346_i_quickactions_promote_to_weekly.yml b/config/metrics/counts_7d/20230607110346_i_quickactions_promote_to_weekly.yml
index 0f66a0d1796..ada66ca0485 100644
--- a/config/metrics/counts_7d/20230607110346_i_quickactions_promote_to_weekly.yml
+++ b/config/metrics/counts_7d/20230607110346_i_quickactions_promote_to_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_promote_to_weekly
 description: Count of WAU using the `/promote_to` quick action
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230607203256_i_user_jetbrains_bundled_api_request_weekly.yml b/config/metrics/counts_7d/20230607203256_i_user_jetbrains_bundled_api_request_weekly.yml
index 237190e386d..a0f97bb797d 100644
--- a/config/metrics/counts_7d/20230607203256_i_user_jetbrains_bundled_api_request_weekly.yml
+++ b/config/metrics/counts_7d/20230607203256_i_user_jetbrains_bundled_api_request_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_user_jetbrains_bundled_api_request_weekly
 description: Count of unique users per week who use the bundled GitLab plugin in JetBrains IDEs
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230628190349_user_visual_studio_api_request_weekly.yml b/config/metrics/counts_7d/20230628190349_user_visual_studio_api_request_weekly.yml
index d7df916c97c..dbf05d20783 100644
--- a/config/metrics/counts_7d/20230628190349_user_visual_studio_api_request_weekly.yml
+++ b/config/metrics/counts_7d/20230628190349_user_visual_studio_api_request_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_user_visual_studio_api_request_weekly
 description: Count of unique users per week who use the GitLab extension for Visual Studio
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230724140652_i_code_review_saved_replies_create_weekly.yml b/config/metrics/counts_7d/20230724140652_i_code_review_saved_replies_create_weekly.yml
index 4c3fb6c6e53..cad375b7480 100644
--- a/config/metrics/counts_7d/20230724140652_i_code_review_saved_replies_create_weekly.yml
+++ b/config/metrics/counts_7d/20230724140652_i_code_review_saved_replies_create_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_saved_replies_create_weekly
 description: Weekly count of unique users who create a saved comment reply
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230725194657_i_code_review_saved_replies_use_weekly.yml b/config/metrics/counts_7d/20230725194657_i_code_review_saved_replies_use_weekly.yml
index b2fde084b40..1a1960818c4 100644
--- a/config/metrics/counts_7d/20230725194657_i_code_review_saved_replies_use_weekly.yml
+++ b/config/metrics/counts_7d/20230725194657_i_code_review_saved_replies_use_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_saved_replies_use_weekly
 description: Number of unique users per week who use a saved reply
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230725222603_user_neovim_plugin_api_request_weekly.yml b/config/metrics/counts_7d/20230725222603_user_neovim_plugin_api_request_weekly.yml
index abe7720152d..4b8df962c9f 100644
--- a/config/metrics/counts_7d/20230725222603_user_neovim_plugin_api_request_weekly.yml
+++ b/config/metrics/counts_7d/20230725222603_user_neovim_plugin_api_request_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.editor_extensions.user_neovim_plugin_api_request_weekly
 description: Count of unique users per week who use the GitLab plugin for Neovim
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230809194743_i_code_review_saved_replies_use_in_mr_weekly.yml b/config/metrics/counts_7d/20230809194743_i_code_review_saved_replies_use_in_mr_weekly.yml
index 1722690aaa3..45eeaf54959 100644
--- a/config/metrics/counts_7d/20230809194743_i_code_review_saved_replies_use_in_mr_weekly.yml
+++ b/config/metrics/counts_7d/20230809194743_i_code_review_saved_replies_use_in_mr_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_saved_replies_use_in_mr_weekly
 description: Weekly unique users who used saved replies from an MR page
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230815171559_i_code_review_saved_replies_use_in_other_weekly.yml b/config/metrics/counts_7d/20230815171559_i_code_review_saved_replies_use_in_other_weekly.yml
index 2ffe3596224..b8e7de2b37f 100644
--- a/config/metrics/counts_7d/20230815171559_i_code_review_saved_replies_use_in_other_weekly.yml
+++ b/config/metrics/counts_7d/20230815171559_i_code_review_saved_replies_use_in_other_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_code_review_saved_replies_use_in_other_weekly
 description: Count of unique users who used the saved replies feature over a week
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230822210848_i_quickactions_checkin_reminder_weekly.yml b/config/metrics/counts_7d/20230822210848_i_quickactions_checkin_reminder_weekly.yml
index 5fa7c3ec559..ec63b8d6446 100644
--- a/config/metrics/counts_7d/20230822210848_i_quickactions_checkin_reminder_weekly.yml
+++ b/config/metrics/counts_7d/20230822210848_i_quickactions_checkin_reminder_weekly.yml
@@ -2,8 +2,6 @@
 key_path: redis_hll_counters.quickactions.i_quickactions_checkin_reminder_weekly
 name: quickactions_checkin_reminder_weekly
 description: Count of WAU using the `/checkin_reminder` quick action
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230922165258_i_quickactions_set_parent_weekly.yml b/config/metrics/counts_7d/20230922165258_i_quickactions_set_parent_weekly.yml
index dfd05f15cb3..f2789ae23ea 100644
--- a/config/metrics/counts_7d/20230922165258_i_quickactions_set_parent_weekly.yml
+++ b/config/metrics/counts_7d/20230922165258_i_quickactions_set_parent_weekly.yml
@@ -2,8 +2,6 @@
 key_path: redis_hll_counters.quickactions.i_quickactions_set_parent_weekly
 name: quickactions_set_parent_weekly
 description: Count of WAU using the `/set_parent` quick action
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20230927152525_i_quickactions_add_child_weekly.yml b/config/metrics/counts_7d/20230927152525_i_quickactions_add_child_weekly.yml
index 7476a452d8f..e3f06a037f4 100644
--- a/config/metrics/counts_7d/20230927152525_i_quickactions_add_child_weekly.yml
+++ b/config/metrics/counts_7d/20230927152525_i_quickactions_add_child_weekly.yml
@@ -2,8 +2,6 @@
 key_path: redis_hll_counters.quickactions.i_quickactions_add_child_weekly
 name: quickactions_add_child_weekly
 description: Count of WAU using the `/add_child` quick action
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20231102160653_i_quickactions_request_changes_weekly.yml b/config/metrics/counts_7d/20231102160653_i_quickactions_request_changes_weekly.yml
index e529dfd4e51..7641069da86 100644
--- a/config/metrics/counts_7d/20231102160653_i_quickactions_request_changes_weekly.yml
+++ b/config/metrics/counts_7d/20231102160653_i_quickactions_request_changes_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.quickactions.i_quickactions_request_changes_weekly
 description: Count using the `/request_changes` quick action on Merge Requests
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20231219135920_users_updating_work_item_todo_weekly.yml b/config/metrics/counts_7d/20231219135920_users_updating_work_item_todo_weekly.yml
index e1034fb47eb..32175597b61 100644
--- a/config/metrics/counts_7d/20231219135920_users_updating_work_item_todo_weekly.yml
+++ b/config/metrics/counts_7d/20231219135920_users_updating_work_item_todo_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.work_items.users_updating_work_item_todo_weekly
 description: Unique users marking a work item as todo.
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20240118133234_i_quickactions_remove_parent_weekly.yml b/config/metrics/counts_7d/20240118133234_i_quickactions_remove_parent_weekly.yml
index a0a2f4be402..7fa45bcab75 100644
--- a/config/metrics/counts_7d/20240118133234_i_quickactions_remove_parent_weekly.yml
+++ b/config/metrics/counts_7d/20240118133234_i_quickactions_remove_parent_weekly.yml
@@ -2,8 +2,6 @@
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_parent_weekly
 name: quickactions_remove_parent_weekly
 description: Count of WAU using the `/remove_parent` quick action
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20240208152528_i_quickactions_remove_child_weekly.yml b/config/metrics/counts_7d/20240208152528_i_quickactions_remove_child_weekly.yml
index b3c11a101d8..c8239523f35 100644
--- a/config/metrics/counts_7d/20240208152528_i_quickactions_remove_child_weekly.yml
+++ b/config/metrics/counts_7d/20240208152528_i_quickactions_remove_child_weekly.yml
@@ -2,8 +2,6 @@
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_child_weekly
 name: quickactions_remove_child_weekly
 description: Count of WAU using the `/remove_child` quick action
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/20240418165311_i_quickactions_remind_me_weekly.yml b/config/metrics/counts_7d/20240418165311_i_quickactions_remind_me_weekly.yml
index 10ef057c829..1be42960bb0 100644
--- a/config/metrics/counts_7d/20240418165311_i_quickactions_remind_me_weekly.yml
+++ b/config/metrics/counts_7d/20240418165311_i_quickactions_remind_me_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.code_review.i_quickactions_remind_me_weekly
 description: Count of WAU using the `/remind_me` quick action
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_7d/count_distinct_user_id_from_click_blame_control_on_blob_page_weekly.yml b/config/metrics/counts_7d/count_distinct_user_id_from_click_blame_control_on_blob_page_weekly.yml
index 9ad5bb85af0..a16524b707f 100644
--- a/config/metrics/counts_7d/count_distinct_user_id_from_click_blame_control_on_blob_page_weekly.yml
+++ b/config/metrics/counts_7d/count_distinct_user_id_from_click_blame_control_on_blob_page_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.count_distinct_user_id_from_click_blame_control_on_blob_page_weekly
 description: Weekly count of unique users who navigated from Blob to Blame page
-product_section: dev
-product_stage: create
 product_group: source_code
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_7d/count_distinct_user_id_from_click_chunk_blame_on_blob_page_weekly.yml b/config/metrics/counts_7d/count_distinct_user_id_from_click_chunk_blame_on_blob_page_weekly.yml
index 18475270e94..0bef9c318b9 100644
--- a/config/metrics/counts_7d/count_distinct_user_id_from_click_chunk_blame_on_blob_page_weekly.yml
+++ b/config/metrics/counts_7d/count_distinct_user_id_from_click_chunk_blame_on_blob_page_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.count_distinct_user_id_from_click_chunk_blame_on_blob_page_weekly
 description: Weekly count of unique users who navigated from specific line of code to its Blame page
-product_section: dev
-product_stage: create
 product_group: source_code
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_7d/count_distinct_user_id_from_click_comment_filter_toggle_bot_comments_in_mr_weekly.yml b/config/metrics/counts_7d/count_distinct_user_id_from_click_comment_filter_toggle_bot_comments_in_mr_weekly.yml
index 17e3c7bf3b8..19bdedb3e00 100644
--- a/config/metrics/counts_7d/count_distinct_user_id_from_click_comment_filter_toggle_bot_comments_in_mr_weekly.yml
+++ b/config/metrics/counts_7d/count_distinct_user_id_from_click_comment_filter_toggle_bot_comments_in_mr_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.count_distinct_user_id_from_click_comment_filter_toggle_bot_comments_in_mr_weekly
 description: Weekly count of unique users who toggled the bot comments option in the MR comment filter dropdown
-product_section: dev
-product_stage: create
 product_group: code_review
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_7d/count_distinct_user_id_from_click_comment_filter_toggle_user_comments_in_mr_weekly.yml b/config/metrics/counts_7d/count_distinct_user_id_from_click_comment_filter_toggle_user_comments_in_mr_weekly.yml
index 558a08398ac..4df7fd47a57 100644
--- a/config/metrics/counts_7d/count_distinct_user_id_from_click_comment_filter_toggle_user_comments_in_mr_weekly.yml
+++ b/config/metrics/counts_7d/count_distinct_user_id_from_click_comment_filter_toggle_user_comments_in_mr_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.count_distinct_user_id_from_click_comment_filter_toggle_user_comments_in_mr_weekly
 description: Weekly count of unique users who toggled the user comments option in the MR comment filter dropdown
-product_section: dev
-product_stage: create
 product_group: code_review
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_7d/count_distinct_user_id_from_click_history_control_on_blob_page_weekly.yml b/config/metrics/counts_7d/count_distinct_user_id_from_click_history_control_on_blob_page_weekly.yml
index 90d32983687..90f2299f4a0 100644
--- a/config/metrics/counts_7d/count_distinct_user_id_from_click_history_control_on_blob_page_weekly.yml
+++ b/config/metrics/counts_7d/count_distinct_user_id_from_click_history_control_on_blob_page_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.count_distinct_user_id_from_click_history_control_on_blob_page_weekly
 description: Weekly count of unique users who navigated from Blob to Commits page
-product_section: dev
-product_stage: create
 product_group: source_code
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_7d/count_distinct_user_id_from_click_previous_blame_on_blob_page_weekly.yml b/config/metrics/counts_7d/count_distinct_user_id_from_click_previous_blame_on_blob_page_weekly.yml
index ed032301984..53cd57c7260 100644
--- a/config/metrics/counts_7d/count_distinct_user_id_from_click_previous_blame_on_blob_page_weekly.yml
+++ b/config/metrics/counts_7d/count_distinct_user_id_from_click_previous_blame_on_blob_page_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.count_distinct_user_id_from_click_previous_blame_on_blob_page_weekly
 description: Weekly count of unique users who navigated from in-file Blame viewer to see prior changes on Blame page
-product_section: dev
-product_stage: create
 product_group: source_code
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_7d/count_distinct_user_id_from_click_ref_selector_on_blob_page_weekly.yml b/config/metrics/counts_7d/count_distinct_user_id_from_click_ref_selector_on_blob_page_weekly.yml
index b92efee6efd..e1394599c41 100644
--- a/config/metrics/counts_7d/count_distinct_user_id_from_click_ref_selector_on_blob_page_weekly.yml
+++ b/config/metrics/counts_7d/count_distinct_user_id_from_click_ref_selector_on_blob_page_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.count_distinct_user_id_from_click_ref_selector_on_blob_page_weekly
 description: Weekly count of unique users who changed Git revision on Blob page
-product_section: dev
-product_stage: create
 product_group: source_code
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_7d/count_distinct_user_id_from_open_blame_viewer_on_blob_page_weekly.yml b/config/metrics/counts_7d/count_distinct_user_id_from_open_blame_viewer_on_blob_page_weekly.yml
index 89a23a84d19..17623dc072f 100644
--- a/config/metrics/counts_7d/count_distinct_user_id_from_open_blame_viewer_on_blob_page_weekly.yml
+++ b/config/metrics/counts_7d/count_distinct_user_id_from_open_blame_viewer_on_blob_page_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.count_distinct_user_id_from_open_blame_viewer_on_blob_page_weekly
 description: Weekly count of unique users who viewed in-file Blame on Blob page
-product_section: dev
-product_stage: create
 product_group: source_code
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_7d/count_distinct_user_id_from_user_clicks_comment_filter_dropdown_weekly.yml b/config/metrics/counts_7d/count_distinct_user_id_from_user_clicks_comment_filter_dropdown_weekly.yml
index 05fa3679c93..7072a5af753 100644
--- a/config/metrics/counts_7d/count_distinct_user_id_from_user_clicks_comment_filter_dropdown_weekly.yml
+++ b/config/metrics/counts_7d/count_distinct_user_id_from_user_clicks_comment_filter_dropdown_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: redis_hll_counters.count_distinct_user_id_from_user_clicks_comment_filter_dropdown_weekly
 description: Weekly count of unique users who opened the MR comment filter dropdown
-product_section: dev
-product_stage: create
 product_group: code_review
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_7d/count_total_click_comment_filter_toggle_bot_comments_in_mr_weekly.yml b/config/metrics/counts_7d/count_total_click_comment_filter_toggle_bot_comments_in_mr_weekly.yml
index d2ce9672a2e..5ca466a7ae1 100644
--- a/config/metrics/counts_7d/count_total_click_comment_filter_toggle_bot_comments_in_mr_weekly.yml
+++ b/config/metrics/counts_7d/count_total_click_comment_filter_toggle_bot_comments_in_mr_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_click_comment_filter_toggle_bot_comments_in_mr_weekly
 description: Weekly count of times the bot comments option in the MR comment filter dropdown was toggled
-product_section: dev
-product_stage: create
 product_group: code_review
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_7d/count_total_click_comment_filter_toggle_user_comments_in_mr_weekly.yml b/config/metrics/counts_7d/count_total_click_comment_filter_toggle_user_comments_in_mr_weekly.yml
index b97d408792b..5cf1f572195 100644
--- a/config/metrics/counts_7d/count_total_click_comment_filter_toggle_user_comments_in_mr_weekly.yml
+++ b/config/metrics/counts_7d/count_total_click_comment_filter_toggle_user_comments_in_mr_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_click_comment_filter_toggle_user_comments_in_mr_weekly
 description: Weekly count of times the user comments option in the MR comment filter dropdown was toggled
-product_section: dev
-product_stage: create
 product_group: code_review
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_7d/count_total_merge_request_click_add_to_review_on_changes_tab_weekly.yml b/config/metrics/counts_7d/count_total_merge_request_click_add_to_review_on_changes_tab_weekly.yml
index d5b5b4d55e2..f828f92cf5b 100644
--- a/config/metrics/counts_7d/count_total_merge_request_click_add_to_review_on_changes_tab_weekly.yml
+++ b/config/metrics/counts_7d/count_total_merge_request_click_add_to_review_on_changes_tab_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_merge_request_click_add_to_review_on_changes_tab_weekly
 description: Weekly count of clicks on the Add to review button on the MR Changes tab
-product_section: dev
-product_stage: create
 product_group: code_review
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_7d/count_total_merge_request_click_add_to_review_on_overview_tab_weekly.yml b/config/metrics/counts_7d/count_total_merge_request_click_add_to_review_on_overview_tab_weekly.yml
index 77e3b1fdb44..5aed0ceb7a3 100644
--- a/config/metrics/counts_7d/count_total_merge_request_click_add_to_review_on_overview_tab_weekly.yml
+++ b/config/metrics/counts_7d/count_total_merge_request_click_add_to_review_on_overview_tab_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_merge_request_click_add_to_review_on_overview_tab_weekly
 description: Weekly count of clicks on the Add to review button on the MR Overview tab
-product_section: dev
-product_stage: create
 product_group: code_review
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_7d/count_total_merge_request_click_start_review_on_changes_tab_weekly.yml b/config/metrics/counts_7d/count_total_merge_request_click_start_review_on_changes_tab_weekly.yml
index cb258a2baaf..6f6a8ee319c 100644
--- a/config/metrics/counts_7d/count_total_merge_request_click_start_review_on_changes_tab_weekly.yml
+++ b/config/metrics/counts_7d/count_total_merge_request_click_start_review_on_changes_tab_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_merge_request_click_start_review_on_changes_tab_weekly
 description: Weekly count of clicks on the Start a Review button on the MR Changes tab
-product_section: dev
-product_stage: create
 product_group: code_review
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_7d/count_total_merge_request_click_start_review_on_overview_tab_weekly.yml b/config/metrics/counts_7d/count_total_merge_request_click_start_review_on_overview_tab_weekly.yml
index a546a6390b3..e07c128bf10 100644
--- a/config/metrics/counts_7d/count_total_merge_request_click_start_review_on_overview_tab_weekly.yml
+++ b/config/metrics/counts_7d/count_total_merge_request_click_start_review_on_overview_tab_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_merge_request_click_start_review_on_overview_tab_weekly
 description: Weekly count of clicks on the Start a Review button on the MR Overview tab
-product_section: dev
-product_stage: create
 product_group: code_review
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_7d/count_total_user_clicks_comment_filter_dropdown_weekly.yml b/config/metrics/counts_7d/count_total_user_clicks_comment_filter_dropdown_weekly.yml
index 7d40822ea0e..f5daff3c8a8 100644
--- a/config/metrics/counts_7d/count_total_user_clicks_comment_filter_dropdown_weekly.yml
+++ b/config/metrics/counts_7d/count_total_user_clicks_comment_filter_dropdown_weekly.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_user_clicks_comment_filter_dropdown_weekly
 description: Weekly count of times the MR comment filter dropdown is opened
-product_section: dev
-product_stage: create
 product_group: code_review
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_all/20210204124930_servers.yml b/config/metrics/counts_all/20210204124930_servers.yml
index 1b9898c4150..dcfe272f754 100644
--- a/config/metrics/counts_all/20210204124930_servers.yml
+++ b/config/metrics/counts_all/20210204124930_servers.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: gitaly.servers
 description: Total Gitalty Servers
-product_section: dev
-product_stage: create
 product_group: gitaly_cluster
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210204124932_clusters.yml b/config/metrics/counts_all/20210204124932_clusters.yml
index 6e8ca9adcda..44c0e911666 100644
--- a/config/metrics/counts_all/20210204124932_clusters.yml
+++ b/config/metrics/counts_all/20210204124932_clusters.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: gitaly.clusters
 description: Total GitLab Managed clusters both enabled and disabled
-product_section: dev
-product_stage: create
 product_group: gitaly_cluster
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175037_suggestions.yml b/config/metrics/counts_all/20210216175037_suggestions.yml
index 7a2aa8e3639..cf7a1d14342 100644
--- a/config/metrics/counts_all/20210216175037_suggestions.yml
+++ b/config/metrics/counts_all/20210216175037_suggestions.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.suggestions
 description: Count of all comments that contain suggested changes
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175039_merge_requests.yml b/config/metrics/counts_all/20210216175039_merge_requests.yml
index b9651ed0329..c4b4e465c56 100644
--- a/config/metrics/counts_all/20210216175039_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175039_merge_requests.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: counts.merge_requests
 description: Count of the number of merge requests
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175041_merge_request_comment.yml b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
index e069709db72..9b4d0e34696 100644
--- a/config/metrics/counts_all/20210216175041_merge_request_comment.yml
+++ b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.merge_request_comment
 description: Count of the number of merge request comments
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175043_merge_request_create.yml b/config/metrics/counts_all/20210216175043_merge_request_create.yml
index 471812eadfa..7eba13ca81e 100644
--- a/config/metrics/counts_all/20210216175043_merge_request_create.yml
+++ b/config/metrics/counts_all/20210216175043_merge_request_create.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.merge_request_create
 description: Count of the number of merge requests created
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216175045_merge_requests.yml b/config/metrics/counts_all/20210216175045_merge_requests.yml
index 16f70b8851b..8c7bc3a3ddb 100644
--- a/config/metrics/counts_all/20210216175045_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175045_merge_requests.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage.create.merge_requests
 description: Count of the number of users creating merge requests
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216175053_suggestions.yml b/config/metrics/counts_all/20210216175053_suggestions.yml
index 34b3ddb8976..31f244aaba0 100644
--- a/config/metrics/counts_all/20210216175053_suggestions.yml
+++ b/config/metrics/counts_all/20210216175053_suggestions.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage.create.suggestions
 description: Count of unique users who create suggestions in merge request comments
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216180239_personal_snippets.yml b/config/metrics/counts_all/20210216180239_personal_snippets.yml
index 872913c85bc..745dda2b3a8 100644
--- a/config/metrics/counts_all/20210216180239_personal_snippets.yml
+++ b/config/metrics/counts_all/20210216180239_personal_snippets.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.personal_snippets
 description: Count of personal Snippets
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180241_project_snippets.yml b/config/metrics/counts_all/20210216180241_project_snippets.yml
index 89adcbdf877..7ad6fac9c75 100644
--- a/config/metrics/counts_all/20210216180241_project_snippets.yml
+++ b/config/metrics/counts_all/20210216180241_project_snippets.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.project_snippets
 description: Count of project Snippets
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180242_web_ide_commits.yml b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
index a427d9840b8..5bb84da32a3 100644
--- a/config/metrics/counts_all/20210216180242_web_ide_commits.yml
+++ b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: counts.web_ide_commits
 description: Count of commits made from the Web IDE
-product_section: dev
-product_stage: create
 product_group: ide
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180244_web_ide_views.yml b/config/metrics/counts_all/20210216180244_web_ide_views.yml
index e5204e40753..bef15e4a6ce 100644
--- a/config/metrics/counts_all/20210216180244_web_ide_views.yml
+++ b/config/metrics/counts_all/20210216180244_web_ide_views.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.web_ide_views
 description: Count of views of the Web IDE
-product_section: dev
-product_stage: create
 product_group: ide
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
index 818456eefdc..06727af9112 100644
--- a/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.web_ide_merge_requests
 description: Count of merge requests created from the Web IDE
-product_section: dev
-product_stage: create
 product_group: ide
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180248_web_ide_previews.yml b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
index f0e36883650..6f4e20ca839 100644
--- a/config/metrics/counts_all/20210216180248_web_ide_previews.yml
+++ b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.web_ide_previews
 description: Count of Live Preview tab views in the Web IDE
-product_section: dev
-product_stage: create
 product_group: ide
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
index 9ed5ca63170..b2081aeaf0d 100644
--- a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
+++ b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.web_ide_terminals
 description: Count of Web Terminal tab views in the Web IDE
-product_section: dev
-product_stage: create
 product_group: ide
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
index 77519bd2f63..cf88b6b5b5e 100644
--- a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
+++ b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.web_ide_pipelines
 description: Count of Pipeline tab views in the Web IDE
-product_section: dev
-product_stage: create
 product_group: ide
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180253_snippet_comment.yml b/config/metrics/counts_all/20210216180253_snippet_comment.yml
index 1ed75891244..ad91cf51ef8 100644
--- a/config/metrics/counts_all/20210216180253_snippet_comment.yml
+++ b/config/metrics/counts_all/20210216180253_snippet_comment.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.snippet_comment
 description: Count of comments on Snippets
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180255_snippet_create.yml b/config/metrics/counts_all/20210216180255_snippet_create.yml
index e317928c2d5..3ad79060c23 100644
--- a/config/metrics/counts_all/20210216180255_snippet_create.yml
+++ b/config/metrics/counts_all/20210216180255_snippet_create.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.snippet_create
 description: Count of newly created Snippets
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180257_snippet_update.yml b/config/metrics/counts_all/20210216180257_snippet_update.yml
index 74636044419..0964f6a522b 100644
--- a/config/metrics/counts_all/20210216180257_snippet_update.yml
+++ b/config/metrics/counts_all/20210216180257_snippet_update.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.snippet_update
 description: Count of updates to existing Snippets
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180259_static_site_editor_views.yml b/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
index 42c23b60427..39d4c97639e 100644
--- a/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
+++ b/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.static_site_editor_views
 description: Count of Static Site Editor views
-product_section: dev
-product_stage: create
 product_group: ide
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
index 23deb11cb7e..2e66d69e170 100644
--- a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
+++ b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.static_site_editor_commits
 description: Count of commits created from the Static Site Editor
-product_section: dev
-product_stage: create
 product_group: ide
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml b/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
index 0bc6662c7b0..1f88c2b7679 100644
--- a/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.static_site_editor_merge_requests
 description: Count of merge requests created via Static Site Editor
-product_section: dev
-product_stage: create
 product_group: ide
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml b/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
index 15a486227c2..91973bdac78 100644
--- a/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
+++ b/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.user_preferences_user_gitpod_enabled
 description: Count of users with the GitPod integration enabled
-product_section: dev
-product_stage: create
 product_group: ide
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180306_snippets.yml b/config/metrics/counts_all/20210216180306_snippets.yml
index f2baffe86dc..d9432cf93e1 100644
--- a/config/metrics/counts_all/20210216180306_snippets.yml
+++ b/config/metrics/counts_all/20210216180306_snippets.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.snippets
 description: Count of all Snippets
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180316_snippets.yml b/config/metrics/counts_all/20210216180316_snippets.yml
index d06ce9ca6f6..063df56f2fa 100644
--- a/config/metrics/counts_all/20210216180316_snippets.yml
+++ b/config/metrics/counts_all/20210216180316_snippets.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage.create.snippets
 description: Count of distinct author_id from snippets
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180410_pool_repositories.yml b/config/metrics/counts_all/20210216180410_pool_repositories.yml
index 2de48dc5b73..a982f2ed189 100644
--- a/config/metrics/counts_all/20210216180410_pool_repositories.yml
+++ b/config/metrics/counts_all/20210216180410_pool_repositories.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.pool_repositories
 description: Count of unique object pool repositories for fork deduplication
-product_section: dev
-product_stage: create
 product_group: gitaly_cluster
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
index e303873e171..160a9bb7080 100644
--- a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
+++ b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.wiki_pages_create
 description: Count of all Wiki pages created
-product_section: dev
-product_stage: plan
 product_group: knowledge
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
index 7880292797e..9098c8a6e1e 100644
--- a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
+++ b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.wiki_pages_update
 description: Count of all Wiki page updates
-product_section: dev
-product_stage: plan
 product_group: knowledge
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
index 04a3c4327b0..bf7b434ab34 100644
--- a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
+++ b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.wiki_pages_delete
 description: Count of all Wiki pages deleted
-product_section: dev
-product_stage: plan
 product_group: knowledge
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180740_design_management_designs_create.yml b/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
index 20f37904d13..3036a4b3771 100644
--- a/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
+++ b/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.design_management_designs_create
 description: Number of designs that were created
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
index 6d972a82ffd..2622e449d59 100644
--- a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
+++ b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.design_management_designs_update
 description: Number of updates to designs
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
index 65eec1d3e15..8ae42e150a6 100644
--- a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
+++ b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.design_management_designs_delete
 description: Number of designs that were deleted
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181009_lfs_objects.yml b/config/metrics/counts_all/20210216181009_lfs_objects.yml
index 56d862a46f3..ef003714737 100644
--- a/config/metrics/counts_all/20210216181009_lfs_objects.yml
+++ b/config/metrics/counts_all/20210216181009_lfs_objects.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.lfs_objects
 description: Count of lfs objects
-product_section: ops
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181102_issues.yml b/config/metrics/counts_all/20210216181102_issues.yml
index f10bbe69e95..b092d2b6700 100644
--- a/config/metrics/counts_all/20210216181102_issues.yml
+++ b/config/metrics/counts_all/20210216181102_issues.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: counts.issues
 description: Count of Issues created
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181104_label_lists.yml b/config/metrics/counts_all/20210216181104_label_lists.yml
index c564f9ea369..d57f4d86dd7 100644
--- a/config/metrics/counts_all/20210216181104_label_lists.yml
+++ b/config/metrics/counts_all/20210216181104_label_lists.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.label_lists
 description: Count of label lists created on Boards
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181108_milestones.yml b/config/metrics/counts_all/20210216181108_milestones.yml
index ec220fc4da8..88e3f4de5be 100644
--- a/config/metrics/counts_all/20210216181108_milestones.yml
+++ b/config/metrics/counts_all/20210216181108_milestones.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.milestones
 description: Count of milestones created
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181109_uploads.yml b/config/metrics/counts_all/20210216181109_uploads.yml
index 30b6ae5bc43..a565d2fff11 100644
--- a/config/metrics/counts_all/20210216181109_uploads.yml
+++ b/config/metrics/counts_all/20210216181109_uploads.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.uploads
 description: Count of Uploads via Notes and Descriptions
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181111_labels.yml b/config/metrics/counts_all/20210216181111_labels.yml
index 26364489b5a..f36cb061783 100644
--- a/config/metrics/counts_all/20210216181111_labels.yml
+++ b/config/metrics/counts_all/20210216181111_labels.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.labels
 description: Count of Labels
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181113_notes.yml b/config/metrics/counts_all/20210216181113_notes.yml
index 6112421c149..23603bcf59f 100644
--- a/config/metrics/counts_all/20210216181113_notes.yml
+++ b/config/metrics/counts_all/20210216181113_notes.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.notes
 description: Count of Notes across all objects that use them
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181115_issues.yml b/config/metrics/counts_all/20210216181115_issues.yml
index 6408ee68a70..f290d768fac 100644
--- a/config/metrics/counts_all/20210216181115_issues.yml
+++ b/config/metrics/counts_all/20210216181115_issues.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: usage_activity_by_stage.plan.issues
 description: Count of users creating Issues
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181117_notes.yml b/config/metrics/counts_all/20210216181117_notes.yml
index c5f1595f9e3..1ce5933c882 100644
--- a/config/metrics/counts_all/20210216181117_notes.yml
+++ b/config/metrics/counts_all/20210216181117_notes.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage.plan.notes
 description: Count of users creating Notes on Issues
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181119_projects.yml b/config/metrics/counts_all/20210216181119_projects.yml
index 0b69061425e..6f90d30a841 100644
--- a/config/metrics/counts_all/20210216181119_projects.yml
+++ b/config/metrics/counts_all/20210216181119_projects.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage.plan.projects
 description: Count of users creating projects
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181121_todos.yml b/config/metrics/counts_all/20210216181121_todos.yml
index be7578a0c6d..d93e069fc44 100644
--- a/config/metrics/counts_all/20210216181121_todos.yml
+++ b/config/metrics/counts_all/20210216181121_todos.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage.plan.todos
 description: Count of users todos created
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181134_epics.yml b/config/metrics/counts_all/20210216181134_epics.yml
index acbc0f132b4..6a7fcdfd5a8 100644
--- a/config/metrics/counts_all/20210216181134_epics.yml
+++ b/config/metrics/counts_all/20210216181134_epics.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: usage_activity_by_stage.plan.epics
 description: Count distinct author ids from epics
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181135_label_lists.yml b/config/metrics/counts_all/20210216181135_label_lists.yml
index 838ba151546..3316c086011 100644
--- a/config/metrics/counts_all/20210216181135_label_lists.yml
+++ b/config/metrics/counts_all/20210216181135_label_lists.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage.plan.label_lists
 description: Count of users creating label lists on Boards
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181252_boards.yml b/config/metrics/counts_all/20210216181252_boards.yml
index 24fbbebc4cc..d560671a187 100644
--- a/config/metrics/counts_all/20210216181252_boards.yml
+++ b/config/metrics/counts_all/20210216181252_boards.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.boards
 description: Count of Boards created
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181254_projects.yml b/config/metrics/counts_all/20210216181254_projects.yml
index 265f8f394a1..1c0a3ceb374 100644
--- a/config/metrics/counts_all/20210216181254_projects.yml
+++ b/config/metrics/counts_all/20210216181254_projects.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: counts.projects
 description: Count of Projects created
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181256_todos.yml b/config/metrics/counts_all/20210216181256_todos.yml
index 57614d7f25e..a1d16b8cc22 100644
--- a/config/metrics/counts_all/20210216181256_todos.yml
+++ b/config/metrics/counts_all/20210216181256_todos.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: counts.todos
 description: Count of todos created
-product_section: dev
-product_stage: plan
 product_group: project_management
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216181946_pages_domains.yml b/config/metrics/counts_all/20210216181946_pages_domains.yml
index 833aab6cc81..c49a4ece9c7 100644
--- a/config/metrics/counts_all/20210216181946_pages_domains.yml
+++ b/config/metrics/counts_all/20210216181946_pages_domains.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.pages_domains
 description: Total GitLab Pages domains
-product_section: ops
-product_stage: create
 product_group: ide
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216182002_remote_mirrors.yml b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
index 7f06be1decb..103bab97cb5 100644
--- a/config/metrics/counts_all/20210216182002_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: counts.remote_mirrors
 description: Count of total remote mirrors. Includes both push and pull mirrors
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216182004_commit_comment.yml b/config/metrics/counts_all/20210216182004_commit_comment.yml
index 8613ee0bb41..e6cd43f7103 100644
--- a/config/metrics/counts_all/20210216182004_commit_comment.yml
+++ b/config/metrics/counts_all/20210216182004_commit_comment.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: counts.commit_comment
 description: Count of total unique commit comments. Does not include MR diff comments
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216182006_source_code_pushes.yml b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
index 7d6a0bf4195..1ecc59302ee 100644
--- a/config/metrics/counts_all/20210216182006_source_code_pushes.yml
+++ b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: counts.source_code_pushes
 description: Count of total Git push operations
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216182010_deploy_keys.yml b/config/metrics/counts_all/20210216182010_deploy_keys.yml
index a701bf5b71d..1df8d46240b 100644
--- a/config/metrics/counts_all/20210216182010_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216182010_deploy_keys.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage.create.deploy_keys
 description: Count of users creating deploy keys.
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216182012_keys.yml b/config/metrics/counts_all/20210216182012_keys.yml
index 09121d5586a..98770686aff 100644
--- a/config/metrics/counts_all/20210216182012_keys.yml
+++ b/config/metrics/counts_all/20210216182012_keys.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage.create.keys
 description: Count of users creating regular keys.
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
index b895c2af2ba..f6208083b77 100644
--- a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: usage_activity_by_stage.create.projects_with_disable_overriding_approvers_per_merge_request
 description: Total count of projects that do not allow overriding approvers on discrete
   merge requests
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
index d2a883e63ae..ff75bebff4f 100644
--- a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
@@ -3,8 +3,6 @@ data_category: optional
 key_path: usage_activity_by_stage.create.projects_without_disable_overriding_approvers_per_merge_request
 description: Count of total projects that do not disable overriding approvers per
   discrete merge request
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216182017_remote_mirrors.yml b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
index a28794c3ea8..9dd64fb1117 100644
--- a/config/metrics/counts_all/20210216182017_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: usage_activity_by_stage.create.remote_mirrors
 description: Count of users creating projects with remote mirrors.
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
index 3f64043fc5d..f372a54a242 100644
--- a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
+++ b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.protected_branches_except_default
 description: Count of branches that have been protected and are not the default branch
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
index 353a210c921..d0d684ba299 100644
--- a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
+++ b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.wiki_pages_view
 description: Total number of wiki page views
-product_section: dev
-product_stage: plan
 product_group: knowledge
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20210723075525_diff_searches.yml b/config/metrics/counts_all/20210723075525_diff_searches.yml
index abf5e62fdc9..628b1736989 100644
--- a/config/metrics/counts_all/20210723075525_diff_searches.yml
+++ b/config/metrics/counts_all/20210723075525_diff_searches.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.diff_searches
 description: Total count of merge request diff searches
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220122022215_web_ide_previews_success.yml b/config/metrics/counts_all/20220122022215_web_ide_previews_success.yml
index 7ae4a738977..41e29315fda 100644
--- a/config/metrics/counts_all/20220122022215_web_ide_previews_success.yml
+++ b/config/metrics/counts_all/20220122022215_web_ide_previews_success.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: counts.web_ide_previews_success
 description: Count of Live Preview tab successful initializations in the Web IDE
-product_section: dev
-product_stage: create
 product_group: ide
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml b/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml
index d1842bc9705..50004df82f4 100644
--- a/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml
+++ b/config/metrics/counts_all/20220708154149_i_code_review_merge_request_widget_test_summary_count_view.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_test_summary_count_view
 description: Total number of times the Test Summary widget extension was viewed (rendered to the screen)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml b/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml
index f9c11f9efee..b170bedecda 100644
--- a/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220708154156_i_code_review_merge_request_widget_test_summary_count_full_report_clicked.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_test_summary_count_full_report_clicked
 description: Total number of times the Test Summary widget extension Full Report button was clicked
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml b/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml
index f141e13bf3e..2b1791a9cf0 100644
--- a/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml
+++ b/config/metrics/counts_all/20220708154201_i_code_review_merge_request_widget_test_summary_count_expand.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_test_summary_count_expand
 description: Total number of times the Test Summary widget extension was expanded (in any state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml b/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml
index 92c20a55418..db905854a2f 100644
--- a/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml
+++ b/config/metrics/counts_all/20220708154206_i_code_review_merge_request_widget_test_summary_count_expand_success.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_test_summary_count_expand_success
 description: Total number of times the Test Summary widget extension was expanded (while in its Success state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml b/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml
index e520852923b..77820105b5b 100644
--- a/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220708154211_i_code_review_merge_request_widget_test_summary_count_expand_warning.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_test_summary_count_expand_warning
 description: Total number of times the Test Summary widget extension was expanded (while in its Warning state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml b/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml
index cb95d09eeb7..6f59902b210 100644
--- a/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220708154216_i_code_review_merge_request_widget_test_summary_count_expand_failed.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_test_summary_count_expand_failed
 description: Total number of times the Test Summary widget extension was expanded (while in its Failed state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml b/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml
index d9ce82794eb..c51c57ca78e 100644
--- a/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml
+++ b/config/metrics/counts_all/20220725205853_i_code_review_merge_request_widget_accessibility_count_view.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_accessibility_count_view
 description: Total number of times the Accessibility widget extension was viewed (rendered to the screen)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml b/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml
index a3c60c34b90..ce4bd4ff262 100644
--- a/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220725205901_i_code_review_merge_request_widget_accessibility_count_full_report_clicked.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_accessibility_count_full_report_clicked
 description: Total number of times the Accessibility widget extension Full Report button was clicked
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml b/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml
index 9e126525b11..03cfe37b89e 100644
--- a/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml
+++ b/config/metrics/counts_all/20220725205908_i_code_review_merge_request_widget_accessibility_count_expand.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_accessibility_count_expand
 description: Total number of times the Accessibility widget extension was expanded (in any state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml b/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml
index c6412c94640..b5ad9ae3083 100644
--- a/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml
+++ b/config/metrics/counts_all/20220725205915_i_code_review_merge_request_widget_accessibility_count_expand_success.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_accessibility_count_expand_success
 description: Total number of times the Accessibility widget extension was expanded (while in its Success state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml b/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml
index 7c557f33ca4..c8fcee5f7ea 100644
--- a/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220725205922_i_code_review_merge_request_widget_accessibility_count_expand_warning.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_accessibility_count_expand_warning
 description: Total number of times the Accessibility widget extension was expanded (while in its Warning state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml b/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml
index b83c7ddfc6f..fe9c6fa9f07 100644
--- a/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220725205928_i_code_review_merge_request_widget_accessibility_count_expand_failed.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_accessibility_count_expand_failed
 description: Total number of times the Accessibility widget extension was expanded (while in its Failed state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml b/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml
index e540343a175..600e3ba7ae8 100644
--- a/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml
+++ b/config/metrics/counts_all/20220727004434_i_code_review_merge_request_widget_code_quality_count_view.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_code_quality_count_view
 description: Total number of times the Code Quality widget extension was viewed (rendered to the screen)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml b/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml
index 8e4bd3e3d05..1999c8cce1d 100644
--- a/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220727004440_i_code_review_merge_request_widget_code_quality_count_full_report_clicked.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_code_quality_count_full_report_clicked
 description: Total number of times the Code Quality widget extension Full Report button was clicked
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml b/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml
index 2f1e2d13256..6df678392d8 100644
--- a/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml
+++ b/config/metrics/counts_all/20220727004446_i_code_review_merge_request_widget_code_quality_count_expand.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_code_quality_count_expand
 description: Total number of times the Code Quality widget extension was expanded (in any state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml b/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml
index be88831a42e..b31b8599957 100644
--- a/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml
+++ b/config/metrics/counts_all/20220727004451_i_code_review_merge_request_widget_code_quality_count_expand_success.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_code_quality_count_expand_success
 description: Total number of times the Code Quality widget extension was expanded (while in its Success state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml b/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml
index 03a85a76b0f..a7eb2e86034 100644
--- a/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220727004457_i_code_review_merge_request_widget_code_quality_count_expand_warning.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_code_quality_count_expand_warning
 description: Total number of times the Code Quality widget extension was expanded (while in its Warning state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml b/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml
index 57e70d7e77e..ceb3d90d5c7 100644
--- a/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220727004502_i_code_review_merge_request_widget_code_quality_count_expand_failed.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_code_quality_count_expand_failed
 description: Total number of times the Code Quality widget extension was expanded (while in its Failed state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml b/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml
index 33ff93179dc..f8fbd87fa09 100644
--- a/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml
+++ b/config/metrics/counts_all/20220727044257_i_code_review_merge_request_widget_terraform_count_view.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_terraform_count_view
 description: Total number of times the Terraform widget extension was viewed (rendered to the screen)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml b/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml
index a025b62a020..a234113b1f5 100644
--- a/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220727044304_i_code_review_merge_request_widget_terraform_count_full_report_clicked.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_terraform_count_full_report_clicked
 description: Total number of times the Terraform widget extension Full Report button was clicked
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml b/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml
index f76c3ddccf5..1b41d967380 100644
--- a/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml
+++ b/config/metrics/counts_all/20220727044310_i_code_review_merge_request_widget_terraform_count_expand.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_terraform_count_expand
 description: Total number of times the Terraform widget extension was expanded (in any state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml b/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml
index 32a07704948..039465c7223 100644
--- a/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml
+++ b/config/metrics/counts_all/20220727044316_i_code_review_merge_request_widget_terraform_count_expand_success.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_terraform_count_expand_success
 description: Total number of times the Terraform widget extension was expanded (while in its Success state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml b/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml
index 7c72de195d8..43f9d9f899a 100644
--- a/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220727044322_i_code_review_merge_request_widget_terraform_count_expand_warning.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_terraform_count_expand_warning
 description: Total number of times the Terraform widget extension was expanded (while in its Warning state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml b/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml
index 152516ff8c7..bbd7e64fd92 100644
--- a/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220727044329_i_code_review_merge_request_widget_terraform_count_expand_failed.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_terraform_count_expand_failed
 description: Total number of times the Terraform widget extension was expanded (while in its Failed state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml b/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml
index 7c5588c8d96..f86b4ad28d5 100644
--- a/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml
+++ b/config/metrics/counts_all/20220825115210_i_merge_request_widget_license_compliance_count_view.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_license_compliance_count_view
 description: Total number of times the License Compliance widget extension was viewed (rendered to the screen)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml b/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml
index 7529025614d..aaf7dbae4d4 100644
--- a/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20220825115217_i_merge_request_widget_license_compliance_count_full_report_clicked.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_license_compliance_count_full_report_clicked
 description: Total number of times the License Compliance widget extension Full Report button was clicked
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml b/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml
index b5c2102fb26..440fbfb54f1 100644
--- a/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml
+++ b/config/metrics/counts_all/20220825115224_i_merge_request_widget_license_compliance_count_expand.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_license_compliance_count_expand
 description: Total number of times the License Compliance widget extension was expanded (in any state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml b/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml
index f6eeeb7d7fc..98321404fd8 100644
--- a/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml
+++ b/config/metrics/counts_all/20220825115230_i_merge_request_widget_license_compliance_count_expand_success.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_license_compliance_count_expand_success
 description: Total number of times the License Compliance widget extension was expanded (while in its Success state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml b/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml
index b5a5d79eec7..bc75abb1c2b 100644
--- a/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml
+++ b/config/metrics/counts_all/20220825115236_i_merge_request_widget_license_compliance_count_expand_warning.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_license_compliance_count_expand_warning
 description: Total number of times the License Compliance widget extension was expanded (while in its Warning state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml b/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml
index 7579b36868f..a9044258888 100644
--- a/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml
+++ b/config/metrics/counts_all/20220825115242_i_merge_request_widget_license_compliance_count_expand_failed.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_license_compliance_count_expand_failed
 description: Total number of times the License Compliance widget extension was expanded (while in its Failed state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml b/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml
index 707ea3420fe..203c2a88d2a 100644
--- a/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml
+++ b/config/metrics/counts_all/20221121113321_i_code_review_merge_request_widget_security_reports_count_view.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_security_reports_count_view
 description: Total number of times the Security Reports widget extension was viewed (rendered to the screen)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml
index 7379f0e233c..3ffcc6ef780 100644
--- a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml
+++ b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_expand.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_security_reports_count_expand
 description: Total number of times the Security Reports widget extension was expanded (in any state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml
index 442d7f04f2d..082ba16eef3 100644
--- a/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml
+++ b/config/metrics/counts_all/20221121113323_i_code_review_merge_request_widget_security_reports_count_full_report_clicked.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_security_reports_count_full_report_clicked
 description: Total number of times the Security Reports widget extension Full Report button was clicked
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml b/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml
index 2c065118d8e..07996535acb 100644
--- a/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml
+++ b/config/metrics/counts_all/20221121113324_i_code_review_merge_request_widget_security_reports_count_expand_success.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_security_reports_count_expand_success
 description: Total number of times the Security Reports widget extension was expanded (while in its Success state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml
index f9de1ef3fa1..ea2712281f1 100644
--- a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml
+++ b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_failed.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_security_reports_count_expand_failed
 description: Total number of times the Security Reports widget extension was expanded (while in its Failed state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml
index b4d5a765a08..c9c9a986f42 100644
--- a/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml
+++ b/config/metrics/counts_all/20221121113325_i_code_review_merge_request_widget_security_reports_count_expand_warning.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_merge_request_widget_security_reports_count_expand_warning
 description: Total number of times the Security Reports widget extension was expanded (while in its Warning state)
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20230201120001_count_ml_candidates.yml b/config/metrics/counts_all/20230201120001_count_ml_candidates.yml
index dd76ea9c36a..a37c14cfc30 100644
--- a/config/metrics/counts_all/20230201120001_count_ml_candidates.yml
+++ b/config/metrics/counts_all/20230201120001_count_ml_candidates.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_ml_candidates
 description: Count of created Ml Candidates
-product_section: dev
-product_stage: create
 product_group: mlops
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20230201120002_count_ml_experiments.yml b/config/metrics/counts_all/20230201120002_count_ml_experiments.yml
index 8786c7fc031..4fcd8087087 100644
--- a/config/metrics/counts_all/20230201120002_count_ml_experiments.yml
+++ b/config/metrics/counts_all/20230201120002_count_ml_experiments.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_ml_experiments
 description: Count of created Ml Experiments
-product_section: dev
-product_stage: create
 product_group: mlops
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20230201120003_count_projects_with_ml_candidates.yml b/config/metrics/counts_all/20230201120003_count_projects_with_ml_candidates.yml
index 6a4fd0b7c53..655ac4abf78 100644
--- a/config/metrics/counts_all/20230201120003_count_projects_with_ml_candidates.yml
+++ b/config/metrics/counts_all/20230201120003_count_projects_with_ml_candidates.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_projects_with_ml_candidates
 description: Count of unique projects that contain at least one Ml Candidate
-product_section: dev
-product_stage: create
 product_group: mlops
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20230201120004_count_users_with_ml_candidates.yml b/config/metrics/counts_all/20230201120004_count_users_with_ml_candidates.yml
index a12b3be4a29..342e03fa12f 100644
--- a/config/metrics/counts_all/20230201120004_count_users_with_ml_candidates.yml
+++ b/config/metrics/counts_all/20230201120004_count_users_with_ml_candidates.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_users_with_ml_candidates
 description: Count of unique users that have created at least one Ml Candidate
-product_section: dev
-product_stage: create
 product_group: mlops
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20230201120005_count_projects_with_ml_experiments.yml b/config/metrics/counts_all/20230201120005_count_projects_with_ml_experiments.yml
index f1f6f6c594e..aa012c0beaa 100644
--- a/config/metrics/counts_all/20230201120005_count_projects_with_ml_experiments.yml
+++ b/config/metrics/counts_all/20230201120005_count_projects_with_ml_experiments.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_projects_with_ml_experiments
 description: Count of unique projects that contain at least one Ml Experiment
-product_section: dev
-product_stage: create
 product_group: mlops
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml b/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml
index a5dfd002473..5056c65f562 100644
--- a/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml
+++ b/config/metrics/counts_all/20230725195335_i_code_review_saved_replies_count_use.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_saved_replies_count_use
 description: Total number of times a saved reply comment was used
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml b/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml
index f706fcab166..848fa3fa30c 100644
--- a/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml
+++ b/config/metrics/counts_all/20230725200123_i_code_review_saved_replies_count_create.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_saved_replies_count_create
 description: Total number of times a saved reply was created
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml b/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml
index 12a7dccd582..657216649b5 100644
--- a/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml
+++ b/config/metrics/counts_all/20230809194308_i_code_review_saved_replies_use_in_mr.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_saved_replies_use_in_mr
 description: Total number of times a saved reply was used from an MR page
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml b/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml
index 6cd2bedafc8..e8fedba9c84 100644
--- a/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml
+++ b/config/metrics/counts_all/20230815054809_i_code_review_saved_replies_use_in_other.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.i_code_review_saved_replies_use_in_other
 description: Total count of times a saved reply is selected when not in an MR
-product_section: dev
-product_stage: create
 product_group: code_review
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20240117153239_instances_beyond_identity_active.yml b/config/metrics/counts_all/20240117153239_instances_beyond_identity_active.yml
index e1040d2a0cb..e563f9f8fd2 100644
--- a/config/metrics/counts_all/20240117153239_instances_beyond_identity_active.yml
+++ b/config/metrics/counts_all/20240117153239_instances_beyond_identity_active.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.instances_beyond_identity_active
 description: Count of projects with active integrations for BeyondIdentity
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20240117153516_groups_inheriting_beyond_identity_active.yml b/config/metrics/counts_all/20240117153516_groups_inheriting_beyond_identity_active.yml
index 5d68a2ed466..a8d0bf0f66f 100644
--- a/config/metrics/counts_all/20240117153516_groups_inheriting_beyond_identity_active.yml
+++ b/config/metrics/counts_all/20240117153516_groups_inheriting_beyond_identity_active.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.groups_inheriting_beyond_identity_active
 description: Count of projects with active integrations for BeyondIdentity
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20240117153519_groups_beyond_identity_active.yml b/config/metrics/counts_all/20240117153519_groups_beyond_identity_active.yml
index ca4db507697..7d3957ef3a4 100644
--- a/config/metrics/counts_all/20240117153519_groups_beyond_identity_active.yml
+++ b/config/metrics/counts_all/20240117153519_groups_beyond_identity_active.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.groups_beyond_identity_active
 description: Count of projects with active integrations for BeyondIdentity
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20240117153523_projects_inheriting_beyond_identity_active.yml b/config/metrics/counts_all/20240117153523_projects_inheriting_beyond_identity_active.yml
index 0dffad590e4..12e8beb32cd 100644
--- a/config/metrics/counts_all/20240117153523_projects_inheriting_beyond_identity_active.yml
+++ b/config/metrics/counts_all/20240117153523_projects_inheriting_beyond_identity_active.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.projects_inheriting_beyond_identity_active
 description: Count of projects with active integrations for BeyondIdentity
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/20240117153527_projects_beyond_identity_active.yml b/config/metrics/counts_all/20240117153527_projects_beyond_identity_active.yml
index 260213e3070..5269780f8d7 100644
--- a/config/metrics/counts_all/20240117153527_projects_beyond_identity_active.yml
+++ b/config/metrics/counts_all/20240117153527_projects_beyond_identity_active.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.projects_beyond_identity_active
 description: Count of projects with active integrations for BeyondIdentity
-product_section: dev
-product_stage: create
 product_group: source_code
 value_type: number
 status: active
diff --git a/config/metrics/counts_all/count_total_merge_request_click_add_to_review_on_changes_tab.yml b/config/metrics/counts_all/count_total_merge_request_click_add_to_review_on_changes_tab.yml
index e9f95b6f79c..1907d2f4865 100644
--- a/config/metrics/counts_all/count_total_merge_request_click_add_to_review_on_changes_tab.yml
+++ b/config/metrics/counts_all/count_total_merge_request_click_add_to_review_on_changes_tab.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_merge_request_click_add_to_review_on_changes_tab
 description: Total count of clicks on the Add to review button on the MR Changes tab
-product_section: dev
-product_stage: create
 product_group: code_review
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_all/count_total_merge_request_click_add_to_review_on_overview_tab.yml b/config/metrics/counts_all/count_total_merge_request_click_add_to_review_on_overview_tab.yml
index 9330c187da9..a2e26aa559d 100644
--- a/config/metrics/counts_all/count_total_merge_request_click_add_to_review_on_overview_tab.yml
+++ b/config/metrics/counts_all/count_total_merge_request_click_add_to_review_on_overview_tab.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_merge_request_click_add_to_review_on_overview_tab
 description: Total count of clicks on the Add to review button on the MR Overview tab
-product_section: dev
-product_stage: create
 product_group: code_review
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_all/count_total_merge_request_click_start_review_on_changes_tab.yml b/config/metrics/counts_all/count_total_merge_request_click_start_review_on_changes_tab.yml
index 5d1145ae56a..53123cc48db 100644
--- a/config/metrics/counts_all/count_total_merge_request_click_start_review_on_changes_tab.yml
+++ b/config/metrics/counts_all/count_total_merge_request_click_start_review_on_changes_tab.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_merge_request_click_start_review_on_changes_tab
 description: Total count of clicks on the Start a Review button on the MR Changes tab
-product_section: dev
-product_stage: create
 product_group: code_review
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/counts_all/count_total_merge_request_click_start_review_on_overview_tab.yml b/config/metrics/counts_all/count_total_merge_request_click_start_review_on_overview_tab.yml
index 671464ac337..4f52784f894 100644
--- a/config/metrics/counts_all/count_total_merge_request_click_start_review_on_overview_tab.yml
+++ b/config/metrics/counts_all/count_total_merge_request_click_start_review_on_overview_tab.yml
@@ -1,8 +1,6 @@
 ---
 key_path: counts.count_total_merge_request_click_start_review_on_overview_tab
 description: Total count of clicks on the Start a Review button on the MR Overview tab
-product_section: dev
-product_stage: create
 product_group: code_review
 performance_indicator_type: []
 value_type: number
diff --git a/config/metrics/license/20210204124928_version.yml b/config/metrics/license/20210204124928_version.yml
index 0ef40b36d04..2acd75e0fa0 100644
--- a/config/metrics/license/20210204124928_version.yml
+++ b/config/metrics/license/20210204124928_version.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: gitaly.version
 description: Version of Gitaly
-product_section: dev
-product_stage: create
 product_group: gitaly_cluster
 value_type: string
 status: active
diff --git a/config/metrics/license/20210204124936_pages_version.yml b/config/metrics/license/20210204124936_pages_version.yml
index d4af304dc66..fd9eef426f0 100644
--- a/config/metrics/license/20210204124936_pages_version.yml
+++ b/config/metrics/license/20210204124936_pages_version.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: gitlab_pages.version
 description: The version number of GitLab Pages
-product_section: ops
-product_stage: create
 product_group: ide
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
index 5aefacbf51d..b894da37caa 100644
--- a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
+++ b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: reply_by_email_enabled
 description: Whether incoming email is setup
-product_section: dev
-product_stage: plan
 product_group: product_planning
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
index a04e8d82686..73cc5234240 100644
--- a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
+++ b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: web_ide_clientside_preview_enabled
 description: Whether Web IDE clientside preview is enabled
-product_section: dev
-product_stage: create
 product_group: ide
 value_type: boolean
 status: removed
diff --git a/config/metrics/settings/20210204124934_pages_enabled.yml b/config/metrics/settings/20210204124934_pages_enabled.yml
index 430aed4de6d..723d3cfc139 100644
--- a/config/metrics/settings/20210204124934_pages_enabled.yml
+++ b/config/metrics/settings/20210204124934_pages_enabled.yml
@@ -2,8 +2,6 @@
 data_category: operational
 key_path: gitlab_pages.enabled
 description: Whether GitLab Pages is enabled
-product_section: ops
-product_stage: create
 product_group: ide
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216180314_gitpod_enabled.yml b/config/metrics/settings/20210216180314_gitpod_enabled.yml
index 047f41fa9d5..390c62e2086 100644
--- a/config/metrics/settings/20210216180314_gitpod_enabled.yml
+++ b/config/metrics/settings/20210216180314_gitpod_enabled.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: gitpod_enabled
 description: Whether Gitpod is enabled in the instance
-product_section: dev
-product_stage: create
 product_group: ide
 value_type: boolean
 status: active
diff --git a/config/metrics/settings/20210216183241_filesystems.yml b/config/metrics/settings/20210216183241_filesystems.yml
index d8e8a617507..7906d75f448 100644
--- a/config/metrics/settings/20210216183241_filesystems.yml
+++ b/config/metrics/settings/20210216183241_filesystems.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: gitaly.filesystems
 description: Filesystem data for Gitaly installations
-product_section: dev
-product_stage: create
 product_group: gitaly_cluster
 value_type: string
 status: active
diff --git a/config/metrics/settings/20210321224827_gitaly_apdex.yml b/config/metrics/settings/20210321224827_gitaly_apdex.yml
index ddb1be87dfd..66a292683cf 100644
--- a/config/metrics/settings/20210321224827_gitaly_apdex.yml
+++ b/config/metrics/settings/20210321224827_gitaly_apdex.yml
@@ -2,8 +2,6 @@
 data_category: optional
 key_path: settings.gitaly_apdex
 description: Gitaly application performance
-product_section: dev
-product_stage: create
 product_group: gitaly_cluster
 value_type: number
 status: active
diff --git a/db/docs/batched_background_migrations/backfill_design_management_versions_namespace_id.yml b/db/docs/batched_background_migrations/backfill_design_management_versions_namespace_id.yml
new file mode 100644
index 00000000000..6f8f87f9e73
--- /dev/null
+++ b/db/docs/batched_background_migrations/backfill_design_management_versions_namespace_id.yml
@@ -0,0 +1,9 @@
+---
+migration_job_name: BackfillDesignManagementVersionsNamespaceId
+description: Backfills sharding key `design_management_versions.namespace_id` from `issues`.
+feature_category: design_management
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154281
+milestone: '17.1'
+queued_migration_version: 20240530121656
+finalize_after: '2024-06-22'
+finalized_by: # version of the migration that finalized this BBM
diff --git a/db/docs/design_management_versions.yml b/db/docs/design_management_versions.yml
index d9d92dc938c..04ca8edfcd7 100644
--- a/db/docs/design_management_versions.yml
+++ b/db/docs/design_management_versions.yml
@@ -4,7 +4,8 @@ classes:
 - DesignManagement::Version
 feature_categories:
 - design_management
-description: The SHA referencing changes to individual designs made using the Design Management tool
+description: The SHA referencing changes to individual designs made using the Design
+  Management tool
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/9801
 milestone: '11.10'
 gitlab_schema: gitlab_main_cell
@@ -19,3 +20,4 @@ desired_sharding_key:
         table: issues
         sharding_key: namespace_id
         belongs_to: issue
+desired_sharding_key_migration_job_name: BackfillDesignManagementVersionsNamespaceId
diff --git a/db/docs/evidences.yml b/db/docs/evidences.yml
index d7f36bc6e04..0c37e4a00b9 100644
--- a/db/docs/evidences.yml
+++ b/db/docs/evidences.yml
@@ -7,4 +7,13 @@ feature_categories:
 description: https://docs.gitlab.com/ee/user/project/releases/#release-evidence
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17217
 milestone: '12.4'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell
+desired_sharding_key:
+  project_id:
+    references: projects
+    backfill_via:
+      parent:
+        foreign_key: release_id
+        table: releases
+        sharding_key: project_id
+        belongs_to: release
diff --git a/db/migrate/20240530121652_add_namespace_id_to_design_management_versions.rb b/db/migrate/20240530121652_add_namespace_id_to_design_management_versions.rb
new file mode 100644
index 00000000000..9520e96e0b2
--- /dev/null
+++ b/db/migrate/20240530121652_add_namespace_id_to_design_management_versions.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddNamespaceIdToDesignManagementVersions < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+
+  def change
+    add_column :design_management_versions, :namespace_id, :bigint
+  end
+end
diff --git a/db/post_migrate/20240530121653_index_design_management_versions_on_namespace_id.rb b/db/post_migrate/20240530121653_index_design_management_versions_on_namespace_id.rb
new file mode 100644
index 00000000000..0bd0a7822f4
--- /dev/null
+++ b/db/post_migrate/20240530121653_index_design_management_versions_on_namespace_id.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class IndexDesignManagementVersionsOnNamespaceId < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+  disable_ddl_transaction!
+
+  INDEX_NAME = 'index_design_management_versions_on_namespace_id'
+
+  def up
+    add_concurrent_index :design_management_versions, :namespace_id, name: INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name :design_management_versions, INDEX_NAME
+  end
+end
diff --git a/db/post_migrate/20240530121654_add_design_management_versions_namespace_id_fk.rb b/db/post_migrate/20240530121654_add_design_management_versions_namespace_id_fk.rb
new file mode 100644
index 00000000000..15b8b24eb26
--- /dev/null
+++ b/db/post_migrate/20240530121654_add_design_management_versions_namespace_id_fk.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddDesignManagementVersionsNamespaceIdFk < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :design_management_versions, :namespaces, column: :namespace_id, on_delete: :cascade
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key :design_management_versions, column: :namespace_id
+    end
+  end
+end
diff --git a/db/post_migrate/20240530121655_add_design_management_versions_namespace_id_trigger.rb b/db/post_migrate/20240530121655_add_design_management_versions_namespace_id_trigger.rb
new file mode 100644
index 00000000000..42672332cc5
--- /dev/null
+++ b/db/post_migrate/20240530121655_add_design_management_versions_namespace_id_trigger.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddDesignManagementVersionsNamespaceIdTrigger < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+
+  def up
+    install_sharding_key_assignment_trigger(
+      table: :design_management_versions,
+      sharding_key: :namespace_id,
+      parent_table: :issues,
+      parent_sharding_key: :namespace_id,
+      foreign_key: :issue_id
+    )
+  end
+
+  def down
+    remove_sharding_key_assignment_trigger(
+      table: :design_management_versions,
+      sharding_key: :namespace_id,
+      parent_table: :issues,
+      parent_sharding_key: :namespace_id,
+      foreign_key: :issue_id
+    )
+  end
+end
diff --git a/db/post_migrate/20240530121656_queue_backfill_design_management_versions_namespace_id.rb b/db/post_migrate/20240530121656_queue_backfill_design_management_versions_namespace_id.rb
new file mode 100644
index 00000000000..79254c4f502
--- /dev/null
+++ b/db/post_migrate/20240530121656_queue_backfill_design_management_versions_namespace_id.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class QueueBackfillDesignManagementVersionsNamespaceId < Gitlab::Database::Migration[2.2]
+  milestone '17.1'
+  restrict_gitlab_migration gitlab_schema: :gitlab_main_cell
+
+  MIGRATION = "BackfillDesignManagementVersionsNamespaceId"
+  DELAY_INTERVAL = 2.minutes
+  BATCH_SIZE = 1000
+  SUB_BATCH_SIZE = 100
+
+  def up
+    queue_batched_background_migration(
+      MIGRATION,
+      :design_management_versions,
+      :id,
+      :namespace_id,
+      :issues,
+      :namespace_id,
+      :issue_id,
+      job_interval: DELAY_INTERVAL,
+      batch_size: BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE
+    )
+  end
+
+  def down
+    delete_batched_background_migration(
+      MIGRATION,
+      :design_management_versions,
+      :id,
+      [
+        :namespace_id,
+        :issues,
+        :namespace_id,
+        :issue_id
+      ]
+    )
+  end
+end
diff --git a/db/schema_migrations/20240530121652 b/db/schema_migrations/20240530121652
new file mode 100644
index 00000000000..e53af02f3d7
--- /dev/null
+++ b/db/schema_migrations/20240530121652
@@ -0,0 +1 @@
+15fe1b60f75a8178d5f5ee64e96b291660101b0ea38b9110f691238fb471d0b6
\ No newline at end of file
diff --git a/db/schema_migrations/20240530121653 b/db/schema_migrations/20240530121653
new file mode 100644
index 00000000000..1c57e00ef78
--- /dev/null
+++ b/db/schema_migrations/20240530121653
@@ -0,0 +1 @@
+77a0be00906ea1d54bbdc2f45662e8a0d25681c2eb65d1fef2f3b14985749d69
\ No newline at end of file
diff --git a/db/schema_migrations/20240530121654 b/db/schema_migrations/20240530121654
new file mode 100644
index 00000000000..8d5d0f88cdf
--- /dev/null
+++ b/db/schema_migrations/20240530121654
@@ -0,0 +1 @@
+422569b47a2e78398c5f3dfb0bbebfc5ceb5df22f1301e6d9928b1c43f52698d
\ No newline at end of file
diff --git a/db/schema_migrations/20240530121655 b/db/schema_migrations/20240530121655
new file mode 100644
index 00000000000..c431c59ad01
--- /dev/null
+++ b/db/schema_migrations/20240530121655
@@ -0,0 +1 @@
+bae65f78870563d5557cb105495fc59721fe444413c8d6e95510b16922481ad5
\ No newline at end of file
diff --git a/db/schema_migrations/20240530121656 b/db/schema_migrations/20240530121656
new file mode 100644
index 00000000000..d009b7cfea7
--- /dev/null
+++ b/db/schema_migrations/20240530121656
@@ -0,0 +1 @@
+969a8909b4c3820821ada2bba6e7b3a4ee007b57da95f6b028ac2d5ec4975581
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 89a18b0011f..258284222be 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -977,6 +977,22 @@ RETURN NEW;
 END
 $$;
 
+CREATE FUNCTION trigger_96a76ee9f147() RETURNS trigger
+    LANGUAGE plpgsql
+    AS $$
+BEGIN
+IF NEW."namespace_id" IS NULL THEN
+  SELECT "namespace_id"
+  INTO NEW."namespace_id"
+  FROM "issues"
+  WHERE "issues"."id" = NEW."issue_id";
+END IF;
+
+RETURN NEW;
+
+END
+$$;
+
 CREATE FUNCTION trigger_a253cb3cacdf() RETURNS trigger
     LANGUAGE plpgsql
     AS $$
@@ -8825,7 +8841,8 @@ CREATE TABLE design_management_versions (
     sha bytea NOT NULL,
     issue_id bigint,
     created_at timestamp with time zone NOT NULL,
-    author_id integer
+    author_id integer,
+    namespace_id bigint
 );
 
 CREATE SEQUENCE design_management_versions_id_seq
@@ -25900,6 +25917,8 @@ CREATE INDEX index_design_management_versions_on_author_id ON design_management_
 
 CREATE INDEX index_design_management_versions_on_issue_id ON design_management_versions USING btree (issue_id);
 
+CREATE INDEX index_design_management_versions_on_namespace_id ON design_management_versions USING btree (namespace_id);
+
 CREATE UNIQUE INDEX index_design_management_versions_on_sha_and_issue_id ON design_management_versions USING btree (sha, issue_id);
 
 CREATE UNIQUE INDEX index_design_user_mentions_on_note_id ON design_user_mentions USING btree (note_id);
@@ -30382,6 +30401,8 @@ CREATE TRIGGER trigger_8fbb044c64ad BEFORE INSERT OR UPDATE ON design_management
 
 CREATE TRIGGER trigger_94514aeadc50 BEFORE INSERT OR UPDATE ON deployment_approvals FOR EACH ROW EXECUTE FUNCTION trigger_94514aeadc50();
 
+CREATE TRIGGER trigger_96a76ee9f147 BEFORE INSERT OR UPDATE ON design_management_versions FOR EACH ROW EXECUTE FUNCTION trigger_96a76ee9f147();
+
 CREATE TRIGGER trigger_a253cb3cacdf BEFORE INSERT OR UPDATE ON dora_daily_metrics FOR EACH ROW EXECUTE FUNCTION trigger_a253cb3cacdf();
 
 CREATE TRIGGER trigger_b4520c29ea74 BEFORE INSERT OR UPDATE ON approval_merge_request_rule_sources FOR EACH ROW EXECUTE FUNCTION trigger_b4520c29ea74();
@@ -30588,6 +30609,9 @@ ALTER TABLE ONLY agent_project_authorizations
 ALTER TABLE ONLY ai_agent_version_attachments
     ADD CONSTRAINT fk_1d4253673b FOREIGN KEY (ai_vectorizable_file_id) REFERENCES ai_vectorizable_files(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY design_management_versions
+    ADD CONSTRAINT fk_1dccb304f8 FOREIGN KEY (namespace_id) REFERENCES namespaces(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY boards
     ADD CONSTRAINT fk_1e9a074a35 FOREIGN KEY (group_id) REFERENCES namespaces(id) ON DELETE CASCADE;
 
diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md
index 49fcbbf7fdd..16871f51e45 100644
--- a/doc/administration/monitoring/prometheus/gitlab_metrics.md
+++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md
@@ -514,6 +514,19 @@ instance. For example, `cache` or `shared_state`.
 | `gitlab_redis_client_requests_pipelined_commands` | Histogram | 16.4 | Number of commands per pipeline sent to a single Redis server |
 | `gitlab_redis_client_pipeline_redirections_count` | Histogram | 17.0 | Number of Redis Cluster redirections in a pipeline |
 
+## Git LFS metrics
+
+Metrics to track various [Git LFS](https://git-lfs.com/) functionality.
+
+| Metric                                             | Type    | Since | Description |
+|:-------------------------------------------------- |:------- |:----- |:----------- |
+| `gitlab_sli_lfs_update_objects_total`              | Counter | 16.10 | Number of updated LFS objects in total |
+| `gitlab_sli_lfs_update_objects_error_total`        | Counter | 16.10 | Number of updated LFS object errors in total |
+| `gitlab_sli_lfs_check_objects_total`               | Counter | 16.10 | Number of check LFS objects in total |
+| `gitlab_sli_lfs_check_objects_error_total`         | Counter | 16.10 | Number of check LFS object errors in total |
+| `gitlab_sli_lfs_validate_link_objects_total`       | Counter | 16.10 | Number of validated LFS linked objects in total |
+| `gitlab_sli_lfs_validate_link_objects_error_total` | Counter | 16.10 | Number of validated LFS linked object errors in total |
+
 ## Metrics shared directory
 
 The GitLab Prometheus client requires a directory to store metrics data shared between multi-process services.
diff --git a/doc/administration/self_hosted_models/index.md b/doc/administration/self_hosted_models/index.md
index 8db1cd96b4b..6c221424974 100644
--- a/doc/administration/self_hosted_models/index.md
+++ b/doc/administration/self_hosted_models/index.md
@@ -11,6 +11,8 @@ DETAILS:
 **Tier:** Premium, Ultimate
 **Offering:** Self-managed
 
+> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/12972) in GitLab 17.1 [behind the feature flag](../../administration/feature_flags.md) `ai_custom_model`. Disabled by default.
+
 Prerequisites:
 
 - You must have the [GitLab Enterprise Edition](../../administration/license.md).
diff --git a/doc/user/ai_features.md b/doc/user/ai_features.md
index b1fc331f0e8..f91627a8ad1 100644
--- a/doc/user/ai_features.md
+++ b/doc/user/ai_features.md
@@ -62,8 +62,8 @@ DETAILS:
 ### Code explanation in the IDE
 
 DETAILS:
-**Tier:** For a limited time, Premium and Ultimate. In the future, [GitLab Duo Pro or Enterprise](../subscriptions/subscription-add-ons.md).
-**Offering:** GitLab.com
+**Tier:** GitLab.com and Self-managed: For a limited time, Premium and Ultimate. In the future, [GitLab Duo Pro or Enterprise](../subscriptions/subscription-add-ons.md). <br>GitLab Dedicated: GitLab Duo Pro or Enterprise.
+**Offering:** GitLab.com, Self-managed, GitLab Dedicated
 
 - Helps you understand the selected code by explaining it more clearly.
 - LLM: Anthropic: [`claude-3-haiku-20240307`](https://docs.anthropic.com/en/docs/models-overview#claude-3-a-new-generation-of-ai)
diff --git a/lib/gitlab/background_migration/backfill_design_management_versions_namespace_id.rb b/lib/gitlab/background_migration/backfill_design_management_versions_namespace_id.rb
new file mode 100644
index 00000000000..cbb9dc45bee
--- /dev/null
+++ b/lib/gitlab/background_migration/backfill_design_management_versions_namespace_id.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module BackgroundMigration
+    # rubocop: disable Migration/BackgroundMigrationBaseClass -- BackfillDesiredShardingKeyJob inherits from BatchedMigrationJob.
+    class BackfillDesignManagementVersionsNamespaceId < BackfillDesiredShardingKeyJob
+      operation_name :backfill_design_management_versions_namespace_id
+      feature_category :design_management
+    end
+    # rubocop: enable Migration/BackgroundMigrationBaseClass
+  end
+end
diff --git a/lib/gitlab/checks/lfs_check.rb b/lib/gitlab/checks/lfs_check.rb
index f2c4b28470d..69031308b1f 100644
--- a/lib/gitlab/checks/lfs_check.rb
+++ b/lib/gitlab/checks/lfs_check.rb
@@ -14,7 +14,10 @@ module Gitlab
           lfs_check = Checks::LfsIntegrity.new(project, newrevs, logger.time_left)
 
           if lfs_check.objects_missing?
+            Gitlab::Metrics::Lfs.check_objects_error_rate.increment(error: true, labels: {})
             raise GitAccess::ForbiddenError, ERROR_MESSAGE
+          else
+            Gitlab::Metrics::Lfs.check_objects_error_rate.increment(error: false, labels: {})
           end
         end
       end
diff --git a/lib/gitlab/design_management/copy_design_collection_model_attributes.yml b/lib/gitlab/design_management/copy_design_collection_model_attributes.yml
index 435f2477959..99dcde61ca7 100644
--- a/lib/gitlab/design_management/copy_design_collection_model_attributes.yml
+++ b/lib/gitlab/design_management/copy_design_collection_model_attributes.yml
@@ -40,6 +40,7 @@ ignore_version_attributes:
   - id
   - issue_id
   - sha
+  - namespace_id
 
 ignore_action_attributes:
   - id
diff --git a/lib/gitlab/metrics/lfs.rb b/lib/gitlab/metrics/lfs.rb
new file mode 100644
index 00000000000..62944f538bc
--- /dev/null
+++ b/lib/gitlab/metrics/lfs.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Metrics
+    module Lfs
+      class << self
+        def initialize_slis!
+          Gitlab::Metrics::Sli::ErrorRate.initialize_sli(:lfs_update_objects, [{}])
+          Gitlab::Metrics::Sli::ErrorRate.initialize_sli(:lfs_check_objects, [{}])
+          Gitlab::Metrics::Sli::ErrorRate.initialize_sli(:lfs_validate_link_objects, [{}])
+        end
+
+        def update_objects_error_rate
+          Gitlab::Metrics::Sli::ErrorRate[:lfs_update_objects]
+        end
+
+        def check_objects_error_rate
+          Gitlab::Metrics::Sli::ErrorRate[:lfs_check_objects]
+        end
+
+        def validate_link_objects_error_rate
+          Gitlab::Metrics::Sli::ErrorRate[:lfs_validate_link_objects]
+        end
+      end
+    end
+  end
+end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 69e68caf4d6..fa36d352371 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -34912,9 +34912,6 @@ msgstr ""
 msgid "Notifications for %{project_or_group} are rate-limited due to the high volume of notifications sent."
 msgstr ""
 
-msgid "Notifications for %{project_or_group} are temporarily disabled due to excessive volume."
-msgstr ""
-
 msgid "Notifications have been disabled by the project or group owner"
 msgstr ""
 
@@ -54460,9 +54457,6 @@ msgstr ""
 msgid "To approve this merge request, please enter your password. This project requires all approvals to be authenticated."
 msgstr ""
 
-msgid "To avoid future interruption to notifications for #{project_or_group}, update your notification preferences."
-msgstr ""
-
 msgid "To avoid future interruption to notifications for %{project_or_group}, update your notification preferences."
 msgstr ""
 
@@ -62100,9 +62094,6 @@ msgstr ""
 msgid "is not allowed for this project."
 msgstr ""
 
-msgid "is not allowed since the group is not top-level group."
-msgstr ""
-
 msgid "is not allowed to add this type of parent"
 msgstr ""
 
diff --git a/spec/features/groups/packages_spec.rb b/spec/features/groups/packages_spec.rb
index d85b53c77b3..dfe11a9d87d 100644
--- a/spec/features/groups/packages_spec.rb
+++ b/spec/features/groups/packages_spec.rb
@@ -52,7 +52,7 @@ RSpec.describe 'Group Packages', feature_category: :package_registry do
       it_behaves_like 'package details link'
 
       it 'allows you to navigate to the project page' do
-        find_by_testid('root-link', text: project.name).click
+        click_link(project.name)
 
         expect(page).to have_current_path(project_path(project))
         expect(page).to have_content(project.name)
diff --git a/spec/frontend/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_linked_pipelines_mini_list_spec.js b/spec/frontend/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_linked_pipelines_mini_list_spec.js
new file mode 100644
index 00000000000..f7c51375260
--- /dev/null
+++ b/spec/frontend/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_linked_pipelines_mini_list_spec.js
@@ -0,0 +1,140 @@
+import { mount } from '@vue/test-utils';
+import CiIcon from '~/vue_shared/components/ci_icon/ci_icon.vue';
+import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
+import LinkedPipelinesMiniList from '~/ci/pipeline_mini_graph/linked_pipelines_mini_list.vue';
+import mockData from '../linked_pipelines_mock_data';
+
+describe('Linked pipeline mini list', () => {
+  let wrapper;
+
+  const findCiIcon = () => wrapper.findComponent(CiIcon);
+  const findCiIcons = () => wrapper.findAllComponents(CiIcon);
+  const findLinkedPipelineCounter = () => wrapper.find('[data-testid="linked-pipeline-counter"]');
+  const findLinkedPipelineMiniItem = () =>
+    wrapper.find('[data-testid="linked-pipeline-mini-item"]');
+  const findLinkedPipelineMiniItems = () =>
+    wrapper.findAll('[data-testid="linked-pipeline-mini-item"]');
+  const findLinkedPipelineMiniList = () => wrapper.findComponent(LinkedPipelinesMiniList);
+
+  const createComponent = (props = {}) => {
+    wrapper = mount(LinkedPipelinesMiniList, {
+      directives: {
+        GlTooltip: createMockDirective('gl-tooltip'),
+      },
+      propsData: {
+        ...props,
+      },
+    });
+  };
+
+  describe('when passed an upstream pipeline as prop', () => {
+    beforeEach(() => {
+      createComponent({
+        triggeredBy: [mockData.triggered_by],
+      });
+    });
+
+    it('should render one linked pipeline item', () => {
+      expect(findLinkedPipelineMiniItem().exists()).toBe(true);
+    });
+
+    it('should render a linked pipeline with the correct href', () => {
+      expect(findLinkedPipelineMiniItem().exists()).toBe(true);
+
+      expect(findLinkedPipelineMiniItem().attributes('href')).toBe(
+        '/gitlab-org/gitlab-foss/-/pipelines/129',
+      );
+    });
+
+    it('should render one ci status icon', () => {
+      expect(findCiIcon().exists()).toBe(true);
+    });
+
+    it('should render the correct ci status icon', () => {
+      expect(wrapper.find('[data-testid="status_running_borderless-icon"]').exists()).toBe(true);
+    });
+
+    it('should have an activated tooltip', () => {
+      expect(findLinkedPipelineMiniItem().exists()).toBe(true);
+      const tooltip = getBinding(findLinkedPipelineMiniItem().element, 'gl-tooltip');
+
+      expect(tooltip.value.title).toBe('GitLabCE - running');
+    });
+
+    it('should correctly set is-upstream', () => {
+      expect(findLinkedPipelineMiniList().exists()).toBe(true);
+
+      expect(findLinkedPipelineMiniList().classes('is-upstream')).toBe(true);
+    });
+
+    it('should correctly compute shouldRenderCounter', () => {
+      expect(findLinkedPipelineMiniList().vm.shouldRenderCounter).toBe(false);
+    });
+
+    it('should not render the pipeline counter', () => {
+      expect(findLinkedPipelineCounter().exists()).toBe(false);
+    });
+  });
+
+  describe('when passed downstream pipelines as props', () => {
+    beforeEach(() => {
+      createComponent({
+        triggered: mockData.triggered,
+        pipelinePath: 'my/pipeline/path',
+      });
+    });
+
+    it('should render three linked pipeline items', () => {
+      expect(findLinkedPipelineMiniItems().exists()).toBe(true);
+      expect(findLinkedPipelineMiniItems().length).toBe(3);
+    });
+
+    it('should render three ci status icons', () => {
+      expect(findCiIcons().exists()).toBe(true);
+      expect(findCiIcons().length).toBe(3);
+    });
+
+    it('should render the correct ci status icon', () => {
+      expect(wrapper.find('[data-testid="status_running_borderless-icon"]').exists()).toBe(true);
+    });
+
+    it('should have an activated tooltip', () => {
+      expect(findLinkedPipelineMiniItem().exists()).toBe(true);
+      const tooltip = getBinding(findLinkedPipelineMiniItem().element, 'gl-tooltip');
+
+      expect(tooltip.value.title).toBe('GitLabCE - running');
+    });
+
+    it('should correctly set is-downstream', () => {
+      expect(findLinkedPipelineMiniList().exists()).toBe(true);
+
+      expect(findLinkedPipelineMiniList().classes('is-downstream')).toBe(true);
+    });
+
+    it('should render the pipeline counter', () => {
+      expect(findLinkedPipelineCounter().exists()).toBe(true);
+    });
+
+    it('should correctly compute shouldRenderCounter', () => {
+      expect(findLinkedPipelineMiniList().vm.shouldRenderCounter).toBe(true);
+    });
+
+    it('should correctly trim linkedPipelines', () => {
+      expect(findLinkedPipelineMiniList().props('triggered').length).toBe(6);
+      expect(findLinkedPipelineMiniList().vm.linkedPipelinesTrimmed.length).toBe(3);
+    });
+
+    it('should set the correct pipeline path', () => {
+      expect(findLinkedPipelineCounter().exists()).toBe(true);
+
+      expect(findLinkedPipelineCounter().attributes('href')).toBe('my/pipeline/path');
+    });
+
+    it('should render the correct counterTooltipText', () => {
+      expect(findLinkedPipelineCounter().exists()).toBe(true);
+      const tooltip = getBinding(findLinkedPipelineCounter().element, 'gl-tooltip');
+
+      expect(tooltip.value.title).toBe(findLinkedPipelineMiniList().vm.counterTooltipText);
+    });
+  });
+});
diff --git a/spec/frontend/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph_spec.js b/spec/frontend/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph_spec.js
index 91199d47518..df533e4b342 100644
--- a/spec/frontend/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph_spec.js
+++ b/spec/frontend/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph_spec.js
@@ -1,7 +1,7 @@
 import { mount } from '@vue/test-utils';
 import { pipelines } from 'test_fixtures/pipelines/pipelines.json';
 import LegacyPipelineMiniGraph from '~/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph.vue';
-import PipelineStages from '~/ci/pipeline_mini_graph/pipeline_stages.vue';
+import PipelineStages from '~/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_stages.vue';
 import mockLinkedPipelines from '../linked_pipelines_mock_data';
 
 const mockStages = pipelines[0].details.stages;
diff --git a/spec/frontend/ci/pipeline_mini_graph/pipeline_stages_spec.js b/spec/frontend/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_stages_spec.js
similarity index 91%
rename from spec/frontend/ci/pipeline_mini_graph/pipeline_stages_spec.js
rename to spec/frontend/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_stages_spec.js
index 54b8830fbb9..444f59573b0 100644
--- a/spec/frontend/ci/pipeline_mini_graph/pipeline_stages_spec.js
+++ b/spec/frontend/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_stages_spec.js
@@ -1,7 +1,7 @@
 import { shallowMount } from '@vue/test-utils';
 import { pipelines } from 'test_fixtures/pipelines/pipelines.json';
 import LegacyPipelineStage from '~/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_stage.vue';
-import PipelineStages from '~/ci/pipeline_mini_graph/pipeline_stages.vue';
+import LegacyPipelineStages from '~/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_stages.vue';
 
 const mockStages = pipelines[0].details.stages;
 
@@ -12,7 +12,7 @@ describe('Pipeline Stages', () => {
   const findPipelineStagesAt = (i) => findLegacyPipelineStages().at(i);
 
   const createComponent = (props = {}) => {
-    wrapper = shallowMount(PipelineStages, {
+    wrapper = shallowMount(LegacyPipelineStages, {
       propsData: {
         stages: mockStages,
         ...props,
diff --git a/spec/frontend/ci/pipeline_mini_graph/pipeline_mini_graph_spec.js b/spec/frontend/ci/pipeline_mini_graph/pipeline_mini_graph_spec.js
index 87b6dc734c2..48f6b0baf0b 100644
--- a/spec/frontend/ci/pipeline_mini_graph/pipeline_mini_graph_spec.js
+++ b/spec/frontend/ci/pipeline_mini_graph/pipeline_mini_graph_spec.js
@@ -9,7 +9,6 @@ import createMockApollo from 'helpers/mock_apollo_helper';
 
 import getLinkedPipelinesQuery from '~/ci/pipeline_details/graphql/queries/get_linked_pipelines.query.graphql';
 import getPipelineStagesQuery from '~/ci/pipeline_mini_graph/graphql/queries/get_pipeline_stages.query.graphql';
-import LegacyPipelineMiniGraph from '~/ci/pipeline_mini_graph/legacy_pipeline_mini_graph/legacy_pipeline_mini_graph.vue';
 import PipelineMiniGraph from '~/ci/pipeline_mini_graph/pipeline_mini_graph.vue';
 import * as sharedGraphQlUtils from '~/graphql_shared/utils';
 
@@ -54,7 +53,7 @@ describe('PipelineMiniGraph', () => {
     return waitForPromises();
   };
 
-  const findLegacyPipelineMiniGraph = () => wrapper.findComponent(LegacyPipelineMiniGraph);
+  const findPipelineMiniGraph = () => wrapper.findComponent('[data-testid="pipeline-mini-graph"]');
   const findLoadingIcon = () => wrapper.findComponent(GlLoadingIcon);
 
   beforeEach(() => {
@@ -69,7 +68,7 @@ describe('PipelineMiniGraph', () => {
 
     it('shows a loading icon and no mini graph', () => {
       expect(findLoadingIcon().exists()).toBe(true);
-      expect(findLegacyPipelineMiniGraph().exists()).toBe(false);
+      expect(findPipelineMiniGraph().exists()).toBe(false);
     });
   });
 
@@ -83,7 +82,7 @@ describe('PipelineMiniGraph', () => {
     it('renders the Pipeline Mini Graph', async () => {
       await createComponent();
 
-      expect(findLegacyPipelineMiniGraph().exists()).toBe(true);
+      expect(findPipelineMiniGraph().exists()).toBe(true);
     });
 
     it('fires the queries', async () => {
diff --git a/spec/frontend/editor/schema/ci/ci_schema_spec.js b/spec/frontend/editor/schema/ci/ci_schema_spec.js
index 39802d5253c..9a87fc83811 100644
--- a/spec/frontend/editor/schema/ci/ci_schema_spec.js
+++ b/spec/frontend/editor/schema/ci/ci_schema_spec.js
@@ -44,6 +44,7 @@ import WorkflowRulesAutoCancelOnJobFailureYaml from './yaml_tests/positive_tests
 import WorkflowRulesAutoCancelOnNewCommitYaml from './yaml_tests/positive_tests/workflow/rules/auto_cancel/on_new_commit.yml';
 import StagesYaml from './yaml_tests/positive_tests/stages.yml';
 import RetryYaml from './yaml_tests/positive_tests/retry.yml';
+import ParallelYaml from './yaml_tests/positive_tests/parallel.yml';
 
 // YAML NEGATIVE TEST
 import ArtifactsNegativeYaml from './yaml_tests/negative_tests/artifacts.yml';
@@ -76,6 +77,7 @@ import WorkflowRulesAutoCancelOnJobFailureNegativeYaml from './yaml_tests/negati
 import WorkflowRulesAutoCancelOnNewCommitNegativeYaml from './yaml_tests/negative_tests/workflow/rules/auto_cancel/on_new_commit.yml';
 import StagesNegativeYaml from './yaml_tests/negative_tests/stages.yml';
 import RetryNegativeYaml from './yaml_tests/negative_tests/retry.yml';
+import ParallelNegativeYaml from './yaml_tests/negative_tests/parallel.yml';
 
 const ajv = new Ajv({
   strictTypes: false,
@@ -123,6 +125,7 @@ describe('positive tests', () => {
       WorkflowRulesAutoCancelOnNewCommitYaml,
       StagesYaml,
       RetryYaml,
+      ParallelYaml,
     }),
   )('schema validates %s', (_, input) => {
     // We construct a new "JSON" from each main key that is inside a
@@ -195,6 +198,7 @@ describe('negative tests', () => {
       WorkflowRulesAutoCancelOnNewCommitNegativeYaml,
       StagesNegativeYaml,
       RetryNegativeYaml,
+      ParallelNegativeYaml,
     }),
   )('schema validates %s', (_, input) => {
     // We construct a new "JSON" from each main key that is inside a
diff --git a/spec/frontend/editor/schema/ci/yaml_tests/negative_tests/parallel.yml b/spec/frontend/editor/schema/ci/yaml_tests/negative_tests/parallel.yml
new file mode 100644
index 00000000000..86b1ad75fee
--- /dev/null
+++ b/spec/frontend/editor/schema/ci/yaml_tests/negative_tests/parallel.yml
@@ -0,0 +1,12 @@
+# invalid parallel
+value as string:
+  script: exit 0
+  parallel: "5"
+
+smaller than minimum value:
+  script: exit 0
+  parallel: 0
+
+greater than maximum value:
+  script: exit 0
+  parallel: 201
diff --git a/spec/frontend/editor/schema/ci/yaml_tests/positive_tests/parallel.yml b/spec/frontend/editor/schema/ci/yaml_tests/positive_tests/parallel.yml
new file mode 100644
index 00000000000..fad0521586d
--- /dev/null
+++ b/spec/frontend/editor/schema/ci/yaml_tests/positive_tests/parallel.yml
@@ -0,0 +1,12 @@
+# valid parallel
+parallel job:
+  script: exit 0
+  parallel: 5
+
+minimum allowed value:
+  script: exit 0
+  parallel: 1
+
+maximum allowed value:
+  script: exit 0
+  parallel: 200
diff --git a/spec/frontend/packages_and_registries/container_registry/explorer/components/list_page/image_list_row_spec.js b/spec/frontend/packages_and_registries/container_registry/explorer/components/list_page/image_list_row_spec.js
index 329f87aad87..f641cd702be 100644
--- a/spec/frontend/packages_and_registries/container_registry/explorer/components/list_page/image_list_row_spec.js
+++ b/spec/frontend/packages_and_registries/container_registry/explorer/components/list_page/image_list_row_spec.js
@@ -1,5 +1,5 @@
 import { GlSprintf, GlSkeletonLoader, GlButton } from '@gitlab/ui';
-import { shallowMount } from '@vue/test-utils';
+import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import { createMockDirective } from 'helpers/vue_mock_directive';
 import { mockTracking } from 'helpers/tracking_helper';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
@@ -17,6 +17,7 @@ import {
 } from '~/packages_and_registries/container_registry/explorer/constants';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import ListItem from '~/vue_shared/components/registry/list_item.vue';
+import PublishMessage from '~/packages_and_registries/shared/components/publish_message.vue';
 import { imagesListResponse } from '../../mock_data';
 import { RouterLink } from '../../stubs';
 
@@ -32,21 +33,24 @@ describe('Image List Row', () => {
   const findSkeletonLoader = () => wrapper.findComponent(GlSkeletonLoader);
   const findListItemComponent = () => wrapper.findComponent(ListItem);
   const findShowFullPathButton = () => wrapper.findComponent(GlButton);
+  const findPublishMessage = () => wrapper.findComponent(PublishMessage);
 
-  const mountComponent = (props) => {
-    wrapper = shallowMount(Component, {
+  const mountComponent = ({ props = {}, config = {} } = {}) => {
+    wrapper = shallowMountExtended(Component, {
       stubs: {
         RouterLink,
-        GlSprintf,
         ListItem,
         GlButton,
+        GlSprintf,
       },
       propsData: {
         item,
         ...props,
       },
       provide: {
-        config: {},
+        config: {
+          ...config,
+        },
       },
       directives: {
         GlTooltip: createMockDirective('gl-tooltip'),
@@ -72,7 +76,7 @@ describe('Image List Row', () => {
     });
 
     it('when the image has no name lists the path', () => {
-      mountComponent({ item: { ...item, name: '' } });
+      mountComponent({ props: { item: { ...item, name: '' } } });
 
       expect(findDetailsLink().text()).toBe('gitlab-test');
     });
@@ -110,7 +114,7 @@ describe('Image List Row', () => {
       `(
         'when expirationPolicyCleanupStatus is $expirationPolicyCleanupStatus it is $shown that the component exists',
         ({ expirationPolicyCleanupStatus, shown }) => {
-          mountComponent({ item: { ...item, expirationPolicyCleanupStatus } });
+          mountComponent({ props: { item: { ...item, expirationPolicyCleanupStatus } } });
 
           expect(findCleanupStatus().exists()).toBe(shown);
 
@@ -125,7 +129,7 @@ describe('Image List Row', () => {
 
     describe('when the item is deleting', () => {
       beforeEach(() => {
-        mountComponent({ item: { ...item, status: IMAGE_DELETE_SCHEDULED_STATUS } });
+        mountComponent({ props: { item: { ...item, status: IMAGE_DELETE_SCHEDULED_STATUS } } });
       });
 
       it('the router link does not exist', () => {
@@ -183,12 +187,14 @@ describe('Image List Row', () => {
       'disabled is $state when userPermissions.destroyContainerRepository is $destroyContainerRepository and status is $status',
       ({ destroyContainerRepository, status, state }) => {
         mountComponent({
-          item: {
-            ...item,
-            userPermissions: {
-              destroyContainerRepository,
+          props: {
+            item: {
+              ...item,
+              userPermissions: {
+                destroyContainerRepository,
+              },
+              status,
             },
-            status,
           },
         });
 
@@ -197,7 +203,7 @@ describe('Image List Row', () => {
     );
 
     it('is disabled when migrationState is importing', () => {
-      mountComponent({ item: { ...item, migrationState: IMAGE_MIGRATING_STATE } });
+      mountComponent({ props: { item: { ...item, migrationState: IMAGE_MIGRATING_STATE } } });
 
       expect(findDeleteBtn().props('disabled')).toBe(true);
     });
@@ -210,30 +216,58 @@ describe('Image List Row', () => {
     });
 
     describe('loading state', () => {
-      it('shows a loader when metadataLoading is true', () => {
-        mountComponent({ metadataLoading: true });
+      beforeEach(() => {
+        mountComponent({ props: { metadataLoading: true } });
+      });
 
+      it('shows a loader when metadataLoading is true', () => {
         expect(findSkeletonLoader().exists()).toBe(true);
       });
 
       it('hides the tags count while loading', () => {
-        mountComponent({ metadataLoading: true });
-
         expect(findTagsCount().exists()).toBe(false);
       });
     });
 
     describe('tags count text', () => {
       it('with one tag in the image', () => {
-        mountComponent({ item: { ...item, tagsCount: 1 } });
+        mountComponent({ props: { item: { ...item, tagsCount: 1 } } });
 
         expect(findTagsCount().text()).toMatchInterpolatedText('1 tag');
       });
       it('with more than one tag in the image', () => {
-        mountComponent({ item: { ...item, tagsCount: 3 } });
+        mountComponent({ props: { item: { ...item, tagsCount: 3 } } });
 
         expect(findTagsCount().text()).toMatchInterpolatedText('3 tags');
       });
     });
   });
+
+  describe('PublishMessage component', () => {
+    it('is rendered', () => {
+      mountComponent();
+
+      expect(findPublishMessage().props()).toStrictEqual({
+        author: '',
+        projectUrl: '',
+        projectName: '',
+        publishDate: item.createdAt,
+      });
+    });
+
+    it('is rendered with package name & link on group pages', () => {
+      mountComponent({
+        config: {
+          isGroupPage: true,
+        },
+      });
+
+      expect(findPublishMessage().props()).toStrictEqual({
+        author: '',
+        projectName: 'gitlab-test',
+        projectUrl: 'http://localhost:3000/gitlab-org/gitlab-test',
+        publishDate: item.createdAt,
+      });
+    });
+  });
 });
diff --git a/spec/frontend/packages_and_registries/container_registry/explorer/mock_data.js b/spec/frontend/packages_and_registries/container_registry/explorer/mock_data.js
index 833351cba79..d3c08cb9884 100644
--- a/spec/frontend/packages_and_registries/container_registry/explorer/mock_data.js
+++ b/spec/frontend/packages_and_registries/container_registry/explorer/mock_data.js
@@ -13,12 +13,14 @@ export const imagesListResponse = [
     status: null,
     migrationState: 'default',
     location: '0.0.0.0:5000/gitlab-org/gitlab-test/rails-12009',
-    createdAt: '2020-11-03T13:29:21Z',
+    createdAt: '2020-05-17T14:23:32Z',
     expirationPolicyStartedAt: null,
     expirationPolicyCleanupStatus: 'UNSCHEDULED',
     project: {
       id: 'gid://gitlab/Project/22',
+      name: 'gitlab-test',
       path: 'GITLAB-TEST',
+      webUrl: 'http://localhost:3000/gitlab-org/gitlab-test',
     },
     ...userPermissionsData,
   },
@@ -35,7 +37,9 @@ export const imagesListResponse = [
     expirationPolicyCleanupStatus: 'UNSCHEDULED',
     project: {
       id: 'gid://gitlab/Project/22',
-      path: 'gitlab-test',
+      name: 'gitlab-test',
+      path: 'GITLAB-TEST',
+      webUrl: 'http://localhost:3000/gitlab-org/gitlab-test',
     },
     ...userPermissionsData,
   },
diff --git a/spec/frontend/packages_and_registries/package_registry/components/details/version_row_spec.js b/spec/frontend/packages_and_registries/package_registry/components/details/version_row_spec.js
index 9a2d92c1a15..f7e1a27f780 100644
--- a/spec/frontend/packages_and_registries/package_registry/components/details/version_row_spec.js
+++ b/spec/frontend/packages_and_registries/package_registry/components/details/version_row_spec.js
@@ -4,16 +4,15 @@ import {
   GlFormCheckbox,
   GlIcon,
   GlLink,
-  GlSprintf,
   GlTruncate,
 } from '@gitlab/ui';
 import { mountExtended, shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import ListItem from '~/vue_shared/components/registry/list_item.vue';
 import PackageTags from '~/packages_and_registries/shared/components/package_tags.vue';
+import PublishMessage from '~/packages_and_registries/shared/components/publish_message.vue';
 import PublishMethod from '~/packages_and_registries/shared/components/publish_method.vue';
 import VersionRow from '~/packages_and_registries/package_registry/components/details/version_row.vue';
-import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import { PACKAGE_ERROR_STATUS } from '~/packages_and_registries/package_registry/constants';
 import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
 
@@ -27,8 +26,8 @@ describe('VersionRow', () => {
   const findListItem = () => wrapper.findComponent(ListItem);
   const findLink = () => wrapper.findComponent(GlLink);
   const findPackageTags = () => wrapper.findComponent(PackageTags);
+  const findPublishMessage = () => wrapper.findComponent(PublishMessage);
   const findPublishMethod = () => wrapper.findComponent(PublishMethod);
-  const findTimeAgoTooltip = () => wrapper.findComponent(TimeAgoTooltip);
   const findPackageName = () => wrapper.findByTestId('package-name');
   const findWarningIcon = () => wrapper.findComponent(GlIcon);
   const findBulkDeleteAction = () => wrapper.findComponent(GlFormCheckbox);
@@ -47,7 +46,6 @@ describe('VersionRow', () => {
         selected,
       },
       stubs: {
-        GlSprintf,
         GlTruncate,
         GlDisclosureDropdown,
       },
@@ -86,10 +84,10 @@ describe('VersionRow', () => {
 
     expect(findPublishMethod().props('packageEntity')).toBe(packageVersion);
   });
-  it('has a time-ago tooltip', () => {
+  it('renders publish message component & passes createdAt', () => {
     createComponent();
 
-    expect(findTimeAgoTooltip().props('time')).toBe(packageVersion.createdAt);
+    expect(findPublishMessage().props('publishDate')).toBe(packageVersion.createdAt);
   });
 
   describe('left action template', () => {
diff --git a/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/package_list_row_spec.js.snap b/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/package_list_row_spec.js.snap
index 0183449b8d2..de1e17cc500 100644
--- a/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/package_list_row_spec.js.snap
+++ b/spec/frontend/packages_and_registries/package_registry/components/list/__snapshots__/package_list_row_spec.js.snap
@@ -70,17 +70,12 @@ exports[`packages_list_row renders 1`] = `
         <div
           class="gl-align-items-center gl-display-flex gl-font-sm gl-min-h-6"
         >
-          <span
-            data-testid="right-secondary"
-          >
-            Published
-            <time
-              datetime="2020-05-17T14:23:32Z"
-              title="May 17, 2020 at 2:23:32 PM GMT"
-            >
-              1 month ago
-            </time>
-          </span>
+          <publish-message-stub
+            author=""
+            projectname=""
+            projecturl=""
+            publishdate="2020-05-17T14:23:32Z"
+          />
         </div>
       </div>
     </div>
diff --git a/spec/frontend/packages_and_registries/package_registry/components/list/package_list_row_spec.js b/spec/frontend/packages_and_registries/package_registry/components/list/package_list_row_spec.js
index 37895ffa04c..e08f6afbf97 100644
--- a/spec/frontend/packages_and_registries/package_registry/components/list/package_list_row_spec.js
+++ b/spec/frontend/packages_and_registries/package_registry/components/list/package_list_row_spec.js
@@ -7,8 +7,8 @@ import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import PackagesListRow from '~/packages_and_registries/package_registry/components/list/package_list_row.vue';
 import PackageTags from '~/packages_and_registries/shared/components/package_tags.vue';
+import PublishMessage from '~/packages_and_registries/shared/components/publish_message.vue';
 import PublishMethod from '~/packages_and_registries/package_registry/components/list/publish_method.vue';
-import TimeagoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 import { PACKAGE_ERROR_STATUS } from '~/packages_and_registries/package_registry/constants';
 
 import ListItem from '~/vue_shared/components/registry/list_item.vue';
@@ -42,8 +42,8 @@ describe('packages_list_row', () => {
   const findWarningIcon = () => wrapper.findByTestId('warning-icon');
   const findLeftSecondaryInfos = () => wrapper.findByTestId('left-secondary-infos');
   const findPackageVersion = () => findLeftSecondaryInfos().findComponent(GlTruncate);
+  const findPublishMessage = () => wrapper.findComponent(PublishMessage);
   const findPublishMethod = () => wrapper.findComponent(PublishMethod);
-  const findRightSecondary = () => wrapper.findByTestId('right-secondary');
   const findListItem = () => wrapper.findComponent(ListItem);
   const findBulkDeleteAction = () => wrapper.findComponent(GlFormCheckbox);
   const findPackageName = () => wrapper.findByTestId('package-name');
@@ -58,7 +58,6 @@ describe('packages_list_row', () => {
       stubs: {
         ListItem,
         GlSprintf,
-        TimeagoTooltip,
         RouterLink: RouterLinkStub,
         GlBadge,
       },
@@ -173,8 +172,8 @@ describe('packages_list_row', () => {
       expect(findPublishMethod().exists()).toBe(false);
     });
 
-    it('does not show the published time', () => {
-      expect(findRightSecondary().exists()).toBe(false);
+    it('does not show published message', () => {
+      expect(findPublishMessage().exists()).toBe(false);
     });
 
     it('does not have a link to navigate to the details page', () => {
@@ -271,6 +270,12 @@ describe('packages_list_row', () => {
   });
 
   describe('right info', () => {
+    const projectPageProps = {
+      projectName: '',
+      projectUrl: '',
+      publishDate: packageWithoutTags.createdAt,
+    };
+
     it('has publish method component', () => {
       mountComponent({
         packageEntity: { ...packageWithoutTags, pipelines: { nodes: packagePipelines() } },
@@ -279,50 +284,64 @@ describe('packages_list_row', () => {
       expect(findPublishMethod().props('pipeline')).toEqual(packagePipelines()[0]);
     });
 
-    it('if the package is published through CI show the author name', () => {
+    it('if the package is published through CI sets author on PublishMessage component', () => {
       mountComponent({
         packageEntity: { ...packageWithoutTags, pipelines: { nodes: packagePipelines() } },
       });
 
-      expect(findRightSecondary().text()).toBe(`Published by Administrator, 1 month ago`);
+      expect(findPublishMessage().props()).toStrictEqual({
+        author: 'Administrator',
+        ...projectPageProps,
+      });
     });
 
-    it('if the package is published manually then dont show author name', () => {
+    it('if the package is published manually then does not set author on PublishMessage component', () => {
       mountComponent({
         packageEntity: { ...packageWithoutTags },
       });
 
-      expect(findRightSecondary().text()).toBe(`Published 1 month ago`);
-    });
-  });
-
-  describe('right info for a group registry', () => {
-    it('if the package is published through CI show the project and author name', () => {
-      mountComponent({
-        provide: {
-          ...defaultProvide,
-          isGroupPage: true,
-        },
-        packageEntity: { ...packageWithoutTags, pipelines: { nodes: packagePipelines() } },
+      expect(findPublishMessage().props()).toStrictEqual({
+        author: '',
+        ...projectPageProps,
       });
-
-      expect(findRightSecondary().text()).toBe(
-        `Published to ${packageWithoutTags.project.name} by Administrator, 1 month ago`,
-      );
     });
 
-    it('if the package is published manually dont show project and the author name', () => {
-      mountComponent({
-        provide: {
-          ...defaultProvide,
-          isGroupPage: true,
-        },
-        packageEntity: { ...packageWithoutTags },
+    describe('PublishMessage component for group page', () => {
+      const groupPageProps = {
+        projectName: packageWithoutTags.project.name,
+        projectUrl: packageWithoutTags.project.webUrl,
+        publishDate: packageWithoutTags.createdAt,
+      };
+
+      it('if the package is published through CI sets project name, url and author', () => {
+        mountComponent({
+          provide: {
+            ...defaultProvide,
+            isGroupPage: true,
+          },
+          packageEntity: { ...packageWithoutTags, pipelines: { nodes: packagePipelines() } },
+        });
+
+        expect(findPublishMessage().props()).toStrictEqual({
+          author: 'Administrator',
+          ...groupPageProps,
+        });
       });
 
-      expect(findRightSecondary().text()).toBe(
-        `Published to ${packageWithoutTags.project.name}, 1 month ago`,
-      );
+      it('if the package is published manually passes show project name, url and does not set author', () => {
+        mountComponent({
+          provide: {
+            ...defaultProvide,
+            isGroupPage: true,
+          },
+          packageEntity: { ...packageWithoutTags },
+        });
+
+        expect(findPublishMessage().props()).toStrictEqual({
+          author: '',
+          ...groupPageProps,
+        });
+      });
     });
   });
 
diff --git a/spec/frontend/packages_and_registries/shared/components/publish_message_spec.js b/spec/frontend/packages_and_registries/shared/components/publish_message_spec.js
new file mode 100644
index 00000000000..2d70effb6f7
--- /dev/null
+++ b/spec/frontend/packages_and_registries/shared/components/publish_message_spec.js
@@ -0,0 +1,49 @@
+import { GlSprintf, GlLink } from '@gitlab/ui';
+import { shallowMount } from '@vue/test-utils';
+import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
+import PublishMessage from '~/packages_and_registries/shared/components/publish_message.vue';
+import { useFakeDate } from 'helpers/fake_date';
+
+describe('PublishMessage', () => {
+  let wrapper;
+
+  // set the date to June 4, 2020
+  useFakeDate(2020, 6, 4);
+
+  const defaultProps = { publishDate: '2020-05-17T14:23:32Z' };
+
+  const findProjectLink = () => wrapper.findComponent(GlLink);
+
+  const createComponent = (props = {}) => {
+    wrapper = shallowMount(PublishMessage, {
+      stubs: {
+        GlSprintf,
+        TimeAgoTooltip,
+      },
+      propsData: {
+        ...defaultProps,
+        ...props,
+      },
+    });
+  };
+
+  it.each`
+    additionalProps                                                                          | expectedText                                            | expectedHref
+    ${{}}                                                                                    | ${'Published 1 month ago'}                              | ${undefined}
+    ${{ author: 'Administrator' }}                                                           | ${'Published by Administrator, 1 month ago'}            | ${undefined}
+    ${{ projectName: 'example' }}                                                            | ${'Published to example, 1 month ago'}                  | ${'#'}
+    ${{ projectName: 'example', projectUrl: 'http://example.com' }}                          | ${'Published to example, 1 month ago'}                  | ${'http://example.com'}
+    ${{ projectName: 'example', author: 'Administrator' }}                                   | ${'Published to example by Administrator, 1 month ago'} | ${'#'}
+    ${{ projectName: 'example', projectUrl: 'http://example.com', author: 'Administrator' }} | ${'Published to example by Administrator, 1 month ago'} | ${'http://example.com'}
+  `(
+    'renders $expectedText with $additionalProps',
+    ({ additionalProps, expectedText, expectedHref }) => {
+      createComponent(additionalProps);
+
+      expect(wrapper.text()).toBe(expectedText);
+      if (expectedHref) {
+        expect(findProjectLink().attributes('href')).toBe(expectedHref);
+      }
+    },
+  );
+});
diff --git a/spec/lib/gitlab/background_migration/backfill_design_management_versions_namespace_id_spec.rb b/spec/lib/gitlab/background_migration/backfill_design_management_versions_namespace_id_spec.rb
new file mode 100644
index 00000000000..04e6ef74db0
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/backfill_design_management_versions_namespace_id_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::BackgroundMigration::BackfillDesignManagementVersionsNamespaceId,
+  feature_category: :design_management,
+  schema: 20240530121652 do
+  include_examples 'desired sharding key backfill job' do
+    let(:batch_table) { :design_management_versions }
+    let(:backfill_column) { :namespace_id }
+    let(:backfill_via_table) { :issues }
+    let(:backfill_via_column) { :namespace_id }
+    let(:backfill_via_foreign_key) { :issue_id }
+  end
+end
diff --git a/spec/lib/gitlab/checks/lfs_check_spec.rb b/spec/lib/gitlab/checks/lfs_check_spec.rb
index ef27b30475f..4e7ac9e179d 100644
--- a/spec/lib/gitlab/checks/lfs_check_spec.rb
+++ b/spec/lib/gitlab/checks/lfs_check_spec.rb
@@ -34,6 +34,9 @@ RSpec.describe Gitlab::Checks::LfsCheck, feature_category: :source_code_manageme
       context 'with deletion' do
         shared_examples 'a skipped integrity check' do
           it 'skips integrity check' do
+            expect(Gitlab::Metrics::Lfs).to receive_message_chain(:check_objects_error_rate, :increment).with(
+              error: false, labels: {})
+
             expect(project.repository).not_to receive(:new_objects)
             expect_any_instance_of(Gitlab::Git::LfsChanges).not_to receive(:new_pointers)
 
@@ -55,6 +58,9 @@ RSpec.describe Gitlab::Checks::LfsCheck, feature_category: :source_code_manageme
       end
 
       it 'fails if any LFS blobs are missing' do
+        expect(Gitlab::Metrics::Lfs).to receive_message_chain(:check_objects_error_rate, :increment).with(error: true,
+          labels: {})
+
         expect { subject.validate! }.to raise_error(Gitlab::GitAccess::ForbiddenError, /LFS objects are missing/)
       end
 
@@ -62,6 +68,9 @@ RSpec.describe Gitlab::Checks::LfsCheck, feature_category: :source_code_manageme
         lfs_object = create(:lfs_object, oid: blob_object.lfs_oid)
         create(:lfs_objects_project, project: project, lfs_object: lfs_object)
 
+        expect(Gitlab::Metrics::Lfs).to receive_message_chain(:check_objects_error_rate, :increment).with(error: false,
+          labels: {})
+
         expect { subject.validate! }.not_to raise_error
       end
     end
diff --git a/spec/lib/gitlab/metrics/lfs_spec.rb b/spec/lib/gitlab/metrics/lfs_spec.rb
new file mode 100644
index 00000000000..86d1ec8651e
--- /dev/null
+++ b/spec/lib/gitlab/metrics/lfs_spec.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Metrics::Lfs, feature_category: :source_code_management do
+  describe '#initialize_slis!' do
+    it 'initializes all metrics' do
+      expect(Gitlab::Metrics::Sli::ErrorRate).to receive(:initialize_sli).with(:lfs_update_objects, [{}])
+      expect(Gitlab::Metrics::Sli::ErrorRate).to receive(:initialize_sli).with(:lfs_check_objects, [{}])
+      expect(Gitlab::Metrics::Sli::ErrorRate).to receive(:initialize_sli).with(:lfs_validate_link_objects, [{}])
+
+      described_class.initialize_slis!
+    end
+  end
+
+  describe '#update_objects_error_rate' do
+    it 'calls increment on lfs_update_objects metric' do
+      expect(Gitlab::Metrics::Sli::ErrorRate[:lfs_update_objects]).to receive(:increment).once
+
+      described_class.update_objects_error_rate.increment(error: true, labels: {})
+    end
+  end
+
+  describe '#check_objects_error_rate' do
+    it 'calls increment on lfs_check_objects metric' do
+      expect(Gitlab::Metrics::Sli::ErrorRate[:lfs_check_objects]).to receive(:increment).once
+
+      described_class.check_objects_error_rate.increment(error: true, labels: {})
+    end
+  end
+
+  describe '#validate_link_objects_error_rate' do
+    it 'calls increment on lfs_validate_link_objects metric' do
+      expect(Gitlab::Metrics::Sli::ErrorRate[:lfs_validate_link_objects]).to receive(:increment).once
+
+      described_class.validate_link_objects_error_rate.increment(error: true, labels: {})
+    end
+  end
+end
diff --git a/spec/migrations/20240530121656_queue_backfill_design_management_versions_namespace_id_spec.rb b/spec/migrations/20240530121656_queue_backfill_design_management_versions_namespace_id_spec.rb
new file mode 100644
index 00000000000..4b716b9968e
--- /dev/null
+++ b/spec/migrations/20240530121656_queue_backfill_design_management_versions_namespace_id_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe QueueBackfillDesignManagementVersionsNamespaceId, feature_category: :design_management do
+  let!(:batched_migration) { described_class::MIGRATION }
+
+  it 'schedules a new batched migration' do
+    reversible_migration do |migration|
+      migration.before -> {
+        expect(batched_migration).not_to have_scheduled_batched_migration
+      }
+
+      migration.after -> {
+        expect(batched_migration).to have_scheduled_batched_migration(
+          table_name: :design_management_versions,
+          column_name: :id,
+          interval: described_class::DELAY_INTERVAL,
+          batch_size: described_class::BATCH_SIZE,
+          sub_batch_size: described_class::SUB_BATCH_SIZE,
+          gitlab_schema: :gitlab_main_cell,
+          job_arguments: [
+            :namespace_id,
+            :issues,
+            :namespace_id,
+            :issue_id
+          ]
+        )
+      }
+    end
+  end
+end
diff --git a/spec/models/namespace_setting_spec.rb b/spec/models/namespace_setting_spec.rb
index 1e228f2e50e..57828a8a680 100644
--- a/spec/models/namespace_setting_spec.rb
+++ b/spec/models/namespace_setting_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 RSpec.describe NamespaceSetting, feature_category: :groups_and_projects, type: :model do
   let_it_be(:group) { create(:group) }
-  let_it_be(:subgroup) { create(:group, parent: group) }
+  let_it_be(:subgroup, refind: true) { create(:group, parent: group) }
   let(:namespace_settings) { group.namespace_settings }
 
   it_behaves_like 'sanitizable', :namespace_settings, %i[default_branch_name]
@@ -69,7 +69,7 @@ RSpec.describe NamespaceSetting, feature_category: :groups_and_projects, type: :
       end
     end
 
-    describe '#allow_mfa_for_group' do
+    describe 'allow_mfa_for_subgroups' do
       context 'group is top-level group' do
         it 'is valid' do
           namespace_settings.allow_mfa_for_subgroups = false
@@ -81,15 +81,27 @@ RSpec.describe NamespaceSetting, feature_category: :groups_and_projects, type: :
       context 'group is a subgroup' do
         let(:namespace_settings) { subgroup.namespace_settings }
 
-        it 'is invalid' do
+        it 'is valid if true' do
+          namespace_settings.allow_mfa_for_subgroups = true
+
+          expect(namespace_settings).to be_valid
+        end
+
+        it 'is invalid if false' do
           namespace_settings.allow_mfa_for_subgroups = false
 
           expect(namespace_settings).to be_invalid
         end
+
+        it 'is invalid if nil' do
+          namespace_settings.allow_mfa_for_subgroups = nil
+
+          expect(namespace_settings).to be_invalid
+        end
       end
     end
 
-    describe '#allow_resource_access_token_creation_for_group' do
+    describe 'resource_access_token_creation_allowed' do
       context 'group is top-level group' do
         it 'is valid' do
           namespace_settings.resource_access_token_creation_allowed = false
@@ -99,13 +111,12 @@ RSpec.describe NamespaceSetting, feature_category: :groups_and_projects, type: :
       end
 
       context 'group is a subgroup' do
-        let(:group) { create(:group, parent: create(:group)) }
+        let(:namespace_settings) { subgroup.namespace_settings }
 
         it 'is invalid when resource access token creation is not enabled' do
           namespace_settings.resource_access_token_creation_allowed = false
 
           expect(namespace_settings).to be_invalid
-          expect(namespace_settings.errors.messages[:resource_access_token_creation_allowed]).to include("is not allowed since the group is not top-level group.")
         end
 
         it 'is valid when resource access tokens are enabled' do
@@ -113,6 +124,12 @@ RSpec.describe NamespaceSetting, feature_category: :groups_and_projects, type: :
 
           expect(namespace_settings).to be_valid
         end
+
+        it 'is invalid if nil' do
+          namespace_settings.resource_access_token_creation_allowed = nil
+
+          expect(namespace_settings).to be_invalid
+        end
       end
     end
 
diff --git a/spec/services/packages/debian/extract_changes_metadata_service_spec.rb b/spec/services/packages/debian/extract_changes_metadata_service_spec.rb
index b46ea820f70..ab1e267fefd 100644
--- a/spec/services/packages/debian/extract_changes_metadata_service_spec.rb
+++ b/spec/services/packages/debian/extract_changes_metadata_service_spec.rb
@@ -9,12 +9,11 @@ RSpec.describe Packages::Debian::ExtractChangesMetadataService, feature_category
       create(:debian_package, without_package_files: true, with_changes_file: true, project: incoming.project)
     end
 
-    let(:source_file) { incoming.package_files.first }
-    let(:dsc_file) { incoming.package_files.second }
-    let(:changes_file) { temp_package.package_files.first }
-    let(:service) { described_class.new(changes_file) }
+    let_it_be_with_reload(:source_file) { incoming.package_files.find_by(file_name: 'sample_1.2.3~alpha2.tar.xz') }
+    let_it_be_with_reload(:dsc_file) { incoming.package_files.find_by(file_name: 'sample_1.2.3~alpha2.dsc') }
+    let_it_be_with_reload(:changes_file) { temp_package.package_files.find_by(file_name: 'sample_1.2.3~alpha2_amd64.changes') }
 
-    subject { service.execute }
+    subject(:service) { described_class.new(changes_file).execute }
 
     context 'with valid package file' do
       it 'extract metadata', :aggregate_failures do
@@ -27,8 +26,8 @@ RSpec.describe Packages::Debian::ExtractChangesMetadataService, feature_category
       end
     end
 
-    context 'with invalid package file' do
-      let(:changes_file) { incoming.package_files.first }
+    context 'with invalid changes file' do
+      let_it_be(:changes_file) { incoming.package_files.find_by(file_name: 'sample-dev_1.2.3~binary_amd64.deb') }
 
       it 'raise ArgumentError', :aggregate_failures do
         expect { subject }.to raise_error(described_class::ExtractionError, "is not a changes file")
@@ -130,7 +129,7 @@ RSpec.describe Packages::Debian::ExtractChangesMetadataService, feature_category
       context 'with invalid MD5' do
         let(:md5_dsc) { '1234567890123456789012345678012 671 libs optional sample_1.2.3~alpha2.dsc' }
 
-        it 'raise ArgumentError', :aggregate_failures, quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/463058' do
+        it 'raise ArgumentError', :aggregate_failures do
           expect { subject }.to raise_error(described_class::ExtractionError, "Validation failed: Md5sum mismatch for sample_1.2.3~alpha2.dsc: #{dsc_file.file_md5} != 1234567890123456789012345678012")
         end
       end
@@ -138,7 +137,7 @@ RSpec.describe Packages::Debian::ExtractChangesMetadataService, feature_category
       context 'with invalid SHA1' do
         let(:sha1_dsc) { '1234567890123456789012345678901234567890 671 sample_1.2.3~alpha2.dsc' }
 
-        it 'raise ArgumentError', :aggregate_failures, quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/463059' do
+        it 'raise ArgumentError', :aggregate_failures do
           expect { subject }.to raise_error(described_class::ExtractionError, "Validation failed: Sha1sum mismatch for sample_1.2.3~alpha2.dsc: #{dsc_file.file_sha1} != 1234567890123456789012345678901234567890")
         end
       end
@@ -146,19 +145,22 @@ RSpec.describe Packages::Debian::ExtractChangesMetadataService, feature_category
       context 'with invalid SHA256' do
         let(:sha256_dsc) { '1234567890123456789012345678901234567890123456789012345678901234 671 sample_1.2.3~alpha2.dsc' }
 
-        it 'raise ArgumentError', :aggregate_failures, quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/463060' do
+        it 'raise ArgumentError', :aggregate_failures do
           expect { subject }.to raise_error(described_class::ExtractionError, "Validation failed: Sha256sum mismatch for sample_1.2.3~alpha2.dsc: #{dsc_file.file_sha256} != 1234567890123456789012345678901234567890123456789012345678901234")
         end
       end
     end
 
     context 'with missing package file' do
+      let(:missing_file) { source_file }
+      let(:missing_file_name) { source_file.file_name }
+
       before do
-        incoming.package_files.first.destroy!
+        missing_file.destroy!
       end
 
-      it 'raise ArgumentError', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/463061' do
-        expect { subject }.to raise_error(described_class::ExtractionError, "sample_1.2.3~alpha2.tar.xz is listed in Files but was not uploaded")
+      it 'raise ArgumentError' do
+        expect { subject }.to raise_error(described_class::ExtractionError, "#{missing_file_name} is listed in Files but was not uploaded")
       end
     end
   end
diff --git a/spec/services/projects/lfs_pointers/lfs_link_service_spec.rb b/spec/services/projects/lfs_pointers/lfs_link_service_spec.rb
index 5862ed15c2a..0d66c4f7d7b 100644
--- a/spec/services/projects/lfs_pointers/lfs_link_service_spec.rb
+++ b/spec/services/projects/lfs_pointers/lfs_link_service_spec.rb
@@ -23,6 +23,8 @@ RSpec.describe Projects::LfsPointers::LfsLinkService, feature_category: :source_
       oids = Array.new(described_class::MAX_OIDS) { |i| "oid-#{i}" }
       oids << 'the straw'
 
+      expect(Gitlab::Metrics::Lfs).to receive_message_chain(:validate_link_objects_error_rate, :increment).with(
+        error: true, labels: {})
       expect { subject.execute(oids) }.to raise_error(described_class::TooManyOidsError)
     end
 
@@ -39,6 +41,8 @@ RSpec.describe Projects::LfsPointers::LfsLinkService, feature_category: :source_
     end
 
     it 'links existing lfs objects to the project' do
+      expect(Gitlab::Metrics::Lfs).to receive_message_chain(:validate_link_objects_error_rate, :increment).with(
+        error: false, labels: {})
       expect(project.lfs_objects.count).to eq 2
 
       linked = subject.execute(new_oid_list.keys)
@@ -50,12 +54,18 @@ RSpec.describe Projects::LfsPointers::LfsLinkService, feature_category: :source_
     it 'returns linked oids' do
       linked = lfs_objects_project.map(&:lfs_object).map(&:oid) << new_lfs_object.oid
 
+      expect(Gitlab::Metrics::Lfs).to receive_message_chain(:validate_link_objects_error_rate, :increment).with(
+        error: false, labels: {})
+
       expect(subject.execute(new_oid_list.keys)).to contain_exactly(*linked)
     end
 
     it 'links in batches' do
       stub_const("#{described_class}::BATCH_SIZE", 3)
 
+      expect(Gitlab::Metrics::Lfs).to receive_message_chain(:validate_link_objects_error_rate, :increment).with(
+        error: false, labels: {})
+
       expect(Gitlab::Import::Logger).to receive(:info).with(
         class: described_class.name,
         project_id: project.id,
@@ -75,6 +85,8 @@ RSpec.describe Projects::LfsPointers::LfsLinkService, feature_category: :source_
       stub_const("#{described_class}::BATCH_SIZE", 1)
       oids = %w[one two]
 
+      expect(Gitlab::Metrics::Lfs).to receive_message_chain(:validate_link_objects_error_rate, :increment).with(
+        error: false, labels: {})
       expect(LfsObject).to receive(:for_oids).with(%w[one]).once.and_call_original
       expect(LfsObject).to receive(:for_oids).with(%w[two]).once.and_call_original
 
@@ -85,6 +97,9 @@ RSpec.describe Projects::LfsPointers::LfsLinkService, feature_category: :source_
       # make sure that we don't count the queries in the setup
       new_oid_list
 
+      expect(Gitlab::Metrics::Lfs).to receive_message_chain(:validate_link_objects_error_rate, :increment).with(
+        error: false, labels: {})
+
       # These are repeated for each batch of oids: maximum (MAX_OIDS / BATCH_SIZE) times
       # 1. Load the batch of lfs object ids that we might know already
       # 2. Load the objects that have not been linked to the project yet
@@ -101,11 +116,16 @@ RSpec.describe Projects::LfsPointers::LfsLinkService, feature_category: :source_
       end
 
       it 'does not raise an error when trying to link exactly the OID limit' do
+        expect(Gitlab::Metrics::Lfs).to receive_message_chain(:validate_link_objects_error_rate, :increment).with(
+          error: false, labels: {})
         expect { subject.execute(oids) }.not_to raise_error
       end
 
       it 'raises an error when trying to link more than OID limit' do
         oids << 'the straw'
+
+        expect(Gitlab::Metrics::Lfs).to receive_message_chain(:validate_link_objects_error_rate, :increment).with(
+          error: true, labels: {})
         expect { subject.execute(oids) }.to raise_error(described_class::TooManyOidsError)
       end
     end