Add latest changes from gitlab-org/gitlab@master

2 files changed, 32 insertions, 37 deletions

diff --git a/doc/development/changelog.md b/doc/development/changelog.md
index f2c8aa4db62..44be6e9548b 100644
--- a/doc/development/changelog.md
+++ b/doc/development/changelog.md
@@ -57,8 +57,7 @@ the `author` field. GitLab team members **should not**.
 - Any change behind an enabled feature flag **should** have a changelog entry.
 - Any change that adds new usage data metrics and changes that needs to be documented in Product Intelligence [Event Dictionary](https://about.gitlab.com/handbook/product/product-intelligence-guide/#event-dictionary) **should** have a changelog entry.
 - A change that adds snowplow events **should** have a changelog entry -
-- A change that [removes a feature flag](feature_flags/development.md) **should** have a changelog entry -
-  only if the feature flag did not default to true already.
+- A change that [removes a feature flag](feature_flags/development.md) **must** have a changelog entry.
 - A fix for a regression introduced and then fixed in the same release (i.e.,
   fixing a bug introduced during a monthly release candidate) **should not**
   have a changelog entry.
diff --git a/doc/development/usage_ping/dictionary.md b/doc/development/usage_ping/dictionary.md
index f6894412bf7..2cac2e45e6a 100644
--- a/doc/development/usage_ping/dictionary.md
+++ b/doc/development/usage_ping/dictionary.md
@@ -19430,41 +19430,39 @@ Calculated unique users to perform Advanced searches by week
 
 ## `redis_hll_counters.search.i_search_paid_monthly`
 
-Missing description
+Calculated unique users to perform a search with a paid license enabled by month
 
 | field | value |
 | --- | --- |
 | `key_path` | **`redis_hll_counters.search.i_search_paid_monthly`** |
-| `product_section` |  |
-| `product_stage` |  |
-| `product_group` |  |
-| `product_category` |  |
+| `product_section` | enablement |
+| `product_stage` | enablement |
+| `product_group` | `group::global search` |
+| `product_category` | `global_search` |
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` | Redis_hll |
-| `distribution` | ce |
-| `tier` | free |
-| `skip_validation` | true |
+| `distribution` | ee |
+| `tier` | premium, ultimate |
 
 ## `redis_hll_counters.search.i_search_paid_weekly`
 
-Missing description
+Calculated unique users to perform a search with a paid license enabled by week
 
 | field | value |
 | --- | --- |
 | `key_path` | **`redis_hll_counters.search.i_search_paid_weekly`** |
-| `product_section` |  |
-| `product_stage` |  |
-| `product_group` |  |
-| `product_category` |  |
+| `product_section` | enablement |
+| `product_stage` | enablement |
+| `product_group` | `group::global search` |
+| `product_category` | `global_search` |
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
 | `data_source` | Redis_hll |
 | `distribution` | ee |
-| `tier` |  |
-| `skip_validation` | true |
+| `tier` | premium, ultimate |
 
 ## `redis_hll_counters.search.i_search_total_monthly`
 
@@ -20692,8 +20690,8 @@ Calculated unique users to perform a search with a paid license enabled by week
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Redis_hll |
-| `distribution` | ce, ee |
-| `tier` | free, premium, ultimate |
+| `distribution` | ee |
+| `tier` | premium, ultimate |
 
 ## `search_unique_visits.i_search_total`
 
@@ -20715,41 +20713,39 @@ Calculated unique users to perform Basic or Advanced searches by week
 
 ## `search_unique_visits.search_unique_visits_for_any_target_monthly`
 
-Missing description
+Total unique users for i_search_total, i_search_advanced, i_search_paid for recent 28 days. This metric is redundant because advanced will be a subset of paid and paid will be a subset of total. i_search_total is more appropriate if you just want the total
 
 | field | value |
 | --- | --- |
 | `key_path` | **`search_unique_visits.search_unique_visits_for_any_target_monthly`** |
-| `product_section` |  |
-| `product_stage` |  |
-| `product_group` |  |
-| `product_category` |  |
+| `product_section` | enablement |
+| `product_stage` | enablement |
+| `product_group` | `group::global search` |
+| `product_category` | `global_search` |
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` |  |
-| `distribution` | ce |
-| `tier` | free |
-| `skip_validation` | true |
+| `data_source` | Redis_hll |
+| `distribution` | ce, ee |
+| `tier` | free, premium, ultimate |
 
 ## `search_unique_visits.search_unique_visits_for_any_target_weekly`
 
-Missing description
+Total unique users for i_search_total, i_search_advanced, i_search_paid for recent 7 days. This metric is redundant because advanced will be a subset of paid and paid will be a subset of total. i_search_total is more appropriate if you just want the total
 
 | field | value |
 | --- | --- |
 | `key_path` | **`search_unique_visits.search_unique_visits_for_any_target_weekly`** |
-| `product_section` |  |
-| `product_stage` |  |
-| `product_group` |  |
-| `product_category` |  |
+| `product_section` | enablement |
+| `product_stage` | enablement |
+| `product_group` | `group::global search` |
+| `product_category` | `global_search` |
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` |  |
-| `distribution` | ee |
-| `tier` |  |
-| `skip_validation` | true |
+| `data_source` | Redis_hll |
+| `distribution` | ce, ee |
+| `tier` | free, premium, ultimate |
 
 ## `settings.ldap_encrypted_secrets_enabled`