cloudscale 0.0.7 → 0.0.8

data/lib/cloudscale/plugins/mongo/data/mongo_menu.json

@@ -0,0 +1,32 @@
+{
+	"mongo":{
+		"menuId" : "mongo",
+		"label" : "Mongo DB",
+		"description": "Mongo DB Stats information",
+		"order" : 1,
+		"agentInstanceId" : null,
+		"subItems" : [
+			{
+				"menuId" : "mongo.status",
+				"label" : "General Stats",
+				"description" : "All relevant information regarding the DBstats",
+				"order" : 1
+			},{
+				"menuId" : "mongo.collection",
+				"label" : "Collection Stats",
+				"description" : "All relevant information regarding the DB collection",
+				"order" : 3
+			},{
+				"menuId" : "mongo.replica",
+				"label" : "Replicaset Stats",
+				"description" : "All relevant information regarding the DB replicastats",
+				"order" : 4
+			},{
+				"menuId" : "mongo.server",
+				"label" : "Detailed Stats",
+				"description" : "All relevant information regarding the DB serverstats",
+				"order" : 2
+			}
+		]
+	}
+}

data/lib/cloudscale/plugins/mongo/mongo_db_collection_status.rb

@@ -0,0 +1,65 @@
+require "#{File.dirname(__FILE__)}/preops/mongodb_preop"
+require "#{File.dirname(__FILE__)}/../plugin"
+
+##
+#
+# @author Johannes Hiemer.
+#
+##
+module Cloudscale
+  module Plugins
+    class MongoDbCollectionStatus < Plugins::Plugin
+      attr_reader :client
+
+      def is_enabled
+        Preops::MongodbPreop.instance.is_enabled
+      end
+
+      def initialize
+        super
+        if is_enabled
+          @client = Preops::MongodbPreop.instance.client
+        end
+      end
+
+      def collect(agentInstanceId)
+        registry = Monitor::Registry.instance
+        metrics = Metrics::Agent.new
+        log.info("Calling Collect on MongoDbCollectionStatus")
+
+        @client.database.collection_names.each do | collection |
+          stats = @client.command({:collstats => collection}).first
+
+          registry.metrics["mongo.coll.count." + collection ] = metrics.gauge ("status_count_" + collection).to_sym do
+            { :value => stats['count'] }
+          end
+
+          registry.metrics["mongo.coll.index.nindexes." + collection] = metrics.gauge ("status_nindexes_" + collection).to_sym do
+            { :value => stats['nindexes'] }
+          end
+
+          registry.metrics["mongo.coll.index.totalIndexSize." + collection] = metrics.gauge ("status_totalIndexSize_" + collection).to_sym do
+            { :value => stats['totalIndexSize'] }
+          end
+
+          registry.metrics["mongo.coll.size.size." + collection] = metrics.gauge ("status_size_" + collection).to_sym do
+            { :value => stats['size'] }
+          end
+
+          registry.metrics["mongo.coll.size.storageSize." + collection] = metrics.gauge ("status_storageSize_" + collection).to_sym do
+            { :value => stats['storageSize'] }
+          end
+
+          registry.metrics["mongo.coll.item.avgObjSize." + collection] = metrics.gauge ("status_avgObjSize_" + collection).to_sym do
+            { :value => stats['avgObjSize'] }
+          end
+
+          registry.metrics["mongo.coll.item.lastExtentSize." + collection] = metrics.gauge ("status_lastExtentSize_" + collection).to_sym do
+            { :value => stats['lastExtentSize'] }
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/cloudscale/plugins/mongo/mongo_db_status.rb

@@ -9,7 +9,7 @@ require "#{File.dirname(__FILE__)}/../plugin"
 module Cloudscale
   module Plugins
     class MongoDbStatus < Plugins::Plugin
-      attr_reader :db
+      attr_reader :client
 
       def is_enabled
         Preops::MongodbPreop.instance.is_enabled
@@ -18,7 +18,7 @@ module Cloudscale
       def initialize
         super
         if is_enabled
-          @db = Preops::MongodbPreop.instance.db
+          @client = Preops::MongodbPreop.instance.client
         end
       end
 
@@ -26,7 +26,8 @@ module Cloudscale
         registry = Monitor::Registry.instance
         metrics = Metrics::Agent.new
         log.info("Calling Collect on MongoDbStatus")
-        stats = @db.stats
+
+        stats = @client.database.command({:dbstats => 1}).first        
 
         registry.metrics["mongo.status.objects"] = metrics.gauge :status_objects do
           { :value => stats['objects'] }

data/lib/cloudscale/plugins/mongo/mongo_replica_status.rb

@@ -9,7 +9,7 @@ require "#{File.dirname(__FILE__)}/../plugin"
 module Cloudscale
   module Plugins
     class MongoReplicaStatus < Plugins::Plugin
-      attr_reader :db
+      attr_reader :client
 
       def is_enabled
         Preops::MongodbPreop.instance.is_enabled
@@ -18,17 +18,18 @@ module Cloudscale
       def initialize
         super
         if is_enabled
-          @db = Preops::MongodbPreop.instance.db
+          @client = Preops::MongodbPreop.instance.client
         end
       end
 
-      def collectHourly()
+      def collect(agentInstanceId)
         registry = Monitor::Registry.instance
         metrics = Metrics::Agent.new
         log.info("Calling Collect on MongoReplicaStatus")
-        replset_status = db.command({'replSetGetStatus' => 1}, :check_response => false)
 
-        unless replset_status['ok'] == 1
+        begin
+          replset_status = @client.command({'replSetGetStatus' => 1}).first
+        rescue
           return "Node isn't a member of a Replica Set","Unable to fetch Replica Set status information."
         end
 

data/lib/cloudscale/plugins/mongo/mongo_server_status.rb

@@ -9,7 +9,7 @@ require "#{File.dirname(__FILE__)}/../plugin"
 module Cloudscale
   module Plugins
     class MongoServerStatus < Plugins::Plugin
-      attr_reader :db
+      attr_reader :client
 
       def is_enabled
         Preops::MongodbPreop.instance.is_enabled
@@ -18,24 +18,25 @@ module Cloudscale
       def initialize
         super
         if is_enabled
-          @db = Preops::MongodbPreop.instance.db
+          @client = Preops::MongodbPreop.instance.client
         end
       end
 
-      def collect()
+      def collect(agentInstanceId)
         registry = Monitor::Registry.instance
         metrics = Metrics::Agent.new
         log.info("Calling Collect on MongoServerStatus")
-        report_index_counters(registry, metrics)
-        report_global_lock_times(registry, metrics)
-        report_op_counters(registry, metrics)
-        report_general_information(registry, metrics)
-        report_memory(registry, metrics)
-        report_network(registry, metrics)
+        stats = @client.command(:serverStatus => 1).first
+        report_index_counters(registry, metrics, stats)
+        report_global_lock_times(registry, metrics, stats)
+        report_op_counters(registry, metrics, stats)
+        report_general_information(registry, metrics, stats)
+        report_memory(registry, metrics, stats)
+        report_network(registry, metrics, stats)
       end
 
-      def report_memory(registry, metrics)
-        stats = @db.command('serverStatus' => 1)
+      def report_memory(registry, metrics, stats)
+
         registry.metrics["mongo.mem.bits"] = metrics.gauge :mem_bits do
           { :value => stats['mem']['bits'] }
         end
@@ -57,24 +58,22 @@ module Cloudscale
         end
       end
 
-      def report_network(registry, metrics)
-        stats = @db.command('serverStatus' => 1)
+      def report_network(registry, metrics, stats)
 
-        registry.metrics["mongo.network.bytes.in"] = metrics.gauge :mem_bytesIn do
-          { :value => stats['mem']['bytesIn'] }
+        registry.metrics["mongo.network.bytes.in"] = metrics.gauge :network_bytesIn do
+          { :value => stats['network']['bytesIn'] }
         end
 
-        registry.metrics["mongo.network.bytes.out"] = metrics.gauge :mem_bytesOut do
-          { :value => stats['mem']['bytesOut'] }
+        registry.metrics["mongo.network.bytes.out"] = metrics.gauge :network_bytesOut do
+          { :value => stats['network']['bytesOut'] }
         end
 
-        registry.metrics["mongo.network.num.requests"] = metrics.gauge :mem_numRequests do
-          { :value => stats['mem']['numRequests'] }
+        registry.metrics["mongo.network.num.requests"] = metrics.gauge :network_numRequests do
+          { :value => stats['network']['numRequests'] }
         end
       end
 
-      def report_general_information(registry, metrics)
-        stats = @db.command('serverStatus' => 1)
+      def report_general_information(registry, metrics, stats)
 
         registry.metrics["mongo.general.uptime"] = metrics.gauge :general_uptime do
           { :value => stats['uptime'] }
@@ -87,10 +86,13 @@ module Cloudscale
         registry.metrics["mongo.general.connections.available"] = metrics.gauge :general_connections_available do
           { :value => stats['connections']['available'] }
         end
+
+        registry.metrics["mongo.general.connections.total"] = metrics.gauge :general_connections_total do
+          { :value => stats['connections']['totalCreated'] }
+        end
       end
 
-      def report_op_counters(registry, metrics)
-        stats = @db.command('serverStatus' => 1)
+      def report_op_counters(registry, metrics, stats)
 
         registry.metrics["mongo.opcounts.insert"] = metrics.gauge :opcounters_inserts do
           { :value => stats['opcounters']['insert'] }
@@ -113,26 +115,34 @@ module Cloudscale
         end
       end
 
-      def report_index_counters(registry, metrics)
-        stats = @db.command('serverStatus' => 1)
+      def report_index_counters(registry, metrics, stats)
+        {"accesses"=>6896, "hits"=>6896, "misses"=>0, "resets"=>0, "missRatio"=>0.0}
+
+        if (stats["indexCounters"])
+          registry.metrics["mongo.index.counters.accesses"] = metrics.gauge :counters_accesses do
+            { :value => stats['indexCounters']['accesses'] }
+          end
+
+          registry.metrics["mongo.index.counters.misses"] = metrics.gauge :counters_misses do
+            { :value => stats['indexCounters']['misses'] }
+          end
 
-        if (stats["indexCounters"] and stats["indexCounters"]["btree"])
-          registry.metrics["mongo.index.counters.btree.accesses"] = metrics.gauge :counters_btree_accesses do
-            { :value => stats['indexCounters']['btree']['accesses'] }
+          registry.metrics["mongo.index.counters.hits"] = metrics.gauge :counters_hits do
+            { :value => stats['indexCounters']['hits'] }
           end
 
-          registry.metrics["mongo.index.counters.btree.misses"] = metrics.gauge :counters_btree_misses do
-            { :value => stats['indexCounters']['btree']['misses'] }
+          registry.metrics["mongo.index.counters.resets"] = metrics.gauge :counters_resets do
+            { :value => stats['indexCounters']['resets'] }
           end
 
-          registry.metrics["mongo.index.counters.btree.hits"] = metrics.gauge :counters_btree_hits do
-            { :value => stats['indexCounters']['btree']['hits'] }
+          registry.metrics["mongo.index.counters.missRatio"] = metrics.gauge :counters_missRatio do
+            { :value => stats['indexCounters']['missRatio'] }
           end
         end
       end
 
-      def report_global_lock_times(registry, metrics)
-        stats = @db.command('serverStatus' => 1)
+      def report_global_lock_times(registry, metrics, stats)
+
         if stats['globalLock']
           registry.metrics["mongo.global.lock.time"] = metrics.gauge :global_lock_time do
             { :value => stats['globalLock']['lockTime'] }

data/lib/cloudscale/plugins/mongo/preops/mongodb_preop.rb

@@ -17,95 +17,93 @@ module Cloudscale
     class MongodbPreop < Preops::PluginPreop
       include Singleton
 
+      attr_accessor :options
+
       def is_enabled
         true
       end
 
