Merge pull request #34 from kickstarter/graphite_base_url

Support HTTPS, basic auth in graphite URL.
ktheory · Mar 19, 2012 · c21752a · c21752a
2 parents ceaae33 + 7986a82
commit c21752a
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/config/settings.yml.example b/config/settings.yml.example
@@ -1,5 +1,6 @@
 ---
-graphite_host: graphite01.pp.local
+graphite_base_url: http://graphite01.pp.local
+#graphite_base_url: https://user:pass@graphite01.pp.local
 redis_url: localhost:6379:1/graphiti
 tmp_dir: /tmp
 fonts:

diff --git a/lib/metric.rb b/lib/metric.rb
@@ -25,7 +25,7 @@ def self.find(match, max = 100)
 
   private
   def self.get_metrics_list(prefix = Graphiti.settings.metric_prefix)
-    url = "http://#{Graphiti.settings.graphite_host}/metrics/index.json"
+    url = "#{Graphiti.settings.graphite_base_url}/metrics/index.json"
     puts "Getting #{url}"
     response = Typhoeus::Request.get(url)
     if response.success?

diff --git a/public/js/default.js b/public/js/default.js
@@ -12566,7 +12566,7 @@ Graphiti.Graph = function(targetsAndOptions){
 }
 
 Graphiti.Graph.prototype = {
-  urlBase: (function() { return "http://" + Graphiti.graphite_host + "/render/?"; })(),
+  urlBase: (function() { return Graphiti.graphite_base_url + "/render/?"; })(),
 
   updateOptions: function(options) {
     $.extend(true, this.options, options || {});

diff --git a/public/js/default.min.js b/public/js/default.min.js
diff --git a/public/js/graph.js b/public/js/graph.js
@@ -65,7 +65,7 @@ Graphiti.Graph = function(targetsAndOptions){
 }
 
 Graphiti.Graph.prototype = {
-  urlBase: (function() { return "http://" + Graphiti.graphite_host + "/render/?"; })(),
+  urlBase: (function() { return Graphiti.graphite_base_url + "/render/?"; })(),
 
   updateOptions: function(options) {
     $.extend(true, this.options, options || {});

diff --git a/views/index.haml b/views/index.haml
@@ -233,7 +233,7 @@
 
   :javascript
     Graphiti = window.Graphiti || {};
-    Graphiti.graphite_host = "#{settings.graphite_host}";
+    Graphiti.graphite_base_url = "#{settings.graphite_base_url}";
     Graphiti.defaultGraph = #{Yajl::Encoder.encode(default_graph)};
 
   - if Graphiti.production?