gitorious-munin-plugins 0.9.17 → 0.9.19

data/bin/gitorious-munin-plugin

@@ -2,6 +2,7 @@
 require "gitorious-munin-plugins"
 require "gitorious-munin-plugins/version"
 require "gitorious-munin-plugins/database"
+require "gitorious-munin-plugins/config"
 require "gitorious-munin-plugins/cli"
 require "gitorious-munin-plugins/plugin"
 require "gitorious-munin-plugins/usage_plugin"

data/lib/gitorious-munin-plugins/config.rb

@@ -0,0 +1,43 @@
+module GitoriousMuninPlugins
+  class Config
+    GITORIOUS_CONF_PATH = "/etc/gitorious.conf"
+
+    def gitorious_config
+      yaml_file = fetch("GITORIOUS_HOME")
+      gitorious_yml = Pathname(fetch("GITORIOUS_HOME")) + "config/gitorious.yml"
+      YAML::load_file(gitorious_yml)[fetch("RAILS_ENV")]
+    end
+
+    def rails_env
+      @rails_env ||= fetch("RAILS_ENV", "production")
+    end
+
+    def gitorious_home
+      path = fetch("GITORIOUS_HOME")
+      Pathname(path)
+    end
+
+    def database_yaml
+      database_yaml = gitorious_home + "config/database.yml"
+      raise NotFound, "No database.yml found in #{database_yml}" unless database_yaml.exist?
+      database_yaml
+    end
+
+    # Fetch line matching #{key}= in /etc/gitorious.conf
+    def fetch(key, default_value=nil)
+
+      begin
+        config_file = File.read(GITORIOUS_CONF_PATH)
+      rescue Errno::ENOENT
+        abort "Gitorious configuration file #{GITORIOUS_CONF_PATH} was not found, exiting"
+      end
+
+      result = config_file.scan(/^#{key}=(.*)$/).flatten.first
+      if result
+        result
+      elsif default_value
+        default_value
+      end
+    end
+  end
+end

data/lib/gitorious-munin-plugins/database.rb

@@ -1,35 +1,32 @@
 module GitoriousMuninPlugins
   class Database
     def initialize
+      @config = Config.new
     end
 
-    def configuration
-      @configuration ||= load_configuration
+    def database_configuration
+      @database_configuration ||= load_database_configuration
     end
 
-    def load_configuration
-      begin
-        gitorious_conf = File.read("/etc/gitorious.conf")
-        dir = gitorious_conf.scan(/^GITORIOUS_HOME=(.*)$/).flatten.first
-        raise NotFound, "/etc/gitorious.conf was found, but no GITORIOUS_HOME was defined" unless dir
-        rails_env = gitorious_conf.scan(/^RAILS_ENV=(.*)$/).flatten.first || "production"
-        database_yaml = Pathname(dir) + "config/database.yml"
-        raise NotFound, "No database.yml found in #{database_yml}" unless database_yaml.exist?
-        YAML::load_file(database_yaml)[rails_env]
-      rescue Errno::ENOENT
-        raise NotFound, "Gitorious configuration file /etc/gitorious.conf was not found, exiting"
-      end
+    def load_database_configuration
+      YAML::load_file(@config.database_yaml)[@config.rails_env]
+    end
+
+    def database_connection
+        @database_connection ||= Mysql.new(database_configuration["host"],
+                         database_configuration["username"],
+                         database_configuration["password"],
+                         database_configuration["database"])
     end
 
     def select(sql)
+      conn = database_connection
       begin
-        conn = Mysql.new(configuration["host"], configuration["username"], configuration["password"], configuration["database"])
         conn.query(sql)
       ensure
         conn.close
       end
     end
 
-    class NotFound < StandardError; end
   end
 end

data/lib/gitorious-munin-plugins/plugins/git_proxy.rb

@@ -0,0 +1,38 @@
+config = GitoriousMuninPlugins::Config.new
+home = config.gitorious_home
+ProxyPid = home + "../run/git-proxy-1.pid"
+
+def ps_output
+if ProxyPid.exist?
+  cmd = "ps ww `cat #{ProxyPid}` | egrep -v '(ps|PID)'"
+  res = `#{cmd}`.strip
+  if res =~ /\-\ (\d+)\/(\d+)\/(\d+)\ cur\/max\/tot\ conns$/
+    curr, max, total = $1, $2, $3
+    puts "curr.value #{curr}"
+    puts "max.value #{max}"
+    puts "total.value #{total}"
+  end
+else
+  $stderr.puts "#{ProxyPid} not found"
+end
+
+end
+
+case ARGV.shift
+when "autoconf"
+  puts "no"
+when "config"
+  puts "graph_title git-proxy activity"
+  puts 'graph_args -l 0'
+  puts 'graph_vlabel active connections'
+  puts 'graph_category Gitorious'
+  puts "curr.label Active connections"
+  puts "curr.draw LINE2"
+  puts "curr.type GAUGE"
+  #    puts "max.label Max connections so far"
+  #    puts "max.draw no"
+  #    puts "total.label Total conncetions"
+  #    puts "total.draw no"
+else
+  ps_output
+end

data/lib/gitorious-munin-plugins/plugins/gitorious_clones.rb

@@ -0,0 +1,20 @@
+# SSH keys
+database =  GitoriousMuninPlugins::Database.new
+cmd = ARGV.shift
+
+case cmd
+when "autoconf"
+  puts "no"
+when "config"
+  puts "graph_title git:// Clones (within last 24 hrs)"
+  puts 'graph_args -l 0'
+  puts 'graph_vlabel Cloners'
+  puts 'graph_category Gitorious'
+  puts "new.label Clones"
+  puts "new.draw LINE2"
+  puts "new.type GAUGE"
+else
+  database.select("select count(*) as count from cloners where date >= date_sub(now(), interval 24 hour)").each_hash do |row|
+    puts "new.value #{row['count'].to_i}"
+  end
+end

data/lib/gitorious-munin-plugins/plugins/gitorious_disk_usage.rb

@@ -0,0 +1,42 @@
+config = GitoriousMuninPlugins::Config.new
+GitoriousConfig = config.gitorious_config
+Directories = {
+  "cache_dir" => GitoriousConfig["archive_cache_dir"],
+  "working_dir" => GitoriousConfig["archive_work_dir"],
+  "repo_root" => GitoriousConfig["repository_base_path"]
+}
+def disk_usage(key)
+  dir = Directories[key]
+  command = "du -sb #{dir} 2>/dev/null"
+  result = `#{command}`.split(/\s+/).first
+end
+
+cmd = ARGV.shift
+case cmd
+when "autoconf"
+  puts "no"
+when "config"
+  puts "graph_title Disk usage"
+  puts "graph_args -l 0"
+  puts "graph_vlabel Disk usage"
+  puts "graph_category Gitorious"
+
+  # Cache dir
+  puts "cache.label Repo cache"
+  puts "cache.draw LINE2"
+  puts "cache.type GAUGE"
+
+  # Work dir
+  puts "work.label Repo work"
+  puts "work.draw LINE2"
+  puts "work.type GAUGE"
+
+  # Root dir
+  puts "root.label Repo storage"
+  puts "root.draw LINE2"
+  puts "root.type GAUGE"
+else
+  puts "cache.value #{disk_usage('cache_dir')}"
+  puts "work.value #{disk_usage('working_dir')}"
+  puts "root.value #{disk_usage('repo_root')}"
+end

data/lib/gitorious-munin-plugins/usage_plugin.rb

@@ -17,6 +17,7 @@ EOS
         opt :status, "List install status of plugins"
         opt :install, "Install PACKAGE1 PACKAGE2. Specify 'all' to install all plugins"
         opt :uninstall, "Uninstall PACKAGE1 PACKAGE2. Specify 'all' to uninstall all plugins "
+        opt :try, "Try running PACKAGE"
       end
 
       if global_options[:status_given]
@@ -25,6 +26,8 @@ EOS
         install_plugins(ARGV)
       elsif global_options[:uninstall_given]
         uninstall_plugins(ARGV)
+      elsif global_options[:try_given]
+        try_running(ARGV)
       end
     end
 
@@ -50,6 +53,10 @@ EOS
       end
     end
 
+    def try_running(name)
+      load Plugin.root.realpath + "#{name}.rb"
+    end
+
     def extract_plugins_from_spec(spec)
       if spec.first == "all"
         @known_plugins.map(&:name)

data/lib/gitorious-munin-plugins/version.rb

@@ -1,3 +1,3 @@
 module GitoriousMuninPlugins
-  VERSION = "0.9.17"
+  VERSION = "0.9.19"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitorious-munin-plugins
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 9
-  - 17
-  version: 0.9.17
+  - 19
+  version: 0.9.19
 platform: ruby
 authors: 
 - Marius Mathiesen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-02 00:00:00 +01:00
+date: 2012-11-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,8 +77,12 @@ files:
 - gitorious-munin-plugins.gemspec
 - lib/gitorious-munin-plugins.rb
 - lib/gitorious-munin-plugins/cli.rb
+- lib/gitorious-munin-plugins/config.rb
 - lib/gitorious-munin-plugins/database.rb
 - lib/gitorious-munin-plugins/plugin.rb
+- lib/gitorious-munin-plugins/plugins/git_proxy.rb
+- lib/gitorious-munin-plugins/plugins/gitorious_clones.rb
+- lib/gitorious-munin-plugins/plugins/gitorious_disk_usage.rb
 - lib/gitorious-munin-plugins/plugins/gitorious_ssh_keys.rb
 - lib/gitorious-munin-plugins/plugins/gitorious_users.rb
 - lib/gitorious-munin-plugins/usage_plugin.rb