Skip to content
Snippets Groups Projects
Commit 2a89d2c9 authored by Pawel Chojnacki's avatar Pawel Chojnacki
Browse files

Avoid comma t the end of hash

parent 436e9078
No related branches found
No related tags found
2 merge requests!12073Add RC2 changes to 9-3-stable,!10981Expose memory deltas between app deployments and refactor prometheus queries to support more custom queries
Loading
Loading
@@ -19,7 +19,7 @@ module Gitlab::Prometheus::Queries
 
cpu_values: client_query_range(cpu_query, start: timeframe_start, stop: timeframe_end),
cpu_before: client_query(cpu_avg_query, time: deployment.created_at.to_f),
cpu_after: client_query(cpu_avg_query, time: timeframe_end),
cpu_after: client_query(cpu_avg_query, time: timeframe_end)
}
end
end
Loading
Loading
Loading
Loading
@@ -13,7 +13,7 @@ module Gitlab::Prometheus::Queries
memory_values: client_query_range(memory_query, start: timeframe_start, stop: timeframe_end),
memory_current: client_query(memory_query, time: timeframe_end),
cpu_values: client_query_range(cpu_query, start: timeframe_start, stop: timeframe_end),
cpu_current: client_query(cpu_query, time: timeframe_end),
cpu_current: client_query(cpu_query, time: timeframe_end)
}
end
end
Loading
Loading
Loading
Loading
@@ -89,7 +89,7 @@ module PrometheusHelpers
memory_values: prometheus_values_body('matrix').dig(:data, :result),
memory_current: prometheus_value_body('vector').dig(:data, :result),
cpu_values: prometheus_values_body('matrix').dig(:data, :result),
cpu_current: prometheus_value_body('vector').dig(:data, :result),
cpu_current: prometheus_value_body('vector').dig(:data, :result)
},
last_update: last_update
}
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment