Skip to content

Make EE prometheus args behavior default -> metrics time window

Sarah Yasonik requested to merge time-windows-cleanup into master

What does this MR do?

This is blocked by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26228.

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26228 updates the CE argument manipulations in prometheus_adapter.rb, bringing it in line with the EE overrides. This MR removes the override, letting the CE behavior be default.

Update: After adding unit tests for #build_query_args, I forgot to double check that tests were still green on EE. This MR should now resolve the current broken master.

What are the relevant issue numbers?

gitlab-ce#31368

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/10894

Does this MR meet the acceptance criteria?

Edited by Sarah Yasonik

Merge request reports