diff options
| -rw-r--r-- | .github/SECURITY.md | 6 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | deps/rabbit/scripts/vmware-rabbitmq (renamed from deps/rabbit/scripts/rabbitmq-tanzu) | 2 | ||||
| -rw-r--r-- | deps/rabbit/scripts/vmware-rabbitmq.bat (renamed from deps/rabbit/scripts/rabbitmq-tanzu.bat) | 2 | ||||
| -rw-r--r-- | deps/rabbitmq_cli/Makefile | 6 | ||||
| -rw-r--r-- | deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/help_command.ex | 2 | ||||
| -rw-r--r-- | deps/rabbitmq_cli/mix.exs | 2 | ||||
| -rw-r--r-- | deps/rabbitmq_prometheus/docker/docker-compose-dist-metrics.yml | 4 | ||||
| -rw-r--r-- | deps/rabbitmq_prometheus/docker/grafana/dashboards/inet_tcp_metrics.json | 2 | ||||
| -rw-r--r-- | rabbitmq_home.bzl | 4 |
11 files changed, 18 insertions, 18 deletions
diff --git a/.github/SECURITY.md b/.github/SECURITY.md index a18925e8cf..d5deaed1be 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -63,9 +63,9 @@ When VMware products that depend on RabbitMQ are also affected, the disclosure p further to allow those projects to ship patch releases. -## Tanzu RabbitMQ +## VMware RabbitMQ -[Tanzu RabbitMQ](https://tanzu.vmware.com/rabbitmq) is covered by the [VMware Security Response Policy](https://www.vmware.com/support/policies/security_response.html). +[VMware RabbitMQ](https://www.vmware.com/products/rabbitmq.html) is covered by the [VMware Security Response Policy](https://www.vmware.com/support/policies/security_response.html). -Vulnerabilities found in Tanzu RabbitMQ can be reported to the RabbitMQ core team or +Vulnerabilities found in VMware RabbitMQ can be reported to the RabbitMQ core team or via the [VMware Security Response Center](https://www.vmware.com/security/vsrc.html). @@ -433,7 +433,7 @@ SCRIPTS = rabbitmq-defaults \ rabbitmq-queues \ rabbitmq-upgrade \ rabbitmq-streams \ - rabbitmq-tanzu + vmware-rabbitmq AUTOCOMPLETE_SCRIPTS = bash_autocomplete.sh zsh_autocomplete.sh @@ -447,7 +447,7 @@ WINDOWS_SCRIPTS = rabbitmq-defaults.bat \ rabbitmq-service.bat \ rabbitmq-upgrade.bat \ rabbitmq-streams.bat \ - rabbitmq-tanzu.bat \ + vmware-rabbitmq.bat \ rabbitmqctl.bat UNIX_TO_DOS ?= todos @@ -44,7 +44,7 @@ RabbitMQ documentation is also [developed on GitHub](https://github.com/rabbitmq ## Commercial Features and Support - * [Commercial edition of RabbitMQ](https://tanzu.vmware.com/rabbitmq) + * [Commercial edition of RabbitMQ](https://www.vmware.com/products/rabbitmq.html) * [Commercial edition for Kubernetes](https://rabbitmq.com/kubernetes/tanzu/installation.html) * [Commercial support](https://rabbitmq.com/services.html) from [VMware](https://vmware.com) for open source RabbitMQ diff --git a/deps/rabbit/scripts/rabbitmq-tanzu b/deps/rabbit/scripts/vmware-rabbitmq index 60d9e566c2..6327dc39d2 100755 --- a/deps/rabbit/scripts/rabbitmq-tanzu +++ b/deps/rabbit/scripts/vmware-rabbitmq @@ -20,4 +20,4 @@ set -a # shellcheck source=./rabbitmq-env . "${0%/*}"/rabbitmq-env -run_escript rabbitmqctl_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-tanzu "$@" +run_escript rabbitmqctl_escript "${ESCRIPT_DIR:?must be defined}"/vmware-rabbitmq "$@" diff --git a/deps/rabbit/scripts/rabbitmq-tanzu.bat b/deps/rabbit/scripts/vmware-rabbitmq.bat index 46ce9ffadf..3c8591d0cd 100644 --- a/deps/rabbit/scripts/rabbitmq-tanzu.bat +++ b/deps/rabbit/scripts/vmware-rabbitmq.bat @@ -44,7 +44,7 @@ if not defined ERL_CRASH_DUMP_SECONDS ( -kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^ -run escript start ^ -escript main rabbitmqctl_escript ^ --extra "%RABBITMQ_HOME%\escript\rabbitmq-tanzu" !STAR! +-extra "%RABBITMQ_HOME%\escript\vmware-rabbitmq" !STAR! if ERRORLEVEL 1 ( exit /B %ERRORLEVEL% diff --git a/deps/rabbitmq_cli/Makefile b/deps/rabbitmq_cli/Makefile index 403d56fd80..f4c4e730a5 100644 --- a/deps/rabbitmq_cli/Makefile +++ b/deps/rabbitmq_cli/Makefile @@ -34,7 +34,7 @@ LINKED_ESCRIPTS = escript/rabbitmq-plugins \ escript/rabbitmq-diagnostics \ escript/rabbitmq-queues \ escript/rabbitmq-streams \ - escript/rabbitmq-tanzu \ + escript/vmware-rabbitmq \ escript/rabbitmq-upgrade ESCRIPTS = $(ACTUAL_ESCRIPTS) $(LINKED_ESCRIPTS) @@ -44,9 +44,9 @@ rabbitmq-plugins = escript/rabbitmqctl rabbitmq-diagnostics = escript/rabbitmqctl rabbitmq-queues = escript/rabbitmqctl rabbitmq-streams = escript/rabbitmqctl -rabbitmq-tanzu = escript/rabbitmqctl rabbitmq-upgrade = escript/rabbitmqctl -escript/rabbitmq-plugins escript/rabbitmq-diagnostics escript/rabbitmq-queues escript/rabbitmq-streams escript/rabbitmq-tanzu escript/rabbitmq-upgrade: escript/rabbitmqctl +vmware-rabbitmq = escript/rabbitmqctl +escript/rabbitmq-plugins escript/rabbitmq-diagnostics escript/rabbitmq-queues escript/rabbitmq-streams escript/rabbitmq-upgrade escript/vmware-rabbitmq: escript/rabbitmqctl # We use hardlinks or symlinks in the `escript` directory and # install's PREFIX when a single escript can have several names (eg. diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/help_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/help_command.ex index 982c920023..e37b5507c7 100644 --- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/help_command.ex +++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/help_command.ex @@ -14,7 +14,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.HelpCommand do @behaviour RabbitMQ.CLI.CommandBehaviour - def scopes(), do: [:ctl, :diagnostics, :plugins, :queues, :tanzu, :upgrade] + def scopes(), do: [:ctl, :diagnostics, :plugins, :queues, :vmware, :upgrade] def switches(), do: [list_commands: :boolean] def distribution(_), do: :none diff --git a/deps/rabbitmq_cli/mix.exs b/deps/rabbitmq_cli/mix.exs index c28e4fa9ba..c39060f1c4 100644 --- a/deps/rabbitmq_cli/mix.exs +++ b/deps/rabbitmq_cli/mix.exs @@ -62,7 +62,7 @@ defmodule RabbitMQCtl.MixfileBase do "rabbitmq-queues": :queues, "rabbitmq-streams": :streams, "rabbitmq-upgrade": :upgrade, - "rabbitmq-tanzu": :tanzu + "vmware-rabbitmq": :vmware ] ] ] diff --git a/deps/rabbitmq_prometheus/docker/docker-compose-dist-metrics.yml b/deps/rabbitmq_prometheus/docker/docker-compose-dist-metrics.yml index b582b52ae5..328b35bfa3 100644 --- a/deps/rabbitmq_prometheus/docker/docker-compose-dist-metrics.yml +++ b/deps/rabbitmq_prometheus/docker/docker-compose-dist-metrics.yml @@ -14,8 +14,8 @@ services: rmq0-dist-metrics: &rabbitmq # https://network.pivotal.io/products/rabbitmq/ # This is a commercial edition of RabbitMQ that requires a valid Tanzu Network account - # Learn more: https://rabbitmq.com/tanzu - image: dev.registry.pivotal.io/rabbitmq/vmware-tanzu-rabbitmq:1.0.0 + # Learn more: https://www.vmware.com/products/rabbitmq.html + image: dev.registry.pivotal.io/rabbitmq/vmware-rabbitmq:1.4.2 networks: - "rabbitmq-prometheus" ports: diff --git a/deps/rabbitmq_prometheus/docker/grafana/dashboards/inet_tcp_metrics.json b/deps/rabbitmq_prometheus/docker/grafana/dashboards/inet_tcp_metrics.json index 997621e1f7..b1ac0a95b5 100644 --- a/deps/rabbitmq_prometheus/docker/grafana/dashboards/inet_tcp_metrics.json +++ b/deps/rabbitmq_prometheus/docker/grafana/dashboards/inet_tcp_metrics.json @@ -129,7 +129,7 @@ }, { "$$hashKey": "object:3230", - "alias": "Tanzu RabbitMQ", + "alias": "VMware RabbitMQ", "align": "auto", "colorMode": null, "colors": [ diff --git a/rabbitmq_home.bzl b/rabbitmq_home.bzl index 7132dff4c9..28112aa63b 100644 --- a/rabbitmq_home.bzl +++ b/rabbitmq_home.bzl @@ -117,9 +117,9 @@ RABBITMQ_HOME_ATTRS = { "//deps/rabbit:scripts/rabbitmq-queues", "//deps/rabbit:scripts/rabbitmq-server", "//deps/rabbit:scripts/rabbitmq-streams", - "//deps/rabbit:scripts/rabbitmq-tanzu", "//deps/rabbit:scripts/rabbitmq-upgrade", "//deps/rabbit:scripts/rabbitmqctl", + "//deps/rabbit:scripts/vmware-rabbitmq", ], allow_files = True, ), @@ -132,9 +132,9 @@ RABBITMQ_HOME_ATTRS = { "//deps/rabbit:scripts/rabbitmq-queues.bat", "//deps/rabbit:scripts/rabbitmq-server.bat", "//deps/rabbit:scripts/rabbitmq-streams.bat", - "//deps/rabbit:scripts/rabbitmq-tanzu.bat", "//deps/rabbit:scripts/rabbitmq-upgrade.bat", "//deps/rabbit:scripts/rabbitmqctl.bat", + "//deps/rabbit:scripts/vmware-rabbitmq.bat", ], allow_files = True, ), |