pencil 0.2.6 → 0.2.8

data/VERSION.rb

@@ -0,0 +1 @@
+PENCIL_VERSION = "0.2.8"

data/examples/dashboards.yml

@@ -51,6 +51,10 @@
       - load_average:
       - cpu_usage:
       - network_traffic:
+      - mysql_pending_file_io:
+      - mysql_history_length:
+      - mysql_file_io_threads:
+      - mysql_file_io_threads_usage:
     hosts: ["sync*_db", "wp-db*"]
   sync_node_alloc:
     title: sync node allocation

data/examples/graphs.yml

@@ -25,7 +25,7 @@
     title: "syncstorage 401s"
     targets:
       syncstorage.request_rate.401:
-        :key: 401
+        :key: 200
         :color: brown
     hosts: ["sync*_web", "test*_web", "wp-web*"]
 
@@ -193,10 +193,10 @@
     scale: 1024 # M -> G
     hosts: ["*"]
     # some random options for demonstration
-    template: alphas
-    bgcolor: "#AFFFFF"
-    vtitle: tvtnolgrf
-    lineWidth: 20
+    # template: alphas
+    # bgcolor: "#AFFFFF"
+    # vtitle: tvtnolgrf
+    # lineWidth: 20
 
   sync_node_alloc:
     title: "node alloc rate"
@@ -221,3 +221,100 @@
         :color: blue
  
     hosts: ["wp-adm01"]
+
+  mysql_pending_file_io:
+    title: "mysql pending file i/o"
+    targets:
+      stats.timers.mysql.innodb.pending_read.mean:
+        :key: read
+        :color: green
+      stats.timers.mysql.innodb.pending_write.mean:
+        :key: write
+        :color: blue
+      stats.timers.mysql.innodb.pending_ibuf.mean:
+        :key: ibuf
+        :color: brown
+      stats.timers.mysql.innodb.pending_log.mean:
+        :key: log
+        :color: red
+      stats.timers.mysql.innodb.pending_sync.mean:
+        :key: sync
+        :color: yellow
+
+    hosts: ["wp-db*", "sync*_db"]
+
+  mysql_history_length:
+    title: "mysql transaction history"
+    targets:
+      stats.timers.mysql.innodb.history_length.mean:
+        :key: read
+        :color: green
+
+    hosts: ["wp-db*", "sync*_db"]
+
+  mysql_file_io_threads_usage:
+    title: "mysql file i/o threads active (% used)"
+    targets:
+      ? - stats.timers.mysql.innodb.threads_active_read.mean:
+        - stats.timers.mysql.innodb.threads_total_read.mean:
+      :
+        !omap
+        - :divideSeries:
+        - :color: green
+        - :asPercent: 1.0
+        - :movingAverage: 10
+        - :key: read
+      ? - stats.timers.mysql.innodb.threads_active_write.mean:
+        - stats.timers.mysql.innodb.threads_total_write.mean:
+      :
+        !omap
+        - :divideSeries:
+        - :color: blue
+        - :asPercent: 1.0
+        - :movingAverage: 10
+        - :key: write
+      ? - stats.timers.mysql.innodb.threads_active_ibuf.mean:
+        - stats.timers.mysql.innodb.threads_total_ibuf.mean:
+      :
+        !omap
+        - :divideSeries:
+        - :color: brown
+        - :asPercent: 1.0
+        - :movingAverage: 10
+        - :key: ibuf
+      ? - stats.timers.mysql.innodb.threads_active_log.mean:
+        - stats.timers.mysql.innodb.threads_total_log.mean:
+      :
+        !omap
+        - :divideSeries:
+        - :color: red
+        - :asPercent: 1.0
+        - :movingAverage: 10
+        - :key: log
+    hosts: ["wp-db*", "sync*_db"]
+
+  mysql_file_io_threads:
+    title: "mysql file i/o threads"
+    targets:
+      stats.timers.mysql.innodb.threads_active_read.mean:
+        !omap
+        - :color: green
+        - :movingAverage: 10
+        - :key: read
+      stats.timers.mysql.innodb.threads_active_write.mean:
+        !omap
+        - :color: blue
+        - :movingAverage: 10
+        - :key: write
+      stats.timers.mysql.innodb.threads_active_ibuf.mean:
+        !omap
+        - :color: brown
+        - :movingAverage: 10
+        - :key: ibuf
+      stats.timers.mysql.innodb.threads_active_log.mean:
+        !omap
+        - :color: red
+        - :movingAverage: 10
+        - :key: log
+
+    hosts: ["wp-db*", "sync*_db"]

