From 4e329a4d6128e0529c0d5cf40521d3ef8be80928 Mon Sep 17 00:00:00 2001 From: Jonathan Lassoff Date: Mon, 25 Nov 2013 18:28:01 -0800 Subject: [PATCH] Allow for HTTPS Graphite servers. --- src/analyzer/analyzer.py | 4 +++- src/horizon/worker.py | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/analyzer/analyzer.py b/src/analyzer/analyzer.py index 77258e67..e0362857 100644 --- a/src/analyzer/analyzer.py +++ b/src/analyzer/analyzer.py @@ -1,4 +1,5 @@ import logging +import re from Queue import Empty from redis import StrictRedis from time import time, sleep @@ -47,7 +48,8 @@ def check_if_parent_is_alive(self): def send_graphite_metric(self, name, value): if settings.GRAPHITE_HOST != '': sock = socket.socket() - sock.connect((settings.GRAPHITE_HOST.replace('http://', ''), settings.CARBON_PORT)) + graphite_host = re.sub('http[s]?://', '', settings.GRAPHITE_HOST) + sock.connect((graphite_host, settings.CARBON_PORT)) sock.sendall('%s %s %i\n' % (name, value, time())) sock.close() return True diff --git a/src/horizon/worker.py b/src/horizon/worker.py index 705e0acc..9180c8d3 100644 --- a/src/horizon/worker.py +++ b/src/horizon/worker.py @@ -48,7 +48,8 @@ def in_skip_list(self, metric_name): def send_graphite_metric(self, name, value): if settings.GRAPHITE_HOST != '': sock = socket.socket() - sock.connect((settings.GRAPHITE_HOST.replace('http://', ''), settings.CARBON_PORT)) + graphite_host = re.sub('http[s]?://', '', settings.GRAPHITE_HOST) + sock.connect((graphite_host, settings.CARBON_PORT)) sock.sendall('%s %s %i\n' % (name, value, time())) sock.close() return True