pencil 0.2.8 → 0.2.9

data/VERSION.rb

@@ -1 +1 @@
-PENCIL_VERSION = "0.2.8"
+PENCIL_VERSION = "0.2.9"

data/examples/pencil.yml

@@ -13,7 +13,7 @@
     :margin: 5
     :thickness: 2
 
-  :refresh_rate: false
+  :refresh_rate: 60
   :host_sort: "sensible"
   :quantum: 30 # map requests to 30 second intervals
   :date_format: "%X %x" # strftime

data/lib/dash.rb

@@ -133,13 +133,11 @@ module Dash
       erb :host
     end
 
-    # fixme make sure not to save shitty values for :start, :duration
-    # remove stime, etime
-    # there is definitely something wrong here
-    # disallow saving from, until
+    # fixme make sure not to save shitty values for :start
     get '/saveprefs' do
       puts 'saving prefs'
-      params.each do |k,v|
+      params.each do |k ,v|
+        next if [:etime, :stime, :duration].member?(k.to_sym)
         session[k] = v unless v.empty?
       end
       redirect URI.parse(request.referrer).path

data/lib/helpers.rb

@@ -132,7 +132,8 @@ module Dash::Helpers
     session.merge(opts).delete_if { |k,v| static_opts.member?(k) || v.empty? }
   end
 
-  def cluster_switcher
+  def cluster_switcher(clusters)
+    @clusters = clusters
     erb :'partials/cluster_switcher', :layout => false
   end
 

data/lib/models/dashboard.rb

@@ -25,6 +25,7 @@ module Dash::Models
         @graphs << g if g
       end
 
+      @valid_hosts_table = {} # cache calls to get_valid_hosts
     end
 
     def clusters
@@ -45,12 +46,15 @@ module Dash::Models
     end
 
     def get_valid_hosts(graph, cluster=nil)
+      if @valid_hosts_table[[graph, cluster]]
+        return @valid_hosts_table[[graph, cluster]]
+      end
+
       clusters = Set.new
       if cluster
         hosts = Host.find_by_cluster(cluster)
       else
         hosts = Host.all
-        hosts.each { |h| clusters << h.cluster }
       end
 
       # filter by what matches the graph definition
@@ -63,6 +67,7 @@ module Dash::Models
 
       hosts.each { |h| clusters << h.cluster }
 
+      @valid_hosts_table[[graph, cluster]] = [hosts, clusters]
       return hosts, clusters
     end
 

data/lib/views/dash-cluster-zoom.erb

@@ -1,6 +1,6 @@
 <% hosts = @dash.get_valid_hosts(@zoom, @cluster)[0].sort %>
 
-<%= cluster_switcher %>
+<%= cluster_switcher(@dash.clusters) %>
 <%= graph_switcher %>
 <%= graph_uplink %>
 <br>

data/lib/views/dash-cluster.erb

@@ -1,4 +1,4 @@
-<%= cluster_switcher %>
+<%= cluster_switcher(@dash.clusters) %>
 <%= dash_switcher %>
 <%= dash_uplink %>
 <br>

data/lib/views/dash-global-zoom.erb

@@ -1,6 +1,6 @@
 <% hosts, clusters = @dash.get_valid_hosts(@zoom) %>
 
-<%= cluster_switcher %>
+<%= cluster_switcher(@dash.clusters) %>
 <%= graph_switcher %>
 <%= graph_uplink %>
 <br>

data/lib/views/dash-global.erb

@@ -1,6 +1,6 @@
 <% clusters =  @dash.clusters %>
 
-<%= cluster_switcher %>
+<%= cluster_switcher(clusters) %>
 <%= dash_switcher %>
 <%= dash_uplink %>
 <br>

data/lib/views/layout.erb

@@ -33,7 +33,9 @@
           <% end %>
           Dashboards: (<%= @cluster %>)
           <br>
-          <% @dashboards.sort.each do |dash| %>
+          <% @dashboards.select do |d|
+             @cluster == "global" || d.clusters.member?(@cluster)
+             end.sort.each do |dash| %>
           <li><a href="<%= dash_link(dash, @cluster) %>"><%= dash["title"] %></a></li>
           <% end %>
           <br>

data/lib/views/partials/cluster_switcher.erb

@@ -1,5 +1,5 @@
 clusters:
-<%= settings.config.clusters.sort.collect do |c|
+<%= @clusters.sort.collect do |c|
     sub = append_query_string(request.path.sub(@cluster, c))
     @cluster == c ? "#{c}" : "<a href=\"#{sub}\">#{c}</a>"
     end.join(" ") %>

data/lib/views/partials/dash_switcher.erb

@@ -1,6 +1,8 @@
 <span class="graphtitle">
   dashboards:
-  <%= @dashboards.sort.collect do |d|
+  <%= @dashboards.select do |d|
+      @cluster == "global" || d.clusters.member?(@cluster)
+      end.sort.collect do |d|
       # this works unless you have a cluster with the same name as a dashboard
       sub = append_query_string(request.path.sub(@dash.name, d.name))
       @dash == d ? "#{d}" : "<a href=\"#{sub}\">#{d}</a>"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pencil
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - Pete Fritchman
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-16 00:00:00 Z
+date: 2011-08-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongrel