From dbece18d19c3977019c6727fcbe7a436031666fe Mon Sep 17 00:00:00 2001 From: Eddie Arrage Date: Wed, 9 May 2018 18:33:55 +0000 Subject: Initial commit for Clover Collector - Added a container named clover-collector using clover container as a base with build script - GRPC server to manage collector process - Cassandra DB client interface to initialize visibility keyspace - Init messaging adds table schemas for tracing - traces & spans - Adds table for monitoring - metrics - Does not implement Cassandra server but developed using public Cassandra docker container - Collector process in simple loop that periodically fetches traces and monitoring data and inserts to Cassandra - not optimized for batch retrieval yet for monitoring - CLI interface added to collector process and used by GRPC server for configuration - Simple GRPC client script to test GRPC server and start/stop of collector process - Collector process can be configured with access for tracing, monitoring and Cassandra - Added a return value in monitoring query method - Added ability to truncate tracing, metrics and spans tables in cql - Added cql prepared statements and batch insert for metrics and spans - Align cql connection to cql deployment within k8s - Fix issue with cql host list using ast and collect process args with background argument - Added redis interface to accept service/metric list externally for monitoring (will work in conjunction with clover-controller) - Use k8s DNS names and default ports for monitoring, tracing and cassandra - Added yaml manifest renderer/template for collector Change-Id: I3e4353e28844c4ce9c185ff4638012b66c7fff67 Signed-off-by: Eddie Arrage --- clover/monitoring/monitoring.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'clover/monitoring/monitoring.py') diff --git a/clover/monitoring/monitoring.py b/clover/monitoring/monitoring.py index 9726fd1..ec97e82 100644 --- a/clover/monitoring/monitoring.py +++ b/clover/monitoring/monitoring.py @@ -90,8 +90,9 @@ class Monitoring(object): print("query %s %s, status=%s, size=%d, dur=%.3f" % \ (self.host, query_params["query"], resp.status_code, len(resp.text), dur)) - pp = pprint.PrettyPrinter(indent=2) - pp.pprint(resp.json()) + #pp = pprint.PrettyPrinter(indent=2) + ##pp.pprint(resp.json()) + return resp.json() except Exception as e: print("ERROR: Could not query prometheus instance %s. \n %s" % (url, e)) -- cgit 1.2.3-korg