diff options
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/ci/templates/Managed-Cluster-Applications.gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | lib/gitlab/sidekiq_config/cli_methods.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/sidekiq_config/dummy_worker.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/sidekiq_config/worker.rb | 6 | ||||
| -rw-r--r-- | lib/gitlab/sidekiq_logging/structured_logger.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/sidekiq_middleware/metrics.rb | 4 |
6 files changed, 11 insertions, 10 deletions
diff --git a/lib/gitlab/ci/templates/Managed-Cluster-Applications.gitlab-ci.yml b/lib/gitlab/ci/templates/Managed-Cluster-Applications.gitlab-ci.yml index 73ae63c3092..ef77bbf5626 100644 --- a/lib/gitlab/ci/templates/Managed-Cluster-Applications.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Managed-Cluster-Applications.gitlab-ci.yml @@ -1,6 +1,6 @@ apply: stage: deploy - image: "registry.gitlab.com/gitlab-org/cluster-integration/cluster-applications:v0.8.0" + image: "registry.gitlab.com/gitlab-org/cluster-integration/cluster-applications:v0.9.0" environment: name: production variables: @@ -11,6 +11,7 @@ apply: SENTRY_VALUES_FILE: $CI_PROJECT_DIR/.gitlab/managed-apps/sentry/values.yaml GITLAB_RUNNER_VALUES_FILE: $CI_PROJECT_DIR/.gitlab/managed-apps/gitlab-runner/values.yaml CILIUM_VALUES_FILE: $CI_PROJECT_DIR/.gitlab/managed-apps/cilium/values.yaml + CILIUM_HUBBLE_VALUES_FILE: $CI_PROJECT_DIR/.gitlab/managed-apps/cilium/hubble-values.yaml JUPYTERHUB_VALUES_FILE: $CI_PROJECT_DIR/.gitlab/managed-apps/jupyterhub/values.yaml PROMETHEUS_VALUES_FILE: $CI_PROJECT_DIR/.gitlab/managed-apps/prometheus/values.yaml ELASTIC_STACK_VALUES_FILE: $CI_PROJECT_DIR/.gitlab/managed-apps/elastic-stack/values.yaml diff --git a/lib/gitlab/sidekiq_config/cli_methods.rb b/lib/gitlab/sidekiq_config/cli_methods.rb index c95ba6faf1e..c49432f0fc6 100644 --- a/lib/gitlab/sidekiq_config/cli_methods.rb +++ b/lib/gitlab/sidekiq_config/cli_methods.rb @@ -26,9 +26,9 @@ module Gitlab QUERY_PREDICATES = { feature_category: :to_sym, has_external_dependencies: lambda { |value| value == 'true' }, - latency_sensitive: lambda { |value| value == 'true' }, name: :to_s, - resource_boundary: :to_sym + resource_boundary: :to_sym, + urgency: :to_sym }.freeze QueryError = Class.new(StandardError) diff --git a/lib/gitlab/sidekiq_config/dummy_worker.rb b/lib/gitlab/sidekiq_config/dummy_worker.rb index c2c8354b662..bd205c81931 100644 --- a/lib/gitlab/sidekiq_config/dummy_worker.rb +++ b/lib/gitlab/sidekiq_config/dummy_worker.rb @@ -9,7 +9,7 @@ module Gitlab ATTRIBUTE_METHODS = { feature_category: :get_feature_category, has_external_dependencies: :worker_has_external_dependencies?, - latency_sensitive: :latency_sensitive_worker?, + urgency: :get_urgency, resource_boundary: :get_worker_resource_boundary, idempotent: :idempotent?, weight: :get_weight diff --git a/lib/gitlab/sidekiq_config/worker.rb b/lib/gitlab/sidekiq_config/worker.rb index 4046ef54383..ec7a82f6459 100644 --- a/lib/gitlab/sidekiq_config/worker.rb +++ b/lib/gitlab/sidekiq_config/worker.rb @@ -7,8 +7,8 @@ module Gitlab attr_reader :klass delegate :feature_category_not_owned?, :get_feature_category, - :get_weight, :get_worker_resource_boundary, :idempotent?, - :latency_sensitive_worker?, :queue, :queue_namespace, + :get_urgency, :get_weight, :get_worker_resource_boundary, + :idempotent?, :queue, :queue_namespace, :worker_has_external_dependencies?, to: :klass @@ -49,7 +49,7 @@ module Gitlab name: queue, feature_category: get_feature_category, has_external_dependencies: worker_has_external_dependencies?, - latency_sensitive: latency_sensitive_worker?, + urgency: get_urgency, resource_boundary: get_worker_resource_boundary, weight: get_weight, idempotent: idempotent? diff --git a/lib/gitlab/sidekiq_logging/structured_logger.rb b/lib/gitlab/sidekiq_logging/structured_logger.rb index b45014d283f..1c36e4a4a5a 100644 --- a/lib/gitlab/sidekiq_logging/structured_logger.rb +++ b/lib/gitlab/sidekiq_logging/structured_logger.rb @@ -85,7 +85,7 @@ module Gitlab job['pid'] = ::Process.pid job.delete('args') unless ENV['SIDEKIQ_LOG_ARGUMENTS'] - job['args'] = Gitlab::Utils::LogLimitedArray.log_limited_array(job['args']) if job['args'] + job['args'] = Gitlab::Utils::LogLimitedArray.log_limited_array(job['args'].map(&:to_s)) if job['args'] job end diff --git a/lib/gitlab/sidekiq_middleware/metrics.rb b/lib/gitlab/sidekiq_middleware/metrics.rb index fbc34357323..693e35f2500 100644 --- a/lib/gitlab/sidekiq_middleware/metrics.rb +++ b/lib/gitlab/sidekiq_middleware/metrics.rb @@ -9,10 +9,10 @@ module Gitlab private def create_labels(worker_class, queue) - labels = { queue: queue.to_s, latency_sensitive: FALSE_LABEL, external_dependencies: FALSE_LABEL, feature_category: "", boundary: "" } + labels = { queue: queue.to_s, urgency: "", external_dependencies: FALSE_LABEL, feature_category: "", boundary: "" } return labels unless worker_class && worker_class.include?(WorkerAttributes) - labels[:latency_sensitive] = bool_as_label(worker_class.latency_sensitive_worker?) + labels[:urgency] = worker_class.get_urgency.to_s labels[:external_dependencies] = bool_as_label(worker_class.worker_has_external_dependencies?) feature_category = worker_class.get_feature_category |