ohai 16.4.12 → 16.7.18
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +11 -11
- data/bin/ohai +2 -1
- data/lib/ohai.rb +2 -1
- data/lib/ohai/application.rb +40 -0
- data/lib/ohai/common/dmi.rb +8 -3
- data/lib/ohai/config.rb +3 -3
- data/lib/ohai/dsl.rb +2 -1
- data/lib/ohai/dsl/plugin.rb +13 -5
- data/lib/ohai/dsl/plugin/versionvii.rb +29 -16
- data/lib/ohai/exception.rb +2 -1
- data/lib/ohai/hints.rb +2 -1
- data/lib/ohai/loader.rb +1 -1
- data/lib/ohai/log.rb +2 -1
- data/lib/ohai/mash.rb +1 -0
- data/lib/ohai/mixin/azure_metadata.rb +3 -2
- data/lib/ohai/mixin/chef_utils_wiring.rb +52 -0
- data/lib/ohai/mixin/command.rb +4 -54
- data/lib/ohai/mixin/constant_helper.rb +2 -1
- data/lib/ohai/mixin/dmi_decode.rb +2 -1
- data/lib/ohai/mixin/do_metadata.rb +4 -3
- data/lib/ohai/mixin/ec2_metadata.rb +5 -4
- data/lib/ohai/mixin/gce_metadata.rb +3 -2
- data/lib/ohai/mixin/http_helper.rb +2 -1
- data/lib/ohai/mixin/network_helper.rb +2 -1
- data/lib/ohai/mixin/os.rb +68 -2
- data/lib/ohai/mixin/scaleway_metadata.rb +4 -3
- data/lib/ohai/mixin/seconds_to_human.rb +2 -1
- data/lib/ohai/mixin/shell_out.rb +51 -0
- data/lib/ohai/mixin/softlayer_metadata.rb +2 -1
- data/lib/ohai/mixin/string.rb +2 -1
- data/lib/ohai/mixin/train_helpers.rb +36 -0
- data/lib/ohai/mixin/which.rb +39 -0
- data/lib/ohai/plugin_config.rb +2 -1
- data/lib/ohai/plugins/aix/kernel.rb +2 -1
- data/lib/ohai/plugins/aix/memory.rb +4 -3
- data/lib/ohai/plugins/aix/network.rb +3 -2
- data/lib/ohai/plugins/aix/platform.rb +2 -1
- data/lib/ohai/plugins/aix/uptime.rb +4 -3
- data/lib/ohai/plugins/aix/virtualization.rb +1 -1
- data/lib/ohai/plugins/azure.rb +26 -5
- data/lib/ohai/plugins/bsd/virtualization.rb +4 -3
- data/lib/ohai/plugins/c.rb +1 -0
- data/lib/ohai/plugins/chef.rb +2 -1
- data/lib/ohai/plugins/cloud.rb +2 -1
- data/lib/ohai/plugins/command.rb +2 -1
- data/lib/ohai/plugins/cpu.rb +8 -9
- data/lib/ohai/plugins/darwin/hardware.rb +1 -0
- data/lib/ohai/plugins/darwin/memory.rb +3 -4
- data/lib/ohai/plugins/darwin/network.rb +2 -1
- data/lib/ohai/plugins/darwin/platform.rb +3 -2
- data/lib/ohai/plugins/darwin/virtualization.rb +3 -2
- data/lib/ohai/plugins/digital_ocean.rb +1 -0
- data/lib/ohai/plugins/dmi.rb +2 -1
- data/lib/ohai/plugins/docker.rb +2 -1
- data/lib/ohai/plugins/dragonflybsd/memory.rb +1 -0
- data/lib/ohai/plugins/dragonflybsd/network.rb +1 -0
- data/lib/ohai/plugins/dragonflybsd/platform.rb +1 -0
- data/lib/ohai/plugins/ec2.rb +16 -9
- data/lib/ohai/plugins/elixir.rb +1 -1
- data/lib/ohai/plugins/erlang.rb +2 -1
- data/lib/ohai/plugins/eucalyptus.rb +5 -2
- data/lib/ohai/plugins/filesystem.rb +5 -5
- data/lib/ohai/plugins/fips.rb +2 -1
- data/lib/ohai/plugins/freebsd/memory.rb +1 -0
- data/lib/ohai/plugins/freebsd/network.rb +1 -0
- data/lib/ohai/plugins/freebsd/platform.rb +1 -0
- data/lib/ohai/plugins/gce.rb +3 -2
- data/lib/ohai/plugins/go.rb +1 -1
- data/lib/ohai/plugins/groovy.rb +1 -1
- data/lib/ohai/plugins/haskell.rb +1 -0
- data/lib/ohai/plugins/hostname.rb +2 -1
- data/lib/ohai/plugins/init_package.rb +3 -2
- data/lib/ohai/plugins/java.rb +2 -1
- data/lib/ohai/plugins/joyent.rb +3 -2
- data/lib/ohai/plugins/kernel.rb +11 -6
- data/lib/ohai/plugins/keys.rb +2 -1
- data/lib/ohai/plugins/languages.rb +2 -1
- data/lib/ohai/plugins/libvirt.rb +2 -1
- data/lib/ohai/plugins/linode.rb +2 -1
- data/lib/ohai/plugins/linux/block_device.rb +10 -9
- data/lib/ohai/plugins/linux/hostnamectl.rb +3 -2
- data/lib/ohai/plugins/linux/interrupts.rb +4 -3
- data/lib/ohai/plugins/linux/ipc.rb +2 -1
- data/lib/ohai/plugins/linux/lsb.rb +8 -21
- data/lib/ohai/plugins/linux/lspci.rb +1 -0
- data/lib/ohai/plugins/linux/machineid.rb +5 -4
- data/lib/ohai/plugins/linux/mdadm.rb +3 -2
- data/lib/ohai/plugins/linux/memory.rb +39 -38
- data/lib/ohai/plugins/linux/network.rb +14 -13
- data/lib/ohai/plugins/linux/platform.rb +32 -31
- data/lib/ohai/plugins/linux/selinux.rb +1 -0
- data/lib/ohai/plugins/linux/sessions.rb +1 -0
- data/lib/ohai/plugins/linux/sysctl.rb +1 -0
- data/lib/ohai/plugins/linux/systemd_paths.rb +1 -0
- data/lib/ohai/plugins/linux/virtualization.rb +25 -24
- data/lib/ohai/plugins/lua.rb +1 -1
- data/lib/ohai/plugins/mono.rb +1 -1
- data/lib/ohai/plugins/netbsd/memory.rb +1 -0
- data/lib/ohai/plugins/netbsd/network.rb +1 -0
- data/lib/ohai/plugins/netbsd/platform.rb +1 -0
- data/lib/ohai/plugins/network.rb +2 -1
- data/lib/ohai/plugins/nodejs.rb +1 -1
- data/lib/ohai/plugins/ohai.rb +1 -0
- data/lib/ohai/plugins/ohai_time.rb +3 -2
- data/lib/ohai/plugins/openbsd/memory.rb +1 -0
- data/lib/ohai/plugins/openbsd/network.rb +1 -0
- data/lib/ohai/plugins/openbsd/platform.rb +1 -0
- data/lib/ohai/plugins/openstack.rb +2 -1
- data/lib/ohai/plugins/os.rb +6 -1
- data/lib/ohai/plugins/packages.rb +21 -0
- data/lib/ohai/plugins/passwd.rb +58 -1
- data/lib/ohai/plugins/perl.rb +2 -2
- data/lib/ohai/plugins/php.rb +1 -1
- data/lib/ohai/plugins/platform.rb +2 -1
- data/lib/ohai/plugins/powershell.rb +2 -2
- data/lib/ohai/plugins/ps.rb +2 -1
- data/lib/ohai/plugins/python.rb +2 -2
- data/lib/ohai/plugins/rackspace.rb +4 -3
- data/lib/ohai/plugins/root_group.rb +1 -0
- data/lib/ohai/plugins/ruby.rb +3 -2
- data/lib/ohai/plugins/rust.rb +1 -1
- data/lib/ohai/plugins/scala.rb +1 -0
- data/lib/ohai/plugins/scaleway.rb +2 -1
- data/lib/ohai/plugins/scsi.rb +1 -0
- data/lib/ohai/plugins/shard.rb +2 -2
- data/lib/ohai/plugins/shells.rb +4 -3
- data/lib/ohai/plugins/softlayer.rb +2 -1
- data/lib/ohai/plugins/solaris2/dmi.rb +2 -1
- data/lib/ohai/plugins/solaris2/memory.rb +1 -0
- data/lib/ohai/plugins/solaris2/network.rb +7 -8
- data/lib/ohai/plugins/solaris2/platform.rb +9 -15
- data/lib/ohai/plugins/solaris2/virtualization.rb +4 -3
- data/lib/ohai/plugins/ssh_host_key.rb +14 -13
- data/lib/ohai/plugins/sysconf.rb +1 -0
- data/lib/ohai/plugins/timezone.rb +1 -0
- data/lib/ohai/plugins/train.rb +36 -0
- data/lib/ohai/plugins/uptime.rb +3 -2
- data/lib/ohai/plugins/virtualbox.rb +2 -1
- data/lib/ohai/plugins/vmware.rb +3 -2
- data/lib/ohai/plugins/windows/dmi.rb +1 -0
- data/lib/ohai/plugins/windows/drivers.rb +2 -1
- data/lib/ohai/plugins/windows/memory.rb +1 -0
- data/lib/ohai/plugins/windows/network.rb +3 -2
- data/lib/ohai/plugins/windows/platform.rb +2 -1
- data/lib/ohai/plugins/windows/system_enclosure.rb +2 -1
- data/lib/ohai/plugins/windows/virtualization.rb +2 -1
- data/lib/ohai/plugins/zpools.rb +6 -3
- data/lib/ohai/provides_map.rb +2 -1
- data/lib/ohai/runner.rb +8 -5
- data/lib/ohai/system.rb +35 -7
- data/lib/ohai/train_transport.rb +29 -0
- data/lib/ohai/util/file_helper.rb +5 -37
- data/lib/ohai/util/ip_helper.rb +1 -0
- data/lib/ohai/util/win32.rb +2 -1
- data/lib/ohai/version.rb +4 -3
- data/ohai.gemspec +8 -7
- metadata +80 -60
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 57f034c4995360aa8eb45d92d95ddee35d307411506e57be5a55b9a5e58b52f3
|
4
|
+
data.tar.gz: dcffcadad6b0a1038b1715397ec2e9ee54000d42ac7cf3f2229e7bbe42e69395
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9198da99387e9dfcc99350cba0a7e1e95f2a1e1de7fecf4ecf76b311d38352214b1f76179aa20bcd42f0017f7a8c5d9e73f251c016eb9e8c83d4e0be234da0a8
|
7
|
+
data.tar.gz: bbd44815894afe658ab51d54088589f4c66d62a5099a81c93c48801a8aa454f9c8af38498b667a2fe51088889145a5b05cf376860459c4889453a088c066f9f5
|
data/Gemfile
CHANGED
@@ -1,28 +1,28 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
source "https://rubygems.org"
|
2
3
|
|
3
4
|
gemspec
|
4
5
|
|
6
|
+
# pull these gems from master of chef/chef so that we're testing against what we will release
|
7
|
+
gem "chef-config", git: "https://github.com/chef/chef", glob: "chef-config/chef-config.gemspec"
|
8
|
+
gem "chef-utils", git: "https://github.com/chef/chef", glob: "chef-utils/chef-utils.gemspec"
|
9
|
+
|
5
10
|
# NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
|
6
11
|
group :development do
|
7
12
|
gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
|
8
|
-
gem "
|
13
|
+
gem "ipaddr_extensions"
|
9
14
|
gem "rake", ">= 10.1.0"
|
15
|
+
gem "rspec-collection_matchers", "~> 1.0"
|
10
16
|
gem "rspec-core", "~> 3.0"
|
11
17
|
gem "rspec-expectations", "~> 3.0"
|
12
18
|
gem "rspec-mocks", "~> 3.0"
|
13
|
-
gem "
|
14
|
-
gem "
|
15
|
-
end
|
16
|
-
|
17
|
-
group :docs do
|
18
|
-
gem "yard"
|
19
|
-
gem "redcarpet"
|
20
|
-
gem "github-markup"
|
19
|
+
gem "rubocop-performance", "1.8.1"
|
20
|
+
gem "rubocop-rspec"
|
21
21
|
end
|
22
22
|
|
23
23
|
group :debug do
|
24
24
|
gem "pry"
|
25
25
|
gem "pry-byebug"
|
26
|
-
gem "pry-stack_explorer"
|
26
|
+
gem "pry-stack_explorer"
|
27
27
|
gem "rb-readline"
|
28
|
-
end
|
28
|
+
end
|
data/bin/ohai
CHANGED
@@ -1,4 +1,5 @@
|
|
1
1
|
#!/usr/bin/env ruby
|
2
|
+
# frozen_string_literal: true
|
2
3
|
#
|
3
4
|
# Author:: Adam Jacob (<adam@chef.io>)
|
4
5
|
# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
|
@@ -18,7 +19,7 @@
|
|
18
19
|
#
|
19
20
|
|
20
21
|
# if we're in a source code checkout, we want to run the code from that.
|
21
|
-
$:.unshift File.expand_path("
|
22
|
+
$:.unshift File.expand_path("../lib", __dir__)
|
22
23
|
require "ohai/application"
|
23
24
|
|
24
25
|
Ohai::Application.new.run
|
data/lib/ohai.rb
CHANGED
@@ -1,6 +1,7 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
#
|
2
3
|
# Author:: Adam Jacob (<adam@chef.io>)
|
3
|
-
# Copyright:: Copyright (c)
|
4
|
+
# Copyright:: Copyright (c) Chef Software Inc.
|
4
5
|
# License:: Apache License, Version 2.0
|
5
6
|
#
|
6
7
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
data/lib/ohai/application.rb
CHANGED
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
#
|
2
3
|
# Author:: Mathieu Sauve-Frankel <msf@kisoku.net>
|
3
4
|
# Copyright:: Copyright (c) 2009 Mathieu Sauve-Frankel.
|
@@ -56,6 +57,15 @@ class Ohai::Application
|
|
56
57
|
description: "Set the log file location, defaults to STDOUT - recommended for daemonizing",
|
57
58
|
proc: nil
|
58
59
|
|
60
|
+
option :target,
|
61
|
+
short: "-t TARGET",
|
62
|
+
long: "--target TARGET",
|
63
|
+
description: "Target Ohai against a remote system or device",
|
64
|
+
proc: lambda { |target|
|
65
|
+
Ohai::Log.warn "-- EXPERIMENTAL -- Target mode activated -- EXPERIMENTAL --"
|
66
|
+
target
|
67
|
+
}
|
68
|
+
|
59
69
|
option :help,
|
60
70
|
short: "-h",
|
61
71
|
long: "--help",
|
@@ -93,9 +103,39 @@ class Ohai::Application
|
|
93
103
|
|
94
104
|
load_workstation_config
|
95
105
|
|
106
|
+
merge_configs
|
107
|
+
|
108
|
+
if config[:target]
|
109
|
+
Ohai::Config.target_mode.host = config[:target]
|
110
|
+
if URI.parse(Ohai::Config.target_mode.host).scheme
|
111
|
+
train_config = Train.unpack_target_from_uri(Ohai::Config.target_mode.host)
|
112
|
+
Ohai::Config.target_mode = train_config
|
113
|
+
end
|
114
|
+
Ohai::Config.target_mode.enabled = true
|
115
|
+
Ohai::Config.node_name = Ohai::Config.target_mode.host unless Ohai::Config.node_name
|
116
|
+
end
|
117
|
+
|
96
118
|
Ohai::Log.init(Ohai.config[:log_location])
|
97
119
|
end
|
98
120
|
|
121
|
+
# @api private
|
122
|
+
def config_file_defaults
|
123
|
+
Ohai::Config.save(true)
|
124
|
+
end
|
125
|
+
|
126
|
+
# @api private
|
127
|
+
def config_file_settings
|
128
|
+
Ohai::Config.save(false)
|
129
|
+
end
|
130
|
+
|
131
|
+
# See lib/chef/knife.rb in the chef/chef github repo
|
132
|
+
#
|
133
|
+
# @api private
|
134
|
+
def merge_configs
|
135
|
+
config.replace(config_file_defaults.merge(default_config).merge(config_file_settings).merge(config))
|
136
|
+
Ohai::Config.merge!(config) # make them both the same
|
137
|
+
end
|
138
|
+
|
99
139
|
# Passes config and attributes arguments to Ohai::System then prints the results.
|
100
140
|
# Called by the run method after config / logging have been initialized
|
101
141
|
#
|
data/lib/ohai/common/dmi.rb
CHANGED
@@ -1,3 +1,4 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
#
|
2
3
|
# Author:: Kurt Yoder (ktyopscode@yoderhome.com)
|
3
4
|
# Copyright:: Copyright (c) 2010 Kurt Yoder
|
@@ -76,11 +77,11 @@ module Ohai
|
|
76
77
|
# away some of the less useful IDs
|
77
78
|
ID_TO_CAPTURE = [ 0, 1, 2, 3, 4, 6, 11 ].freeze
|
78
79
|
|
79
|
-
# the
|
80
|
+
# the allowlisted DMI IDs. This is combination of the defaults + any additional
|
80
81
|
# IDs defined in the :additional_dmi_ids config
|
81
82
|
#
|
82
83
|
# @return [Array] the list of DMI IDs to capture
|
83
|
-
def
|
84
|
+
def allowlisted_ids
|
84
85
|
if Ohai.config[:additional_dmi_ids]
|
85
86
|
if [ Integer, Array ].include?(Ohai.config[:additional_dmi_ids].class)
|
86
87
|
return ID_TO_CAPTURE + Array(Ohai.config[:additional_dmi_ids])
|
@@ -91,6 +92,10 @@ module Ohai
|
|
91
92
|
ID_TO_CAPTURE
|
92
93
|
end
|
93
94
|
|
95
|
+
##
|
96
|
+
# @deprecated Use the `allowlisted_ids` method instead.
|
97
|
+
alias whitelisted_ids allowlisted_ids
|
98
|
+
|
94
99
|
# the human readable description from a DMI ID
|
95
100
|
#
|
96
101
|
# @param id [String, Integer] the ID to lookup
|
@@ -152,7 +157,7 @@ module Ohai
|
|
152
157
|
end
|
153
158
|
end
|
154
159
|
|
155
|
-
module_function :id_lookup, :convenience_keys, :whitelisted_ids
|
160
|
+
module_function :id_lookup, :convenience_keys, :allowlisted_ids, :whitelisted_ids
|
156
161
|
end
|
157
162
|
end
|
158
163
|
end
|
data/lib/ohai/config.rb
CHANGED
@@ -1,7 +1,8 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
#
|
2
3
|
# Author:: Adam Jacob (<adam@chef.io>)
|
3
4
|
# Author:: Claire McQuin (<claire@chef.io>)
|
4
|
-
# Copyright:: Copyright (c)
|
5
|
+
# Copyright:: Copyright (c) Chef Software Inc.
|
5
6
|
# License:: Apache License, Version 2.0
|
6
7
|
#
|
7
8
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
@@ -27,14 +28,13 @@ module Ohai
|
|
27
28
|
# Reopens ChefConfig::Config to add Ohai configuration settings.
|
28
29
|
# see: https://github.com/chef/chef/blob/master/lib/chef/config.rb
|
29
30
|
class Config
|
30
|
-
|
31
31
|
config_context :ohai do
|
32
32
|
default :disabled_plugins, []
|
33
33
|
default :hints_path, [ ChefConfig::Config.platform_specific_path("/etc/chef/ohai/hints") ]
|
34
34
|
default :log_level, :auto
|
35
35
|
default :log_location, STDERR
|
36
36
|
default :plugin, ( Ohai::PluginConfig.new { |h, k| h[k] = Ohai::PluginConfig.new } )
|
37
|
-
default :plugin_path, [ File.expand_path(File.join(
|
37
|
+
default :plugin_path, [ File.expand_path(File.join(__dir__, "plugins")), ChefConfig::Config.platform_specific_path("/etc/chef/ohai/plugins") ]
|
38
38
|
default :critical_plugins, []
|
39
39
|
# causes all optional plugins to be run.
|
40
40
|
default :run_all_plugins, false
|
data/lib/ohai/dsl.rb
CHANGED
@@ -1,6 +1,7 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
#
|
2
3
|
# Author:: Serdar Sutay (<serdar@chef.io>)
|
3
|
-
# Copyright:: Copyright (c)
|
4
|
+
# Copyright:: Copyright (c) Chef Software Inc.
|
4
5
|
# License:: Apache License, Version 2.0
|
5
6
|
#
|
6
7
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
data/lib/ohai/dsl/plugin.rb
CHANGED
@@ -1,7 +1,8 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
#
|
2
3
|
# Author:: Adam Jacob (<adam@chef.io>)
|
3
4
|
# Author:: Claire McQuin (<claire@chef.io>)
|
4
|
-
# Copyright:: Copyright (c)
|
5
|
+
# Copyright:: Copyright (c) Chef Software Inc.
|
5
6
|
# License:: Apache License, Version 2.0
|
6
7
|
#
|
7
8
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
@@ -19,10 +20,11 @@
|
|
19
20
|
#
|
20
21
|
|
21
22
|
require_relative "../mixin/os"
|
22
|
-
require_relative "../mixin/
|
23
|
+
require_relative "../mixin/shell_out"
|
23
24
|
require_relative "../mixin/seconds_to_human"
|
25
|
+
require_relative "../mixin/which"
|
26
|
+
require_relative "../mixin/train_helpers"
|
24
27
|
require_relative "../hints"
|
25
|
-
require_relative "../util/file_helper"
|
26
28
|
|
27
29
|
module Ohai
|
28
30
|
|
@@ -83,13 +85,15 @@ module Ohai
|
|
83
85
|
class Plugin
|
84
86
|
|
85
87
|
include Ohai::Mixin::OS
|
86
|
-
include Ohai::Mixin::
|
88
|
+
include Ohai::Mixin::ShellOut
|
87
89
|
include Ohai::Mixin::SecondsToHuman
|
88
|
-
include Ohai::
|
90
|
+
include Ohai::Mixin::Which
|
91
|
+
include Ohai::Mixin::TrainHelpers
|
89
92
|
|
90
93
|
attr_reader :data
|
91
94
|
attr_reader :failed
|
92
95
|
attr_reader :logger
|
96
|
+
attr_accessor :transport_connection
|
93
97
|
|
94
98
|
def initialize(data, logger)
|
95
99
|
@data = data
|
@@ -98,6 +102,10 @@ module Ohai
|
|
98
102
|
@failed = false
|
99
103
|
end
|
100
104
|
|
105
|
+
def target_mode?
|
106
|
+
!!@transport_connection
|
107
|
+
end
|
108
|
+
|
101
109
|
def run
|
102
110
|
@has_run = true
|
103
111
|
|
@@ -1,6 +1,7 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
#
|
2
3
|
# Author:: Serdar Sutay (<serdar@chef.io>)
|
3
|
-
# Copyright:: Copyright (c)
|
4
|
+
# Copyright:: Copyright (c) Chef Software Inc.
|
4
5
|
# License:: Apache License, Version 2.0
|
5
6
|
#
|
6
7
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
@@ -46,7 +47,8 @@ module Ohai
|
|
46
47
|
:version7
|
47
48
|
end
|
48
49
|
|
49
|
-
#
|
50
|
+
# The source of the plugin on disk. This is an array since a plugin may exist for multiple
|
51
|
+
# oses and this would include each of those os specific file paths
|
50
52
|
#
|
51
53
|
# @return [Array]
|
52
54
|
def self.sources
|
@@ -61,7 +63,7 @@ module Ohai
|
|
61
63
|
@depends_attrs ||= []
|
62
64
|
end
|
63
65
|
|
64
|
-
# A block per
|
66
|
+
# A block per os for actually performing data collection constructed
|
65
67
|
# by the collect_data method
|
66
68
|
#
|
67
69
|
# @return [Mash]
|
@@ -101,15 +103,16 @@ module Ohai
|
|
101
103
|
!!@optional
|
102
104
|
end
|
103
105
|
|
104
|
-
# define data collection methodology per
|
106
|
+
# define data collection methodology per os
|
105
107
|
#
|
106
|
-
# @param
|
107
|
-
# @param
|
108
|
-
#
|
109
|
-
def self.collect_data(
|
110
|
-
[
|
111
|
-
|
112
|
-
|
108
|
+
# @param os [Array<Symbol>] the list of oses to collect data for
|
109
|
+
# @param block [block] the actual code to collect data for the specified os
|
110
|
+
#
|
111
|
+
def self.collect_data(*os_list, &block)
|
112
|
+
os_list = [ :default ] if os_list.empty?
|
113
|
+
os_list.flatten.each do |os|
|
114
|
+
Ohai::Log.warn("collect_data already defined on os '#{os}' for #{self}, last plugin seen will be used") if data_collector.key?(os)
|
115
|
+
data_collector[os] = block
|
113
116
|
end
|
114
117
|
end
|
115
118
|
|
@@ -120,12 +123,22 @@ module Ohai
|
|
120
123
|
|
121
124
|
def run_plugin
|
122
125
|
collector = self.class.data_collector
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
126
|
+
os = collect_os
|
127
|
+
|
128
|
+
# :default - means any remote or local unix or windows host
|
129
|
+
# :target - means any remote API which is not unix/windows or otherwise rubyable (cisco switches, IPMI console, HTTP API, etc)
|
130
|
+
#
|
131
|
+
# Do not be confused by the fact that collectors tagged :target do not run against e.g. target-mode ubuntu boxes, that is not
|
132
|
+
# what :target is intended for. Also, do not be confused by the fact that collectors tagged :default do not run by default against
|
133
|
+
# pure-target mode targets like switches. That is all intended behavior, the names are problematic. The :default nomenclature was
|
134
|
+
# invented 10 years before target mode and we are stuck with it.
|
135
|
+
#
|
136
|
+
if collector.key?(os)
|
137
|
+
instance_eval(&collector[os])
|
138
|
+
elsif collector.key?(:default) && !nonruby_target?
|
128
139
|
instance_eval(&collector[:default])
|
140
|
+
elsif collector.key?(:target) && nonruby_target?
|
141
|
+
instance_eval(&collector[:target])
|
129
142
|
else
|
130
143
|
logger.trace("Plugin #{name}: No data to collect. Skipping...")
|
131
144
|
end
|
data/lib/ohai/exception.rb
CHANGED
@@ -1,6 +1,7 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
#
|
2
3
|
# Author:: Adam Jacob (<adam@chef.io>)
|
3
|
-
# Copyright:: Copyright (c)
|
4
|
+
# Copyright:: Copyright (c) Chef Software Inc.
|
4
5
|
# License:: Apache License, Version 2.0
|
5
6
|
#
|
6
7
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
data/lib/ohai/hints.rb
CHANGED
@@ -1,6 +1,7 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
#
|
2
3
|
# Author:: Serdar Sutay (<serdar@chef.io>)
|
3
|
-
# Copyright:: Copyright (c)
|
4
|
+
# Copyright:: Copyright (c) Chef Software Inc.
|
4
5
|
# License:: Apache License, Version 2.0
|
5
6
|
#
|
6
7
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
data/lib/ohai/loader.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
#
|
2
2
|
# Author:: Claire McQuin (<claire@chef.io>)
|
3
|
-
# Copyright:: Copyright (c)
|
3
|
+
# Copyright:: Copyright (c) Chef Software Inc.
|
4
4
|
# License:: Apache License, Version 2.0
|
5
5
|
#
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
data/lib/ohai/log.rb
CHANGED
@@ -1,6 +1,7 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
#
|
2
3
|
# Author:: Adam Jacob (<adam@chef.io>)
|
3
|
-
# Copyright:: Copyright (c)
|
4
|
+
# Copyright:: Copyright (c) Chef Software Inc.
|
4
5
|
# License:: Apache License, Version 2.0
|
5
6
|
#
|
6
7
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
data/lib/ohai/mash.rb
CHANGED
@@ -1,6 +1,7 @@
|
|
1
|
+
# frozen_string_literal: true
|
1
2
|
#
|
2
3
|
# Author:: Tim Smith (<tsmith@chef.io>)
|
3
|
-
# Copyright::
|
4
|
+
# Copyright:: Copyright (c) Chef Software Inc.
|
4
5
|
# License:: Apache License, Version 2.0
|
5
6
|
#
|
6
7
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
@@ -31,7 +32,7 @@ module Ohai
|
|
31
32
|
#
|
32
33
|
module AzureMetadata
|
33
34
|
|
34
|
-
AZURE_METADATA_ADDR ||= "169.254.169.254"
|
35
|
+
AZURE_METADATA_ADDR ||= "169.254.169.254"
|
35
36
|
|
36
37
|
# it's important that the newer versions are at the end of this array so we can skip sorting it
|
37
38
|
AZURE_SUPPORTED_VERSIONS ||= %w{ 2017-04-02 2017-08-01 2017-12-01 2018-02-01 2018-04-02
|
@@ -0,0 +1,52 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
#
|
3
|
+
# Copyright:: Copyright (c) Chef Software Inc.
|
4
|
+
# License:: Apache License, Version 2.0
|
5
|
+
#
|
6
|
+
# Licensed under the Apache License, Version 2.0 (the "License");
|
7
|
+
# you may not use this file except in compliance with the License.
|
8
|
+
# You may obtain a copy of the License at
|
9
|
+
#
|
10
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
11
|
+
#
|
12
|
+
# Unless required by applicable law or agreed to in writing, software
|
13
|
+
# distributed under the License is distributed on an "AS IS" BASIS,
|
14
|
+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
15
|
+
# See the License for the specific language governing permissions and
|
16
|
+
# limitations under the License.
|
17
|
+
#
|
18
|
+
|
19
|
+
require_relative "../config"
|
20
|
+
require "singleton" unless defined?(Singleton)
|
21
|
+
|
22
|
+
module Ohai
|
23
|
+
module Mixin
|
24
|
+
# Common Dependency Injection wiring for ChefUtils-related modules
|
25
|
+
module ChefUtilsWiring
|
26
|
+
private
|
27
|
+
|
28
|
+
def __config
|
29
|
+
Ohai::Config
|
30
|
+
end
|
31
|
+
|
32
|
+
def __log
|
33
|
+
logger
|
34
|
+
end
|
35
|
+
|
36
|
+
def __transport_connection
|
37
|
+
transport_connection
|
38
|
+
end
|
39
|
+
|
40
|
+
# because of target mode we cache the PATH to avoid massive amounts of `echo $PATH` remote queries
|
41
|
+
#
|
42
|
+
def __env_path
|
43
|
+
PathCache.instance.path_cache ||= super
|
44
|
+
end
|
45
|
+
|
46
|
+
class PathCache
|
47
|
+
include Singleton
|
48
|
+
attr_accessor :path_cache
|
49
|
+
end
|
50
|
+
end
|
51
|
+
end
|
52
|
+
end
|