kstats-node 1.0.2 → 1.0.3

data/bin/kstats-node

@@ -16,6 +16,37 @@ optparse = OptionParser.new do |opts|
   opts.on('-c', '--config CONF', 'Set configuration file (required)') do |config|
     options[:config] = config
   end
+
+  opts.on('-i', '--install', 'Build into current directory all startup files.') do
+    pwd = `pwd`.gsub("\n", "")
+
+    puts "Create #{pwd}/conf..."
+    `mkdir conf`
+
+    puts "Create #{pwd}/probes..."
+    `mkdir probes`
+
+    puts "Create #{pwd}/conf/conf.yml..."
+    File.open('conf/conf.yml', 'w') do |f|
+      content = <<CONF
+probes_dir: #{pwd}/probes
+db_dir: #{pwd}/db.sqlite3
+server:
+  port: 1234
+  bind: 0.0.0.0
+CONF
+      f.write content
+    end
+
+    Dir[File.expand_path('../../lib/kstats/probes/*', __FILE__)].each do |probefile|
+      puts "cp #{probefile} #{pwd}/probes/"
+      `cp #{probefile} #{pwd}/probes/`
+    end
+
+    puts "Done"
+
+    exit
+  end
 end
 
 optparse.parse!
@@ -26,67 +57,19 @@ if options[:config].nil?
   exit
 end
 
-require 'sinatra'
-
 puts "KStats::Node"
 
 puts "Load configuration file"
 config = YAML::load(File.read(options[:config]))
 Kstats::Node::Config.init(config)
 
-set :port, Kstats::Node::Config['server.port', 4567].to_i
-set :bind, Kstats::Node::Config['server.bind', '0.0.0.0']
-
 puts "Initialize database"
 Kstats::Node::Database.init
 
-get '/probes/list' do
-  Kstats::Node::Probe.list.to_json
-end
-
-#Display data for daily infos
-get '/probe/:id/:target' do
-  now = Time.now
-
-  case params[:target]
-  when 'tick'
-    start = now - (60*60*24)
-  when 'weekly'
-    start = now - 7*(60*60*24)
-  when 'monthly'
-    start = now - 30*(60*60*24)
-  when 'yearly'
-    start = now - 365*(60*60*24)
-  else
-    return 403
-  end
-
-
-  data =Kstats::Node::Database.db.execute(
-    "SELECT probe_key, date, probe_value FROM probe_data WHERE period_type=? AND probe_id = ? AND date >= ? ORDER BY date ASC",
-    params[:target],
-    params[:id],
-    start.to_s
-  )
-
-  datas = {}
-  data.each do |record|
-    key, date, value = record
-    datas[key] ||= []
-    datas[key] << [Time.parse(date), value]
-  end
-
-  datas.each do |key, value|
-    datas[key] =   Kstats::Node::Helper.generate_array(value, start, (now-start)/60, 288)
-  end
-
-  {
-    start_at: start,
-    format: Kstats::Node::Probe.get_format(params[:id]),
-    data: datas
-  }.to_json
-end
 
 Kstats::Node::Worker.launch!
 
+require 'kstats/node/app'
+Kstats::Node::App.run!
+
 puts "Service is launched"

data/kstats-node.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Yacine Petitprez"]
   spec.email         = ["yacine@kosmogo.com"]
   spec.summary       = %q{Node for the project kstats}
-  spec.description   = %q{Provide a simple way to make probe on system values, and monitorign theses values.}
+  spec.description   = %q{Provide a simple way to make probe on system values, and monitoring theses values.}
   spec.homepage      = ""
   spec.license       = "MIT"
   spec.executables << 'kstats-node'

data/lib/kstats/node/app.rb

@@ -0,0 +1,58 @@
+require 'sinatra'
+
+module Kstats
+  module Node
+    class App < Sinatra::Base
+      set :port, Kstats::Node::Config['server.port', 4567].to_i
+      set :bind, Kstats::Node::Config['server.bind', '0.0.0.0']
+
+      get '/probes/list' do
+        Kstats::Node::Probe.list.to_json
+      end
+
+      #Display data for daily infos
+      get '/probe/:id/:target' do
+        now = Time.now
+
+        case params[:target]
+        when 'tick'
+          start = now - (60*60*24)
+        when 'weekly'
+          start = now - 7*(60*60*24)
+        when 'monthly'
+          start = now - 30*(60*60*24)
+        when 'yearly'
+          start = now - 365*(60*60*24)
+        else
+          return 403
+        end
+
+
+        data =Kstats::Node::Database.db.execute(
+          "SELECT probe_key, date, probe_value FROM probe_data WHERE period_type=? AND probe_id = ? AND date >= ? ORDER BY date ASC",
+          params[:target],
+          params[:id],
+          start.to_s
+        )
+
+        datas = {}
+        data.each do |record|
+          key, date, value = record
+          datas[key] ||= []
+          datas[key] << [Time.parse(date), value]
+        end
+
+        datas.each do |key, value|
+          datas[key] =   Kstats::Node::Helper.generate_array(value, start, (now-start)/60, 288)
+        end
+
+        {
+          start_at: start,
+          format: Kstats::Node::Probe.get_format(params[:id]),
+          data: datas
+        }.to_json
+      end
+    end
+  end
+end
+

data/lib/kstats/node/version.rb

@@ -1,5 +1,5 @@
 module Kstats
   module Node
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

data/lib/kstats/node.rb

@@ -5,9 +5,9 @@ require "kstats/node/probe"
 require "kstats/node/database"
 require "kstats/node/helper"
 
+require 'sinatra'
 
 module Kstats
   module Node
-    # Your code goes here...
   end
 end

data/lib/kstats/probes/cpu.rb

@@ -0,0 +1,32 @@
+Kstats::Node::Probe.register 'cpu' do
+  category 'Hardware'
+  name 'CPU usage'
+
+  type :curve
+
+  command{ `cat /proc/loadavg`.split(/\s/).map(&:to_f) }
+
+  variable :load_avg_1mn do
+    desc 'Load average (1mn)'
+    color '#0000FF'
+    probe do
+      command[0]
+    end
+  end
+
+  variable :load_avg_5mn do
+    desc 'Load average (5mn)'
+    color '#00FF00'
+    probe do
+      command[1]
+    end
+  end
+
+  variable :load_avg_15mn do
+    desc 'Load average (15mn)'
+    color '#FF0000'
+    probe do
+      command[2]
+    end
+  end
+end

data/lib/kstats/probes/disk.rb

@@ -0,0 +1,35 @@
+Kstats::Node::Probe.register 'disk' do
+  category 'Hardware'
+  name 'Disk usage'
+
+  type :curve
+
+  _self = self
+  instance_eval do
+    def parsedf
+      disks = `df`.split(/\n/).map do |x|
+        x.split(/\s+/)
+      end
+
+      disks.reject!{|x| x[0] == 'udev' ||  x[0] == 'none' || x[0] == 'tmpfs' || x[0] == 'Filesystem' }
+      disks.map!{|x| {name: x[0], space: 100*(x[2].to_f/x[1].to_f) }}
+    end
+  end
+
+  parsedf.each do |infos|
+    var = infos[:name]
+
+    variable var do
+      desc "Filling of `#{infos[:name]}`"
+      color "#0000FF"
+      probe do
+        val = _self.parsedf.select{|x| x[:name] == var }.first[:space]
+
+        puts val
+
+        val
+      end
+    end
+  end
+
+end

data/test/conf/conf.yml

@@ -0,0 +1,5 @@
+probes_dir: /home/yacine/Workspaces/kstats/kstats-node/test/probes
+db_dir: /home/yacine/Workspaces/kstats/kstats-node/test/db.sqlite3
+server:
+  port: 1234
+  bind: 0.0.0.0

data/test/probes/mem.rb

@@ -0,0 +1,37 @@
+Kstats::Node::Probe.register 'hwmem' do
+  category 'Hardware'
+  name 'Memory usage'
+
+  type :curve
+
+  command do
+    cmd = `cat /proc/meminfo`
+    lines = cmd.split(/\n/)
+
+    memtotal = lines.select{|x| x =~ /MemTotal/ }.first.gsub(/[^0-9]/, '').to_f
+    active = lines.select{|x| x =~ /Active/ }.first.gsub(/[^0-9]/, '').to_f
+    inactive = lines.select{|x| x =~ /Inactive/ }.first.gsub(/[^0-9]/, '').to_f
+    memfree = lines.select{|x| x =~ /MemFree/ }.first.gsub(/[^0-9]/, '').to_f
+    swaptotal = lines.select{|x| x =~ /SwapTotal/ }.first.gsub(/[^0-9]/, '').to_f
+    swapfree = lines.select{|x| x =~ /SwapFree/ }.first.gsub(/[^0-9]/, '').to_f
+
+    [memtotal, active, inactive, memfree, swaptotal, swapfree]
+  end
+
+  variable :mem_load do
+    desc 'Memory load (%)'
+    color '#0000FF'
+    probe do
+      1-(command[3]/command[0])
+    end
+  end
+
+  variable :swap_load do
+    desc 'Swap load (%)'
+    color '#FF0000'
+
+    probe do
+      1-(command[5]/command[4])
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kstats-node
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -75,7 +75,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Provide a simple way to make probe on system values, and monitorign theses
+description: Provide a simple way to make probe on system values, and monitoring theses
   values.
 email:
 - yacine@kosmogo.com
@@ -92,16 +92,22 @@ files:
 - bin/kstats-node
 - kstats-node.gemspec
 - lib/kstats/node.rb
+- lib/kstats/node/app.rb
 - lib/kstats/node/config.rb
 - lib/kstats/node/database.rb
 - lib/kstats/node/helper.rb
 - lib/kstats/node/probe.rb
 - lib/kstats/node/version.rb
 - lib/kstats/node/worker.rb
+- lib/kstats/probes/cpu.rb
+- lib/kstats/probes/disk.rb
+- lib/kstats/probes/mem.rb
 - test/conf.yml
+- test/conf/conf.yml
+- test/db.sqlite3
 - test/probes/cpu.rb
 - test/probes/disk.rb
-- test/probes/memory.rb
+- test/probes/mem.rb
 homepage: ''
 licenses:
 - MIT
@@ -129,7 +135,9 @@ specification_version: 3
 summary: Node for the project kstats
 test_files:
 - test/conf.yml
+- test/conf/conf.yml
+- test/db.sqlite3
 - test/probes/cpu.rb
 - test/probes/disk.rb
-- test/probes/memory.rb
+- test/probes/mem.rb
 has_rdoc: