instrumental_tools 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a27d4c996ef62de7323120f50798c5162414783
-  data.tar.gz: e9cef00763a959a8038d740d899e9ff89d1a1c45
+  metadata.gz: 50f38f48908d371b0eed50d4675bec89713a1233
+  data.tar.gz: 00bbf5415ac6e113941cd84b2c987c6d24b23277
 SHA512:
-  metadata.gz: d4f571bc227d0cf8e2668337542bfb8de90ac11e57964decb105457257949483befd35f3ee1c281b6db33ca64a48deedf803e2f95535313427e2e357df2621ca
-  data.tar.gz: 670224fe2b26100ea685880bae31f9440f0d24a39604f3f27779dc0c71dd2bdc333f784e844c9e1d5bce37aec3472abda5adccd8402f6bcab86dd85fb421628d
+  metadata.gz: ee78fe22322104ac03e3dd747a56c83bd1ff97d1691cefc8d6d1c864db6a895dc00dd36628b0f5e30c5bc4bb07a9c7ffbb8a0393f073af713e4579805e66566c
+  data.tar.gz: d73c0e2c2bf43f0e4cd51982dde63c90f6a612f92f055352fa999cb0bc210f0c08e594c8ec185ccd2baf9653dc72660170164f1ed67e9f8d6b30c4bc137e29ac

data/BUILD.md

@@ -18,6 +18,12 @@ to push a new copy of the gem directly to RubyGems. This presumes you have the c
 
 ## `deb`, `rpm` and `tgz` packages
 
+To build everything, use the following command:
+
+```
+rake package
+```
+
 Building new `deb`, `rpm` and `tgz` packages can be done via the following rake commands:
 
 For 32 bit Linux:
@@ -34,7 +40,6 @@ rake package:linux-x86_64:package
 rake package:linux-x86_64:tarball
 ```
 
-
 For Mac OS X:
 
 ```
@@ -47,6 +52,19 @@ rake package:osx:tarball
 {"url":"https://packagecloud.io","token":"YOUR PACKAGECLOUD API TOKEN"}
 ```
 
+You will need to install some things:
+
+```
+brew install gnu-tar --with-default-names
+brew install rpm
+```
+
+And then use the package_cloud gem to push our packages.  For example:
+
+```
+package_cloud push expectedbehavior/instrumental/ubuntu/precise instrumental-tools_YOUR_VERSION_HERE_amd64.deb
+```
+
 On release, the tarball should be uploaded to the Github releases page and linked to from the main README.md.
 
 ## `exe` packages

data/INSTALL.md

@@ -17,7 +17,7 @@ Prebuilt `deb` and `rpm` packages are available via the [packagecloud.io](https:
 
 ```sh
 sudo apt-get install curl
-curl https://packagecloud.io/install/repositories/expectedbehavior/instrumental/script.deb | sudo bash
+curl https://packagecloud.io/install/repositories/expectedbehavior/instrumental/script.deb.sh | sudo bash
 sudo apt-get install instrumental-tools
 ```
 
@@ -25,14 +25,14 @@ sudo apt-get install instrumental-tools
 
 ```sh
 su -c "apt-get install curl"
-su -c "curl https://packagecloud.io/install/repositories/expectedbehavior/instrumental/script.deb | bash"
+su -c "curl https://packagecloud.io/install/repositories/expectedbehavior/instrumental/script.deb.sh | bash"
 su -c "apt-get install instrumental-tools"
 ```
 
 # Enterprise Linux (CentOS, AWS Linux, RedHat)
 
 ```sh
