Remove unused riemann functionality - depends were breaking pipelinesjjardon/tristan/rpm-export

5 files changed, 1 insertions, 29 deletions

diff --git a/requirements.freeze.txt b/requirements.freeze.txt
index 1e1261f..91cc28b 100644
--- a/requirements.freeze.txt
+++ b/requirements.freeze.txt
@@ -5,6 +5,4 @@ pycodestyle==2.2.0
 jsonschema==2.5.1
 bottle==0.12.1
 cherrypy==8.1.2
-riemann-client==6.3.0
 fs==2.0.0
-protobuf==3.0.0
diff --git a/requirements.txt b/requirements.txt
index 323a254..aa9f1b0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,5 +5,4 @@ pycodestyle
 jsonschema
 bottle
 cherrypy
-riemann-client
 fs
diff --git a/ybd/app.py b/ybd/app.py
index d106d60..c03cda3 100644
--- a/ybd/app.py
+++ b/ybd/app.py
@@ -28,12 +28,6 @@ from subprocess import call
 from fs.osfs import OSFS  # not used here, but we import it to check install
 from repos import get_version
 from cache import cache_key
-try:
-    from riemann_client.transport import TCPTransport
-    from riemann_client.client import QueuedClient
-    riemann_available = True
-except ImportError:
-    riemann_available = False
 
 
 config = {}
@@ -302,19 +296,6 @@ def timer(dn, message=''):
     text = '' if message == '' else ' for ' + message
     time_elapsed = elapsed(starttime)
     log(dn, 'Elapsed time' + text, time_elapsed)
-    log_riemann(dn, 'Timer', text, time_elapsed)
-
-
-def log_riemann(dn, service, text, time_elapsed):
-    if riemann_available and 'riemann-server' in config:
-        time_split = time_elapsed.split(':')
-        time_sec = int(time_split[0]) * 3600 \
-            + int(time_split[1]) * 60 + int(time_split[2])
-        with QueuedClient(TCPTransport(config['riemann-server'],
-                                       config['riemann-port'],
-                                       timeout=30)) as client:
-            client.event(service=service, description=text, metric_f=time_sec)
-            client.flush()
 
 
 def elapsed(starttime):
diff --git a/ybd/assembly.py b/ybd/assembly.py
index 0b2e1c9..c818c8c 100644
--- a/ybd/assembly.py
+++ b/ybd/assembly.py
@@ -22,7 +22,7 @@ import errno
 
 import app
 from app import config, timer, elapsed
-from app import log, log_riemann, lockfile, RetryException
+from app import log, lockfile, RetryException
 from cache import cache, cache_key, get_cache, get_remote
 import repos
 import sandbox
@@ -190,7 +190,6 @@ def run_build(dn):
     with open(dn['log'], "a") as logfile:
         time_elapsed = elapsed(dn['start-time'])
         logfile.write('Elapsed_time: %s\n' % time_elapsed)
-        log_riemann(dn, 'Artifact_Timer', dn['name'], time_elapsed)
 
 
 def shuffle(contents):
diff --git a/ybd/config/ybd.conf b/ybd/config/ybd.conf
index 66b19c0..891dc8e 100644
--- a/ybd/config/ybd.conf
+++ b/ybd/config/ybd.conf
@@ -189,11 +189,6 @@ no-distcc: True
 # Some modes of ybd (eg build-only, keys-only) output a result to a file
 result-file: './ybd.result'
 
-# Address of a riemann server to optionally send events to
-# riemann-server: '127.0.0.1'
-# associated port of riemann server
-# riemann-port: 5555
-
 schemas:
   chunk: './schemas/chunk.json-schema'
   stratum: './schemas/stratum.json-schema'