riemann-marathon 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43500e67579cb7ec39bd9a9238018aa0daf848f9
-  data.tar.gz: a367f509d5bcff1ef724f7fcabc09d51f49c93fe
+  metadata.gz: bd6b63f80a80454f635f0f2365b77f06667ac7ae
+  data.tar.gz: 8d165f8ab4f066f0c33c63c89235b69c05be9182
 SHA512:
-  metadata.gz: 75eb9e3ac77ac0e1765c409ee3759c4366b123b1b5dcca1fd9795d54d0e6c2b0168f7e7990a3d5569d404e89d22ec683532517cb6b1ef63c8513f6dd59906a64
-  data.tar.gz: 03da585d1db87aed865729b7ea6ace0926334561e4638032016ac96d784b0661ced6038fb44771a71dbc92b280d3139423fe5bc2f63e5e96be0fd9c7d6cdd25b
+  metadata.gz: 02bbbeb5253be11f51a217681b6d10fed4a6b75d82c358d9bee4193343ac805eccb9524921fdae0a05dccceb2af3c341375fc71bf709bb209b191fb87b861363
+  data.tar.gz: f0765a7f957cc736626b54038ce385b152f2a242a270b891500ae679116d2afbdadcb633864ed1d670fbabf93c2fee6a72bdb6c0eb2869f21f44d110cb3d6654

data/bin/riemann-marathon

@@ -47,7 +47,19 @@ class Riemann::Tools::Marathon
     "http://#{options[:marathon_host]}:#{options[:marathon_port]}#{path_prefix.length>0?'/':''}#{path_prefix}/metrics"
   end
 
+  def apps_url
+    path_prefix = options[:path_prefix]
+    path_prefix[0] = '' if path_prefix[0]=='/'
+    path_prefix[path_prefix.length-1] = '' if path_prefix[path_prefix.length-1]=='/'
+    "http://#{options[:marathon_host]}:#{options[:marathon_port]}#{path_prefix.length>0?'/':''}#{path_prefix}/v2/apps"
+  end
+
   def tick
+    tick_health
+    tick_apps
+  end
+  
+  def tick_health
     uri = URI(health_url)
     response = safe_get(uri)
 
@@ -74,7 +86,8 @@ class Riemann::Tools::Marathon
             report(:host => uri.host,
                    :service => "marathon_metric #{t} #{service}",
                    :metric => 1,
-                   :tags => ["metric_name"]
+                   :tags => ["metric_name"],
+                   :ttl => 600
             )
             if counters.respond_to? :each_pair
               counters.each_pair do |k, v|
@@ -82,7 +95,8 @@ class Riemann::Tools::Marathon
                   report(:host => uri.host,
                          :service => "marathon #{service} #{k}",
                          :metric => v,
-                         :tags => ["metric", "#{t}"]
+                         :tags => ["metric", "#{t}"],
+                         :ttl => 600
                   )
                 end
               end
@@ -92,6 +106,41 @@ class Riemann::Tools::Marathon
       end
     end
   end
+
+  def tick_apps
+    uri = URI(apps_url)
+    response = safe_get(uri)
+
+    return if response.nil?
+
+    if response.status != 200
+        report(:host => uri.host,
+          :service => "marathon health",
+          :state => "critical",
+          :description => "HTTP connection error: #{response.status} - #{response.body}"
+        )
+    else
+      # Assuming that a 200 will give json
+      json = JSON.parse(response.body)
+      state = "ok"
+
+      report(:host => uri.host,
+             :service => "marathon health",
+             :state => state)
+
+      json["apps"].each do |app|
+        app.each_pair do |k, v|
+          if v.is_a? Numeric
+            report(:host => uri.host,
+                   :service => "marathon apps#{app["id"]}/#{k}",
+                   :metric => v,
+                   :ttl => 120
+            )
+          end
+        end
+      end
+    end
+  end
 end
 Riemann::Tools::Marathon.run
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-marathon
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Giulio Eulisse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-tools
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.2.8
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -62,8 +62,9 @@ files:
 - LICENSE
 - README.md
 - bin/riemann-marathon
-homepage: https://github.com/riemann/riemann-marathon
-licenses: []
+homepage: https://github.com/riemann/riemann-tools
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -84,5 +85,5 @@ rubyforge_project: riemann-marathon
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Submits marathon stats to riemann.
+summary: Submits Marathon stats to riemann.
 test_files: []