Merge branch '745-overops-updates'

Signed-off-by: Ben Hale <bhale@pivotal.io>

Author: nebhale

docs/framework-takipi_agent.md

@@ -18,11 +18,13 @@ The credential payload can contain the following entries.
 
 | Name | Description
 | ---- | -----------
-| `secret_key` | (Optional) The agent installation key
-| `collector_host` | (Optional) The remote collector hostname or IP 
-| `collector_port` | (Optional) the remote collector port
+| `collector_host` | The remote collector hostname or IP 
+| `collector_port` | the remote collector port (TCP)
+| `secret_key` | (DEPRECATED) The agent installation key for running collector alongside agent
 
-Setting `secret_key` will run a local collector alongside the agent. Setting `collector_host` will use a remote collector. More information can be found in [OverOps Remote Collector][]
+Setting `collector_host` and `collector_port` will connect to a remote collector. More information can be found in [OverOps Remote Collector][]
+ 
+(DEPRECATED)Setting `secret_key` will run a local collector alongside the agent. 
 
 ## Configuration
 For general information on configuring the buildpack, including how to specify configuration values through environment variables, refer to [Configuration and Extension][].
@@ -32,7 +34,7 @@ The framework can be configured by modifying the [`config/takipi_agent.yml`][] f
 | Name | Description
 | ---- | -----------
 | `node_name_prefix` | Node name prefix, will be concatenated with `-` and instance index
-| `application_name` | Override the Cloudfoundry default application name
+| `application_name` | Override the CloudFoundry default application name
 
 ## Logs
 
@@ -49,5 +51,5 @@ If your container is running out of memory and exited with status 137, then you
 [Configuration and Extension]: ../README.md#configuration-and-extension
 [repositories]: extending-repositories.md
 [version syntax]: extending-repositories.md#version-syntax-and-ordering
-[OverOps Remote Collector]: https://support.overops.com/hc/en-us/articles/227109628-Remote-Daemon-Process-
+[OverOps Remote Collector]: https://doc.overops.com/docs/install-collector
 [OverOps Service]: https://www.overops.com

lib/java_buildpack/framework/takipi_agent.rb

@@ -77,14 +77,14 @@ def application_name
       def config_env_vars(credentials)
         env = @droplet.environment_variables
 
-        secret_key = credentials['secret_key']
-        env.add_environment_variable 'TAKIPI_SECRET_KEY', secret_key if secret_key
-
         collector_host = credentials['collector_host']
-        env.add_environment_variable 'TAKIPI_MASTER_HOST', collector_host if collector_host
+        env.add_environment_variable 'TAKIPI_COLLECTOR_HOST', collector_host if collector_host
 
         collector_port = credentials['collector_port']
-        env.add_environment_variable 'TAKIPI_MASTER_PORT', collector_port if collector_port
+        env.add_environment_variable 'TAKIPI_COLLECTOR_PORT', collector_port if collector_port
+
+        secret_key = credentials['secret_key']
+        env.add_environment_variable 'TAKIPI_SECRET_KEY', secret_key if secret_key
       end
 
       def lib

spec/java_buildpack/framework/takipi_agent_spec.rb

@@ -64,7 +64,7 @@
       it 'updates user environment variables' do
         component.release
 
-        expect(environment_variables).to include('TAKIPI_MASTER_HOST=test-host')
+        expect(environment_variables).to include('TAKIPI_COLLECTOR_HOST=test-host')
       end
 
       context 'with secret key' do