visage-app 1.0.0 → 2.0.0

data/bin/visage-app

@@ -6,13 +6,15 @@ require 'socket'
 fqdn = Socket.gethostbyname(Socket.gethostname).first
 port = 9292
 $stdout.sync = true
-@root = Pathname.new(File.dirname(__FILE__)).parent.expand_path
+@root = (Pathname.new(__FILE__).parent.parent + 'lib').expand_path
+$: << @root.to_s
 action = ARGV[0]
 
 case action
 when "start"
   require 'rubygems'
   require 'rack'
+  require 'visage-app'
 
   puts ' _    ___'
   puts '| |  / (_)________ _____ ____'
@@ -22,18 +24,29 @@ when "start"
   puts '                 /____/'
   puts
   puts "will be running at http://#{fqdn}:#{port}/"
+
+  if Visage::Profile.old_format?
+    puts
+    puts "The Visage profile format has changed!"
+    puts "You need to upgrade your profiles."
+    puts "Please run:"
+    puts
+    puts "  #{$0} upgrade"
+    puts
+    exit 1
+  end
+
   puts
-  require @root.join('lib/visage-app')
   puts "Looking for RRDs in #{Visage::Config.rrddir}"
   puts
 
-  config = @root.join('lib/visage-app/config.ru').to_s
+  config = (@root + 'lib/visage-app/config.ru').to_s
   server = Rack::Server.new(:config => config, :Port => port, :server => "webrick")
   server.start
 when "genapache"
   require 'socket'
   fqdn = Socket.gethostbyname(Socket.gethostname).first
-  public_dir = @root.join('lib/visage-app/public')
+  public_dir = (@root + 'lib/visage-app/public').to_s
 
   puts <<-CONFIG
 <VirtualHost *>

data/features/cli.feature

@@ -16,9 +16,16 @@ Feature: command line utility
 
   Scenario: Specified configuration directory
     Given the "visage" gem is installed
-    And there is no file at "features/data/config/with_no_profiles/profiles.yaml"
+    And there is no file at "features/support/config/with_no_profiles/profiles.yaml"
     When I start the visage server helper with "visage-app start" and the following variables:
       | CONFIG_PATH                           |
-      | features/data/config/with_no_profiles |
-    Then I should see a file at "features/data/config/with_no_profiles/profiles.yaml"
+      | features/support/config/with_no_profiles |
+    Then I should see a file at "features/support/config/with_no_profiles/profiles.yaml"
 
+  Scenario: Config upgrader
+    Given the "visage" gem is installed
+    When I start the visage server helper with "visage-app start" and the following variables:
+      | CONFIG_PATH                           |
+      | features/support/config/with_old_profile_yaml |
+    Then I should see "The Visage profile format has changed" on the terminal
+    And I should see "visage-app upgrade" on the terminal

data/features/json.feature

@@ -16,6 +16,18 @@ Feature: Export data
     Then I should receive valid JSON
     And the JSON should have a list of plugins
 
+  Scenario: Get a list of available metrics on a host
+    When I visit the first available host
+    Then the request should succeed
+    Then I should receive valid JSON
+    And the JSON should have a list of plugins
+
+  Scenario: Get a list of available metrics across many hosts
+    When I visit the first two available hosts
+    Then the request should succeed
+    Then I should receive valid JSON
+    And the JSON should have a list of plugins
+
   Scenario: Retrieve single plugin instance
     Given a list of hosts exist
     When I visit "memory/memory-free" on the first available host
@@ -49,3 +61,28 @@ Feature: Export data
     Then I should receive valid JSON
     And I should see multiple hosts
 
+  Scenario: Retrieve data with a defined start time
+    Given a list of hosts exist
+    When I visit "disk*/disk_ops" on the first available host with the following query parameters:
+      | parameter | value      |
+      | start     | 1321769692 |
+      | finish    | 1321773292 |
+    Then the request should succeed
+    Then I should receive valid JSON
+    And I should see the following parameters for each plugin instance:
+      | parameter | value      |
+      | start     | 1321769692 |
+      | finish    | 1321773292 |
+
+  Scenario: Retrieve data with a defined finish time
+    Given a list of hosts exist
+    When I visit "disk*/disk_ops" on the first available host with the following query parameters:
+      | parameter | value      |
+      | finish    | 1321773292 |
+    Then the request should succeed
+    Then I should receive valid JSON
+    And I should see the following parameters for each plugin instance:
+      | parameter | value      |
+      | start     | 1321769692 |
+      | finish    | 1321773292 |
+

data/features/step_definitions/{visage_steps.rb → cli_steps.rb}

@@ -34,7 +34,7 @@ When /^I start the visage server helper with "([^"]*)" and the following variabl
       ENV[variable] = value
     end
   end
-  When %(I start the visage server helper with "#{cmd}")
+  step %(I start the visage server helper with "#{cmd}")
 end
 
 Then /^I should see a file at "([^"]*)"$/ do |filename|

data/features/step_definitions/json_steps.rb

@@ -94,10 +94,10 @@ Then /^the JSON should have a list of hosts$/ do
 end
 
 Given /^a list of hosts exist$/ do
-  When 'I go to /data'
-  Then 'the request should succeed'
-  Then 'I should receive valid JSON'
-  Then 'the JSON should have a list of hosts'
+  step 'I go to /data'
+  step 'the request should succeed'
+  step 'I should receive valid JSON'
+  step 'the JSON should have a list of hosts'
 end
 
 When /^I visit "([^"]*)" on the first available host$/ do |glob|
@@ -108,16 +108,27 @@ end
 
 
 When /^I visit the first available host$/ do
-  When 'I go to /data'
-  Then 'the request should succeed'
-  Then 'I should receive valid JSON'
-  Then 'the JSON should have a list of hosts'
+  step 'I go to /data'
+  step 'the request should succeed'
+  step 'I should receive valid JSON'
+  step 'the JSON should have a list of hosts'
 
   host = @response["hosts"].first
   url  = "/data/#{host}"
   When "I go to #{url}"
 end
 
+When /^I visit the first two available hosts$/ do
+  step 'I go to /data'
+  step 'the request should succeed'
+  step 'I should receive valid JSON'
+  step 'the JSON should have a list of hosts'
+
+  host = @response["hosts"][0..1].join(',')
+  url  = "/data/#{host}"
+  When "I go to #{url}"
+end
+
 Then /^the JSON should have a list of plugins$/ do
   host    = @response.keys.first
   plugins = @response[host]
@@ -133,3 +144,34 @@ Then /^the JSON should have a list of types$/ do
   end
 end
 
+
+When /^I visit "([^"]*)" on the first available host with the following query parameters:$/ do |glob, table|
+  host = @response["hosts"].first
+  url  = "/data/#{host}/#{glob}"
+
+  params = Hash[table.hashes.map { |hash| [hash["parameter"], hash["value"]] }]
+  query  = params.map{|k,v| "#{CGI.escape(k)}=#{CGI.escape(v)}"}.join("&")
+  url   += "?#{query}"
+
+  step "I go to #{url}"
+end
+
+Then /^I should see the following parameters for each plugin instance:$/ do |table|
+  params = Hash[table.hashes.map { |hash| [hash["parameter"], hash["value"]] }]
+
+  @response.should_not be_nil
+
+  @response.each_pair do |host, plugin|
+    plugin.each_pair do |instance, metric|
+      metric.each_pair do |k, series|
+        series.each_pair do |k, data|
+          params.each do |key, value|
+            data[key].should == value.to_i
+          end
+        end
+      end
+    end
+  end
+
+end
+

data/features/step_definitions/site_steps.rb

@@ -33,7 +33,7 @@ end
 
 Then /^I should see a profile heading$/ do
   doc = Nokogiri::HTML(response_body)
-  doc.search('div#profile h2#profile_name').size.should == 1
+  doc.search('div#profile h2#name').size.should == 1
 end
 
 Then /^show me the page source$/ do

data/features/support/config/default/profiles.yaml

@@ -0,0 +1,335 @@
+---
+cpu+on+bar+flapjack+worker01+:
+  :metrics:
+  - cpu-0/cpu-wait
+  - cpu-0/cpu-interrupt
+  - cpu-0/cpu-nice
+  - cpu-0/cpu-softirq
+  - cpu-0/cpu-steal
+  - cpu-0/cpu-system
+  - cpu-0/cpu-user
+  :hosts:
+  - bar
+  - flapjack-worker01
+  :profile_name: "cpu on bar + flapjack-worker01 "
+  :url: cpu+on+bar+flapjack+worker01+
+load+on+ubuntu+localdomain:
+  :metrics:
+  - load/load
+  :hosts:
+  - ubuntu.localdomain
+  :profile_name: load on ubuntu.localdomain
+  :url: load+on+ubuntu+localdomain
+apache+stats+on+all+flapjack+workers:
+  :metrics:
+  - apache/apache_scoreboard-starting
+  - apache/apache_scoreboard-logging
+  - apache/apache_scoreboard-sending
+  - apache/apache_scoreboard-open
+  - apache/apache_scoreboard-closing
+  - apache/apache_scoreboard-waiting
+  - apache/apache_scoreboard-reading
+  - apache/apache_scoreboard-keepalive
+  - apache/apache_bytes
+  - apache/apache_scoreboard-dnslookup
+  - apache/apache_requests
+  - apache/apache_scoreboard-finishing
+  - apache/apache_scoreboard-idle_cleanup
+  :hosts:
+  - flapjack-worker01
+  - flapjack-worker02
+  - flapjack-worker03
+  - flapjack-worker04
+  - flapjack-worker05
+  - flapjack-worker06
+  :profile_name: apache stats on all flapjack workers
+  :url: apache+stats+on+all+flapjack+workers
+cpu+on+blah+and+foo:
+  :metrics:
+  - cpu-0/cpu-softirq
+  - cpu-0/cpu-user
+  - cpu-0/cpu-wait
+  - cpu-0/cpu-system
+  - cpu-0/cpu-nice
+  - cpu-0/cpu-steal
+  - cpu-0/cpu-interrupt
+  :hosts:
+  - blah
+  - foo
+  :profile_name: cpu on blah and foo
+  :url: cpu+on+blah+and+foo
+cpu+load+on+blah+foo:
+  :metrics:
+  - cpu-0/cpu-softirq
+  - cpu-0/cpu-idle
+  - load/load
+  - cpu-0/cpu-steal
+  - cpu-0/cpu-system
+  - cpu-0/cpu-user
+  - cpu-0/cpu-wait
+  - cpu-0/cpu-interrupt
+  - cpu-0/cpu-nice
+  :hosts:
+  - blah
+  - foo
+  :profile_name: cpu + load on blah + foo
+  :url: cpu+load+on+blah+foo
+cpu+memory+on+blah:
+  :metrics:
+  - cpu-0/cpu-steal
+  - memory/memory-used
+  - cpu-0/cpu-system
+  - memory/memory-buffered
+  - memory/memory-cached
+  - cpu-0/cpu-user
+  - cpu-0/cpu-wait
+  - cpu-0/cpu-idle
+  - cpu-0/cpu-interrupt
+  - cpu-0/cpu-nice
+  - memory/memory-free
+  - cpu-0/cpu-softirq
+  :hosts:
+  - blah
+  :profile_name: cpu + memory on blah
+  :url: cpu+memory+on+blah
+all+on+all:
+  :metrics: []
+
+  :hosts:
+  - bar
+  - baz
+  - blah
+  - doom
+  - flapjack-worker01
+  - flapjack-worker02
+  - flapjack-worker03
+  - flapjack-worker04
+  - flapjack-worker05
+  - flapjack-worker06
+  - foo
+  - spoons
+  - ubuntu.localdomain
+  :profile_name: all on all
+  :url: all+on+all
+cpu+on+bar+worker+:
+  :metrics:
+  - cpu-0/cpu-idle
+  - cpu-0/cpu-steal
+  - cpu-0/cpu-softirq
+  - cpu-0/cpu-user
+  - cpu-0/cpu-system
+  - cpu-0/cpu-nice
+  - cpu-0/cpu-wait
+  - cpu-0/cpu-interrupt
+  :hosts:
+  - bar
+  :profile_name: cpu on bar + worker*
+  :url: cpu+on+bar+worker+
+spf+dns+queries+on+ubuntu:
+  :metrics:
+  - dns/dns_qtype-#99
+  :hosts:
+  - ubuntu.localdomain
+  :profile_name: SPF DNS queries on ubuntu
+  :url: spf+dns+queries+on+ubuntu
+foobar:
+  :metrics:
+  - cpu-0/cpu-nice
+  - cpu-0/cpu-softirq
+  - cpu-0/cpu-steal
+  - cpu-0/cpu-idle
+  - cpu-0/cpu-system
+  - cpu-0/cpu-user
+  - cpu-0/cpu-wait
+  - cpu-0/cpu-interrupt
+  :hosts:
+  - blah
+  :profile_name: foobar
+  :url: foobar
+foo:
+  :metrics:
+  - cpu-0/cpu-steal
+  - cpu-0/cpu-idle
+  - cpu-0/cpu-system
+  - cpu-0/cpu-user
+  - cpu-0/cpu-wait
+  - cpu-0/cpu-interrupt
+  - cpu-0/cpu-nice
+  - cpu-0/cpu-softirq
+  :hosts:
+  - blah
+  :profile_name: foo
+  :url: foo
+processes+on+blah:
+  :metrics:
+  - processes/ps_state-zombies
+  - processes/ps_state-running
+  - processes/ps_state-blocked
+  - processes/ps_state-stopped
+  - processes/ps_state-paging
+  - processes/ps_state-sleeping
+  :hosts:
+  - ubuntu.localdomain
+  :profile_name: processes on blah
+  :url: processes+on+blah
+wide+variance+in+values:
+  :metrics:
+  - vmem/vmpage_number-dirty
+  :hosts:
+  - ubuntu.localdomain
+  :profile_name: wide variance in values
+  :url: wide+variance+in+values
+sda+on+ubuntu:
+  :metrics:
+  - disk-sda/disk_ops
+  - disk-sda/disk_time
+  - disk-sda/disk_merged
+  - disk-sda/disk_octets
+  :hosts:
+  - ubuntu.localdomain
+  :profile_name: sda on ubuntu
+  :url: sda+on+ubuntu
+ruby+gc+on+ubuntu+localdomain:
+  :metrics:
+  - curl_json-gc/counter--growth
+  - curl_json-gc/counter--collections
+  - curl_json-gc/counter--num_allocations
+  - curl_json-gc/counter--allocated_size
+  :hosts:
+  - ubuntu.localdomain
+  :profile_name: Ruby GC on ubuntu.localdomain
+  :url: ruby+gc+on+ubuntu+localdomain
+cpu+on+ubuntu+:
+  :metrics:
+  - cpu-0/cpu-idle
+  - cpu-0/cpu-steal
+  - cpu-0/cpu-softirq
+  - cpu-0/cpu-user
+  - cpu-0/cpu-system
+  - cpu-0/cpu-nice
+  - cpu-0/cpu-wait
+  - cpu-0/cpu-interrupt
+  :hosts:
+  - ubuntu.localdomain
+  :profile_name: "cpu on ubuntu "
+  :url: cpu+on+ubuntu+
+swap+on+ubuntu:
+  :metrics:
+  - swap/swap-cached
+  - swap/swap-used
+  - swap/swap_io-out
+  - swap/swap-free
+  - swap/swap_io-in
+  :hosts:
+  - ubuntu.localdomain
+  :profile_name: swap on ubuntu
+  :url: swap+on+ubuntu
+load+on+blah+baz+bar:
+  :metrics:
+  - load/load
+  :hosts:
+  - blah
+  - bar
+  - baz
+  :profile_name: load on blah + baz + bar
+  :url: load+on+blah+baz+bar
+cpu+on+blah+doom:
+  :metrics:
+  - cpu-0/cpu-steal
+  - cpu-0/cpu-system
+  - cpu-0/cpu-user
+  - cpu-0/cpu-wait
+  - cpu-0/cpu-idle
+  - cpu-0/cpu-interrupt
+  - cpu-0/cpu-nice
+  - cpu-0/cpu-softirq
+  :hosts:
+  - blah
+  - doom
+  :profile_name: cpu on blah + doom
+  :url: cpu+on+blah+doom
+cpu+on+blah:
+  :metrics:
+  - cpu-0/cpu-system
+  - cpu-0/cpu-user
+  - cpu-0/cpu-wait
+  - cpu-0/cpu-interrupt
+  - cpu-0/cpu-nice
+  - cpu-0/cpu-softirq
+  - cpu-0/cpu-steal
+  :hosts:
+  - blah
+  :profile_name: cpu on blah
+  :url: cpu+on+blah
+df+var+run+and+df+root+on+ubuntu:
+  :metrics:
+  - df/df-root
+  - df/df-var-run
+  :hosts:
+  - ubuntu.localdomain
+  :profile_name: df-var-run and df-root on ubuntu
+  :url: df+var+run+and+df+root+on+ubuntu
+memory+and+cpu+on+ubuntu:
+  :metrics:
+  - memory/memory-buffered
+  - memory/memory-cached
+  - memory/memory-free
+  - memory/memory-used
+  - cpu-0/cpu-idle
+  - cpu-0/cpu-steal
+  - cpu-0/cpu-softirq
+  - cpu-0/cpu-user
+  - cpu-0/cpu-system
+  - cpu-0/cpu-nice
+  - cpu-0/cpu-wait
+  - cpu-0/cpu-interrupt
+  :hosts:
+  - ubuntu.localdomain
+  :profile_name: memory and cpu on ubuntu
+  :url: memory+and+cpu+on+ubuntu
+cpu+no+idle+on+blah+doom:
+  :metrics:
+  - cpu-0/cpu-interrupt
+  - cpu-0/cpu-nice
+  - cpu-0/cpu-softirq
+  - cpu-0/cpu-steal
+  - cpu-0/cpu-system
+  - cpu-0/cpu-user
+  - cpu-0/cpu-wait
+  :hosts:
+  - blah
+  - doom
+  :profile_name: cpu (no idle) on blah + doom
+  :url: cpu+no+idle+on+blah+doom
+vmem+on+blah:
+  :metrics:
+  - vmem/vmpage_number-writeback_temp
+  - vmem/vmpage_number-file_pages
+  - vmem/vmpage_number-mlock
+  - vmem/vmpage_number-unstable
+  - vmem/vmpage_number-kernel_stack
+  - vmem/vmpage_io-swap
+  - vmem/vmpage_number-free_pages
+  - vmem/vmpage_number-vmscan_write
+  - vmem/vmpage_io-memory
+  - vmem/vmpage_number-inactive_anon
+  - vmem/vmpage_faults
+  - vmem/vmpage_number-unevictable
+  - vmem/vmpage_number-slab_unreclaimable
+  - vmem/vmpage_number-mapped
+  - vmem/vmpage_number-page_table_pages
+  - vmem/vmpage_number-anon_pages
+  - vmem/vmpage_number-isolated_file
+  - vmem/vmpage_number-isolated_anon
+  - vmem/vmpage_number-inactive_file
+  - vmem/vmpage_number-active_anon
+  - vmem/vmpage_number-dirty
+  - vmem/vmpage_number-shmem
+  - vmem/vmpage_number-slab_reclaimable
+  - vmem/vmpage_number-writeback
+  - vmem/vmpage_number-bounce
+  - vmem/vmpage_number-active_file
+  :hosts:
+  - blah
+  :profile_name: vmem on blah
+  :url: vmem+on+blah