Add latest changes from gitlab-org/gitlab@master

8 files changed, 57 insertions, 1 deletions

diff --git a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
index 0b75e7faa13..8ad0494e775 100644
--- a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
@@ -109,6 +109,7 @@ options:
     - i_code_review_user_jetbrains_api_request
     - i_editor_extensions_user_jetbrains_bundled_api_request
     - i_editor_extensions_user_visual_studio_api_request
+    - i_editor_extensions_user_neovim_plugin_api_request
     - i_code_review_user_labels_changed
     - i_code_review_user_load_conflict_ui
     - i_code_review_user_marked_as_draft
diff --git a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
index 1a30a8558f3..f61e065033a 100644
--- a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: counts_monthly.aggregated_metrics.code_review_extension_category_monthly_active_users
-description: Number of users performing i_code_review_user_vs_code_api_request event
+description: Number of users performing api requests with editor extensions
 product_section: dev
 product_stage: create
 product_group: code_review
@@ -22,6 +22,7 @@ options:
     - 'i_editor_extensions_user_jetbrains_bundled_api_request'
     - 'i_code_review_user_gitlab_cli_api_request'
     - 'i_editor_extensions_user_visual_studio_api_request'
+    - 'i_editor_extensions_user_neovim_plugin_api_request'
 distribution:
   - ce
   - ee
diff --git a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
index 0fab23fc035..9140ab4cc5f 100644
--- a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
@@ -89,6 +89,7 @@ options:
     - 'i_code_review_user_jetbrains_api_request'
     - 'i_editor_extensions_user_jetbrains_bundled_api_request'
     - 'i_editor_extensions_user_visual_studio_api_request'
+    - 'i_editor_extensions_user_neovim_plugin_api_request'
     - 'i_code_review_user_gitlab_cli_api_request'
     - 'i_code_review_user_create_note_in_ipynb_diff'
     - 'i_code_review_user_create_note_in_ipynb_diff_mr'
diff --git a/config/metrics/counts_28d/20230725222604_user_neovim_plugin_api_request_monthly.yml b/config/metrics/counts_28d/20230725222604_user_neovim_plugin_api_request_monthly.yml
new file mode 100644
index 00000000000..0f2048f6b0b
--- /dev/null
+++ b/config/metrics/counts_28d/20230725222604_user_neovim_plugin_api_request_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.editor_extensions.user_neovim_plugin_api_request_monthly
+description: Count of unique users per month who use the GitLab plugin for Neovim
+product_section: dev
+product_stage: create
+product_group: code_review
+value_type: number
+status: active
+milestone: '16.3'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127561
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_editor_extensions_user_neovim_plugin_api_request
+performance_indicator_type: []
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
index 1dd12324481..e8670a1fe1e 100644
--- a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
@@ -109,6 +109,7 @@ options:
     - i_code_review_user_jetbrains_api_request
     - i_editor_extensions_user_jetbrains_bundled_api_request
     - i_editor_extensions_user_visual_studio_api_request
+    - i_editor_extensions_user_neovim_plugin_api_request
     - i_code_review_user_labels_changed
     - i_code_review_user_load_conflict_ui
     - i_code_review_user_marked_as_draft
diff --git a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
index 2f9ed569234..7e209470ac9 100644
--- a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
@@ -87,6 +87,7 @@ options:
     - 'i_code_review_user_jetbrains_api_request'
     - 'i_editor_extensions_user_jetbrains_bundled_api_request'
     - 'i_editor_extensions_user_visual_studio_api_request'
+    - 'i_editor_extensions_user_neovim_plugin_api_request'
     - 'i_code_review_user_gitlab_cli_api_request'
     - 'i_code_review_user_create_note_in_ipynb_diff'
     - 'i_code_review_user_create_note_in_ipynb_diff_mr'
diff --git a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
index 1b27089b9cd..7b1d58caeca 100644
--- a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
@@ -22,6 +22,7 @@ options:
     - 'i_editor_extensions_user_jetbrains_bundled_api_request'
     - 'i_code_review_user_gitlab_cli_api_request'
     - 'i_editor_extensions_user_visual_studio_api_request'
+    - 'i_editor_extensions_user_neovim_plugin_api_request'
 distribution:
   - ce
   - ee
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
new file mode 100644
index 00000000000..abe7720152d
--- /dev/null
+++ b/config/metrics/counts_7d/20230725222603_user_neovim_plugin_api_request_weekly.yml
@@ -0,0 +1,25 @@
+---
+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
+milestone: '16.3'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127561
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_editor_extensions_user_neovim_plugin_api_request
+performance_indicator_type: []
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate