passenger-metrics 0.0.1 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4253eefcd53799123022aeee6e5f0f60df2685c7
-  data.tar.gz: f51be74d6c4503a6c48c71ee64d775feb5523d6d
+SHA256:
+  metadata.gz: a0ece3183790878ef70152c7ffd4c33119c9e126fd0cc4a0f0034fd164ff1a80
+  data.tar.gz: 8d14dc5b1879632605400d877906d3bbc64f4f19e42307d9120c6836f78af377
 SHA512:
-  metadata.gz: a7a0cff0a03d344f4af6fe120f6137b34cdd7dec29bc6e9f0c3fa834428c6c96fc3912814a9918095b1259b17b72a5415204c9a9f71eabf054d057cde34bd276
-  data.tar.gz: f5e410c4f676b368885f2c81b33ae7f4f18c3fd55c28ece11f1f6c78801bb2eabc2df8c06188e45f2cb93f642eaf3c64839e7c2b9ce617552cf8e665a6d590de
+  metadata.gz: cce9a96901b6aa622ae60bc1d3606baf245143bb96f45bb774165902945b3166a7cee3c0215b4ea6e3a64e299069b2af2f2c32494d1be0f7f807a362e3577109
+  data.tar.gz: 0a87aa5880719787514a62a18c9792e327a4dc10771cc4b79bb8cc5519c41f0789ce8a48c5586035be049f0034f2720edf9610a3f0f939e6e31f11edd58f02b8

data/.github/workflows/ci.yml

@@ -0,0 +1,14 @@
+name: CI
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@477b21f02be01bcb8030d50f37cfec92bfa615b6
+        with:
+          ruby-version: 2.7
+          bundler-cache: true
+      - run: bundle install
+      - run: bundle exec rspec

data/Gemfile

@@ -1,15 +1,12 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-gem 'crack'
-gem 'aws-sdk'
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
+gem 'crack', '~> 0.4.3'
+gem 'aws-sdk-cloudwatch'
+
 group :development do
-  gem "rspec", ">= 0"
-  gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 2.0.1"
-  gem 'guard'
+  gem 'rspec', '>= 0'
+  gem 'jeweler', '~> 2.1', '>= 2.1.2'
+  gem 'guard', '~> 2.13'
   gem 'guard-rspec', require: false
   gem 'byebug'
 end

data/README.md

@@ -1,4 +1,4 @@
 # passenger-metrics
 A ruby gem for reading metrics from the passenger-status command. 
 
