Update1.1.5 and forward jaeger headers

Makefile

@@ -1,4 +1,4 @@
-VERSION=1.1.4
+VERSION=1.1.5
 PROJECT=raintank
 APP=graphite-mt
 TAG_LATEST=0

local_settings.py

@@ -145,7 +145,7 @@
 
 # Provide a list of HTTP headers that you want forwarded on from this host
 # when making a request to a remote webapp server in CLUSTER_SERVERS
-REMOTE_STORE_FORWARD_HEADERS = ["x-org-id"] # An iterable of HTTP header names
+REMOTE_STORE_FORWARD_HEADERS = ["x-org-id", "jaeger-debug-id", "jaeger-baggage", "uber-trace-id"] # An iterable of HTTP header names
 
 ## Prefetch cache
 # set to True to fetch all metrics using a single http request per remote server

vhost.conf

@@ -45,3 +45,15 @@ WSGISocketPrefix /opt/graphite/run/wsgi
 
 </VirtualHost>
 
+<VirtualHost *:80>
+        ServerName localhost
+        DocumentRoot "/var/www/html"
+        ErrorLog /dev/stderr
+        # dont write request logs for status checks
+        CustomLog /dev/null common
+
+        <Location /server-status>
+            SetHandler server-status
+            Require local
+        </Location>
+</VirtualHost>