docs/telemetry: remove merge conflict remnant (#3882)

* remove merge conflict remnant * s/auth/authentication
hashicorp · Feb 1, 2018 · 1d310fa · 1d310fa
1 parent 75ed6b9
commit 1d310fa
Showing 1 changed file with 1 addition and 62 deletions.
diff --git a/website/source/docs/internals/telemetry.html.md b/website/source/docs/internals/telemetry.html.md
@@ -62,67 +62,6 @@ The following sections describe available Vault metrics. The metrics interval ca
 
 These metrics represent operational aspects of the running Vault instance.
 
-<<<<<<< HEAD
-| Metric           | Description                       | Unit | Type |
-| ---------------- | ----------------------------------| ---- | ---- |
-|`vault.audit.log_request`| This measures the number of audit log requests | Number of requests | Summary |
-|`vault.audit.log_response`| This measures the number of audit log responses | Number of responses | Summary |
-|`vault.barrier.delete`| This measures the number of delete operations at the barrier | Number of operations | Summary |
-|`vault.barrier.get`| This measures the number of get operations at the barrier | Number of operations | Summary |
-|`vault.barrier.put`| This measures the number of put operations at the barrier | Number of operations | Summary |
-|`vault.barrier.list`| This measures the number of list operations at the barrier | Number of operations | Counter |
-|`vault.core.check_token`| This measures the number of token checks | Number of checks | Summary |
-|`vault.core.fetch_acl_and_token`| This measures the number of ACL and corresponding token entry fetches | Number of fetches | Summary |
-|`vault.core.handle_request`| This measures the number of requests | Number of requests | Summary |
-|`vault.core.handle_login_request`| This measures the number of login requests | Number of requests | Summary |
-|`vault.core.leadership_setup_failed`| This measures the number of cluster leadership setup failures | Number of failures | Summary |
-|`vault.core.leadership_lost`| This measures the number of cluster leadership losses | Number of losses | Summary |
-|`vault.core.post_unseal` | This measures the number of post-unseal operations | Number of operations | Gauge |
-|`vault.core.pre_seal`| This measures the number of pre-seal operations | Number of operations | Gauge |
-|`vault.core.seal-with-request`| This measures the number of requested seal operations | Number of operations | Gauge |
-|`vault.core.seal`| This measures the number of seal operations | Number of operations | Gauge |
-|`vault.core.seal-internal`| This measures the number of internal seal operations | Number of operations | Gauge |
-|`vault.core.step_down`| This measures the number of cluster leadership step downs | Number of stepdowns | Summary |
-|`vault.core.unseal`| This measures the number of unseal operations | Number of operations | Summary |
-|`vault.runtime.alloc_bytes` | This measures the number of bytes allocated by the Vault process. This may burst from time to time but should return to a steady state value.| Number of bytes | Gauge |
-|`vault.runtime.free_count`| This measures the number of `free` operations | Number of operations | Gauge |
-|`vault.runtime.heap_objects`| This measures the number of objects on the heap and is a good general memory pressure indicator | Number of heap objects | Gauge |
-|`vault.runtime.malloc_count`| This measures the number of `malloc` operations | Number of operations | Gauge |
-|`vault.runtime.num_goroutines`| This measures the number of goroutines and serves as a general load indicator | Number of goroutines| Gauge |
-|`vault.runtime.sys_bytes`| This measures the number of bytes allocated to Vault and includes what is being used by the heap and what has been reclaimed but not given back| Number of bytes | Gauge |
-|`vault.runtime.total_gc_pause_ns` | This measures the total garbage collector pause time since the Vault instance was last started | Nanosecond | Summary |
-| `vault.runtime.total_gc_runs` | Total number of garbage collection runs since the Vault instance was last started  | Number of operations | Gauge |
-
-### Policy and Token Metrics
-
-These metrics relate to policies and tokens.
-
-| Metric           | Description                       | Unit | Type |
-| ---------------- | ----------------------------------| ---- | ---- |
-`vault.expire.fetch-lease-times`| This measures the number of lease time fetch operations | Number of operations | Gauge |
-`vault.expire.fetch-lease-times-by-token`| This measures the number of operations which compute lease times by token | Number of operations | Gauge |
-`vault.expire.num_leases`| This measures the number of expired leases | Number of expired leases | Gauge |
-`vault.expire.revoke`| This measures the number of revoke operations | Number of operations | Counter |
-`vault.expire.revoke-force`| This measures the number of forced revoke operations | Number of operations | Counter |
-`vault.expire.revoke-prefix`| This measures the number of operations used to revoke all secrets with a given prefix | Number of operations | Counter |
-`vault.expire.revoke-by-token`| This measures the number of operations used to revoke all secrets issued with a given token | Number of operations | Counter |
-`vault.expire.renew`| This measures the number of renew operations | Number of operations | Counter |
-`vault.expire.renew-token`| This measures the number of renew token operations to renew a token which does not need to invoke a logical backend | Number of operations | Gauge |
-`vault.expire.register`| This measures the number of register operations which  take a request and response with an associated lease and register a lease entry with lease ID | Number of operations | Gauge |
-`vault.expire.register-auth`| This measures the number of register auth operations which create lease entries without lease ID | Number of operations | Gauge |
-`vault.policy.get_policy`| This measures the number of policy get operations | Number of operations | Counter |
-`vault.policy.list_policies`| This measures the number of policy list operations | Number of operations | Counter |
-`vault.policy.delete_policy`| This measures the number of policy delete operations | Number of operations | Counter |
-`vault.policy.set_policy`| This measures the number of policy set operations | Number of operations | Gauge |
-`vault.token.create`| This measures the number of token create operations | Number of operations | Gauge |
-`vault.token.createAccessor`| This measures the number of Token ID identifier operations | Number of operations | Gauge |
-`vault.token.lookup`| This measures the number of token lookups | Number of lookups | Counter |
-`vault.token.revoke`| This measures the number of token revocation operations | Number of operations | Gauge |
-`vault.token.revoke-tree`| This measures the number of revoke tree operations | Number of operations | Gauge |
-`vault.token.store`| This measures the number of operations to store an updated token entry without writing to the secondary index | Number of operations | Gauge |
-
-### Auth Method Metrics
-=======
 ### vault.audit.log_request
 
 **[S]** Summary (Number of requests): Number of audit log requests
@@ -349,7 +288,7 @@ Thes operations take a request and response with an associated lease and registe
 
 ## Authentication Backend Metrics
 
-These metrics relate to supported auth methods.
+These metrics relate to supported authentication methods.
 
 ### vault.rollback.attempt.auth-token-