diff options
| author | danielsdeleo <dan@chef.io> | 2016-11-01 10:31:59 -0700 |
|---|---|---|
| committer | danielsdeleo <dan@chef.io> | 2016-11-02 08:06:38 -0700 |
| commit | 34d2b287c6a7ee0afb303b49054a25fd96f0a30a (patch) | |
| tree | 6ea2f411cfe0c90106f67ddee222a90dfabeaaa9 | |
| parent | ee4a4c2a80511fcfa36e3de3b3b1cffa0c689f77 (diff) | |
| download | chef-34d2b287c6a7ee0afb303b49054a25fd96f0a30a.tar.gz | |
Update release notes for automatic data collectionkey-auth-data-collector
Also, Chef Server 12.10 was released, so we will most likely require
12.11+ for the feature to work.
Signed-off-by: Daniel DeLeo <dan@chef.io>
| -rw-r--r-- | RELEASE_NOTES.md | 14 | ||||
| -rw-r--r-- | lib/chef/data_collector.rb | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 1e1920b600..6f48c2db94 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -31,5 +31,19 @@ There will likely be some missed attribute changes and some bugs that need fixin added command line options to print out all attribute changes or filter them (hint: PRs accepted), or to add source file and line numbers to the event (hint: PRs accepted). +* Added automatic connection to Chef Automate's Data Collector when + using a Chef Server that supports it: + +Chef Client will automatically attempt to connect to the Chef Server +authenticated data collector proxy. If you have a supported version of +Chef Server and have enabled this feature on the Chef Server, Chef +Client run data will automatically be forwarded to Automate without +additional Chef Client configuration. If you do not have Automate or the +feature is disabled on the Chef Server, Chef Client will detect this and +disable data collection. + +Note that Chef Server 12.11.0+ (not yet released as of the time this was +written) is required for this feature. + ## Highlighted bug fixes for this release: diff --git a/lib/chef/data_collector.rb b/lib/chef/data_collector.rb index f544a4b044..cf860d81e2 100644 --- a/lib/chef/data_collector.rb +++ b/lib/chef/data_collector.rb @@ -60,7 +60,7 @@ class Chef end if !solo? && token_auth_configured? Chef::Log.warn("Data collector token authentication is not recommended for client-server mode" \ - "Please upgrade Chef Server to 12.9.2+ and remove the token from your config file " \ + "Please upgrade Chef Server to 12.11.0 and remove the token from your config file " \ "to use key based authentication instead") end true |