Skip to content

Commit

Permalink
Merge branch 'main' into 24504-enhancement-for-kv-engine-ui-behavior
Browse files Browse the repository at this point in the history
  • Loading branch information
hashishaw authored Dec 13, 2023
2 parents c515159 + 98d0125 commit 51b1fb0
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 4 deletions.
2 changes: 1 addition & 1 deletion website/content/api-docs/auth/aws.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -1057,7 +1057,7 @@ for more information on the signature types.
when using the ec2 auth method.
- `signature` `(string: <required-ec2>)` - Base64-encoded SHA256 RSA signature of
the instance identity document, which can usually be obtained from the
`http://169.254.169.254/latest/dynamic/instance-identity/document` endpoint.
`http://169.254.169.254/latest/dynamic/instance-identity/signature` endpoint.
Either both this _AND_ `identity` must be set _OR_ `pkcs7` must be set
when using the ec2 auth method.
- `pkcs7` `(string: <required-ec2>)` - PKCS#7 signature of the identity document
Expand Down
14 changes: 14 additions & 0 deletions website/content/docs/commands/operator/raft.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,20 @@ Usage: vault operator raft snapshot restore <snapshot_file>
$ vault operator raft snapshot restore raft.snap
```

### snapshot inspect

Inspects a snapshot file taken from a Vault Raft cluster and prints a table showing the number of keys and the amount of space used.

```text
Usage: vault operator raft snapshot inspect <snapshot_file>
```

For example:

```shell-session
$ vault operator raft snapshot inspect raft.snap
```

## autopilot

This command groups subcommands for operators interacting with the autopilot
Expand Down
7 changes: 5 additions & 2 deletions website/content/docs/configuration/storage/raft.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ set [`disable_mlock`](/vault/docs/configuration#disable_mlock) to `true`, and to
This value can be overridden by setting the `VAULT_RAFT_PATH` environment variable.

- `node_id` `(string: "")` - The identifier for the node in the Raft cluster.
This value can be overridden by setting the `VAULT_RAFT_NODE_ID` environment variable.
You can override `node_id` with the `VAULT_RAFT_NODE_ID` environment
variable. When `VAULT_RAFT_NODE_ID` is unset, Vault assigns a random
GUID during initialization and writes the value to `data/node-id` in the
directory specified by the `path` parameter.

- `performance_multiplier` `(integer: 0)` - An integer multiplier used by
servers to scale key Raft timing parameters, where each increment translates to approximately 1 – 2 seconds of delay. For example, setting the multiplier to "3" translates to 3 – 6 seconds of total delay. Tuning the multiplier affects the time it
Expand Down Expand Up @@ -124,7 +127,7 @@ delay) mode. The maximum allowed value is 10.
breaking a large value into chunks. By default, the chunk size is the same as
Raft's max size log entry. The default value for this configuration is 1048576
-- two times the chunking size.
- **Note:** This option corresponds to [Consul's `kv_max_value_size` parameter](https://developer.hashicorp.com/consul/docs/agent/config/config-files#kv_max_value_size) for
- **Note:** This option corresponds to [Consul's `kv_max_value_size` parameter](/consul/docs/agent/config/config-files#kv_max_value_size) for
Vault clusters using a Consul storage backend. If you are migrating from Consul
storage to Raft Integrated Storage, and have changed this value in Consul from its
default to a value larger than the Integrated Storage default of 1MB, then you will
Expand Down
2 changes: 1 addition & 1 deletion website/content/docs/sync/azurekv.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Prerequisites:
1. Configure a sync destination with the service principal credentials and Key Vault URI created in the previous steps.

```shell-session
$ vault write sys/sync/stores/azure-kv/my-azure-1 \
$ vault write sys/sync/destinations/azure-kv/my-azure-1 \
key_vault_uri="$KEY_VAULT_URI" \
client_id="$CLIENT_ID" \
client_secret="$CLIENT_SECRET" \
Expand Down

0 comments on commit 51b1fb0

Please sign in to comment.