Commit 6c6eb96a authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'frontent-prometheus-metrics' into 'master'

Remove the project label from histogram metrics

See merge request gitlab-org/gitlab!53496
parents 85a0c2c6 990abe5b
...@@ -40,7 +40,7 @@ module Ci ...@@ -40,7 +40,7 @@ module Ci
def observe(data) def observe(data)
histogram = find_histogram(data[:name]) histogram = find_histogram(data[:name])
histogram.observe({ project: project.full_path }, data[:value].to_f) histogram.observe({}, data[:value].to_f)
end end
def find_histogram(name) def find_histogram(name)
......
...@@ -119,9 +119,9 @@ The following metrics are available: ...@@ -119,9 +119,9 @@ The following metrics are available:
| `gitlab_external_http_duration_seconds` | Counter | 13.8 | Duration in seconds spent on each HTTP call to external systems | | | `gitlab_external_http_duration_seconds` | Counter | 13.8 | Duration in seconds spent on each HTTP call to external systems | |
| `gitlab_external_http_exception_total` | Counter | 13.8 | Total number of exceptions raised when making external HTTP calls | | | `gitlab_external_http_exception_total` | Counter | 13.8 | Total number of exceptions raised when making external HTTP calls | |
| `ci_report_parser_duration_seconds` | Histogram | 13.9 | Time to parse CI/CD report artifacts | `parser` | | `ci_report_parser_duration_seconds` | Histogram | 13.9 | Time to parse CI/CD report artifacts | `parser` |
| `pipeline_graph_link_calculation_duration_seconds` | Histogram | 13.9 | Total time spent calculating links, in seconds | `project` | | `pipeline_graph_link_calculation_duration_seconds` | Histogram | 13.9 | Total time spent calculating links, in seconds | |
| `pipeline_graph_links_total` | Histogram | 13.9 | Number of links per graph | `project` | | `pipeline_graph_links_total` | Histogram | 13.9 | Number of links per graph | |
| `pipeline_graph_links_per_job_ratio` | Histogram | 13.9 | Ratio of links to job per graph | `project` | | `pipeline_graph_links_per_job_ratio` | Histogram | 13.9 | Ratio of links to job per graph | |
## Metrics controlled by a feature flag ## Metrics controlled by a feature flag
......
...@@ -81,6 +81,6 @@ RSpec.describe Ci::PrometheusMetrics::ObserveHistogramsService do ...@@ -81,6 +81,6 @@ RSpec.describe Ci::PrometheusMetrics::ObserveHistogramsService do
end end
def histogram_data(name = :pipeline_graph_link_calculation_duration_seconds) def histogram_data(name = :pipeline_graph_link_calculation_duration_seconds)
Gitlab::Metrics.registry.get(name)&.get({ project: project.full_path }) Gitlab::Metrics.registry.get(name)&.get({})
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment