Merge branch 'main' into release-rs-fuya-fuya

Author: rrelledge

build/components/example.py

@@ -11,17 +11,19 @@
 GO_OUTPUT = 'Output:'
 TEST_MARKER = {
     'java': '@Test',
-    'c#': '\[Fact\]'
+    'c#': '\[Fact\]|\[SkipIfRedis\(.*\)\]'
 }
 PREFIXES = {
     'python': '#',
     'node.js': '//',
     'java': '//',
     'go': '//',
     'c#': '//',
-    'redisvl': '#'
+    'redisvl': '#',
+    'php': '//'
 }
 
+
 class Example(object):
     language = None
     path = None

content/commands/ft.config-set/index.md

@@ -35,7 +35,7 @@ Set the value of a RediSearch configuration parameter.
 
 Values set using `FT.CONFIG SET` are not persisted after server restart.
 
-RediSearch configuration parameters are detailed in [Configuration parameters]({{< relref "/develop/interact/search-and-query/administration" >}}).
+RediSearch configuration parameters are detailed in [Configuration parameters]({{< relref "/develop/interact/search-and-query/basic-constructs/configuration-parameters" >}}).
 
 {{% alert title="Note" color="warning" %}}
 As detailed in the link above, not all RediSearch configuration parameters can be set at runtime.

content/develop/connect/clients/client-side-caching.md

@@ -82,7 +82,7 @@ will use cached data, except for the following:
     [probabilistic data types]({{< relref "/develop/data-types/probabilistic" >}}).
     These types are designed to be updated frequently, which means that caching
     has little or no benefit.
--   Non-deterministic commands such as [`HGETALL`]({{< relref "/commands/hgetall" >}}),
+-   Non-deterministic commands such as [`HRANDFIELD`]({{< relref "/commands/hrandfield" >}}),
     [`HSCAN`]({{< relref "/commands/hscan" >}}),
     and [`ZRANDMEMBER`]({{< relref "/commands/zrandmember" >}}). By design, these commands
     give different results each time they are called.

content/develop/connect/clients/java/jedis.md

@@ -468,9 +468,13 @@ All the Jedis exceptions are runtime exceptions and in most cases irrecoverable,
 
 ### DNS cache and Redis
 
