From e3ed5d8c25631a2e518af935d7bcf0aaabc9740b Mon Sep 17 00:00:00 2001 From: William Cummings Date: Tue, 1 Apr 2014 18:46:52 -0400 Subject: [PATCH] Allow graphite to exist on non-standard ports --- src/analyzer/analyzer.py | 3 ++- src/horizon/worker.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/analyzer/analyzer.py b/src/analyzer/analyzer.py index 77258e67..2fd0ca25 100644 --- a/src/analyzer/analyzer.py +++ b/src/analyzer/analyzer.py @@ -12,6 +12,7 @@ import operator import socket import settings +import re from alerters import trigger_alert from algorithms import run_selected_algorithm @@ -47,7 +48,7 @@ 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)) + sock.connect((re.sub(r":\d+$", "", settings.GRAPHITE_HOST.replace('http://', '')), 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..6983a421 100644 --- a/src/horizon/worker.py +++ b/src/horizon/worker.py @@ -4,6 +4,7 @@ from Queue import Empty from msgpack import packb from time import time, sleep +import re import logging import socket @@ -48,7 +49,7 @@ 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)) + sock.connect((re.sub(r":\d+$", "", settings.GRAPHITE_HOST.replace('http://', '')), settings.CARBON_PORT)) sock.sendall('%s %s %i\n' % (name, value, time())) sock.close() return True