data/examples/pencil.yml

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

data/lib/dash.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require "rubygems"
 require "namespace"
 
@@ -17,9 +15,6 @@ require "chronic_duration"
 require "optparse"
 require "rubyfixes"
 
-# fixme style.css isn't actually cached, you need to set something up with
-# rack to cache static files
-
 $:.unshift(File.dirname(__FILE__))
 
 module Dash
@@ -129,8 +124,8 @@ module Dash
     end
 
     get '/host/:cluster/:host/?' do
-      @host = Host.new(params[:host], { "cluster" => params[:cluster] })
-      @cluster = params[:cluster]
+      @host = Host.find_by_name_and_cluster(params[:host], params[:cluster])
+      @cluster = @host.cluster
       raise "Unknown host: #{params[:host]} in #{params[:cluster]}" unless @host
 
       @title = "#{@host.cluster} :: host :: #{@host.name}"

data/lib/helpers.rb

@@ -114,15 +114,15 @@ module Dash::Helpers
     end
   end
 
-  def hosts_selector(hosts)
+  def hosts_selector(hosts, print_clusters=false)
+    @print_clusters = print_clusters
     @hosts = hosts
     erb :'partials/hosts_selector', :layout => false
   end
 
   def append_query_string(str)
     v = str.dup
-    query = request.query_string.chomp("&permalink=1")
-    (v << "?#{query}") unless request.query_string.empty?
+    (v << "?#{request.query_string}") unless request.query_string.empty?
     return v
   end
 

data/lib/models/graph.rb

@@ -307,11 +307,11 @@ module Dash::Models
       return metrics.flatten.map { |x| x.split(".") }
     end
 
-    # FIXMEEEE needs to be fixed for different metric formats
     def hosts_clusters
       metrics = expand
       clusters = Set.new
 
+      # find the indicies of the clusters and hosts
       f = @params[:metric_format].dup.split("%m")
       first = f.first.split(".")
       last = f.last.split(".")
@@ -327,7 +327,7 @@ module Dash::Models
         end
       end
       hosts = metrics.map do |m|
-        Host.new(m[hi], @params.merge({ "cluster" => m[ci] }))
+        Host.new(m[hi], m[ci], @params)
       end.uniq
 
       # filter by what matches the graph definition

data/lib/models/host.rb

@@ -4,9 +4,14 @@ require "models/graph"
 module Dash::Models
   class Host < Base
     attr_accessor :graphs
+    attr_reader :cluster
 
-    def initialize(name, params={})
-      super
+    def initialize(name, cluster, params={})
+      super(name, params)
+      @cluster = cluster
+      # hack for the case where colo{1,2}.host1 both exist
+      @@objects[self.class.to_s].delete(name)
+      @@objects[self.class.to_s]["#{cluster}#{name}"] = self
 
       @graphs = []
       Graph.each do |graph_name, graph|
@@ -19,8 +24,8 @@ module Dash::Models
       end # Graph.each
     end
 
-    def cluster
-      return @params["cluster"]
+    def self.find(name)
+      return @@objects[self.name][key] rescue []
     end
 
     def key
@@ -64,7 +69,7 @@ module Dash::Models
 
     def self.find_by_name_and_cluster(name, cluster)
       Host.each do |host_name, host|
-        next unless host_name = name
+        next unless host.name == name
         return host if host.cluster == cluster
       end
       return nil

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

@@ -5,7 +5,6 @@
 <%= graph_uplink %>
 <br>
 <br>
-<a href="#by_host">by_host</a>
 <%= hosts.collect { |h| "<a href=\"##{h}\">#{h}</a>" }.join(" ") %>
 
 <div class="graphsection" style="width:<%= @zoom.width(merge_opts) %>;">

data/lib/views/global.erb

@@ -1,7 +1,5 @@
 <h2>List of dashboards for <%= cluster_selector %></h2>
 
-I feel like some graphs should go here
-
 <% hosts = Host.all
    boards = @dashboards
    seen_hosts = Set.new %>
@@ -10,7 +8,7 @@ I feel like some graphs should go here
 <h2><a href="/dash/<%= "#{@cluster}/#{append_query_string(b.name)}" %>"><%= b.name %></a>
   <% dash_hosts = b.get_all_hosts()[0]
      seen_hosts += dash_hosts %>
-  <%= hosts_selector(dash_hosts) %>
+  <%= hosts_selector(dash_hosts, true) %>
 </h2>
 <%= b.graphs.collect do |g|
     href = append_query_string("/dash/#{@cluster}/#{b.name}/#{g}")

