Skip to content
Snippets Groups Projects

Add RC2 changes to 9-3-stable

Merged Add RC2 changes to 9-3-stable
9-3-stable-rc2 into 9-3-stable
Merged username-removed-408677 requested to merge 9-3-stable-rc2 into 9-3-stable
Viewing commit 4f824d2a
Show latest version
13 files
+ 146
− 53
Compare changes
  • Side-by-side
  • Inline
Files
13
  • 4f824d2a
    Pawel Chojnacki
    Custom queries for prometheus · 4f824d2a
    Pawel Chojnacki authored 
    - Tests for prometheus queries

- fix rubocop warnings

- Remove unused method. Add more queries to deployment queries.

- Wrap BaseQuery in module hierarchy

Renname Prometheus class to PrometheusClient
app/controllers/projects/deployments_controller.rb
+ 1
− 1
@@ -11,7 +11,7 @@ class Projects::DeploymentsController < Projects::ApplicationController
@@ -11,7 +11,7 @@ class Projects::DeploymentsController < Projects::ApplicationController
end
end
def metrics
def metrics
@metrics = deployment.metrics(1.hour)
@metrics = deployment.metrics
if @metrics&.any?
if @metrics&.any?
render json: @metrics, status: :ok
render json: @metrics, status: :ok