summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2021-04-29 11:27:54 -0700
committerGitHub <noreply@github.com>2021-04-29 11:27:54 -0700
commit1f63db195a828875095ed761f547404a928d6fec (patch)
tree48adc46cb78c094063c3bf6775306a014bd77280
parentee7082bedd9ddbbf4c4c5524f9806620cc217c08 (diff)
parent49b58746eae9f68cd755992cecd90f8682fa639d (diff)
downloadchef-1f63db195a828875095ed761f547404a928d6fec.tar.gz
Merge pull request #11480 from chef/fix_urls
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--lib/chef/compliance/reporter/automate.rb2
-rw-r--r--lib/chef/compliance/runner.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/compliance/reporter/automate.rb b/lib/chef/compliance/reporter/automate.rb
index 23514c857d..c40631771d 100644
--- a/lib/chef/compliance/reporter/automate.rb
+++ b/lib/chef/compliance/reporter/automate.rb
@@ -44,7 +44,7 @@ class Chef
end
unless @url && @token
- raise "CMPL006: data_collector.token and data_collector.server_url must be configured in client.rb! Further information: https://docs.chef.io/chef_compliance_phase/#direct-reporting-to-chef-automate"
+ raise "CMPL006: data_collector.token and data_collector.server_url must be configured in client.rb! Further information: https://docs.chef.io/automate/data_collection/#configure-your-chef-infra-client-to-send-data-to-chef-automate-without-chef-infra-server"
end
end
diff --git a/lib/chef/compliance/runner.rb b/lib/chef/compliance/runner.rb
index 3f754e8259..ec68fe141a 100644
--- a/lib/chef/compliance/runner.rb
+++ b/lib/chef/compliance/runner.rb
@@ -288,7 +288,7 @@ class Chef
# supports it.
Array(node["audit"]["reporter"]).each do |type|
unless SUPPORTED_REPORTERS.include? type
- raise "CMPL003: '#{type}' found in node['audit']['reporter'] is not a supported reporter for Compliance Phase. Supported reporters are: #{SUPPORTED_REPORTERS.join(", ")}. For more information, see the documentation at https://docs.chef.io/chef_compliance_phase/chef_compliance_runners/#reporters"
+ raise "CMPL003: '#{type}' found in node['audit']['reporter'] is not a supported reporter for Compliance Phase. Supported reporters are: #{SUPPORTED_REPORTERS.join(", ")}. For more information, see the documentation at https://docs.chef.io/chef_compliance_phase#reporters"
end
@reporters[type] = reporter(type)
@@ -297,7 +297,7 @@ class Chef
unless (fetcher = node["audit"]["fetcher"]).nil?
unless SUPPORTED_FETCHERS.include? fetcher
- raise "CMPL002: Unrecognized Compliance Phase fetcher (node['audit']['fetcher'] = #{fetcher}). Supported fetchers are: #{SUPPORTED_FETCHERS.join(", ")}, or nil. For more information, see the documentation at https://docs.chef.io/chef_compliance_phase/chef_compliance_runners/#fetchers"
+ raise "CMPL002: Unrecognized Compliance Phase fetcher (node['audit']['fetcher'] = #{fetcher}). Supported fetchers are: #{SUPPORTED_FETCHERS.join(", ")}, or nil. For more information, see the documentation at https://docs.chef.io/chef_compliance_phase#fetch-profiles"
end
end
@validation_passed = true