From 5e8267ec18a5a00b20a54d2cbea4034e94b1d0f9 Mon Sep 17 00:00:00 2001 From: Sai Sindhur Malleni Date: Thu, 29 Sep 2016 17:14:48 -0400 Subject: [PATCH] Ignore sending null values from shaker output to Elasticsearch Shaker reports throughput/ping values as None for the first and last few seconds of the test for synchronization. Currently we are pushing null values also to ES, which most likely is affecting averages etc. This commit prevents shaker from reporting these values to Elasticsearch. Fixing linting errors in lib/Elastic.py Change-Id: Ib8aaf425d68fae1254c3692ebf39e885888e497a --- lib/Elastic.py | 4 ++-- lib/Shaker.py | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/Elastic.py b/lib/Elastic.py index 26214dea2..606ad710c 100644 --- a/lib/Elastic.py +++ b/lib/Elastic.py @@ -96,8 +96,8 @@ class Elastic(object): doc_type=_type, refresh=True) self.logger.info("Pushed data to Elasticsearch to index {}" - " and browbeat UUID {}" .format(self.index, - result['browbeat_uuid'])) + " and browbeat UUID {}" .format(self.index, + result['browbeat_uuid'])) break except Exception: self.logger.error("Error pushing data to Elasticsearch, going to retry" diff --git a/lib/Shaker.py b/lib/Shaker.py index 80d6be9d8..9180c72e8 100644 --- a/lib/Shaker.py +++ b/lib/Shaker.py @@ -172,8 +172,11 @@ class Shaker(WorkloadBase.WorkloadBase): self.grafana.grafana_urls()], 'shaker_uuid': str(shaker_uuid)} # Ship Data to ES when record status is ok - result = self.elastic.combine_metadata(shaker_stats) - self.elastic.index_result(result, test_name) + if result['value'] is None: + self.logger.debug("Ignoring sending null values to ES") + else: + result = self.elastic.combine_metadata(shaker_stats) + self.elastic.index_result(result, test_name) else: # If the status of the record is not ok, ship minimal # shaker_stats dictionary to ES