mirror of
https://github.com/status-im/consul.git
synced 2025-01-13 15:26:48 +00:00
fix a couple html errors (#4456)
This commit is contained in:
parent
2710ae4159
commit
30d27d8356
@ -103,7 +103,7 @@ populate the query before it is executed. All of the string fields inside the
|
||||
}
|
||||
}
|
||||
```
|
||||
This will map all names of the form "<service>.query.consul" over DNS to a query
|
||||
This will map all names of the form `<service>.query.consul` over DNS to a query
|
||||
that will select an instance of the service in the agent's own network segment.
|
||||
|
||||
Using templates, it is possible to apply prepared query behaviors to many
|
||||
|
@ -67,7 +67,7 @@ $ consul agent -retry-join "provider=aws tag_key=... tag_value=..."
|
||||
- `access_key_id` (optional) - the AWS access key for authentication (see below for more information about authenticating).
|
||||
- `secret_access_key` (optional) - the AWS secret access key for authentication (see below for more information about authenticating).
|
||||
|
||||
#### Authentication & Precedence
|
||||
#### Authentication & Precedence
|
||||
|
||||
- Static credentials `access_key_id=... secret_access_key=...`
|
||||
- Environment variables (`AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`)
|
||||
@ -134,7 +134,7 @@ $ consul agent -retry-join "provider=gce project_name=... tag_value=..."
|
||||
- `zone_pattern` (optional) - the list of zones can be restricted through an RE2 compatible regular expression. If omitted, servers in all zones are returned.
|
||||
- `credentials_file` (optional) - the credentials file for authentication. See below for more information.
|
||||
|
||||
#### Authentication & Precedence
|
||||
#### Authentication & Precedence
|
||||
|
||||
- Use credentials from `credentials_file`, if provided.
|
||||
- Use JSON file from `GOOGLE_APPLICATION_CREDENTIALS` environment variable.
|
||||
@ -164,7 +164,7 @@ $ consul agent -retry-join "provider=softlayer datacenter=... tag_value=... user
|
||||
```
|
||||
|
||||
- `provider` (required) - the name of the provider ("softlayer" in this case).
|
||||
- <a name="sl_datacenter"></a><a href="#sl_datacenter"><code>datacenter</code></a></a> (required) - the name of the datacenter to auto-join in.
|
||||
- <a name="sl_datacenter"></a><a href="#sl_datacenter"><code>datacenter</code></a> (required) - the name of the datacenter to auto-join in.
|
||||
- `tag_value` (required) - the value of the tag to auto-join on.
|
||||
- `username` (required) - the username to use for auth.
|
||||
- `api_key` (required) - the api key to use for auth.
|
||||
|
@ -1257,10 +1257,10 @@ Consul will not enable TLS for the HTTP API unless the `https` port has been ass
|
||||
* <a name="telemetry-circonus_check_search_tag"></a><a href="#telemetry-circonus_check_search_tag">`circonus_check_search_tag`</a>
|
||||
A special tag which, when coupled with the instance id, helps to narrow down the search results when neither a Submission URL or Check ID is provided. By default, this is set to service:application name (e.g. "service:consul").
|
||||
|
||||
* <a name="telemetry-circonus_check_display_name"</a><a href="#telemetry-circonus_check_display_name">`circonus_check_display_name`</a>
|
||||
* <a name="telemetry-circonus_check_display_name"></a><a href="#telemetry-circonus_check_display_name">`circonus_check_display_name`</a>
|
||||
Specifies a name to give a check when it is created. This name is displayed in the Circonus UI Checks list. Available in Consul 0.7.2 and later.
|
||||
|
||||
* <a name="telemetry-circonus_check_tags"</a><a href="#telemetry-circonus_check_tags">`circonus_check_tags`</a>
|
||||
* <a name="telemetry-circonus_check_tags"></a><a href="#telemetry-circonus_check_tags">`circonus_check_tags`</a>
|
||||
Comma separated list of additional tags to add to a check when it is created. Available in Consul 0.7.2 and later.
|
||||
|
||||
* <a name="telemetry-circonus_broker_id"></a><a href="#telemetry-circonus_broker_id">`circonus_broker_id`</a>
|
||||
@ -1352,7 +1352,7 @@ Consul will not enable TLS for the HTTP API unless the `https` port has been ass
|
||||
`tls_prefer_server_cipher_suites`</a> Added in Consul 0.8.2, this will cause Consul to prefer the
|
||||
server's ciphersuite over the client ciphersuites.
|
||||
|
||||
* <a name="translate_wan_addrs"</a><a href="#translate_wan_addrs">`translate_wan_addrs`</a> If
|
||||
* <a name="translate_wan_addrs"></a><a href="#translate_wan_addrs">`translate_wan_addrs`</a> If
|
||||
set to true, Consul will prefer a node's configured <a href="#_advertise-wan">WAN address</a>
|
||||
when servicing DNS and HTTP requests for a node in a remote datacenter. This allows the node to
|
||||
be reached within its own datacenter using its local address, and reached from other datacenters
|
||||
|
@ -373,14 +373,12 @@ These metrics are used to monitor the health of the Consul servers.
|
||||
<td>ms</td>
|
||||
<td>timer</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr>
|
||||
<td>`consul.raft.fsm.apply`</td>
|
||||
<td>This metric gives the number of logs committed since the last interval. </td>
|
||||
<td>commit logs / interval</td>
|
||||
<td>counter</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr>
|
||||
<td>`consul.raft.fsm.restore`</td>
|
||||
<td>This metric measures the time taken by the FSM to restore its state from a snapshot.</td>
|
||||
@ -521,7 +519,6 @@ These metrics are used to monitor the health of the Consul servers.
|
||||
<td>timer</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<tr>
|
||||
<td>`consul.raft.rpc.requestVote`</td>
|
||||
<td>This metric measures the time taken to process the request vote RPC call.</td>
|
||||
<td>ms</td>
|
||||
@ -532,6 +529,7 @@ These metrics are used to monitor the health of the Consul servers.
|
||||
<td>This metric measures the time taken to process the installSnapshot RPC call. This metric should only be seen on agents which are currently in the follower state.</td>
|
||||
<td>ms</td>
|
||||
<td>timer</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>`consul.raft.replication.appendEntries.rpc`</td>
|
||||
<td>This metric measures the time taken by the append entries RFC, to replicate the log entries of a leader agent onto its follower agent(s)</td>
|
||||
@ -784,6 +782,7 @@ These metrics are used to monitor the health of the Consul servers.
|
||||
<td>ms</td>
|
||||
<td>timer</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>`consul.txn.read`</td>
|
||||
<td>This measures the time spent returning a read transaction.</td>
|
||||
<td>ms</td>
|
||||
|
@ -39,6 +39,7 @@ For more details on the specifics of upgrading, see the [upgrading page](/docs/u
|
||||
<td>0.1 - 0.3</td>
|
||||
<td>1</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>0.4</td>
|
||||
<td>1, 2</td>
|
||||
</tr>
|
||||
@ -57,4 +58,3 @@ For more details on the specifics of upgrading, see the [upgrading page](/docs/u
|
||||
</table>
|
||||
|
||||
-> **Note:** Raft Protocol is versioned separately, but maintains compatibility with at least one prior version. See [here](https://www.consul.io/docs/upgrade-specific.html#raft-protocol-version-compatibility) for details.
|
||||
|
||||
|
@ -85,7 +85,7 @@ with the `-cleanup-dead-servers=false` option.
|
||||
## Server Health Checking
|
||||
|
||||
An internal health check runs on the leader to track the stability of servers.
|
||||
</br>A server is considered healthy if all of the following conditions are true:
|
||||
<br>A server is considered healthy if all of the following conditions are true:
|
||||
|
||||
- It has a SerfHealth status of 'Alive'
|
||||
- The time since its last contact with the current leader is below
|
||||
|
@ -38,7 +38,7 @@ options, but it is recommended to have 3 or 5 total servers per datacenter. A
|
||||
single server deployment is _**highly**_ discouraged as data loss is inevitable
|
||||
in a failure scenario. We start the next servers **without** specifying
|
||||
`-bootstrap`. This is critical, since only one server should ever be running in
|
||||
bootstrap mode*. Once `Node B` and `Node C` are started, you should see a
|
||||
bootstrap mode. Once `Node B` and `Node C` are started, you should see a
|
||||
message to the effect of:
|
||||
|
||||
```text
|
||||
|
@ -67,7 +67,7 @@ As part of supporting the [HCL](https://github.com/hashicorp/hcl#syntax) format
|
||||
|
||||
#### Deprecated Options Have Been Removed
|
||||
|
||||
All of Consul's previously deprecated command line flags and config options have been removed, so these will need to be mapped to their equivalents before upgrading. Here's the complete list of removed options and their equivalents:</summary>
|
||||
All of Consul's previously deprecated command line flags and config options have been removed, so these will need to be mapped to their equivalents before upgrading. Here's the complete list of removed options and their equivalents:
|
||||
|
||||
| Removed Option | Equivalent |
|
||||
| -------------- | ---------- |
|
||||
@ -585,4 +585,3 @@ fails for some reason, it is not fatal. The older version of the server
|
||||
will simply panic and stop. At that point, you can upgrade to the new version
|
||||
and restart the agent. There will be no data loss and the cluster will
|
||||
resume operations.
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user