Skip to content
This repository was archived by the owner on Dec 18, 2019. It is now read-only.

Allow for HTTPS Graphite servers. #71

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/analyzer/analyzer.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import logging
import re
from Queue import Empty
from redis import StrictRedis
from time import time, sleep
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/horizon/worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down