como_client 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ae20fe23f326d495c7edf5f443930b2367aed444
-  data.tar.gz: b93f69e2785a6555fe7c98d9cc8827f8453c6cd8
+SHA256:
+  metadata.gz: 0a46fb908d89401f14ca6a5da2b07b90ac80d908f0a63da574a7f7a3b2c32fd2
+  data.tar.gz: 2cbdc2ad2c54f24ee9beaea1b4b053ca19f9601c86011943b832707d759baa27
 SHA512:
-  metadata.gz: ddb4bcbc381b9c3fc9697e1a778e284fdcac72af88c4d5387902fb3a85753f5ee59574417c896865779c8a979844cdd7828c7afb081af3be529ba687c87c78ed
-  data.tar.gz: 0f33065ad30d448a07731b570cf102e639b80bd19f1ff98e47505ba06c895c82d7d82ab16719adc9888c75ecd9ef901dabf201f6f06a6a2a3b6fe06c3b11dad2
+  metadata.gz: e267901e852d2c4e182805e9b62a1e8b80a2e85f59e1effe89b59414661ceb9c2e3b99cb716bf3d7d927acf7cb7c91674f6a92534e64d3f9bfec8d328268bd37
+  data.tar.gz: 02c09fec0e0cedf8595a61eb7ac854e4ce6003fe08dab48d7febb9f1506b447c3175ceddf38b70442c7ef7d36b829eefd07a6d828f7fafe13a8f434b7767c35d

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.3
+  - 2.6.3
 before_install: gem install bundler -v 1.14.6

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Disler Colin, INI-DEV-APO-CAU-LFA
+Copyright (c) 2019 Disler Colin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -8,7 +8,7 @@ If you work in a Cloud Foundry environment and want to actively push your Promet
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'COMO_Client'
+gem 'como_client'
 ```
 
 And then execute:
@@ -17,7 +17,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install COMO_Client
+    $ gem install como_client
 
 ## Usage
 

data/como_client.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["Colin.Disler@gmail.com"]
 
   spec.summary       = "A Prometheus Client for continuous monitoring"
-  spec.description   = "A Prometheus Client for continuous monitoring"
+  spec.description   = "A Prometheus Client for continuous monitoring. Configure & Run."
   spec.homepage      = "https://github.com/lombold/COMO_Client"
   spec.license       = "MIT"
 
@@ -30,9 +30,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'rspec'
-  spec.add_dependency 'concurrent-ruby'
-  spec.add_dependency 'prometheus-client'
-  spec.add_dependency 'usagewatch_ext'
-  spec.add_dependency 'mem_info'
+  spec.add_development_dependency 'rspec', '~> 3.9.0'
+  spec.add_dependency 'concurrent-ruby', '~> 1.1.5'
+  spec.add_dependency 'prometheus-client', '~> 1.0'
+  spec.add_dependency 'usagewatch_ext', '~> 0.2.1'
+  spec.add_dependency 'mem_info', '~> 1.0.1'
 end

data/lib/como_client.rb

@@ -10,11 +10,17 @@ require 'prometheus/middleware/exporter'
 require 'prometheus/middleware/collector'
 
 module COMOClient
+  def self.logger
+    @@logger ||= defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
+  end
+
+  def self.logger=(logger)
+    @@logger = logger
+  end
 
   class Railtie < Rails::Railtie
     initializer 'como_client.configure_rails_initialization' do
       Rails.configuration.middleware.use Prometheus::Middleware::Collector
-      Rails.configuration.middleware.use Prometheus::Middleware::Exporter
     end
   end
 
@@ -36,18 +42,18 @@ module COMOClient
   end
 
   def self.run
-    logger = Logger.new(STDOUT)
-    logger.info("initialize metrics push service...")
+
+    COMOClient.logger.debug("initialise metrics push service...")
     if @pushTask and @pushTask.running?
-      logger.info("the metrics push service is already running!")
+      COMOClient.logger.debug("push service is already running!")
       return true
     end
 
     COMOClient::Metrics.register
-    @pushTask = Concurrent::TimerTask.new(execution_interval: 20, timeout_interval: 20){COMOClient::Tasks::PeriodicPush.push}
+    @pushTask = Concurrent::TimerTask.new(execution_interval: @configuration.push_interval, timeout_interval: 20){COMOClient::Tasks::PeriodicPush.push}
     @pushTask.add_observer(COMOClient::Tasks::Observer.new)
     @pushTask.execute
-    logger.info("successfully initiated metrics push service!")
+    COMOClient.logger.info("push service initialised")
     @pushTask.running?
   end
 

data/lib/como_client/metrics.rb

@@ -1,23 +1,21 @@
 module COMOClient
   module Metrics
     def self.register
-      logger = Logger.new(STDOUT)
-      logger.info("register metrics...")
+      COMOClient.logger.debug("register metrics...")
 
       #Register Cloud Froundry metrics if the app is pushed to Cloud Foundry
       COMOClient::Metrics::CF.register if !ENV["CF_INSTANCE_GUID"].nil?
 
-      logger.info("registered metrics")
+      COMOClient.logger.debug("registered metrics")
     end
 
     def self.update
-      logger = Logger.new(STDOUT)
-      logger.info("update metrics...")
+      COMOClient.logger.debug("update metrics...")
 
       #Update Cloud Froundry metrics if the app is pushed to Cloud Foundry
       COMOClient::Metrics::CF.update if !ENV["CF_INSTANCE_GUID"].nil?
 
-      logger.info("updated metrics")
+      COMOClient.logger.debug("updated metrics")
     end
   end
 end

data/lib/como_client/metrics/cf.rb

@@ -6,36 +6,33 @@ module COMOClient
       require 'mem_info'
 
       def self.register
-        logger = Logger.new(STDOUT)
-        logger.info("register CF metrics...")
+        COMOClient.logger.debug("register CF metrics...")
 
         prometheus =  Prometheus::Client.registry
 
-        hardwareGauges = Prometheus::Client::Gauge.new(:instance_metrics, 'instance hardware metrics')
+        hardwareGauges = Prometheus::Client::Gauge.new( :instance_metrics, docstring: 'instance hardware metrics', labels: [:hardware])
         prometheus.register(hardwareGauges)
-        logger.info("registered hardware gauges")
+        COMOClient.logger.debug("registered hardware gauges")
 
-        logger.info("registered CF metrics")
+        COMOClient.logger.debug("registered CF metrics")
       end
       def self.update
-        logger = Logger.new(STDOUT)
-        logger.info("update CF metrics...")
+        COMOClient.logger.debug("update CF metrics...")
         prometheus =  Prometheus::Client.registry
 
         usw = Usagewatch
         mem = MemInfo.new
         hardwareGauges = prometheus.get(:instance_metrics)
-        hardwareGauges.set({ hardware: 'cpu'}, usw.uw_cpuused)
-        hardwareGauges.set({ hardware: 'avg_load_past_minute'}, usw.uw_load)
-        hardwareGauges.set({ hardware: 'memory_total'}, mem.memtotal)
-        hardwareGauges.set({ hardware: 'memory_free'}, mem.memfree)
-        hardwareGauges.set({ hardware: 'memory_used'}, mem.memused)
-        hardwareGauges.set({ hardware: 'disk_used_perc'}, usw.uw_diskused_perc)
-        hardwareGauges.set({ hardware: 'disk_used_gigabytes'}, usw.uw_diskused)
-        hardwareGauges.set({ hardware: 'uptime_seconds'}, IO.read('/proc/uptime').split[0].to_i)
-        logger.info("instance gauges")
+        hardwareGauges.set(usw.uw_cpuused, labels: { hardware: 'cpu'})
+        hardwareGauges.set(usw.uw_load, labels: { hardware: 'avg_load_past_minute'})
+        hardwareGauges.set(mem.memtotal, labels: { hardware: 'memory_total'})
+        hardwareGauges.set(mem.memfree, labels: { hardware: 'memory_free'})
+        hardwareGauges.set(mem.memused, labels: { hardware: 'memory_used'})
+        hardwareGauges.set(usw.uw_diskused_perc, labels: { hardware: 'disk_used_perc'})
+        hardwareGauges.set(usw.uw_diskused, labels: { hardware: 'disk_used_gigabytes'})
+        hardwareGauges.set(IO.read('/proc/uptime').split[0].to_i, labels: { hardware: 'uptime_seconds'})
 
-        logger.info("updated CF metrics")
+        COMOClient.logger.debug("updated CF metrics")
       end
     end
   end

data/lib/como_client/tasks/periodic_push.rb

@@ -5,17 +5,16 @@ module COMOClient
       require 'prometheus/client/push'
       def self.push
         # register some metrics
-        logger = Logger.new(STDOUT)
-        logger.info("pushing metrics to #{COMOClient.configuration.pushgateway_url}")
-        logger.info("job: #{COMOClient.configuration.job_name}")
-        logger.info("instance: #{COMOClient.configuration.instance_name}")
+        COMOClient.logger.debug("pushing metrics to #{COMOClient.configuration.pushgateway_url}")
+        COMOClient.logger.debug("job: #{COMOClient.configuration.job_name}")
+        COMOClient.logger.debug("instance: #{COMOClient.configuration.instance_name}")
         COMOClient::Metrics.update
         Prometheus::Client::Push.new(COMOClient.configuration.job_name, #job name
                                      COMOClient.configuration.instance_name,#instance name
                                      COMOClient.configuration.pushgateway_url)#pushgateway url
                                 .add(Prometheus::Client.registry)
-        logger.info("successfully pushed metrics")
+        COMOClient.logger.debug("successfully pushed metrics")
       end
     end
   end
-end
+end

data/lib/como_client/version.rb

@@ -1,3 +1,3 @@
 module COMOClient
-  VERSION = "0.1.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,86 +1,86 @@
 --- !ruby/object:Gem::Specification
 name: como_client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Disler Colin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.5
 - !ruby/object:Gem::Dependency
   name: prometheus-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: usagewatch_ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: mem_info
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: A Prometheus Client for continuous monitoring
+        version: 1.0.1
+description: A Prometheus Client for continuous monitoring. Configure & Run.
 email:
 - Colin.Disler@gmail.com
 executables: []
@@ -124,8 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A Prometheus Client for continuous monitoring