lib/fnordmetric/widgets/timeseries_widget.rb in fnordmetric-1.0.1 vs lib/fnordmetric/widgets/timeseries_widget.rb in fnordmetric-1.2.0

@@ -3,45 +3,55 @@
   def self.execute(namespace, event)
     resp = if event["cmd"] == "values_at"
       {
         :cmd => :values_at,
         :gauges => event["gauges"].map{ |gkey|
-          vals = namespace.gauges[gkey.to_sym].values_in(event["since"]..event["until"])
-          { :key => gkey, :vals => vals }
+          _gauge = namespace.gauges[gkey.to_sym]
+          unless _gauge
+            return { :error => "gauge not found: #{gkey}" }
+          end
+
+          t_since = FnordMetric::Util.parse_time(event["since"].to_s)
+          t_until = FnordMetric::Util.parse_time(event["until"].to_s)
+
+          vals = _gauge.values_in(t_since..t_until)
+          { :key => gkey, :vals => vals, :title => _gauge.title }
         }
       }
     end
 
     return false unless resp
 
     resp.merge(
-      :class => "widget_response",
+      :type => "widget_response",
       :widget_key => event["widget_key"]
     )
   end
 
-  def data    
+  def data
     super.merge(
       :series => series,
       :gauges => gauges.map(&:name),
       :start_timestamp => ticks.first,
       :end_timestamp => ticks.last,
+      :xticks => (@opts[:xticks] || 30),
       :autoupdate => (@opts[:autoupdate] || 60),
       :include_current => !!@opts[:include_current],
       :default_style => (@opts[:plot_style] || 'line'),
       :async_chart => true,
       :tick => tick
     )
   end
 
   def series
     colors = FnordMetric::COLORS.dup
-    
+
     gauges.map do |gauge|
-      { 
-        :name => gauge.name, 
-        :data => [{:x => ticks.first, :y => 0}], 
-        :color => colors.unshift(colors.pop).first 
+      {
+        :name => gauge.name,
+        :title => gauge.title,
+        :data => [{:x => ticks.first, :y => 0}],
+        :color => colors.unshift(colors.pop).first
       }
     end
   end
 
   def has_tick?