-      attr_accessor :db, :connection
-      @@options = {
-        :"mongo-host" => {
-          :argument => "--mongo-host",
-          :description => "Host for your MongoDB Instance (e.g. host.mongodb.com)",
-          :required => true,
-          :value => nil
-        },
-        :"mongo-port" => {
-          :argument => "--mongo-port",
-          :description => "Port for your MongoDB Instance (Standard 27017)",
-          :required => false,
-          :value => 27017
-        },
-        :"mongo-db" => {
-          :argument => "--mongo-db",
-          :description => "Database of your MongoDB instance",
-          :required => true,
-          :value => nil
-        },
-        :"mongo-ssl" => {
-          :argument => "--mongo-ssl",
-          :description => "Usage SSL of your MongoDB instance",
-          :required => false,
-          :value => false
-        },
-        :"mongo-username" => {
-          :argument => "--mongo-username",
-          :description => "Username for your MongoDB instance",
-          :required => false,
-          :value => nil
-        },
-        :"mongo-password" => {
-          :argument => "--mongo-password",
-          :description => "Password for your MongoDB instance",
-          :required => false,
-          :value => nil
-        },
-        :"mongo-connect-timeout" => {
-          :argument => "--mongo-connect-timeout",
-          :description => "Connection Timeout for your MongoDB instance",
-          :required => false,
-          :value => 30
-        },
-        :"mongo-op-timeout" => {
-          :argument => "--mongo-timeout",
-          :description => "Operation Timeout for your MongoDB instance",
-          :required => false,
-          :value => 30
-        }
-      }
-
-      def options
-        @@options
+      def register
+        init_charts("#{File.dirname(__FILE__)}/../data/mongo_chart.json")
+        init_menus("#{File.dirname(__FILE__)}/../data/mongo_menu.json")
       end
 
       def initialize
         self.init
-        if defined? Mongo
-          begin Mongo
-            @connection = Mongo::Connection.new(options[:host][:value], options[:port][:value])
-          rescue Mongo::ConnectionFailure
-            puts "Unable to connect to the MongoDB Daemon.",
-            "Please ensure it is running on #{@host}:#{@port}\n\nException Message: #{$!.message}. Also confirm if SSL should be enabled or disabled."
-          end
+        @options = {
+          :'mongo-host' => {
+            :argument => "--mongo-host",
+            :description => "Host for your MongoDB Instance (e.g. host.mongodb.com)",
+            :required => true,
+            :value => nil
+          },
+          :'mongo-port' => {
+            :argument => "--mongo-port",
+            :description => "Port for your MongoDB Instance (Standard 27017)",
+            :required => false,
+            :value => 27017
+          },
+          :'mongo-db' => {
+            :argument => "--mongo-db",
+            :description => "Database of your MongoDB instance",
+            :required => true,
+            :value => nil
+          },
+          :'mongo-ssl' => {
+            :argument => "--mongo-ssl",
+            :description => "Usage SSL of your MongoDB instance",
+            :required => false,
+            :value => false
+          },
+          :'mongo-username' => {
+            :argument => "--mongo-username",
+            :description => "Username for your MongoDB instance",
+            :required => false,
+            :value => nil
+          },
+          :'mongo-password' => {
+            :argument => "--mongo-password",
+            :description => "Password for your MongoDB instance",
+            :required => false,
+            :value => nil
+          },
+          :'mongo-connect-timeout' => {
+            :argument => "--mongo-connect-timeout",
+            :description => "Connection Timeout for your MongoDB instance",
+            :required => false,
+            :value => 30
+          },
+          :'mongo-op-timeout' => {
+            :argument => "--mongo-timeout",
+            :description => "Operation Timeout for your MongoDB instance",
+            :required => false,
+            :value => 30
+          }
+        }
+      end
 
-          if @connection != nil
+      def client
+        if @client == nil
+          if defined? Mongo
             begin
-              @db = @connection.db(options[:db][:value])
-              if (@username != nil)
-                @db.authenticate(options[:username][:value], options[:password][:value])
-              end
+              @client = Mongo::Client.new([@options[:'mongo-host'][:value] + ":" + @options[:'mongo-port'][:value].to_s],
+                :database => @options[:'mongo-db'][:value])
             rescue Exception
-              puts "Unable to authenticate to MongoDB Database." << $!.message
+              puts "Unable to connect to the MongoDB Daemon. Exception: #{$!.message}. Also confirm if SSL should be enabled or disabled."
+            end
+
+            if @client != nil
+              begin
+                if (@options[:'mongo-username'][:value] != nil)
+                  @client = @client.with(user: @options[:'mongo-username'][:value], password: @options[:'mongo-password'][:value])
+                end
+              rescue Exception
+                puts "Unable to authenticate to MongoDB Database." << $!.message
+              end
             end
           end
         end
-      end
-
-      def connection
-        @connection
-      end
-
-      def db
-        @db
+        @client
       end
 
     end