Merge

Author: cshollingsworth

managing-cf/app-event.html.md.erb

@@ -10,20 +10,14 @@ This topic explains how to query the Cloud Controller API (CAPI) to retrieve cur
 
 ## <a id='target'></a> Target and Log In
 
-To perform the procedures in this topic, you must target the endpoint of your Cloud Controller and log in. If you do not have the cf CLI installed, see the [Installing the cf CLI](../../cf-cli/install-go-cli.html) topic.
+To perform the procedures in this topic, you must authenticate to your Cloud Controller.  There are two ways of doing this:
 
-There are two ways to target your Cloud Controller endpoint. You can run the following `curl` command to target the endpoint and log in:
-<pre class='terminal'>
-$ curl "https://app-usage.YOUR-SYSTEM-DOMAIN/system_report/app_usages" -k -v \
--H "authorization: `cf oauth-token`"
-</pre>
-
-You can also use `cf curl` to retrieve information. To use `cf curl`, do the following:
+* Run `curl` commands that include the Cloud Controller endpoint and pass in your authorization token each time with the `-H` flag.
 
- 1. Target the endpoint of your Cloud Controller:
+* Run `cf curl` commands without including the endpoint or token. To do this, you must first use the Cloud Controller Command-Line Interface (cf CLI) to target the endpoint of your Cloud Controller and log in, as follows:
+    1. Target the endpoint of your Cloud Controller:
   <pre class='terminal'>$ cf api api.YOUR-SYSTEM-DOMAIN</pre>
-
- 1. Log in as admin or as an Org Manager or Org Auditor for the org you want to obtain information about.
+    1. Log in as admin or as an Org Manager or Org Auditor for the org you want to obtain information about.
   <pre class='terminal'>
   $ cf login -u admin
   API endpoint:  api.YOUR-SYSTEM-DOMAIN
@@ -38,8 +32,8 @@ You can also use `cf curl` to retrieve information. To use `cf curl`, do the fol
   User:            user<span>@</span>example.com
   Org:             YOUR-ORG
   Space:           development
-  </pre>
-
+  </pre>  
+    If you do not have the cf CLI installed, see the [Installing the cf CLI](../../cf-cli/install-go-cli.html) topic
 
 ## <a id='obtain_apps'></a> Obtain App Information
 

metrics/_diego.html.md.erb

@@ -48,8 +48,8 @@ Default Origin Name: bbs
  ConvergenceTasksPruned                                  | Cumulative number of times the BBS has deleted a malformed Task during its Task convergence pass. Emitted every 30 seconds.
  CrashedActualLRPs                                       | Total number of LRP instances that have crashed. Emitted every 30 seconds.
  CrashingDesiredLRPs                                     | Total number of DesiredLRPs that have at least one crashed instance. Emitted every 30 seconds.
- Domain.cf-apps                                          | Whether the 'cf-apps' domain is up-to-date, so that CF apps from CC have been synchronized with DesiredLRPs for Diego to run. `1` means the domain is up-to-date, no data means it is not. Emitted every 30 seconds.
- Domain.cf-tasks                                         | Whether the 'cf-tasks' domain is up-to-date, so that CF tasks from CC have been synchronized with tasks for Diego to run. `1` means the domain is up-to-date, no data means it is not. Emitted every 30 seconds.
+ Domain.cf-apps                                          | Whether the <code>cf-apps</code> domain is up-to-date. Also known as [domain freshness](https://github.com/cloudfoundry/bbs/blob/master/doc/lrps.md#domain-freshness), this key metric indicates that CF apps from Cloud Controller have been synchronized with DesiredLRPs for Diego to run. When the domain is not up-to-date, Diego does not take corrective actions to ensure eventual consistency. In particular, Diego refuses to stop extra app instances that have no corresponding desired state.<br><br> A value of <code>1</code> means the domain is up-to-date, no data means it is not. Emitted every 30 seconds.
+ Domain.cf-tasks                                         | Whether the <code>cf-tasks</code> domain is up-to-date. Also known as [domain freshness](https://github.com/cloudfoundry/bbs/blob/master/doc/lrps.md#domain-freshness), this key metric indicates that CF tasks from Cloud Controller have been synchronized with tasks for Diego to run. When the domain is not up-to-date, Diego does not take corrective actions to ensure eventual consistency.<br><br> A value of  <code>1</code> means the domain is up-to-date, no data means it is not.  Emitted every 30 seconds.
  ETCDLeader                                              | Index of the leader node in the etcd cluster. Emitted every 30 seconds.
  ETCDRaftTerm                                            | Raft term of the etcd cluster. Emitted every 30 seconds.
  ETCDReceivedBandwidthRate                               | Number of bytes per second received by the follower etcd node. Emitted every 30 seconds.