-
+[![CI Status](https://github.com/controlshift/passenger-metrics/actions/workflows/ci.yml/badge.svg)](https://github.com/controlshift/passenger-metrics/actions/workflows/ci.yml)

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.4

data/lib/passenger-metrics.rb

@@ -1,13 +1,18 @@
-require 'aws-sdk'
+require 'aws-sdk-cloudwatch'
 require 'crack'
 
 module PassengerMetrics
   def self.status
     @status ||= PassengerMetrics::Status.new
   end
+
+  def self.instance_id
+    @instance_id ||= Net::HTTP.get( URI.parse('http://169.254.169.254/latest/meta-data/instance-id' ) )
+  end
 end
 
 require 'passenger-metrics/metrics/base'
 require 'passenger-metrics/metrics/queue_length'
+require 'passenger-metrics/metrics/process_count'
 require 'passenger-metrics/status'
 require 'passenger-metrics/cloudwatch'

data/lib/passenger-metrics/cloudwatch.rb

@@ -1,3 +1,5 @@
+require 'net/http'
+
 module PassengerMetrics
   class Cloudwatch
     DEFAULT_NAMESPACE = "Passenger"
@@ -43,7 +45,7 @@ module PassengerMetrics
     end
 
     def metric_name
-      ENV["AWS_CLOUDWATCH_METRIC_NAME"] || DEFAULT_METRIC_NAME
+      metric.metric_name || ENV["AWS_CLOUDWATCH_METRIC_NAME"] || DEFAULT_METRIC_NAME
     end
 
     def dimension_name
@@ -51,7 +53,7 @@ module PassengerMetrics
     end
 
     def dimension_value
-      ENV["AWS_CLOUDWATCH_DIMENSION_VALUE"] || DEFAULT_DIMENSION_VALUE
+      ENV["AWS_CLOUDWATCH_DIMENSION_VALUE"] || instance_id || DEFAULT_DIMENSION_VALUE
     end
 
     def dimensions
@@ -77,5 +79,9 @@ module PassengerMetrics
     def client
       @client ||= ::Aws::CloudWatch::Client.new region: 'us-east-1'
     end
+
+    def instance_id
+      PassengerMetrics.instance_id
+    end  
   end
 end

data/lib/passenger-metrics/metrics/process_count.rb

@@ -0,0 +1,18 @@
+module PassengerMetrics
+  module Metrics
+    class ProcessCount < PassengerMetrics::Metrics::Base
+      def unit
+        :count
+      end
+
+      def value
+        PassengerMetrics.status.info['process_count']
+      end
+
+      def metric_name
+        'PassengerProcessCount'
+      end
+  
+    end
+  end
+end

data/lib/passenger-metrics/metrics/queue_length.rb

@@ -8,6 +8,10 @@ module PassengerMetrics
       def value
         PassengerMetrics.status.info['get_wait_list_size']
       end
+
+      def metric_name
+        'PassengerQueueLenght'
+      end
     end
   end
 end

data/passenger-metrics.gemspec

@@ -2,27 +2,27 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: passenger-metrics 0.0.1 ruby lib
+# stub: passenger-metrics 0.0.4 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "passenger-metrics"
-  s.version = "0.0.1"
+  s.name = "passenger-metrics".freeze
+  s.version = "0.0.5"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Nathan Woodhull"]
-  s.date = "2016-03-09"
-  s.description = "Get passenger metrics from passenger-status into the analytics tool of your choice."
-  s.email = "nathan@gcontrolshiftlabs.com"
-  s.executables = ["passenger-metrics-cloudwatch"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Nathan Woodhull".freeze]
+  s.date = "2021-08-04"
+  s.description = "Get passenger metrics from passenger-status into the analytics tool of your choice.".freeze
+  s.email = "nathan@gcontrolshiftlabs.com".freeze
+  s.executables = ["passenger-metrics-cloudwatch".freeze]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
   ]
   s.files = [
+    ".github/workflows/ci.yml",
     ".rspec",
     "Gemfile",
-    "Gemfile.lock",
     "Guardfile",
     "LICENSE",
     "README.md",
@@ -34,52 +34,43 @@ Gem::Specification.new do |s|
     "lib/passenger-metrics.rb",
     "lib/passenger-metrics/cloudwatch.rb",
     "lib/passenger-metrics/metrics/base.rb",
+    "lib/passenger-metrics/metrics/process_count.rb",
     "lib/passenger-metrics/metrics/queue_length.rb",
     "lib/passenger-metrics/status.rb",
     "passenger-metrics.gemspec",
     "spec/fixtures/status.xml",
     "spec/passenger-metrics/cloudwatch_spec.rb",
+    "spec/passenger-metrics/metrics/process_count_spec.rb",
     "spec/passenger-metrics/status_spec.rb",
     "spec/passenger_metrics_spec.rb",
     "spec/spec_helper.rb",
     "spec/status_spec.rb"
   ]
-  s.homepage = "http://github.com/controlshift/passenger-metrics"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.8"
-  s.summary = "ruby interface to passenger-status"
+  s.homepage = "http://github.com/controlshift/passenger-metrics".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.1.6".freeze
+  s.summary = "ruby interface to passenger-status".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<crack>, [">= 0"])
-      s.add_runtime_dependency(%q<aws-sdk>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_development_dependency(%q<guard>, [">= 0"])
-      s.add_development_dependency(%q<guard-rspec>, [">= 0"])
-      s.add_development_dependency(%q<byebug>, [">= 0"])
-    else
-      s.add_dependency(%q<crack>, [">= 0"])
-      s.add_dependency(%q<aws-sdk>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-      s.add_dependency(%q<guard>, [">= 0"])
-      s.add_dependency(%q<guard-rspec>, [">= 0"])
-      s.add_dependency(%q<byebug>, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<crack>.freeze, ["~> 0.4.3"])
+    s.add_runtime_dependency(%q<aws-sdk-cloudwatch>.freeze, [">= 0"])
+    s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
+    s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.1", ">= 2.1.2"])
+    s.add_development_dependency(%q<guard>.freeze, ["~> 2.13"])
+    s.add_development_dependency(%q<guard-rspec>.freeze, [">= 0"])
+    s.add_development_dependency(%q<byebug>.freeze, [">= 0"])
   else
-    s.add_dependency(%q<crack>, [">= 0"])
-    s.add_dependency(%q<aws-sdk>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
-    s.add_dependency(%q<guard>, [">= 0"])
-    s.add_dependency(%q<guard-rspec>, [">= 0"])
-    s.add_dependency(%q<byebug>, [">= 0"])
+    s.add_dependency(%q<crack>.freeze, ["~> 0.4.3"])
+    s.add_dependency(%q<aws-sdk-cloudwatch>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.1", ">= 2.1.2"])
+    s.add_dependency(%q<guard>.freeze, ["~> 2.13"])
+    s.add_dependency(%q<guard-rspec>.freeze, [">= 0"])
+    s.add_dependency(%q<byebug>.freeze, [">= 0"])
   end
 end
 

data/spec/passenger-metrics/metrics/process_count_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper' 
+
+describe PassengerMetrics::Metrics::ProcessCount do 
+  it 'should have a metric name' do
+    expect(subject.metric_name).to eq('PassengerProcessCount')
+  end
+end 

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: passenger-metrics
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.5
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2021-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-cloudwatch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -52,48 +52,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -132,9 +124,9 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- ".github/workflows/ci.yml"
 - ".rspec"
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md
@@ -146,11 +138,13 @@ files:
 - lib/passenger-metrics.rb
 - lib/passenger-metrics/cloudwatch.rb
 - lib/passenger-metrics/metrics/base.rb
+- lib/passenger-metrics/metrics/process_count.rb
 - lib/passenger-metrics/metrics/queue_length.rb
 - lib/passenger-metrics/status.rb
 - passenger-metrics.gemspec
 - spec/fixtures/status.xml
 - spec/passenger-metrics/cloudwatch_spec.rb
+- spec/passenger-metrics/metrics/process_count_spec.rb
 - spec/passenger-metrics/status_spec.rb
 - spec/passenger_metrics_spec.rb
 - spec/spec_helper.rb
@@ -174,8 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: ruby interface to passenger-status

data/Gemfile.lock

@@ -1,124 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.4.0)
-    aws-sdk (2.2.24)
-      aws-sdk-resources (= 2.2.24)
-    aws-sdk-core (2.2.24)
-      jmespath (~> 1.0)
-    aws-sdk-resources (2.2.24)
-      aws-sdk-core (= 2.2.24)
-    builder (3.2.2)
-    byebug (8.2.2)
-    coderay (1.1.1)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.2.5)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.9.10)
-    formatador (0.2.5)
-    git (1.3.0)
-    github_api (0.13.1)
-      addressable (~> 2.4.0)
-      descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
-      multi_json (>= 1.7.5, < 2.0)
-      oauth2
-    guard (2.13.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, <= 4.0)
-      lumberjack (~> 1.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.6.4)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    hashie (3.4.3)
-    highline (1.7.8)
-    jeweler (2.0.1)
-      builder
-      bundler (>= 1.0)
-      git (>= 1.2.5)
-      github_api
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
-      rake
-      rdoc
-    jmespath (1.1.3)
-    json (1.8.3)
-    jwt (1.5.1)
-    listen (3.0.6)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9.7)
-    lumberjack (1.0.10)
-    method_source (0.8.2)
-    mini_portile2 (2.0.0)
-    multi_json (1.11.2)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nenv (0.3.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    notiffany (0.0.8)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    oauth2 (1.1.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0, < 1.5.2)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.6.4)
-    rake (10.5.0)
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
-    rdoc (4.2.2)
-      json (~> 1.4)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.3)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    safe_yaml (1.0.4)
-    shellany (0.0.1)
-    slop (3.6.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aws-sdk
-  bundler (~> 1.0)
-  byebug
-  crack
-  guard
-  guard-rspec
-  jeweler (~> 2.0.1)
-  rspec
-
-BUNDLED WITH
-   1.11.2