Automatic merge of gitlab-org/gitlab master

.rubocop_manual_todo.yml

@@ -503,7 +503,6 @@ RSpec/EmptyLineAfterFinalLetItBe:
     - ee/spec/services/dast_scanner_profiles/destroy_service_spec.rb
     - ee/spec/services/dast_scanner_profiles/update_service_spec.rb
     - ee/spec/services/dast_site_profiles/destroy_service_spec.rb
-    - ee/spec/services/dora/aggregate_metrics_service_spec.rb
     - ee/spec/services/external_approval_rules/create_service_spec.rb
     - ee/spec/services/external_approval_rules/destroy_service_spec.rb
     - ee/spec/services/external_approval_rules/update_service_spec.rb

changelogs/unreleased/297029-remove-alerts-service-metric.yml

+---
+title: Remove Alerts service metric
+merge_request: 60149
+author:
+type: removed

config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml

@@ -6,7 +6,8 @@ product_stage: monitor
 product_group: group::health
 product_category: incident_management
 value_type: number
-status: deprecated
+status: removed
+milestone_removed: '13.12'
 time_frame: all
 data_source: database
 distribution:

doc/development/usage_ping/dictionary.md

@@ -4756,7 +4756,7 @@ Count of projects that have enabled the Alerts service
 
 Group: `group::health`
 
-Status: `deprecated`
+Status: `removed`
 
 Tiers: `free`, `premium`, `ultimate`
 

doc/user/packages/conan_repository/index.md

@@ -186,6 +186,10 @@ To authenticate to the Package Registry, you need one of the following:
   scope set to `read_package_registry`, `write_package_registry`, or both.
 - A [CI job token](#publish-a-conan-package-by-using-cicd).
 
+NOTE:
+Packages from private and internal projects are hidden if you are not
+authenticated. If you try to search or download a package from a private or internal project without authenticating, you will receive the error `unable to find the package in remote` in the Conan client.
+
 ### Add your credentials to the GitLab remote
 
 Associate your token with the GitLab remote, so that you don't have to

ee/changelogs/unreleased/rspec-empty-lines-after-letitbe-ee-spec-dora.yml

+---
+title: Fix RSpec/EmptyLineAfterFinalLetItBe rubocop offenses in ee/spec/services/dora
+merge_request: 58353
+author: Abdul Wadood @abdulwd
+type: fixed

ee/spec/services/dora/aggregate_metrics_service_spec.rb

@@ -93,6 +93,7 @@ RSpec.describe Dora::AggregateMetricsService do
       let_it_be(:staging) { create(:environment, :staging, project: project) }
       let_it_be(:maintainer) { create(:user) }
       let_it_be(:guest) { create(:user) }
+
       let(:container) { project }
       let(:user) { maintainer }
       let(:params) { { metric: 'deployment_frequency' }.merge(extra_params) }
@@ -153,6 +154,7 @@ RSpec.describe Dora::AggregateMetricsService do
       let_it_be(:production_2) { create(:environment, :production, project: project_2) }
       let_it_be(:maintainer) { create(:user) }
       let_it_be(:guest) { create(:user) }
+
       let(:container) { group }
       let(:user) { maintainer }
       let(:params) { { metric: 'deployment_frequency' }.merge(extra_params) }

lib/gitlab/usage_data.rb

@@ -164,7 +164,6 @@ module Gitlab
             projects_with_repositories_enabled: count(ProjectFeature.where('repository_access_level > ?', ProjectFeature::DISABLED)),
             projects_with_tracing_enabled: count(ProjectTracingSetting),
             projects_with_error_tracking_enabled: count(::ErrorTracking::ProjectErrorTrackingSetting.where(enabled: true)),
-            projects_with_alerts_service_enabled: DEPRECATED_VALUE,
             projects_with_alerts_created: distinct_count(::AlertManagement::Alert, :project_id),
             projects_with_enabled_alert_integrations: distinct_count(::AlertManagement::HttpIntegration.active, :project_id),
             projects_with_prometheus_alerts: distinct_count(PrometheusAlert, :project_id),

spec/lib/gitlab/usage_data_spec.rb

@@ -571,7 +571,6 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
       expect(count_data[:projects_with_repositories_enabled]).to eq(3)
       expect(count_data[:projects_with_error_tracking_enabled]).to eq(1)
       expect(count_data[:projects_with_tracing_enabled]).to eq(1)
-      expect(count_data[:projects_with_alerts_service_enabled]).to eq(Gitlab::UsageData::DEPRECATED_VALUE)
       expect(count_data[:projects_with_enabled_alert_integrations]).to eq(1)
       expect(count_data[:projects_with_prometheus_alerts]).to eq(2)
       expect(count_data[:projects_with_terraform_reports]).to eq(2)

spec/support/helpers/usage_data_helpers.rb

@@ -98,7 +98,6 @@ module UsageDataHelpers
       projects_prometheus_active
       projects_with_repositories_enabled
       projects_with_error_tracking_enabled
-      projects_with_alerts_service_enabled
       projects_with_enabled_alert_integrations
       projects_with_prometheus_alerts
       projects_with_tracing_enabled