Add latest changes from gitlab-org/gitlab@master

5 files changed, 29 insertions, 12 deletions

diff --git a/config/application.rb b/config/application.rb
index d9a237eba50..f8b19ae895d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -65,6 +65,7 @@ module Gitlab
     require_dependency Rails.root.join('lib/gitlab')
     require_dependency Rails.root.join('lib/gitlab/action_cable/config')
     require_dependency Rails.root.join('lib/gitlab/redis/wrapper')
+    require_dependency Rails.root.join('lib/gitlab/redis/multi_store_wrapper')
     require_dependency Rails.root.join('lib/gitlab/redis/cache')
     require_dependency Rails.root.join('lib/gitlab/redis/queues')
     require_dependency Rails.root.join('lib/gitlab/redis/shared_state')
diff --git a/config/events/agent_users_using_ci_tunnel.yml b/config/events/agent_users_using_ci_tunnel.yml
new file mode 100644
index 00000000000..575c2ddf9e8
--- /dev/null
+++ b/config/events/agent_users_using_ci_tunnel.yml
@@ -0,0 +1,20 @@
+---
+description: Kubernetes API proxy request using the CI/CD Tunnel
+category: InternalEventTracking
+action: agent_users_using_ci_tunnel
+identifiers:
+- project
+- namespace
+- user
+product_section: cd
+product_stage: deploy
+product_group: environments
+milestone: '16.8'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140038
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/feature_flags/development/restyle_login_page.yml b/config/feature_flags/development/restyle_login_page.yml
deleted file mode 100644
index 90b56e64c48..00000000000
--- a/config/feature_flags/development/restyle_login_page.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: restyle_login_page
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91673
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/368387
-milestone: '15.2'
-type: development
-group: group::authentication
-default_enabled: true
diff --git a/config/metrics/counts_28d/20220729001651_agent_users_using_ci_tunnel_monthly.yml b/config/metrics/counts_28d/20220729001651_agent_users_using_ci_tunnel_monthly.yml
index a16dbc17f05..1938323ffda 100644
--- a/config/metrics/counts_28d/20220729001651_agent_users_using_ci_tunnel_monthly.yml
+++ b/config/metrics/counts_28d/20220729001651_agent_users_using_ci_tunnel_monthly.yml
@@ -10,12 +10,14 @@ status: active
 milestone: "15.3"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61685
 time_frame: 28d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 options:
   events:
     - agent_users_using_ci_tunnel
+events:
+  - name: agent_users_using_ci_tunnel
+    unique: user.id
 performance_indicator_type: []
 distribution:
   - ce
diff --git a/config/metrics/counts_7d/20220729001644_agent_users_using_ci_tunnel_weekly.yml b/config/metrics/counts_7d/20220729001644_agent_users_using_ci_tunnel_weekly.yml
index efb97bc1b95..3c309eb1bb5 100644
--- a/config/metrics/counts_7d/20220729001644_agent_users_using_ci_tunnel_weekly.yml
+++ b/config/metrics/counts_7d/20220729001644_agent_users_using_ci_tunnel_weekly.yml
@@ -9,13 +9,15 @@ status: active
 milestone: "15.3"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61685
 time_frame: 7d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
-instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
 options:
   events:
     - agent_users_using_ci_tunnel
+events:
+  - name: agent_users_using_ci_tunnel
+    unique: user.id
 distribution:
   - ce
   - ee