graphite_graph 0.0.6 → 0.0.7

data/lib/graphite_graph.rb

@@ -23,6 +23,7 @@ class GraphiteGraph
   def defaults
     @properties = {:title => nil,
                    :vtitle => nil,
+                   :vtitle_right => nil,
                    :width => 500,
                    :height => 250,
                    :from => "-1hour",
@@ -47,6 +48,7 @@ class GraphiteGraph
                    :major_grid_line_color => nil,
                    :minor_grid_line_color => nil,
                    :area => :none,
+                   :logbase => nil,
                    :placeholders => nil}.merge(@overrides)
   end
 
@@ -234,6 +236,7 @@ class GraphiteGraph
     args = {:data => "threshold(#{options[:value]})", :color => options[:color], :alias => options[:alias]}
 
     args[:dashed] = true if options[:dashed]
+    args[:second_y_axis] = true if options[:second_y_axis]
 
     field "line_#{@linecount}", args
 
@@ -282,6 +285,8 @@ class GraphiteGraph
     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]
+    url_parts << "vtitleRight=#{properties[:vtitle_right]}" if properties[:vtitle_right]
+    url_parts << "logBase=#{properties[:logbase]}" if properties[:logbase]
 
     target_order.each do |name|
       target = targets[name]
@@ -293,7 +298,13 @@ class GraphiteGraph
 
         graphite_target = target[:data]
 
-        graphite_target = "derivative(#{graphite_target})" if target[:derivative]
+        graphite_target = "keepLastValue(#{graphite_target})" if target[:keep_last_value]
+        graphite_target = "sum(#{graphite_target})" if target[:sum]
+        if target[:derivative]
+          graphite_target = "derivative(#{graphite_target})"
+        elsif target[:non_negative_derivative]
+          graphite_target = "nonNegativeDerivative(#{graphite_target})"
+        end
         graphite_target = "highestAverage(#{graphite_target},#{target[:highest_average]})" if target[:highest_average]
         if target[:scale]
           graphite_target = "scale(#{graphite_target},#{target[:scale]})"

data/lib/graphite_graph/version.rb

@@ -1,3 +1,3 @@
 class GraphiteGraph
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: graphite_graph
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-16 00:00:00 +01:00
+date: 2012-09-21 00:00:00 +01:00
 default_executable: 
 dependencies: []