Allow graphite to exist on non-standard ports

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

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