-When you connect to a Redis with multiple endpoints, such as [Redis Enterprise Active-Active](https://redis.com/redis-enterprise/technology/active-active-geo-distribution/), it's recommended to disable the JVM's DNS cache to load-balance requests across multiple endpoints.
+When you connect to a Redis server with multiple endpoints, such as [Redis Enterprise Active-Active](https://redis.com/redis-enterprise/technology/active-active-geo-distribution/), you *must*
+disable the JVM's DNS cache. If a server node or proxy fails, the IP address for any database
+affected by the failure will change. When this happens, your app will keep
+trying to use the stale IP address if DNS caching is enabled.
+
+Use the following code to disable the DNS cache:
 
-You can do this in your application's code with the following snippet:
 ```java
 java.security.Security.setProperty("networkaddress.cache.ttl","0");
 java.security.Security.setProperty("networkaddress.cache.negative.ttl", "0");

content/develop/connect/clients/java/lettuce.md

@@ -296,9 +296,12 @@ In this setup, `LettuceConnectionFactory` is a custom class you would need to im
 
 ## DNS cache and Redis
 
-When you connect to a Redis database with multiple endpoints, such as Redis Enterprise Active-Active, it's recommended to disable the JVM's DNS cache to load-balance requests across multiple endpoints.
+When you connect to a Redis server with multiple endpoints, such as [Redis Enterprise Active-Active](https://redis.com/redis-enterprise/technology/active-active-geo-distribution/), you *must*
+disable the JVM's DNS cache. If a server node or proxy fails, the IP address for any database
+affected by the failure will change. When this happens, your app will keep
+trying to use the stale IP address if DNS caching is enabled.
 
-You can do this in your application's code with the following snippet:
+Use the following code to disable the DNS cache:
 
 ```java
 java.security.Security.setProperty("networkaddress.cache.ttl","0");

content/develop/reference/eviction/index.md

@@ -0,0 +1,13 @@
+## Supported upgrade paths
+
+<span title="Check mark icon">&#x2705;</span> Supported – You can upgrade directly from the current Redis Software cluster version.
+
+<span title="X icon">:x:</span> Not supported – You cannot upgrade directly from the current Redis Software cluster version. You must first upgrade to a supported intermediate version.
+
+| Current Redis Software cluster version | Upgrade to Redis Software 6.2.x | Upgrade to Redis Software 6.4.x | Upgrade to Redis Software 7.2.x | Upgrade to Redis Software 7.4.x |
+|:-----------------------:|:----------------:|:----------------:|:----------------:|:----------------:|
+| 6.0.x | <span title="Supported">&#x2705;</span> | <span title="Supported">&#x2705;</span> | <span title="Supported">&#x2705;</span> | <span title="Not supported">:x:</span> |
+| 6.2.4<br />6.2.8 | – | <span title="Supported">&#x2705;</span> | <span title="Supported">&#x2705;</span> | <span title="Supported">&#x2705;</span> |
+| 6.2.10<br />6.2.12<br />6.2.18 | – | <span title="Supported">&#x2705;</span> | <span title="Supported">&#x2705;</span> | <span title="Supported">&#x2705;</span> |
+| 6.4.x | – | – | <span title="Supported">&#x2705;</span> |  <span title="Supported">&#x2705;</span> |
+| 7.2.x | – | – | – | <span title="Supported">&#x2705;</span> |

content/embeds/rs-upgrade-paths.md

@@ -43,7 +43,7 @@ The **Copy** button copies the account key to the Clipboard.
 
 **API user keys** (also known as _secret keys_) are used as the value of the `x-api-secret-key` HTTP header used to authenticate a REST API request.
 
-In this context, _user_ refers to the account used to sign in to the Redis Cloud console.  Users must be account owners.
+In this context, _user_ refers to the account used to sign in to the Redis Cloud console.  Users must have an owner (read-write) or viewer (read-only) role.
 
 Users can have more than one user key; however, users should not share user keys.
 
@@ -62,7 +62,7 @@ The key name:
 - Must be between 10 and 50 characters long
 - Can contain alphanumeric characters, hyphens, and underscores. Spaces are not allowed.
 
-The user name must be an account owner.
+The user name must have an owner or viewer role.
 
 Select **Create** to create the new key.  
 
@@ -123,4 +123,4 @@ To manage the CIDR allow list:
 
     Use the **Edit** button to change the address for a rule or the **Delete button** to remove a rule.
 
-    {{<image filename="images/rc/button-access-management-cidr-rule-edit.png#no-click" alt="Use the **Edit** button to change the address for a CIDR allow list rule." class="inline">}} &nbsp; {{<image filename="images/rc/button-access-management-cidr-rule-delete.png#no-click" alt="Use the **Delete** button to remove an address from the CIDR allow list." class="inline" >}} 
+    {{<image filename="images/rc/button-access-management-cidr-rule-edit.png#no-click" alt="Use the **Edit** button to change the address for a CIDR allow list rule." class="inline">}} &nbsp; {{<image filename="images/rc/button-access-management-cidr-rule-delete.png#no-click" alt="Use the **Delete** button to remove an address from the CIDR allow list." class="inline" >}} 

content/operate/rc/api/get-started/manage-api-keys.md

@@ -12,15 +12,98 @@ toc: 'true'
 weight: $weight
 ---
 If you encounter any issues that you are not able to resolve yourself
-and need to [contact Redis support](https://redis.com/company/support/) for assistance, you can create a
-support package that gathers all essential information to help debug
+and need to [contact Redis support](https://redis.io/support/) for assistance, you can [create a support package](#create-support-package) that gathers all essential information to help debug
 your issues.
 
 {{< note >}}
 The process of creating the support package can take several minutes and generates load on the system.
 {{< /note >}}
 
-## Cluster Manager UI method
+## Support package files
+
+The support package is a zip file that contains all cluster configuration and logs.
+
+When downloaded from the Cluster Manager UI, the support package's name is `debuginfo.tar.gz`.
+
+### Database support package files
+
+Cluster and database support packages collect database details in `database_<bdb_uid>` directories, where `<bdb_uid>` is the database ID, and Redis shard details in `<node_uid>` directories.
+
+The following table describes the included files:
+
+| File | Description |
+|------|-------------|
+| ccs-redis.json | Primary node's local cluster configuration store (CCS). |
+| /database_<bdb_uid>/ | Directory that includes files for a specific database.<bdb_uid> is the database ID. |
+| database_<bdb_uid>_ccs_info.txt | Database information from the cluster configuration store (CCS). Includes settings for databases, endpoints, shards, replicas, and CRDB. |
+| database_<bdb_uid>.clientlist | List of clients connected to the database when the support package was created. |
+| database_<bdb_uid>.info | Redis information and statistics for the database. See [`INFO`]({{<relref "/commands/info">}}) for details about the collected fields. |
+| database_<bdb_uid>.rladmin | Database information. See [`rladmin info db`]({{<relref "/operate/rs/references/cli-utilities/rladmin/info#info-db">}}) for an example of collected fields. Also includes creation time, last changed time, Redis version, memory limit, persistence type, eviction policy, hashing policy, and whether SSL, backups, and email alerts are enabled. |
+| database_<bdb_uid>.slowlog | Contains slowlog output, which includes commands that took longer than 10 milliseconds. Only included if `slowlog_in_sanitized_support` is `true` in cluster settings. |
+| /node_<node_uid>/redis_<shard_uid>.txt | For each shard of the specified database only. Includes shard configuration and [information]({{<relref "/commands/info">}}), slowlog information, and latency information. |
+
+### Node support package files
+
+Cluster and node support packages collect node details in `node_<node_uid>` directories, where `<node_uid>` is the node ID.
+
+The following table describes the included files:
+
+| File | Description |
+|------|-------------|
+| ccs-redis.json | The node's local cluster configuration store (CCS). |
+| /conf/ | Directory that contains configuration files. |
+| /logs/ | Directory that includes logs. |
+| node_<node_uid>.ccs | Includes cluster configuration, node configuration, and DMC proxy configuration. |
+| node_<node_uid>_envoy_config.json | Envoy configuration. |
+| node_<node_uid>.rladmin | Information about the cluster's nodes, databases, endpoints, and shards. See [`rladmin status`]({{<relref "/operate/rs/references/cli-utilities/rladmin/status">}}) for example output. |
+| node_<node_uid>_sys_info.txt | Node's system information including:<br />• Socket files list<br />• Log files list<br />• Processes running on the node<br />• Disk usage<br />• Persistent files list<br />• Memory usage<br />• Network interfaces<br />• Installed packages<br />• Active iptables<br />• OS and platform<br />• Network connection<br />• Status of Redis processes |
+| redis_<shard_uid>.txt | For each shard of the specified database only. Includes shard configuration and [information]({{<relref "/commands/info">}}), slowlog information, and latency information. |
+
+Each node's `/conf/` directory contains the following files:
+
+- bootstrap_status.json
+- ccs-paths.conf
+- config.json
+- envoy.yaml
+- gossip_envoy.yaml
+- heartbeatd-config.json
+- last_bootstrap.json
+- local_addr.conf
+- node.id
+- node_local_config.json
+- redislabs_env_config.sh
+- socket.conf
+- supervisord_alert_mgr.conf
+- supervisord_cm_server.conf
+- supervisord_crdb_coordinator.conf
+- supervisord_crdb_worker.conf
+- supervisord_mdns_server.conf
+- supervisord_pdns_server.conf
+
+Each node's `/conf/` directory also contains the following key and cert modulus files:
+
+- api_cert.modulus
+- api_key.modulus
+- ccs_internode_encryption_cert.modulus
+- ccs_internode_encryption_key.modulus
+- cm_cert.modulus
+- cm_key.modulus
+- data_internode_encryption_cert.modulus
+- data_internode_encryption_key.modulus
+- gossip_ca_signed_cert.modulus
+- gossip_ca_signed_key.modulus
+- mesh_ca_signed_cert.modulus
+- mesh_ca_signed_key.modulus
+- metrics_exporter_cert.modulus
+- metrics_exporter_key.modulus
+- proxy_cert.modulus
+- proxy_key.modulus
+- syncer_cert.modulus
+- syncer_key.modulus
+
+## Create support package
+
+### Cluster Manager UI method
 
 To create a support package from the Cluster Manager UI:
 
@@ -34,7 +117,7 @@ To create a support package from the Cluster Manager UI:
 
 1. The package is created and downloaded by your browser.
 
-## Command-line method
+### Command-line method
 
 If package creation fails with `internal error` or if you cannot access the UI, create a support package for the cluster from the command line on any node in the cluster using the [`rladmin cluster debug_info`]({{< relref "/operate/rs/references/cli-utilities/rladmin/cluster/debug_info" >}}) command: 
 
@@ -66,7 +149,7 @@ If package creation fails with `internal error` or if you cannot access the UI,
 
 Upload the tar file to [Redis support](https://redis.com/company/support/). The path to the archive is shown in the command output.
 
-## REST API method
+### REST API method
 
 You can also use `debuginfo` [REST API]({{< relref "/operate/rs/references/rest-api" >}}) requests to create and download support packages.
 

content/operate/rs/installing-upgrading/creating-support-package.md

@@ -8,6 +8,7 @@ categories:
 description: The product lifecycle of Redis Enterprise Software.
 linkTitle: Product lifecycle
 weight: 100
+tocEmbedHeaders: true
 ---
 The Redis Enterprise Software product lifecycle fully reflects the [subscription agreement](https://redis.com/software-subscription-agreement).
 However, for any discrepancy between the two policies, the subscription agreement prevails.
@@ -47,3 +48,7 @@ This update to the EOL policy allows a lead time of at least 24 months to upgrad
 | 5.6 – April 2020                          | October 31, 2021  |
 | 5.4 – December 2018                       | December 31, 2020  |
 | 5.2 – June 2018                           | December 31, 2019  |
+
+{{<embed-md "rs-upgrade-paths.md">}}
+
+For detailed upgrade instructions, see [Upgrade a Redis Enterprise Software cluster]({{<relref "/operate/rs/installing-upgrading/upgrading/upgrade-cluster">}}).