diff options
author | Tim Smith <tsmith@chef.io> | 2020-12-18 11:53:26 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-18 11:53:26 -0800 |
commit | 6340df95bf409287e36fc6cc4c7dd386e3a09ba4 (patch) | |
tree | a5be781ce156f4adc5bfa344b848196e0a2fa986 | |
parent | ccafde3ee0b1e82473ed92101e801cb38bc9ba0d (diff) | |
parent | ddfc5d8eca813349de350e8b692f1a35f95d4421 (diff) | |
download | chef-6340df95bf409287e36fc6cc4c7dd386e3a09ba4.tar.gz |
Merge pull request #10755 from chef/update-link-to-compliance-phase-troubleshooting-docs
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | lib/chef/compliance/fetcher/automate.rb | 4 | ||||
-rw-r--r-- | lib/chef/compliance/fetcher/chef_server.rb | 4 | ||||
-rw-r--r-- | lib/chef/compliance/reporter/automate.rb | 3 | ||||
-rw-r--r-- | lib/chef/compliance/reporter/chef_server_automate.rb | 4 |
4 files changed, 7 insertions, 8 deletions
diff --git a/lib/chef/compliance/fetcher/automate.rb b/lib/chef/compliance/fetcher/automate.rb index c86da331c2..b254684280 100644 --- a/lib/chef/compliance/fetcher/automate.rb +++ b/lib/chef/compliance/fetcher/automate.rb @@ -7,8 +7,8 @@ class Chef class Automate < ::InspecPlugins::Compliance::Fetcher name "chef-automate" - # it positions itself before `compliance` fetcher - # only load it, if you want to use audit cookbook in Chef Solo with Chef Automate + # Positions this fetcher before Chef InSpec's `compliance` fetcher. + # Only load this file if you want to use Compliance Phase in Chef Solo with Chef Automate. priority 502 CONFIG = { diff --git a/lib/chef/compliance/fetcher/chef_server.rb b/lib/chef/compliance/fetcher/chef_server.rb index db56aa82a7..96a2213b69 100644 --- a/lib/chef/compliance/fetcher/chef_server.rb +++ b/lib/chef/compliance/fetcher/chef_server.rb @@ -95,11 +95,11 @@ class Chef def handle_http_error_code(code) case code when /401|403/ - Chef::Log.error "Auth issue: see audit cookbook TROUBLESHOOTING.md" + Chef::Log.error "Auth issue: see the Compliance Phase troubleshooting documentation (http://docs.chef.io/chef_compliance_phase/#troubleshooting)." when /404/ Chef::Log.error "Object does not exist on remote server." when /413/ - Chef::Log.error "You most likely hit the erchef request size in #{ChefUtils::Dist::Server::PRODUCT} that defaults to ~2MB. To increase this limit see audit cookbook TROUBLESHOOTING.md OR https://docs.chef.io/config_rb_server.html" + Chef::Log.error "You most likely hit the erchef request size in #{ChefUtils::Dist::Server::PRODUCT} that defaults to ~2MB. To increase this limit see the Compliance Phase troubleshooting documentation (http://docs.chef.io/chef_compliance_phase/#troubleshooting) or the Chef Infra Server configuration documentation (https://docs.chef.io/server/config_rb_server/)" when /429/ Chef::Log.error "This error typically means the data sent was larger than #{ChefUtils::Dist::Automate::PRODUCT}'s limit (4 MB). Run InSpec locally to identify any controls producing large diffs." end diff --git a/lib/chef/compliance/reporter/automate.rb b/lib/chef/compliance/reporter/automate.rb index ed5c4837d0..cae0256085 100644 --- a/lib/chef/compliance/reporter/automate.rb +++ b/lib/chef/compliance/reporter/automate.rb @@ -36,8 +36,7 @@ class Chef end unless @url && @token - Chef::Log.warn "data_collector.token and data_collector.server_url must be defined in client.rb!" - Chef::Log.warn "Further information: https://github.com/chef-cookbooks/audit#direct-reporting-to-chef-automate" + Chef::Log.warn "data_collector.token and data_collector.server_url must be defined in client.rb! Further information: https://docs.chef.io/chef_compliance_phase/#direct-reporting-to-chef-automate" return false end diff --git a/lib/chef/compliance/reporter/chef_server_automate.rb b/lib/chef/compliance/reporter/chef_server_automate.rb index f0eba27816..46ca7dc7ba 100644 --- a/lib/chef/compliance/reporter/chef_server_automate.rb +++ b/lib/chef/compliance/reporter/chef_server_automate.rb @@ -76,11 +76,11 @@ class Chef def handle_http_error_code(code) case code when /401|403/ - Chef::Log.error "Auth issue: see audit cookbook TROUBLESHOOTING.md" + Chef::Log.error "Auth issue: see the Compliance Phase troubleshooting documentation (http://docs.chef.io/chef_compliance_phase/#troubleshooting)." when /404/ Chef::Log.error "Object does not exist on remote server." when /413/ - Chef::Log.error "You most likely hit the erchef request size in #{ChefUtils::Dist::Server::PRODUCT} that defaults to ~2MB. To increase this limit see audit cookbook TROUBLESHOOTING.md OR https://docs.chef.io/config_rb_server.html" + Chef::Log.error "You most likely hit the erchef request size in #{ChefUtils::Dist::Server::PRODUCT} that defaults to ~2MB. To increase this limit see the Compliance Phase troubleshooting documentation (http://docs.chef.io/chef_compliance_phase/#troubleshooting) or the Chef Infra Server configuration documentation (https://docs.chef.io/server/config_rb_server/)" when /429/ Chef::Log.error "This error typically means the data sent was larger than #{ChefUtils::Dist::Automate::PRODUCT}'s limit (4 MB). Run InSpec locally to identify any controls producing large diffs." end |