diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-01 03:09:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-01 03:09:45 +0300 |
commit | 53758cb2cae0e3c2be30d166a4734701d05d0935 (patch) | |
tree | c57a7c598457ce7d60949eb0f73e7f37360f7b3e /app/models/concerns/enums | |
parent | 8bb9ee876910bf5a14e116ace9ec95791486a78a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/enums')
-rw-r--r-- | app/models/concerns/enums/ci/pipeline.rb | 75 | ||||
-rw-r--r-- | app/models/concerns/enums/commit_status.rb | 34 | ||||
-rw-r--r-- | app/models/concerns/enums/internal_id.rb | 23 | ||||
-rw-r--r-- | app/models/concerns/enums/prometheus_metric.rb | 86 | ||||
-rw-r--r-- | app/models/concerns/enums/user_callout.rb | 28 |
5 files changed, 0 insertions, 246 deletions
diff --git a/app/models/concerns/enums/ci/pipeline.rb b/app/models/concerns/enums/ci/pipeline.rb deleted file mode 100644 index c1086fcc617..00000000000 --- a/app/models/concerns/enums/ci/pipeline.rb +++ /dev/null @@ -1,75 +0,0 @@ -# frozen_string_literal: true - -module Enums - module Ci - module Pipeline - # Returns the `Hash` to use for creating the `failure_reason` enum for - # `Ci::Pipeline`. - def self.failure_reasons - { - unknown_failure: 0, - config_error: 1, - external_validation_failure: 2 - } - end - - # Returns the `Hash` to use for creating the `sources` enum for - # `Ci::Pipeline`. - def self.sources - { - unknown: nil, - push: 1, - web: 2, - trigger: 3, - schedule: 4, - api: 5, - external: 6, - # TODO: Rename `pipeline` to `cross_project_pipeline` in 13.0 - # https://gitlab.com/gitlab-org/gitlab/issues/195991 - pipeline: 7, - chat: 8, - webide: 9, - merge_request_event: 10, - external_pull_request_event: 11, - parent_pipeline: 12, - ondemand_dast_scan: 13 - } - end - - # Returns the `Hash` to use for creating the `config_sources` enum for - # `Ci::Pipeline`. - def self.config_sources - { - unknown_source: nil, - repository_source: 1, - auto_devops_source: 2, - webide_source: 3, - remote_source: 4, - external_project_source: 5, - bridge_source: 6, - parameter_source: 7 - } - end - - def self.ci_config_sources - config_sources.slice( - :unknown_source, - :repository_source, - :auto_devops_source, - :remote_source, - :external_project_source - ) - end - - def self.ci_config_sources_values - ci_config_sources.values - end - - def self.non_ci_config_source_values - config_sources.values - ci_config_sources.values - end - end - end -end - -Enums::Ci::Pipeline.prepend_if_ee('EE::Enums::Ci::Pipeline') diff --git a/app/models/concerns/enums/commit_status.rb b/app/models/concerns/enums/commit_status.rb deleted file mode 100644 index 2a2d9e99b83..00000000000 --- a/app/models/concerns/enums/commit_status.rb +++ /dev/null @@ -1,34 +0,0 @@ -# frozen_string_literal: true - -module Enums - module CommitStatus - # Returns the Hash to use for creating the `failure_reason` enum for - # `CommitStatus`. - def self.failure_reasons - { - unknown_failure: nil, - script_failure: 1, - api_failure: 2, - stuck_or_timeout_failure: 3, - runner_system_failure: 4, - missing_dependency_failure: 5, - runner_unsupported: 6, - stale_schedule: 7, - job_execution_timeout: 8, - archived_failure: 9, - unmet_prerequisites: 10, - scheduler_failure: 11, - data_integrity_failure: 12, - forward_deployment_failure: 13, - protected_environment_failure: 1_000, - insufficient_bridge_permissions: 1_001, - downstream_bridge_project_not_found: 1_002, - invalid_bridge_trigger: 1_003, - upstream_bridge_project_not_found: 1_004, - insufficient_upstream_permissions: 1_005, - bridge_pipeline_is_child_pipeline: 1_006, - downstream_pipeline_creation_failed: 1_007 - } - end - end -end diff --git a/app/models/concerns/enums/internal_id.rb b/app/models/concerns/enums/internal_id.rb deleted file mode 100644 index 2d51d232e93..00000000000 --- a/app/models/concerns/enums/internal_id.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -module Enums - module InternalId - def self.usage_resources - # when adding new resource, make sure it doesn't conflict with EE usage_resources - { - issues: 0, - merge_requests: 1, - deployments: 2, - milestones: 3, - epics: 4, - ci_pipelines: 5, - operations_feature_flags: 6, - operations_user_lists: 7, - alert_management_alerts: 8, - sprints: 9 # iterations - } - end - end -end - -Enums::InternalId.prepend_if_ee('EE::Enums::InternalId') diff --git a/app/models/concerns/enums/prometheus_metric.rb b/app/models/concerns/enums/prometheus_metric.rb deleted file mode 100644 index 3dbcc8ee587..00000000000 --- a/app/models/concerns/enums/prometheus_metric.rb +++ /dev/null @@ -1,86 +0,0 @@ -# frozen_string_literal: true - -module Enums - module PrometheusMetric - def self.groups - { - # built-in groups - nginx_ingress_vts: -1, - ha_proxy: -2, - aws_elb: -3, - nginx: -4, - kubernetes: -5, - nginx_ingress: -6, - cluster_health: -100 - }.merge(custom_groups).freeze - end - - # custom/user groups - def self.custom_groups - { - business: 0, - response: 1, - system: 2 - }.freeze - end - - def self.group_details - { - # built-in groups - nginx_ingress_vts: { - group_title: _('Response metrics (NGINX Ingress VTS)'), - required_metrics: %w(nginx_upstream_responses_total nginx_upstream_response_msecs_avg), - priority: 10 - }.freeze, - nginx_ingress: { - group_title: _('Response metrics (NGINX Ingress)'), - required_metrics: %w(nginx_ingress_controller_requests nginx_ingress_controller_ingress_upstream_latency_seconds_sum), - priority: 10 - }.freeze, - ha_proxy: { - group_title: _('Response metrics (HA Proxy)'), - required_metrics: %w(haproxy_frontend_http_requests_total haproxy_frontend_http_responses_total), - priority: 10 - }.freeze, - aws_elb: { - group_title: _('Response metrics (AWS ELB)'), - required_metrics: %w(aws_elb_request_count_sum aws_elb_latency_average aws_elb_httpcode_backend_5_xx_sum), - priority: 10 - }.freeze, - nginx: { - group_title: _('Response metrics (NGINX)'), - required_metrics: %w(nginx_server_requests nginx_server_requestMsec), - priority: 10 - }.freeze, - kubernetes: { - group_title: _('System metrics (Kubernetes)'), - required_metrics: %w(container_memory_usage_bytes container_cpu_usage_seconds_total), - priority: 5 - }.freeze, - cluster_health: { - group_title: _('Cluster Health'), - required_metrics: %w(container_memory_usage_bytes container_cpu_usage_seconds_total), - priority: 10 - }.freeze - }.merge(custom_group_details).freeze - end - - # custom/user groups - def self.custom_group_details - { - business: { - group_title: _('Business metrics (Custom)'), - priority: 0 - }.freeze, - response: { - group_title: _('Response metrics (Custom)'), - priority: -5 - }.freeze, - system: { - group_title: _('System metrics (Custom)'), - priority: -10 - }.freeze - }.freeze - end - end -end diff --git a/app/models/concerns/enums/user_callout.rb b/app/models/concerns/enums/user_callout.rb deleted file mode 100644 index e58cd9add02..00000000000 --- a/app/models/concerns/enums/user_callout.rb +++ /dev/null @@ -1,28 +0,0 @@ -# frozen_string_literal: true - -module Enums - module UserCallout - # Returns the `Hash` to use for the `feature_name` enum in the `UserCallout` - # model. - # - # This method is separate from the `UserCallout` model so that it can be - # extended by EE. - # - # If you are going to add new items to this hash, check that you're not going - # to conflict with EE-only values: https://gitlab.com/gitlab-org/gitlab/blob/master/ee/app/models/concerns/ee/enums/user_callout.rb - def self.feature_names - { - gke_cluster_integration: 1, - gcp_signup_offer: 2, - cluster_security_warning: 3, - suggest_popover_dismissed: 9, - tabs_position_highlight: 10, - webhooks_moved: 13, - admin_integrations_moved: 15, - personal_access_token_expiry: 21 # EE-only - } - end - end -end - -Enums::UserCallout.prepend_if_ee('EE::Enums::UserCallout') |