data/lib/views/layout.erb

@@ -17,16 +17,20 @@
       <div id="nav">
         <% if @cluster %>
         <ul>
+          <!-- fixme change this to the cluster overview link when there's only one cluster-->
           Global Views:
           <li><a href="<%= cluster_link("global") %>">overview</a></li>
           <br>
+          <% clusters = settings.config.clusters %>
+          <% if clusters.size > 1 %>
           Cluster Views:
           <br>
-          <% clusters = settings.config.clusters %>
+
           <% clusters.sort.each do |cluster| %>
           <li><a href="<%= cluster_link(cluster) %>"><%= cluster %></a></li>
           <% end %>
           <br>
+          <% end %>
           Dashboards: (<%= @cluster %>)
           <br>
           <% @dashboards.sort.each do |dash| %>
@@ -35,7 +39,7 @@
           <br>
           Jump to Host:
           <br>
-          <%= hosts_selector(Host.all) %>
+          <%= hosts_selector(* @cluster == "global" ? [Host.all, true] : [Host.find_by_cluster(@cluster), false]) %>
           <br>
           <br>
           <%= input_boxes %>
@@ -52,6 +56,6 @@
 
   </body>
   <div id="footer" style="color:green;">
-    generated <%= @request_time %> by <a href="https://github.com/petef/pencil">pencil</a> v<%= PENCIL_VERSION %>
+    generated <%= @request_time %> by <a href="https://github.com/fetep/pencil">pencil</a> v<%= PENCIL_VERSION %>
   </div>
 </html>

data/lib/views/partials/hosts_selector.erb

@@ -1,7 +1,9 @@
 <select onchange="window.open(this.options[this.selectedIndex].value,'_top')">
   <option value="">-select host-</option>
   <% @hosts.sort.each do |h|
+     option = "#{h.name}"
+     option << " [#{h.cluster}] " if @print_clusters
      value = append_query_string("/host/#{h.cluster}/#{h}") %>
-  <option value="<%= value %>" <%= "selected=\"selected\"" if @host == h %>><%= h %></option>
+  <option value="<%= value %>" <%= "selected=\"selected\"" if @host == h %>><%= option %></option>
   <% end %>
 </select>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pencil
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Pete Fritchman
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-02 00:00:00 -07:00
-default_executable: 
+date: 2011-08-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongrel
@@ -114,41 +113,41 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/dash.rb
+- VERSION.rb
 - lib/models.rb
+- lib/config.ru
 - lib/helpers.rb
-- lib/namespace.rb
+- lib/dash.rb
 - lib/config.rb
-- lib/views/dash-cluster.erb
-- lib/views/cluster.erb
-- lib/views/layout.erb
-- lib/views/host.erb
+- lib/models/dashboard.rb
+- lib/models/graph.rb
+- lib/models/base.rb
+- lib/models/host.rb
 - lib/views/dash-global.erb
-- lib/views/dash-global-zoom.erb
+- lib/views/host.erb
+- lib/views/dash-cluster-zoom.erb
 - lib/views/global.erb
-- lib/views/partials/input_boxes.erb
+- lib/views/layout.erb
+- lib/views/dash-global-zoom.erb
 - lib/views/partials/graph_switcher.erb
-- lib/views/partials/cluster_selector.erb
-- lib/views/partials/dash_switcher.erb
 - lib/views/partials/hosts_selector.erb
+- lib/views/partials/cluster_switcher.erb
 - lib/views/partials/refresh_button.erb
 - lib/views/partials/cookies_form.erb
-- lib/views/partials/cluster_switcher.erb
-- lib/views/dash-cluster-zoom.erb
-- lib/rubyfixes.rb
-- lib/public/favicon.ico
+- lib/views/partials/dash_switcher.erb
+- lib/views/partials/input_boxes.erb
+- lib/views/partials/cluster_selector.erb
+- lib/views/cluster.erb
+- lib/views/dash-cluster.erb
 - lib/public/style.css
-- lib/models/graph.rb
-- lib/models/dashboard.rb
-- lib/models/base.rb
-- lib/models/host.rb
-- lib/config.ru
+- lib/public/favicon.ico
+- lib/rubyfixes.rb
+- lib/namespace.rb
 - docs/pencil_options.md
+- examples/dashboards.yml
 - examples/pencil.yml
 - examples/graphs.yml
-- examples/dashboards.yml
 - bin/pencil
-has_rdoc: true
 homepage: https://github.com/fetep/pencil
 licenses: 
 - Mozilla Public License (1.1)
@@ -178,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: pencil -- Graphite dashboard system