summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Don't fail to uninstall bundler on Ruby 2.5+fix_travisTim Smith2017-10-201-1/+1
| | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* Update ruby releases we test onTim Smith2017-10-201-2/+2
| | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* Properly allow ruby-head to fail in TravisTim Smith2017-10-201-2/+3
| | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* Merge pull request #1075 from rmcleod8/aix_uptime_secondsTim Smith2017-10-202-3/+3
|\ | | | | Updating AIX uptime_seconds to reflect elapsed seconds from boot rather than epoch
| * Adding comment for the changermcleod82017-10-131-0/+1
| | | | | | | | Signed-off-by: rmcleod8 <richard.mcleod@gmail.com>
| * Updating AIX uptime_seconds to reflect elapsed seconds from boot rather than ↵rmcleod82017-10-132-3/+2
|/ | | | | | epoch Signed-off-by: rmcleod8 <richard.mcleod@gmail.com>
* Merge pull request #1071 from chef/amazon_packagesTim Smith2017-10-111-1/+1
|\ | | | | Gather packages on Amazon Linux
| * Gather packages on Amazon Linuxamazon_packagesTim Smith2017-10-101-1/+1
|/ | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* Merge pull request #1070 from jeunito/bug/488Tim Smith2017-10-072-6/+14
|\ | | | | also check for lxc-start
| * also check for lxc-startJose Asuncion2017-10-062-6/+14
|/ | | | Signed-off-by: Jose Asuncion <jeunito@gmail.com>
* Fix regression in #1047 (#1066)Phil Dibowitz2017-10-043-2/+23
| | | | | | | | PR #1047 allows a plugin to return partial data which may be incredibly dangerous. It's a totally reasonable thing to want, however, so we gate it behind a plugin config. However, the default behavior reverts to where it was. Signed-off-by: Phil Dibowitz <phil@ipom.com>
* Critical Plugins (#1064)Phil Dibowitz2017-10-047-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new Ohai configuration `critical_plugins` which will cause Ohai to exit (or `fail` if inside of Chef) if the plugins in the list do not run successfully. This feature only supports Ohai 7-style named plugins, not the ancient Ohai 6-style stuff. Tests to follow, but: ``` $ cat /home/phild/ohai.rb ohai.critical_plugins << :Filesystem $ ./bin/ohai -c /home/phild/ohai.rb [2017-10-03T13:43:14-07:00] INFO: The plugin path /etc/chef/ohai/plugins does not exist. Skipping... [2017-10-03T13:43:14-07:00] ERROR: The following plugins marked as critical failed: [:Filesystem] ``` And when I run Chef: ``` [2017-10-03T13:44:11-07:00] FATAL: RuntimeError: The following plugins marked as critical failed: [:Filesystem2]. Failing Chef run. ``` This fixes #879. Signed-off-by: Phil Dibowitz <phil@ipom.com>
* Merge pull request #1063 from chef/tm/13_5v13.5.0Thom May2017-09-282-1/+13
|\ | | | | prep 13.5 for release
| * prep 13.5 for releasetm/13_5Thom May2017-09-282-1/+13
|/ | | | Signed-off-by: Thom May <thom@chef.io>
* Merge pull request #1059 from chef/ec2_missing_requireTim Smith2017-09-201-1/+1
|\ | | | | Make sure we require wmi/lite in the ec2 plugin
| * Make sure we require wmi/lite in the ec2 pluginec2_missing_requireTim Smith2017-09-191-1/+1
|/ | | | | | This gets required in other places, but it was meant to be uncommented. Signed-off-by: Tim Smith <tsmith@chef.io>
* Merge pull request #1056 from chef/timingTim Smith2017-09-192-19/+27
|\ | | | | Add plugin timing information in debug mode
| * Use benchmark vs. timeTim Smith2017-09-192-25/+27
| | | | | | | | | | | | Seems like a bit of overkill, but it does nicely format the time strings, which I'll take Signed-off-by: Tim Smith <tsmith@chef.io>
| * Add plugin timing information in debug modetimingTim Smith2017-09-112-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A reoccurring problem in Ohai is the runs taking too long. It's hard to troubleshoot since you can't tell what plugin is causing the long runs. This simple debug information provides us with the information we need to troubleshoot unusually long ohai run times. Example output ``` [2017-09-11T09:20:27-07:00] DEBUG: Plugin Ruby took 1.568772 seconds to run. [2017-09-11T09:20:27-07:00] DEBUG: Plugin Rust: ran 'rustc --version' and returned 0 [2017-09-11T09:20:27-07:00] DEBUG: Plugin Rust took 0.356488 seconds to run. [2017-09-11T09:20:31-07:00] DEBUG: Plugin Scala: ran 'scala -version' and returned 0 [2017-09-11T09:20:31-07:00] DEBUG: Plugin Scala took 3.216373 seconds to run. [2017-09-11T09:20:36-07:00] DEBUG: Ohai took 16.940469 total seconds to run. ``` Signed-off-by: Tim Smith <tsmith@chef.io>
* | Merge pull request #1058 from chef/ipv6_colon_regexAdam Leff2017-09-151-1/+2
|\ \ | | | | | | Fix the route support for IPV6 routes ending in ::
| * | Fix the route support for IPV6 routes ending in ::ipv6_colon_regexTim Smith2017-09-151-1/+2
|/ / | | | | | | | | | | | | | | | | Removing the ending word boundary in the regex allows is to capture the :: endings while still properly parsing other routes. I added a rubular comment as well so we know what this regex is actually trying to capture. Signed-off-by: Tim Smith <tsmith@chef.io>
* | Merge pull request #1057 from chef/134v13.4.0Tim Smith2017-09-113-6/+115
|\ \ | | | | | | Release Ohai 13.4
| * | Release Ohai 13.4Tim Smith2017-09-113-6/+115
|/ / | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* | Merge pull request #1042 from oslerw/masterTim Smith2017-09-104-2/+120
|\ \ | | | | | | Add Arch Linux support to package plugin
| * | Add Arch Linux support to package pluginWilliam Osler2017-09-104-2/+120
| | | | | | | | | | | | Signed-off-by: William Osler <oslerw@fb.com>
* | | Merge pull request #1055 from jeunito/bug/833Tim Smith2017-09-082-0/+16
|\ \ \ | |_|/ |/| | Detect LXC if LXC and Docker are on the same host
| * | change expressionJose Asuncion2017-09-081-1/+1
| | | | | | | | | | | | Signed-off-by: Jose Asuncion <jeunito@gmail.com>
| * | refactoringJose Asuncion2017-09-081-3/+1
| | | | | | | | | | | | Signed-off-by: Jose Asuncion <jeunito@gmail.com>
| * | detect lxc guest using /proc/1/environJose Asuncion2017-09-072-0/+18
| | | | | | | | | | | | Signed-off-by: Jose Asuncion <jeunito@gmail.com>
* | | Merge pull request #1033 from chef/azureTim Smith2017-09-088-20/+313
|\ \ \ | | | | | | | | Add Azure metadata endpoint support
| * | | Move the require into the pluginTim Smith2017-09-081-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | Add azure plugin specs for metadataTim Smith2017-09-071-0/+81
| | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | Return nils on error instead of an empty hashTim Smith2017-09-073-4/+5
| | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | Chefstyle fixesTim Smith2017-09-071-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | Minor tweaks to the ec2 / softlayer specsTim Smith2017-09-072-5/+3
| | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | Add a simple spec for the azure mixinTim Smith2017-09-071-0/+67
| | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | Warn in the mixin when things go wrongTim Smith2017-09-071-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | Fix cloud specs for azure changesTim Smith2017-08-111-5/+37
| | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | Update the cloud plugin to use the Azure metadata informationTim Smith2017-08-111-2/+4
| | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | Add Azure metadata endpoint supportTim Smith2017-08-112-8/+120
| | | | | | | | | | | | | | | | | | | | | | | | The Azure metadata endpoint has gone GA. This pulls instance information straight from the source. Signed-off-by: Tim Smith <tsmith@chef.io>
* | | | Merge pull request #1045 from chef/requiresTim Smith2017-09-0717-43/+30
|\ \ \ \ | | | | | | | | | | Move all requires into the plugin definitions
| * | | | Move all requires into the plugin definitionsTim Smith2017-08-1618-47/+34
| |/ / / | | | | | | | | | | | | | | | | | | | | Avoid requiring all these things if we're skipping these plugins Signed-off-by: Tim Smith <tsmith@chef.io>
* | | | Merge pull request #1052 from chef/ec2_windowsTim Smith2017-09-072-24/+56
|\ \ \ \ | | | | | | | | | | Improve detection of Windows EC2 nodes by using UUID information
| * | | | Move windows detect to its own method and add specsTim Smith2017-09-072-12/+54
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | | Remove specs for the org detection method on Windowsec2_windowsTim Smith2017-09-061-10/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | | Remove the org detection since it's less reliable that UUIDTim Smith2017-09-061-16/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | | Detect EC2 using UUIDs on Windows as well as LinuxTim Smith2017-09-061-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is actually how Amazon recommends doing it. It works no matter how the VM was built. Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | | Improve the existing commentsTim Smith2017-09-061-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | | Move the queries into the actual pluginTim Smith2017-09-061-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* | | | | Merge pull request #1051 from chef/loggingTim Smith2017-09-062-3/+3
|\ \ \ \ \ | |/ / / / | | | | | Use standard logging in Filesystem