-curl https://packagecloud.io/install/repositories/expectedbehavior/instrumental/script.rpm | sudo bash
+curl https://packagecloud.io/install/repositories/expectedbehavior/instrumental/script.rpm.sh | sudo bash
 sudo yum install instrumental-tools
 ```
 

data/README.md

@@ -10,7 +10,12 @@ A collection of tools for monitoring servers with Instrumental ([www.instrumenta
 
 Installation instructions for supported platforms is available in [INSTALL.md](INSTALL.md). The recommended installation method is to use a prebuilt package, which will automatically install the application as a service in your operating system's startup list.
 
-Once you've installed the package, you will want to edit the `/etc/instrumental.yml` file with your Instrumental API key. Example `/etc/instrumental.yml`:
+Once you've installed the package, you will want to edit the `/etc/instrumental.yml` file with your Instrumental API key. Example `/etc/instrumental.yml` (replace `YOUR_API_KEY` with the API key for your Instrumental project):
+
+```yaml
+---
+api_key: YOUR_API_KEY
+```
 
 ## Sent Metrics
 
@@ -96,4 +101,4 @@ Mac OS users: Due to a bug in Ruby, instrument_server can occasionally deadlock
 
 ## Troubleshooting & Help
 
-We are here to help. Email us at [support@instrumentalapp.com](mailto:support@instrumentalapp.com), or visit the [Instrumental Support](https://fastestforward.campfirenow.com/6b934) Campfire room.
+We are here to help. Email us at [support@instrumentalapp.com](mailto:support@instrumentalapp.com).

data/chef/instrumental_tools/attributes/default.rb

@@ -1,7 +1,7 @@
 default[:instrumental]                   = {}
 default[:instrumental][:api_key]         = nil
 
-default[:instrumental][:version]         = "1.1.2"
+default[:instrumental][:version]         = "1.1.3"
 default[:instrumental][:repo]            = "https://s3.amazonaws.com/instrumental-tools"
 
 default[:instrumental][:curl_path]       = "/usr/bin/curl"

data/chef/instrumental_tools/recipes/default.rb

@@ -25,8 +25,8 @@ file_name = case node["platform_family"]
               "instrumental-tools_%s_linux-%s.tar.gz" % [version, arch]
             end
 
-local_path          = ::File.join(node[:instrumental][:local_path], file_name)
 dest_dir            = node[:instrumental][:destination_dir]
+local_path          = ::File.join(node[:instrumental][:local_path] || dest_dir, file_name)
 conf_file           = node[:instrumental][:config_file]
 remote_name         = "%s/%s/%s" % [node[:instrumental][:repo], version, file_name]
 package_destination = ::File.join(dest_dir, file_name)

data/examples/docker/README.md

@@ -17,4 +17,4 @@ The following metric will be output only once for the host:
 
 * `running` - The total number of docker containers running on the host
 
-This script will only work if the `docker ps` process is exeutable by the same user that is running `instrument_server`. You should ensure that the user that exeutes the `instrument_server` process belongs to the `docker` group on your system.
+This script will only work if the `docker ps` process is executable by the same user that is running `instrument_server`. You should ensure that the user that executes the `instrument_server` process belongs to the `docker` group on your system.

data/lib/instrumental_tools/system_inspector/linux.rb

@@ -86,6 +86,7 @@ class SystemInspector
       swaptotal    = memory_stats["SwapTotal"].to_f
       swapfree     = memory_stats["SwapFree"].to_f
       swapused     = swaptotal - swapfree
+      available    = memory_stats["MemAvailable"].to_f if memory_stats["MemAvailable"]
 
       stats_to_record = {
         'memory.used_mb'      => used / 1024,
@@ -96,6 +97,11 @@ class SystemInspector
 
       }
 
+      if available
+        stats_to_record['memory.available_mb']      = available / 1024
+        stats_to_record['memory.available_percent'] = (available / total) * 100
+      end
+
       if swaptotal > 0
         stats_to_record.merge!({
                                  'swap.used_mb'        => swapused / 1024,
@@ -143,7 +149,7 @@ class SystemInspector
     def self.disk_io
       output          = {}
       device_root     = "/dev/"
-      mounted_devices = File.read(mount_file).lines.map { |l| l.split.first }.select { |device| device.index(device_root) }.map { |device| File.realpath(device) }
+      mounted_devices = File.read(mount_file).lines.map { |l| l.split.first }.select { |device| device.index(device_root) }.map { |device| File.exists?(device) ? File.realpath(device) : nil }.compact
       diskstats_lines = File.read(disk_file).lines.map(&:split).select { |values| mounted_devices.include?(File.join(device_root, values[2])) }
       entries         = diskstats_lines.map do |values|
                           entry               = {}

data/lib/instrumental_tools/version.rb

@@ -1,5 +1,5 @@
 module Instrumental
   module Tools
-    VERSION = "1.1.3"
+    VERSION = "1.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instrumental_tools
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Expected Behavior
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2016-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: instrumental_agent
@@ -247,7 +247,6 @@ files:
 - lib/instrumental_tools/system_inspector/win32.rb
 - lib/instrumental_tools/version.rb
 - puppet/.kitchen.yml
-- puppet/.librarian/puppet/config
 - puppet/Puppetfile
 - puppet/Puppetfile.lock
 - puppet/instrumental_tools/manifests/init.pp
@@ -287,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Command line tools for Instrumental

data/puppet/.librarian/puppet/config

@@ -1,2 +0,0 @@
----
-LIBRARIAN_PUPPET_PATH: "/var/folders/xm/2h3f2hxd3fb5h0g0g3_60yf80000gp/T/default-nocm-ubuntu-1204-sandbox-20150506-73288-12zf3mo/modules"