diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
| commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
| tree | c42be41678c2586d49a75cabce89322082698334 /lib/gitlab/usage_data_counters | |
| parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'lib/gitlab/usage_data_counters')
3 files changed, 21 insertions, 1 deletions
diff --git a/lib/gitlab/usage_data_counters/counter_events/package_events.yml b/lib/gitlab/usage_data_counters/counter_events/package_events.yml index c72f487a442..21d637e7152 100644 --- a/lib/gitlab/usage_data_counters/counter_events/package_events.yml +++ b/lib/gitlab/usage_data_counters/counter_events/package_events.yml @@ -22,6 +22,7 @@ - i_package_golang_pull_package - i_package_golang_push_package - i_package_helm_pull_package +- i_package_helm_push_package - i_package_maven_delete_package - i_package_maven_pull_package - i_package_maven_push_package @@ -31,14 +32,24 @@ - i_package_nuget_delete_package - i_package_nuget_pull_package - i_package_nuget_push_package +- i_package_nuget_pull_symbol_package +- i_package_nuget_push_symbol_package - i_package_pull_package - i_package_pull_package_by_deploy_token - i_package_pull_package_by_guest - i_package_pull_package_by_user +- i_package_pull_symbol_package +- i_package_pull_symbol_package_by_deploy_token +- i_package_pull_symbol_package_by_guest +- i_package_pull_symbol_package_by_user - i_package_push_package - i_package_push_package_by_deploy_token - i_package_push_package_by_guest - i_package_push_package_by_user +- i_package_push_symbol_package +- i_package_push_symbol_package_by_deploy_token +- i_package_push_symbol_package_by_guest +- i_package_push_symbol_package_by_user - i_package_pypi_delete_package - i_package_pypi_pull_package - i_package_pypi_push_package diff --git a/lib/gitlab/usage_data_counters/hll_redis_counter.rb b/lib/gitlab/usage_data_counters/hll_redis_counter.rb index 2a231f8fce0..597df9936ea 100644 --- a/lib/gitlab/usage_data_counters/hll_redis_counter.rb +++ b/lib/gitlab/usage_data_counters/hll_redis_counter.rb @@ -117,7 +117,7 @@ module Gitlab private def track(values, event_name, context: '', time: Time.zone.now) - return unless Gitlab::CurrentSettings.usage_ping_enabled? + return unless usage_ping_enabled? event = event_for(event_name) Gitlab::ErrorTracking.track_and_raise_for_dev_exception(UnknownEvent.new("Unknown event #{event_name}")) unless event.present? @@ -131,6 +131,10 @@ module Gitlab Gitlab::ErrorTracking.track_and_raise_for_dev_exception(e) end + def usage_ping_enabled? + Gitlab::CurrentSettings.usage_ping_enabled? + end + # The array of valid context on which we allow tracking def valid_context_list Plan.all_plans diff --git a/lib/gitlab/usage_data_counters/known_events/common.yml b/lib/gitlab/usage_data_counters/known_events/common.yml index f2e45a52434..fe1eb090fa4 100644 --- a/lib/gitlab/usage_data_counters/known_events/common.yml +++ b/lib/gitlab/usage_data_counters/known_events/common.yml @@ -369,3 +369,8 @@ category: testing aggregation: weekly feature_flag: users_expanding_widgets_usage_data +# Container Security - Network Policies +- name: clusters_using_network_policies_ui + redis_slot: network_policies + category: network_policies + aggregation: weekly |