graphite_graph 0.0.1 → 0.0.2

data/.gitignore

@@ -1 +1,2 @@
 pkg
+Gemfile.lock

data/lib/graphite_graph/version.rb

@@ -1,3 +1,3 @@
 class GraphiteGraph
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/graphite_graph.rb

@@ -37,10 +37,13 @@ class GraphiteGraph
                    :fontsize => nil,
                    :fontbold => false,
                    :timezone => nil,
+                   :background_color => nil,
+                   :foreground_color => nil,
                    :draw_null_as_zero => false,
                    :major_grid_line_color => nil,
                    :minor_grid_line_color => nil,
-                   :area => :none}.merge(@overrides)
+                   :area => :none,
+                   :placeholders => nil}.merge(@overrides)
   end
 
   def [](key)
@@ -270,6 +273,8 @@ class GraphiteGraph
     url_parts << "tz=#{properties[:timezone]}" if properties[:timezone]
     url_parts << "majorGridLineColor=#{properties[:major_grid_line_color]}" if properties[:major_grid_line_color]
     url_parts << "minorGridLineColor=#{properties[:minor_grid_line_color]}" if properties[:minor_grid_line_color]
+    url_parts << "bgcolor=#{properties[:background_color]}" if properties[:background_color]
+    url_parts << "fgcolor=#{properties[:foreground_color]}" if properties[:foreground_color]
 
     target_order.each do |name|
       target = targets[name]
@@ -282,6 +287,7 @@ class GraphiteGraph
         graphite_target = target[:data]
 
         graphite_target = "derivative(#{graphite_target})" if target[:derivative]
+        graphite_target = "highestAverage(#{graphite_target},#{target[:highest_average]})" if target[:highest_average]
         graphite_target = "scale(#{graphite_target},#{target[:scale]})" if target[:scale]
         graphite_target = "drawAsInfinite(#{graphite_target})" if target[:line]
         graphite_target = "movingAverage(#{graphite_target},#{target[:smoothing]})" if target[:smoothing]
@@ -291,11 +297,19 @@ class GraphiteGraph
         graphite_target = "secondYAxis(#{graphite_target})" if target[:second_y_axis]
 
         unless target.include?(:subgroup)
-          if target[:alias]
+          if target[:alias_by_node]
+            graphite_target = "aliasByNode(#{graphite_target},#{target[:alias_by_node]})"
+          elsif target[:alias]
             graphite_target = "alias(#{graphite_target},\"#{target[:alias]}\")"
           else
             graphite_target = "alias(#{graphite_target},\"#{name.to_s.capitalize}\")"
           end
+
+          if target[:cacti_style]
+            graphite_target = "cactiStyle(#{graphite_target})"
+          elsif target[:legend_value]
+            graphite_target = "legendValue(#{graphite_target},\"#{target[:legend_value]}\")"
+          end
         end
 
         url_parts << "target=#{graphite_target}"
@@ -305,7 +319,10 @@ class GraphiteGraph
     url_parts << "format=#{format}" if format
 
     if url
-       URI.encode(url_parts.join("&"))
+      url_str = url_parts.join("&")
+      properties[:placeholders].each { |k,v| url_str.gsub!("%{#{k}}", v.to_s) } if properties[:placeholders].is_a?(Hash)
+
+      URI.encode(url_str)
     else
       url_parts
     end

metadata

@@ -1,30 +1,39 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: graphite_graph
-version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 27
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
-authors:
+authors: 
 - R.I.Pienaar
 - Tom Taylor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000 Z
+
+date: 2012-04-15 00:00:00 +01:00
+default_executable: 
 dependencies: []
+
 description: 
-email:
+email: 
 - rip@devco.net
 - tom@tomtaylor.co.uk
-executables:
+executables: 
 - check_graph.rb
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - COPYING
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/check_graph.rb
@@ -58,34 +67,39 @@ files:
 - samples/monitoring/monitor.png
 - samples/thresholds/thresholds.graph
 - samples/thresholds/thresholds.png
+has_rdoc: true
 homepage: https://github.com/ripienaar/graphite-graph-dsl
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 69971418371862677
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 69971418371862677
+      version: "0"
 requirements: []
+
 rubyforge_project: graphite_graph
-rubygems_version: 1.8.11
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: DSL for generating Graphite graphs
 test_files: []
+

data/Gemfile.lock

@@ -1,14 +0,0 @@
-PATH
-  remote: .
-  specs:
-    graphite_graph (0.0.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  graphite_graph!