From 2dc4fa462553b7b6572738ea33fa8669b1576cfc Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Oct 03 2018 19:41:56 +0000 Subject: Adjust naming scheme for one prometheus metric. I ran across some best practices guidelines from upstream: https://prometheus.io/docs/practices/naming/ --- diff --git a/greenwave/api_v1.py b/greenwave/api_v1.py index b2096b8..897cf71 100644 --- a/greenwave/api_v1.py +++ b/greenwave/api_v1.py @@ -8,7 +8,11 @@ from greenwave.policies import summarize_answers, RemotePolicy, RemoteRule from greenwave.resources import ResultsRetriever, retrieve_waivers, retrieve_builds_in_update from greenwave.safe_yaml import SafeYAMLError from greenwave.utils import insert_headers, jsonp -from greenwave.monitoring import registry, decision_exception_counter, decision_latency +from greenwave.monitoring import ( + registry, + decision_exception_counter, + decision_request_duration_seconds, +) api = (Blueprint('api_v1', __name__)) @@ -165,7 +169,7 @@ def make_decision_options(): @api.route('/decision', methods=['POST']) @decision_exception_counter.count_exceptions() -@decision_latency.time() +@decision_request_duration_seconds.time() @jsonp def make_decision(): """ diff --git a/greenwave/monitoring.py b/greenwave/monitoring.py index 445f2ae..42b6780 100644 --- a/greenwave/monitoring.py +++ b/greenwave/monitoring.py @@ -17,7 +17,9 @@ multiprocess.MultiProcessCollector(registry) decision_exception_counter = Counter('total_decision_exceptions', ('All exceptions occurred in ' 'Greenwave "decision" API'), registry=registry) -decision_latency = Histogram('decision_latency', 'Decision latency', registry=registry) +decision_request_duration_seconds = Histogram('decision_request_duration_seconds', + 'Decision latency', + registry=registry) publish_decision_exceptions_waiver_counter = Counter('publish_decision_exceptions_new_waiver', ('All exceptions occurred in publishing a ' 'message after a new waiver'),