cloudscale 0.0.6 → 0.0.7

data/lib/cloudscale/plugins/os/sigar_disk_iops.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/preops/plugin_preop"
+require "#{File.dirname(__FILE__)}/preops/os_preop"
 require "#{File.dirname(__FILE__)}/../plugin"
 
 ##
@@ -11,13 +11,13 @@ module Cloudscale
     class SigarDiskIops < Plugins::Plugin
 
       def is_enabled
-        true
+        Preops::OsPreop.instance.is_enabled
       end
 
       def initialize
         super
         if is_enabled
-          @sigar = Plugins::PluginPreop.instance.sigar
+          @sigar = Preops::OsPreop.instance.sigar
         end
       end
 
@@ -31,7 +31,7 @@ module Cloudscale
           dir_name = fs.dir_name
           begin
             usage = @sigar.file_system_usage(dir_name)
-            dir = dir_name.gsub(/[^0-9A-Za-z]/, '')            
+            dir = dir_name.gsub(/[^0-9A-Za-z]/, '')
             registry.metrics["os.disk.iops.read." + dir] = metrics.gauge :iops_read do
               { :value => usage.disk_reads }
             end

data/lib/cloudscale/plugins/os/sigar_disk_space.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/preops/plugin_preop"
+require "#{File.dirname(__FILE__)}/preops/os_preop"
 require "#{File.dirname(__FILE__)}/../plugin"
 
 ##
@@ -11,13 +11,13 @@ module Cloudscale
     class SigarDiskSpace < Plugins::Plugin
 
       def is_enabled
-        true
+        Preops::OsPreop.instance.is_enabled
       end
 
       def initialize
         super
         if is_enabled
-          @sigar = Plugins::PluginPreop.instance.sigar
+          @sigar = Preops::OsPreop.instance.sigar
         end
       end
 

data/lib/cloudscale/plugins/os/sigar_net_byte_information.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/preops/plugin_preop"
+require "#{File.dirname(__FILE__)}/preops/os_preop"
 require "#{File.dirname(__FILE__)}/../plugin"
 
 ##
@@ -11,15 +11,14 @@ module Cloudscale
     class SigarNetByteInformation < Plugins::Plugin
 
       def is_enabled
-        true
+        Preops::OsPreop.instance.is_enabled
       end
-
+      
       def initialize
         super
         if is_enabled
-          @sigar = Plugins::PluginPreop.instance.sigar
+          @sigar = Preops::OsPreop.instance.sigar
         end
-
       end
 
       def collect(agentInstanceId)

data/lib/cloudscale/plugins/os/sigar_packet_information.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/preops/plugin_preop"
+require "#{File.dirname(__FILE__)}/preops/os_preop"
 require "#{File.dirname(__FILE__)}/../plugin"
 
 ##
@@ -11,13 +11,13 @@ module Cloudscale
     class SigarNetPacketInformation < Plugins::Plugin
 
       def is_enabled
-        true
+        Preops::OsPreop.instance.is_enabled
       end
-
+      
       def initialize
         super
         if is_enabled
-          @sigar = Plugins::PluginPreop.instance.sigar
+          @sigar = Preops::OsPreop.instance.sigar
         end
       end
 

data/lib/cloudscale/plugins/os/sigar_ram_usage.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/preops/plugin_preop"
+require "#{File.dirname(__FILE__)}/preops/os_preop"
 require "#{File.dirname(__FILE__)}/../plugin"
 
 ##
@@ -11,13 +11,13 @@ module Cloudscale
     class SigarRamUsage < Plugins::Plugin
 
       def is_enabled
-        true
+        Preops::OsPreop.instance.is_enabled
       end
-
+      
       def initialize
         super
         if is_enabled
-          @sigar = Plugins::PluginPreop.instance.sigar
+          @sigar = Preops::OsPreop.instance.sigar
         end
       end
 

data/lib/cloudscale/plugins/os/sigar_swap_usage.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/preops/plugin_preop"
+require "#{File.dirname(__FILE__)}/preops/os_preop"
 require "#{File.dirname(__FILE__)}/../plugin"
 
 ##
@@ -11,13 +11,13 @@ module Cloudscale
     class SigarSwapUsage < Plugins::Plugin
 
       def is_enabled
-        true
+        Preops::OsPreop.instance.is_enabled
       end
 
       def initialize
         super
         if is_enabled
-          @sigar = Plugins::PluginPreop.instance.sigar
+          @sigar = Preops::OsPreop.instance.sigar
         end
       end
 

data/lib/cloudscale/plugins/plugin.rb

@@ -1,9 +1,6 @@
-require "fsdb"
-require "yaml/store"
 require "logger"
 require "ruby-metrics"
-require "#{File.dirname(__FILE__)}/../monitor/agent/init_charts"
-require "#{File.dirname(__FILE__)}/../monitor/agent/init_menus"
+require "#{File.dirname(__FILE__)}/../registry"
 require "#{File.dirname(__FILE__)}/../monitor/model/constants/agent_instance_store"
 require "#{File.dirname(__FILE__)}/../rest/rest_client"
 
@@ -15,7 +12,7 @@ require "#{File.dirname(__FILE__)}/../rest/rest_client"
 module Cloudscale
   module Plugins
     class Plugin
-      attr_accessor :log, :plugins, :rest_client
+      attr_accessor :log, :plugins
 
       @plugins = Set.new
 
@@ -23,51 +20,6 @@ module Cloudscale
         @log = Logger.new(STDOUT)
       end
 
-      def initialize()
-        @rest_client = RestClientWrapper.instance
-      end
-
-      def self.reset(agentInstanceId)
-        resetRestEndpoint('coredatas', agentInstanceId, 'Coredata')
-        resetRestEndpoint('tables', agentInstanceId, 'Table')
-        resetRestEndpoint('charts', agentInstanceId, 'Chart')
-      
-        remove_agenInstance(agentInstanceId)
-      end
-
-      def self.remove(agentInstanceId)
-        reset(agentInstanceId)
-
-        Constants::AgentInstance.remove()
-      end
-
-      def self.resetRestEndpoint(entityRel, agentInstanceId, entityName)
-        rest_client = RestClientWrapper.instance
-        entities = rest_client.searchAny(entityRel,"findByAgentInstanceId",
-                        { :agentInstanceId => agentInstanceId })
-
-        puts "Found #{entityName} elements for Agent (#{agentInstanceId}): #{entities["content"].length.to_s}"
-        puts "    Starting to delete all elements..."
-
-        entities["content"].each do  | entity |
-          rest_client.delete(entityRel, RestClientWrapper.load_entity_id(entity))
-        end
-
-        puts "    Deleting all elements was successful \n\n"
-      end
-
-      def self.remove_agenInstance(agentInstanceId)
-        rest_client = RestClientWrapper.instance
-        puts "Removing AgentInstance completely:\n\n"
-
-        agent_instance = rest_client.searchOne('agentInstances',
-                'findByAgentInstanceId', { :id => agentInstanceId })
-
-        rest_client.delete('agentInstances', RestClientWrapper.load_entity_id(agent_instance))
-
-        puts "    Deleting AgentInstance was successful \n\n"
-      end
-
       def self.plugins
         @plugins
       end

data/lib/cloudscale/plugins/postgres/postgres_server_status.rb

@@ -9,55 +9,27 @@ require "#{File.dirname(__FILE__)}/../plugin"
 module Cloudscale
   module Plugins
     class PostgresServerStatus < Plugins::Plugin
-      attr_reader :menu_generalInformationm, :menu_numBackends, :menu_transactionInformation, :menu_bulkOps, :menu_rowStats,
-        :numBackends, :xactCommit, :xactRollback, :xactTotal, :blksRead, :blksHit,
-        :generalInformation, :rowsSelectIdx, :rowsSelectScan, :rowInserts, :rowUpdated, :rowDeleted, :rowTotal
-      def log
-        @log = Logger.new(STDOUT)
-      end
-  
+      attr_reader :connection
+
       def is_enabled
-        false
+        Preops::PostgresPreop.instance.is_enabled
       end
-  
+
       def initialize
         super
         if is_enabled
-          menus = Plugins::PluginMenus.load_hash()
-          @menu_generalInformation = load_menu(menus["pgDatabaseStats"], "generalInformation")
-          @menu_numBackends = load_menu(menus["pgDatabaseStats"], "numBackends")
-          @menu_transactionInformation = load_menu(menus["pgDatabaseStats"], "transactionInformation")
-          @menu_bulkOps = load_menu(menus["pgDatabaseStats"], "bulkOps")
-          @menu_rowStats = load_menu(menus["pgTableStats"], "rowStats")
-                    
-          @connection = Plugins::PostgresDbWrapper.instance.connection
-          components = Plugins::PluginComponents.load_hash()
-          @numBackends = load_metric(components["pgDatabaseStats"], "numBackends")        
-          @xactCommit = load_metric(components["pgDatabaseStats"], "xactCommit")
-          @xactRollback = load_metric(components["pgDatabaseStats"], "xactRollback")
-          @xactTotal = load_metric(components["pgDatabaseStats"], "xactTotal")
-          @blksRead = load_metric(components["pgDatabaseStats"], "blksRead")
-          @blksHit = load_metric(components["pgDatabaseStats"], "blksHit")
-            
-          @generalInformation = load_metric(components["pgDatabaseStats"], "generalInformation")
-            
-          @rowsSelectIdx = load_metric(components["pgTableStats"], "rowsSelectIdx")
-          @rowsSelectScan = load_metric(components["pgTableStats"], "rowsSelectScan")
-          @rowInserts = load_metric(components["pgTableStats"], "rowInserts")
-          @rowUpdated = load_metric(components["pgTableStats"], "rowUpdated")
-          @rowDeleted = load_metric(components["rowDeleted"], "rowDeleted")
-          @rowTotal = load_metric(components["rowTotal"], "rowTotal")
-            
+          @connection = Preops::PostgresPreop.instance.connection
         end
       end
-  
+
       def collect(agentInstanceId)
+        registry = Monitor::Registry.instance
+        metrics = Metrics::Agent.new
         log.info("Calling Collect on MongoServerStatus")
-        report_general_information(agentInstanceId)
-        report_database_stats(agentInstanceId)
-        report_table_stats(agentInstanceId)
+        report_database_stats(registry, metrics)
+        report_table_stats(registry, metrics)
       end
-  
+
       def report_database_stats(agentInstanceId)
         result = @connection.exec('SELECT sum(idx_tup_fetch) AS "rows_select_idx",
                   sum(seq_tup_read) AS "rows_select_scan",
@@ -65,28 +37,34 @@ module Cloudscale
                   sum(n_tup_upd) AS "rows_update",
                   sum(n_tup_del) AS "rows_delete",
                   (sum(idx_tup_fetch) + sum(seq_tup_read) + sum(n_tup_ins) + sum(n_tup_upd) + sum(n_tup_del)) AS "rows_total"
-                  FROM pg_stat_all_tables;')  
+                  FROM pg_stat_all_tables;')
         row = result[0]
-        
-        report(rowsSelectIdx, menu_rowStats, row['rows_select_idx'], false, agentInstanceId, "rowsSelectIdxChart",
-            "Select indexes", "Select indexes across all tables in the database", "area", "Time", "Count", "c",  nil) 
-        
-        report(rowsSelectScan, menu_rowStats, row['rows_select_scan'], false, agentInstanceId, "rowsSelectScanChart",
-            "Row select scan", "Row select scans across all tables in the database", "area", "Time", "Count", "c",  nil)
-        
-        report(rowInserts, menu_rowStats, row['rows_insert'], false, agentInstanceId, "rowInsertsChart",
-            "Row inserts", "Row inserts across all tables in the database", "area", "Time", "Count", "c",  nil)
-            
-        report(rowUpdated, menu_rowStats, row['rows_update'], false, agentInstanceId, "rowUpdatedChart",
-            "Row updates", "Row updates across all tables in the database", "area", "Time", "Count", "c",  nil)
-            
-        report(rowDeleted, menu_rowStats, row['rows_delete'], false, agentInstanceId, "rowDeletedChart",
-            "Row deletes", "Row deletes across all tables in the database", "area", "Time", "Count", "c",  nil)
-        
-        report(rowTotal, menu_rowStats, row['rows_total'], false, agentInstanceId, "rowTotalChart",
-            "Rows affected", "Rows affected across all tables in the database", "area", "Time", "Count", "c",  nil)
+
+        registry.metrics["postgres.rows.select.index"] = metrics.gauge :rows_select_idx do
+          { :value => row['rows_select_idx'] }
+        end
+
+        registry.metrics["postgres.rows.select.scan"] = metrics.gauge :rows_select_scan do
+          { :value => row['rows_select_scan'] }
+        end
+
+        registry.metrics["postgres.rows.inserts"] = metrics.gauge :rows_insert do
+          { :value => row['rows_insert'] }
+        end
+
+        registry.metrics["postgres.rows.updates"] = metrics.gauge :rows_update do
+          { :value => row['rows_update'] }
+        end
+
+        registry.metrics["postgres.rows.select.delete"] = metrics.gauge :rows_delete do
+          { :value => row['rows_delete'] }
+        end
+
+        registry.metrics["postgres.rows.select.total"] = metrics.gauge :rows_total do
+          { :value => row['rows_total'] }
+        end
       end
-  
+
       def report_table_stats(agentInstanceId)
         result = @connection.exec('SELECT sum(numbackends) AS "numbackends",
                     sum(xact_commit) AS "xact_commit",
@@ -96,48 +74,29 @@ module Cloudscale
                     sum(blks_hit) AS "blks_hit"
              FROM pg_stat_database;')
         row = result[0]
-        
-        report(xactCommit, menu_transactionInformation, row['xact_commit'], false, agentInstanceId, "xactCommitChart",
-            "Transaction commits", "Transaction commits across all tables in the database", "area", "Time", "Count", "c",  nil)
-        
-        report(xactRollback, menu_transactionInformation, row['xact_rollback'], false, agentInstanceId, "xactRollbackChart",
-            "Transaction rollback", "Transaction rollback across all tables in the database", "area", "Time", "Count", "c",  nil)
-            
-        report(xactTotal, menu_transactionInformation, row['xact_total'], false, agentInstanceId, "xactTotalChart",
-            "Transactions total", "Transactions total across all tables in the database", "area", "Time", "Count", "c",  nil)
-            
-        report(blksRead, menu_bulkOps, row['blks_read'], false, agentInstanceId, "blksReadChart",
-            "Bulk reads", "Bulk reads across all tables in the database", "area", "Time", "Count", "c",  nil)
-        
-        report(blksHit, menu_bulkOps, row['blks_hit'], false, agentInstanceId, "blksHitChart",
-            "Bulk hits", "Bulk hits across all tables in the database", "area", "Time", "Count", "c",  nil)
-      end
-  
-      def report_general_information(agentInstanceId)
-        result = @connection.exec('SELECT datid,
-                 datname, pid, usesysid, usename, 
-                 client_addr, client_hostname, 
-                 client_port, backend_start, state, waiting
-                 FROM pg_stat_activity;')
-        row = result[0]
-        
-        body = Array.new
-        body.push(["DatId", row['datid']])
-        body.push(["Datname", row['datname']])
-        body.push(["Pid", row['pid']])
-        body.push(["Use Sysid", row['usesysid']])
-        body.push(["usename", row['usename']])
-        body.push(["client_addr", row['client_addr']])
-        body.push(["client_hostname", row['client_hostname']])
-        body.push(["client_port", row['client_port']])
-        body.push(["backend_start", row['backend_start']])
-        body.push(["state", row['state']])
-        body.push(["waiting", row['waiting']])
-        mongo_general_inf_table = Monitor::Table.new("generalInformationPostgres", "Postgres General Information", nil, body, "compact")
-        mongo_general_inf_table.caption = "General Information regarding your Postgres Instance"
-  
-        persist_table(mongo_general_inf_table, agentInstanceId, menu_generalInformation)
+
+        registry.metrics["postgres.transactions.commit"] = metrics.gauge :xact_commit do
+          { :value => row['xact_commit'] }
+        end
+
+        registry.metrics["postgres.transactions.rollback"] = metrics.gauge :xact_rollback do
+          { :value => row['xact_rollback'] }
+        end
+
+        registry.metrics["postgres.transactions.total"] = metrics.gauge :xact_total do
+          { :value => row['xact_total'] }
+        end
+
+        registry.metrics["postgres.bulk.reads"] = metrics.gauge :blks_read do
+          { :value => row['blks_read'] }
+        end
+
+        registry.metrics["postgres.bulk.hits"] = metrics.gauge :blks_hit do
+          { :value => row['blks_hit'] }
+        end
+
       end
+
     end
   end
-end
+end

data/lib/cloudscale/plugins/postgres/preops/postgres_preop.rb

@@ -0,0 +1,80 @@
+require "logger"
+begin
+  require "pg"
+rescue LoadError
+  puts "WARNING: Load error PG needs to be installed via bundler"
+end
+require "singleton"
+require "#{File.dirname(__FILE__)}/../../preops/plugin_preop"
+
+##
+#
+# @author Johannes Hiemer.
+#
+##
+module Cloudscale
+  module Preops
+    class PostgresPreop < Preops::PluginPreop
+      include Singleton
+
+      def is_enabled
+        false
+      end
+
+      @@options = {
+        :"postgres-host" => {
+          :argument => "--postgres-host",
+          :description => "Host for your Postgres Instance (e.g. host.instance.com)",
+          :required => true,
+          :value => nil
+        },
+        :"postgres-port" => {
+          :argument => "--postgres-port",
+          :description => "Port for your Postgres Instance (Standard 5432)",
+          :required => false,
+          :value => 5432
+        },
+        :"postgres-db" => {
+          :argument => "--postgres-db",
+          :description => "Database of your Postgres instance",
+          :required => true,
+          :value => nil
+        },
+        :"postgres-username" => {
+          :argument => "--postgres-username",
+          :description => "Username for your Postgres instance",
+          :required => false,
+          :value => nil
+        },
+        :"postgres-password" => {
+          :argument => "--postgres-password",
+          :description => "Password for your Postgres instance",
+          :required => false,
+          :value => nil
+        }
+      }
+
+      def options
+        @@options
+      end
+
+      def initialize
+        self.init
+        if defined? PG
+          begin
+            @connection = PG.connect(:host => options[:host][:value], :user => options[:username][:value],
+              :password => options[:password][:value],
+              :port => options[:port][:value].to_i, :dbname => options[:db][:value])
+          rescue PGError => e
+            puts e.message
+          end
+        end
+      end
+
+      def connection
+        @connection
+      end
+
+    end
+  end
+end