Skip to content

Commit

Permalink
Merge branch 'main' into latest
Browse files Browse the repository at this point in the history
  • Loading branch information
dwdougherty committed Jun 14, 2024
2 parents 353aca3 + 1efdfd6 commit 07e5e2e
Show file tree
Hide file tree
Showing 51 changed files with 194 additions and 167 deletions.
2 changes: 1 addition & 1 deletion content/develop/connect/insight/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Redis Insight is a powerful tool for visualizing and optimizing data in Redis or

* Automatically discover and add your local Redis or Redis Stack databases (that use standalone connection type and do not require authentication).
* Discover your databases in Redis Enterprise Cluster and databases with Flexible plans in Redis Cloud.
* Use a form to enter your connection details and add any Redis database running anywhere (including OSS Cluster, Sentinel).
* Use a form to enter your connection details and add any Redis database running anywhere (including Redis Community Edition Cluster or Sentinel).

<img src="images/Databases.png">

Expand Down
2 changes: 1 addition & 1 deletion content/develop/data-types/json/developer.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ make pytest # run flow tests using RLTest
GEN=1 # run general tests on a standalone Redis topology
AOF=1 # run AOF persistency tests on a standalone Redis topology
SLAVES=1 # run replication tests on standalone Redis topology
CLUSTER=1 # run general tests on a OSS Redis Cluster topology
CLUSTER=1 # run general tests on a Redis Community Edition Cluster topology
VALGRIND|VG=1 # run specified tests with Valgrind
VERBOSE=1 # display more RLTest-related information
Expand Down
2 changes: 1 addition & 1 deletion content/develop/data-types/timeseries/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ $ redis-server --loadmodule ./redistimeseries.so COMPACTION_POLICY max:1m:1h; CH

### OSS_GLOBAL_PASSWORD

Global OSS cluster password used for connecting to other shards.
Global Redis Community Edition cluster password used for connecting to other shards.

#### Default

Expand Down
2 changes: 1 addition & 1 deletion content/develop/get-started/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ to split your data set into multiple Redis instances, please read the
Redis Ltd., the company sponsoring Redis development, has developed a
"Redis on Flash" solution that uses a mixed RAM/flash approach for
larger data sets with a biased access pattern. You may check their offering
for more information, however this feature is not part of the open source Redis
for more information, however this feature is not part of the Redis Community Edition
code base.

## Can you use Redis with a disk-based database?
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ $ redis-server --loadmodule ./redisearch.so UPGRADE_INDEX idx PREFIX 1 tt LANGUA

### OSS_GLOBAL_PASSWORD

Global oss cluster password that will be used to connect to other shards.
Global Redis Community Edition cluster password that will be used to connect to other shards.

#### Default

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ Run the following from the project root dir:

```make build``` will build RediSearch.

`make build COORD=1` will build OSS RediSearch Coordinator.
`make build COORD=1` will build Redis Community Edition RediSearch Coordinator.

`make build STATIC=1` will build as a static library.

Expand Down
2 changes: 1 addition & 1 deletion content/embeds/cluster-dns-embed.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
By default, Redis Enterprise Software deployments use DNS to communicate between nodes. You can also use the [Discovery Service]({{< relref "/operate/rs/databases/durability-ha/discovery-service" >}}), which uses IP addresses to connect and complies with the [Redis Sentinel API]({{< relref "/operate/oss_and_stack/management/sentinel" >}}) supported by open source Redis.
By default, Redis Enterprise Software deployments use DNS to communicate between nodes. You can also use the [Discovery Service]({{< relref "/operate/rs/databases/durability-ha/discovery-service" >}}), which uses IP addresses to connect and complies with the [Redis Sentinel API]({{< relref "/operate/oss_and_stack/management/sentinel" >}}) supported by Redis Community Edition.

Each node in a Redis Enterprise cluster includes a small DNS server to manage internal functions, such as high availability, automatic failover, automatic migration, and so on.
Nodes should only run the DNS server included with the software. Running additional DNS servers can lead to unexpected behavior.
Expand Down
4 changes: 2 additions & 2 deletions content/embeds/compatible-with-oss.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Yes we are. Not only are we are the home of Redis, but most of the core engineers on open source Redis also work here. We contribute extensively to the open source Redis project. As a rule, we adhere to the open source’s specifications and make every effort to update our service with its latest versions.
Yes we are. Not only are we are the home of Redis, but most of the core engineers on Redis Community Edition also work here. We contribute extensively to the Redis Community Edition project. As a rule, we adhere to the Redis Community Edition’s specifications and make every effort to update our service with its latest versions.

That said, the following Redis features are not applicable in the context of our service:

