Skip to content

Fix missing data_consistency label

What does this MR do?

In Prometheus we introduced sidekiq_load_balancing_count metric.

But it seems that data_consistency label is missing.

In EE::Gitlab::SidekiqMiddleware::ServerMetrics, it seems that we are expecting job[:data_consistency] to be set.

But in SidekiqClientMiddleware we are actually setting job['worker_data_consistency']

{
   "app":"sidekiq",
   "chart":"sidekiq-4.10.0",
   "cluster":"gstg-gitlab-gke",
   "container":"sidekiq",
   "database_chosen":"replica",
   "endpoint":"metrics",
   "env":"gstg",
   "environment":"gstg",
   "job":"monitoring/sidekiq",
   "job_status":"done",
   "monitor":"default",
   "namespace":"gitlab",
   "prometheus":"monitoring/gitlab-monitoring-promethe-prometheus",
   "provider":"gcp",
   "queue":"pipeline_hooks:build_hooks",
   "release":"gitlab",
   "stage":"main",
   "type":"sidekiq",
   "urgency":"high",
   "worker":"BuildHooksWorker"
}

image

Screenshots (strongly suggested)

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

Does this MR contain changes to processing or storing of credentials or tokens, authorization and authentication methods or other items described in the security review guidelines? If not, then delete this Security section.

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team

Related to: #330610 (closed)

Edited by Nikola Milojevic

Merge request reports