Expand All @@ -15,7 +15,7 @@ That said, the following Redis features are not applicable in the context of our
- [REPLCONF](http://redis.io/commands/REPLCONF)
- [SLAVEOF](http://redis.io/commands/SLAVEOF)
- [SYNC](http://redis.io/commands/SYNC)/[PSYNC](http://redis.io/commands/PSYNC)
- Redis Enterprise clustering technology is different than the open source Redis Cluster and supports clustering in a seamless manner that works with all standard Redis clients. As a result, [all Cluster related commands](http://redis.io/commands#cluster) are blocked and show an error when used.
- Redis Enterprise clustering technology is different than the Redis Community Edition Cluster and supports clustering in a seamless manner that works with all standard Redis clients. As a result, [all Cluster related commands](http://redis.io/commands#cluster) are blocked and show an error when used.
- Redis Enterprise clustering technology allows [multiple active proxies](http://docs.redislabs.com/latest/rs/databases/configure/proxy-policy.md). As a result, the CLIENT ID command cannot guarantee incremental IDs between clients who connect to different nodes under multi proxy policies.
- Commands that aren’t relevant for a hosted Redis service are blocked:
- [CONFIG RESETSTAT](http://redis.io/commands/CONFIG-RESETSTAT)
Expand Down
2 changes: 1 addition & 1 deletion content/embeds/what-is-redis-enterprise.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Redis has enhanced open source Redis with a technology layer that encapsulates open source Redis, while fully supporting all its commands, data structures and modules. It adds exceptional flexibility, stable high performance and unmatched resilience, as well as multiple deployment choices (public and private clouds, on-premises, hybrid, RAM-Flash combination), topology (active-active, active-passive, active-replica) and support for very large dataset sizes. This enhanced and exponentially more powerful database platform is Redis Enterprise.
Redis has enhanced Redis Community Edition with a technology layer that encapsulates Redis CE, while fully supporting all its commands, data structures and modules. It adds exceptional flexibility, stable high performance and unmatched resilience, as well as multiple deployment choices (public and private clouds, on-premises, hybrid, RAM-Flash combination), topology (active-active, active-passive, active-replica) and support for very large dataset sizes. This enhanced and exponentially more powerful database platform is Redis Enterprise.

Learn more about [Redis Enterprise](https://redislabs.com/why-redis/redis-enterprise/).
6 changes: 3 additions & 3 deletions content/get-started/_index.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
description: Get started with source available Redis
description: Get started with Redis Community Edition
hideListLinks: true
linkTitle: Source available
title: Source available
linkTitle: Community Edition
title: Community Edition
type: develop
---
Redis is an [in-memory data store]({{< relref "/develop/get-started/data-store" >}}) used by millions of developers as a cache, [vector database]({{< relref "/develop/get-started/vector-database" >}}), [document database]({{< relref "/develop/get-started/document-database" >}}), [streaming engine]({{< relref "/develop/data-types/streams" >}}), and message broker. Redis has built-in replication and different levels of [on-disk persistence]({{< relref "/operate/oss_and_stack/management/persistence" >}}). It supports complex [data types]({{< relref "/develop/data-types/" >}}) (for example, strings, hashes, lists, sets, sorted sets, and JSON), with atomic operations defined on those data types.
Expand Down
2 changes: 1 addition & 1 deletion content/glossary/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ The on-premises version of Redis Enterprise.
{{%/definition%}}

{{%definition "Redis instance"%}}
Single-threaded Redis OSS database.
Single-threaded Redis Community Edition database. Redis OSS was renamed Redis Community Edition (CE) with the v7.4 release.
{{%/definition%}}

{{%definition "Auto Tiering "%}}
Expand Down
4 changes: 2 additions & 2 deletions content/integrate/riot/replication.md
Original file line number Diff line number Diff line change
Expand Up @@ -384,12 +384,12 @@ Do note that the source database is specified first and the target database is s
riot -h <source EC host> -p <source EC port> --db <index> replicate -h <target RE host> -p <target RE port> --pass <RE password>
```

#### EC Single Master -> RE with OSS Cluster
#### EC Single Master -> RE with Redis Community Edition Cluster
```
riot -h <source EC host> -p <source EC port> replicate -h <target RE host> -p <target RE port> --pass <RE password> --cluster
```

#### Live EC Cluster -> RE with OSS Cluster
#### Live EC Cluster -> RE with Redis Community Edition Cluster

```
riot -h <source EC host> -p <source EC port> --cluster replicate --mode live -h <target RE host> -p <target RE port> --pass <RE password> --cluster
Expand Down
2 changes: 1 addition & 1 deletion content/operate/kubernetes/old-index.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ simple way to get a Redis Enterprise cluster on Kubernetes as well as enables mo
{{% comment %}}
## What is Redis Enterprise?

Redis is the most popular database used with Docker containers. Redis Enterprise (Redise) extends open source Redis and delivers stable high performance, linear scaling and high availability with significant operational savings.
Redis is the most popular database used with Docker containers. Redis Enterprise (Redise) extends Redis Community Edition and delivers stable high performance, linear scaling and high availability with significant operational savings.

We use the Docker container for 4.5 version of Redis Enterprise for the steps here. You can find more information on the container image on [Docker Hub](https://hub.docker.com/r/redislabs/redis/) and see details on how to deploy the container locally with Docker below:

Expand Down
6 changes: 3 additions & 3 deletions content/operate/oss_and_stack/_index.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: Redis OSS and Stack
description: Operate Redis OSS and Redis Stack
linkTitle: Redis OSS and Stack
title: Redis Community Edition and Stack
description: Operate Redis Community Edition and Redis Stack. Redis OSS was renamed Redis Community Edition (CE) with the v7.4 release.
linkTitle: Redis Community Edition and Stack
---
2 changes: 1 addition & 1 deletion content/operate/oss_and_stack/reference/_index.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: Reference
description: Redis OSS and Redis Stack reference documentation
description: Redis Community Edition and Redis Stack reference documentation
linkTitle: Reference
---
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ aliases:
- /develop/interact/programmability/triggers-and-functions/concepts/cluster_support/
---

**Notice**: On an OSS cluster, before executing any gears function, you must send a `REDISGEARS_2.REFRESHCLUSTER` command to all the shards so that they will be aware of the cluster topology. Without this step, each shard will act as a single OSS instance.
**Notice**: On a Redis Community Edition cluster, before executing any gears function, you must send a `REDISGEARS_2.REFRESHCLUSTER` command to all the shards so that they will be aware of the cluster topology. Without this step, each shard will act as a single Redis Community Edition instance.

Triggers and functions support cross-shard operation on Redis clusters. This means that it is possible to call a function that will be invoked on another shard. We call such a function a remote function.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Prior to v1.2, RedisGears only supported Python. However, an internal C API exis

RedisGears is implemented by a Redis module. To use RedisGears, you'll need to make sure that your Redis deployment has the module installed. [Redis Enterprise Software](https://docs.redislabs.com/latest/rs/) supports the module natively.

If you're running open source Redis, you'll also need to [install the RedisGears module]({{< relref "/operate/oss_and_stack/stack-with-enterprise/gears-v1/installing-redisgears" >}}) before using it.
If you're running Redis Community Edition, you'll also need to [install the RedisGears module]({{< relref "/operate/oss_and_stack/stack-with-enterprise/gears-v1/installing-redisgears" >}}) before using it.

To get started with RedisGears, see the quick start tutorial for [Python]({{< relref "/operate/oss_and_stack/stack-with-enterprise/gears-v1/python/quickstart" >}}) or [Java]({{< relref "/operate/oss_and_stack/stack-with-enterprise/gears-v1/jvm/quickstart" >}}).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ For this tutorial, you need:

- Either:
- A Redis Enterprise cluster with the [RedisGears module and Python plugin installed]({{< relref "/operate/oss_and_stack/stack-with-enterprise/gears-v1/installing-redisgears#install-redisgears" >}}) and [enabled on a database]({{< relref "/operate/oss_and_stack/stack-with-enterprise/gears-v1/python/install" >}})
- An OSS Redis database with the RedisGears module
- An Redis Community Edition database with the RedisGears module
- `redis-cli` with connectivity to a Redis database

## RedisGears basics
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ weight: 30

Redis Stack adds support for the [JSON data structure](http://www.json.org/) to Redis databases.

Applications developed with the [open source version of RedisJSON](https://github.com/RedisJSON/RedisJSON) are 100%
Applications developed with the [source available version of RedisJSON](https://github.com/RedisJSON/RedisJSON) are 100%
compatible with Redis Enterprise databases with JSON enabled.

## JSON paths
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,90 +24,120 @@ First, create a policy to use for the new instance role:
{
"Version": "2012-10-17",
"Statement": [
{
"Version": "2012-10-17",
"Statement": [
{
"Sid": "EC2",
"Sid": "Ec2DescribeAll",
"Effect": "Allow",
"Action": "ec2:Describe*",
"Resource": "*"
},
{
"Sid": "GetUserInfo",
"Effect": "Allow",
"Action": [
"ec2:DescribeAvailabilityZones",
"ec2:DescribeRegions",
"ec2:DescribeSecurityGroups",
"ec2:DescribeTags",
"ec2:DescribeVolumes"
"iam:GetUser",
"iam:GetUserPolicy"
],
"Resource": "arn:aws:iam::*:user/${aws:username}"
},
{
"Sid": "RolePolicyUserReadActions",
"Effect": "Allow",
"Action": [
"iam:GetRole",
"iam:GetPolicy",
"iam:ListUsers",
"iam:ListPolicies",
"iam:ListRolePolicies",
"iam:ListAttachedRolePolicies",
"iam:ListInstanceProfiles",
"iam:ListInstanceProfilesForRole",
"iam:SimulatePrincipalPolicy"
],
"Resource": "*"
},
{
"Sid": "EC2Tagged",
"Sid": "KeyPairActions",
"Effect": "Allow",
"Action": [
"ec2:AuthorizeSecurityGroupEgress",
"ec2:AuthorizeSecurityGroupIngress",
"ec2:DeleteSecurityGroup",
"ec2:RevokeSecurityGroupEgress",
"ec2:RevokeSecurityGroupIngress"
"ec2:CreateKeyPair",
"ec2:DeleteKeyPair",
"ec2:ImportKeyPair"
],
"Resource": "*",
"Condition": {
"StringEquals": {
"ec2:ResourceTag/RedisLabsIdentifier": "Redislabs-VPC"
}
}
"Resource": "*"
},
{
"Sid": "EBSVolumeActions",
"Sid": "CreateInstancesSnapshotsVolumesAndTags",
"Effect": "Allow",
"Action": [
"ec2:AttachVolume",
"ec2:CreateVolume",
"ec2:CreateTags",
"ec2:DescribeTags"
"ec2:CreateVolume",
"ec2:AttachVolume",
"ec2:StartInstances",
"ec2:RunInstances",
"ec2:CreateSnapshot",
"ec2:CreateTags",
"ec2:ModifyInstanceAttribute"
],
"Resource": "*"
},
{
"Sid": "S3Object",
"Sid": "PassRlClusterNodeRole",
"Effect": "Allow",
"Action": "iam:PassRole",
"Resource": "arn:aws:iam::*:role/redislabs-cluster-node-role"
},
{
"Sid": "ResourceAccessManagerActions",
"Effect": "Allow",
"Action": [
"s3:PutObject",
"s3:PutObjectAcl",
"s3:GetObject",
"s3:GetObjectAcl",
"s3:DeleteObject",
"s3:ListBucket",
"s3:GetBucketLocation"
"ram:AcceptResourceShareInvitation",
"ram:GetResourceShares",
"ram:RejectResourceShareInvitation",
"ram:GetResourceShareInvitations",
"ram:DisassociateResourceShare"
],
"Resource": "*"
},
{
"Sid": "IAM",
"Sid": "NetworkAccess",
"Effect": "Allow",
"Action": [
"iam:GetPolicy",
"iam:ListPolicies"
"ec2:*Vpc*",
"ec2:*VpcPeering*",
"ec2:*Subnet*",
"ec2:*Gateway*",
"ec2:*Vpn*",
"ec2:*Route*",
"ec2:*Address*",
"ec2:*SecurityGroup*",
"ec2:*NetworkAcl*",
"ec2:*DhcpOptions*"
],
"Resource": "*"
}
},
{
"Sid": "ResourceAccessManagerActions",
"Effect": "Allow",
"Action": [
"ram:AcceptResourceShareInvitation",
"ram:GetResourceShares",
"ram:RejectResourceShareInvitation",
"ram:GetResourceShareInvitations",
"ram:DisassociateResourceShare"
],
"Resource": "*"
"Sid": "DeleteInstancesVolumesSnapshotsAndTagsWithIdentiferTag",
"Effect": "Allow",
"Action": [
"ec2:RebootInstances",
"ec2:StopInstances",
"ec2:TerminateInstances",
"ec2:DeleteSnapshot",
"ec2:DeleteVolume",
"ec2:DetachVolume",
"ec2:DeleteTags"
],
"Resource": "*",
"Condition": {
"StringEquals": {
"ec2:ResourceTag/RedisLabsIdentifier": "Redislabs-VPC"
}
}
},
{
"Sid": "CreateAndChangeServiceLinkedRoleForTransitGateway",
"Effect": "Allow",
"Action": "iam:CreateServiceLinkedRole",
"Resource": "arn:aws:iam::*:role/"
"aws-service-role/transitgateway.amazonaws.com/AWSServiceRoleForVPCTransitGateway*",
"Resource": "arn:aws:iam::*:role/aws-service-role/transitgateway.amazonaws.com/AWSServiceRoleForVPCTransitGateway*",
"Condition": {"StringLike": {"iam:AWSServiceName": "transitgateway.amazonaws.com"}}
},
{
Expand All @@ -116,11 +146,8 @@ First, create a policy to use for the new instance role:
"iam:AttachRolePolicy",
"iam:PutRolePolicy"
],
"Resource": "arn:aws:iam::*:role/"
"aws-service-role/transitgateway.amazonaws.com/AWSServiceRoleForVPCTransitGateway*"
"Resource": "arn:aws:iam::*:role/aws-service-role/transitgateway.amazonaws.com/AWSServiceRoleForVPCTransitGateway*"
}
]
}
]
}
```
Expand Down
Loading

0 comments on commit 07e5e2e

Please sign in to comment.