merlimat closed pull request #2235: [website] Fix content inconsistency between
site and site2
URL: https://github.com/apache/incubator-pulsar/pull/2235
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/site2/docs/admin-api-brokers.md b/site2/docs/admin-api-brokers.md
index 62199bfdcb..99c1cf7720 100644
--- a/site2/docs/admin-api-brokers.md
+++ b/site2/docs/admin-api-brokers.md
@@ -12,7 +12,7 @@ Pulsar brokers consist of two components:
{% popover Brokers %} can be managed via:
* The [`brokers`](reference-pulsar-admin.md#brokers) command of the
[`pulsar-admin`](reference-pulsar-admin.md) tool
-* The `/admin/brokers` endpoint of the admin [REST API](reference-rest-api.md)
+* The `/admin/v2/brokers` endpoint of the admin [REST
API](reference-rest-api.md)
* The `brokers` method of the {% javadoc PulsarAdmin admin
org.apache.pulsar.client.admin.PulsarAdmin %} object in the [Java
API](client-libraries-java.md)
In addition to being configurable when you start them up, brokers can also be
[dynamically configured](#dynamic-broker-configuration).
@@ -25,7 +25,7 @@ See the [Configuration](reference-configuration.md#broker)
page for a full listi
### List active brokers
-Fetch all available active brokers that are serving traffic.
+Fetch all available active brokers that are serving traffic.
#### pulsar-admin
@@ -40,7 +40,7 @@ broker1.use.org.com:8080
###### REST
-{% endpoint GET /admin/brokers/:cluster %}
+{% endpoint GET /admin/v2/brokers/:cluster %}
[More info](reference-rest-api.md#/admin/brokers/:cluster)
@@ -52,7 +52,7 @@ admin.brokers().getActiveBrokers(clusterName)
#### list of namespaces owned by a given broker
-It finds all namespaces which are owned and served by a given broker.
+It finds all namespaces which are owned and served by a given broker.
###### CLI
@@ -72,7 +72,7 @@ $ pulsar-admin brokers namespaces use \
```
###### REST
-{% endpoint GET /admin/brokers/:cluster/:broker:/ownedNamespaces %}
+{% endpoint GET /admin/v2/brokers/:cluster/:broker:/ownedNamespaces %}
###### Java
@@ -87,7 +87,7 @@ One way to configure a Pulsar {% popover broker %} is to
supply a [configuration
But since all broker configuration in Pulsar is stored in {% popover ZooKeeper
%}, configuration values can also be dynamically updated *while the broker is
running*. When you update broker configuration dynamically, ZooKeeper will
notify the broker of the change and the broker will then override any existing
configuration values.
* The [`brokers`](reference-pulsar-admin.md#brokers) command for the
[`pulsar-admin`](reference-pulsar-admin.md) tool has a variety of subcommands
that enable you to manipulate a broker's configuration dynamically, enabling
you to [update config values](#update-dynamic-configuration) and more.
-* In the Pulsar admin [REST API](reference-rest-api.md), dynamic configuration
is managed through the `/admin/brokers/configuration` endpoint.
+* In the Pulsar admin [REST API](reference-rest-api.md), dynamic configuration
is managed through the `/admin/v2/brokers/configuration` endpoint.
### Update dynamic configuration
@@ -101,7 +101,7 @@ $ pulsar-admin brokers update-dynamic-config
brokerShutdownTimeoutMs 100
#### REST API
-{% endpoint POST /admin/brokers/configuration/:configName/:configValue %}
+{% endpoint POST /admin/v2/brokers/configuration/:configName/:configValue %}
[More
info](reference-rest-api.md#/admin/brokers/configuration/:configName/:configValue)
@@ -124,7 +124,7 @@ brokerShutdownTimeoutMs
#### REST API
-{% endpoint GET /admin/brokers/configuration %}
+{% endpoint GET /admin/v2/brokers/configuration %}
[More info](reference-rest-api.md#/admin/brokers/configuration)
@@ -147,7 +147,7 @@ brokerShutdownTimeoutMs:100
#### REST API
-{% endpoint GET /admin/brokers/configuration/values %}
+{% endpoint GET /admin/v2/brokers/configuration/values %}
[More info](reference-rest-api.md#/admin/brokers/configuration/values)
diff --git a/site2/docs/admin-api-clusters.md b/site2/docs/admin-api-clusters.md
index d808b4de9d..d180e43015 100644
--- a/site2/docs/admin-api-clusters.md
+++ b/site2/docs/admin-api-clusters.md
@@ -9,7 +9,7 @@ Pulsar clusters consist of one or more Pulsar {% popover
brokers %}, one or more
Clusters can be managed via:
* The [`clusters`](reference-pulsar-admin.md#clusters) command of the
[`pulsar-admin`](reference-pulsar-admin.md) tool
-* The `/admin/clusters` endpoint of the admin [REST API](reference-rest-api.md)
+* The `/admin/v2/clusters` endpoint of the admin [REST
API](reference-rest-api.md)
* The `clusters` method of the {% javadoc PulsarAdmin admin
org.apache.pulsar.client.admin.PulsarAdmin %} object in the [Java
API](client-libraries-java.md)
## Clusters resources
@@ -34,7 +34,7 @@ $ pulsar-admin clusters create cluster-1 \
#### REST API
-{% endpoint PUT /admin/clusters/:cluster %}
+{% endpoint PUT /admin/v2/clusters/:cluster %}
[More info](reference-rest-api.md#/admin/clusters/:cluster)
@@ -102,7 +102,7 @@ $ pulsar-admin clusters get cluster-1
#### REST API
-{% endpoint GET /admin/clusters/:cluster %}
+{% endpoint GET /admin/v2/clusters/:cluster %}
[More info](reference-rest-api.md#/admin/clusters/:cluster)
@@ -128,7 +128,7 @@ $ pulsar-admin clusters update cluster-1 \
#### REST
-{% endpoint POST /admin/clusters/:cluster %}
+{% endpoint POST /admin/v2/clusters/:cluster %}
[More info](reference-rest-api.md#/admin/clusters/:cluster)
@@ -158,7 +158,7 @@ $ pulsar-admin clusters delete cluster-1
#### REST API
-{% endpoint DELETE /admin/clusters/:cluster %}
+{% endpoint DELETE /admin/v2/clusters/:cluster %}
[More info](reference-rest-api.md#/admin/clusters/:cluster)
@@ -184,7 +184,7 @@ cluster-2
#### REST API
-{% endpoint GET /admin/clusters %}
+{% endpoint GET /admin/v2/clusters %}
[More info](reference-rest-api.md#/admin/clusters)
@@ -208,7 +208,7 @@ $ pulsar-admin update-peer-clusters cluster-1
--peer-clusters cluster-2
#### REST API
-{% endpoint POST /admin/clusters/:cluster/peers %}
+{% endpoint POST /admin/v2/clusters/:cluster/peers %}
[More info](reference-rest-api.md#/admin/clusters/:cluster/peers)
diff --git a/site2/docs/admin-api-namespaces.md
b/site2/docs/admin-api-namespaces.md
index 8e366e7653..6d95aaf030 100644
--- a/site2/docs/admin-api-namespaces.md
+++ b/site2/docs/admin-api-namespaces.md
@@ -9,7 +9,7 @@ Pulsar {% popover namespaces %} are logical groupings of {%
popover topics %}.
Namespaces can be managed via:
* The [`namespaces`](reference-pulsar-admin.md#clusters) command of the
[`pulsar-admin`](reference-pulsar-admin.md) tool
-* The `/admin/namespaces` endpoint of the admin [REST
API](reference-rest-api.md)
+* The `/admin/v2/namespaces` endpoint of the admin [REST
API](reference-rest-api.md)
* The `namespaces` method of the {% javadoc PulsarAdmin admin
org.apache.pulsar.client.admin.PulsarAdmin %} object in the [Java
API](client-libraries-java.md)
## Namespaces resources
@@ -28,9 +28,9 @@ $ pulsar-admin namespaces create test-tenant/test-namespace
#### REST API
-{% endpoint PUT /admin/namespaces/:tenant/:cluster/:namespace %}
+{% endpoint PUT /admin/v2/namespaces/:tenant/:namespace %}
-[More
info](reference-rest-api.md#/admin/namespaces/:tenant/:cluster/:namespace)
+[More info](reference-rest-api.md#/admin/namespaces/:tenant/:namespace)
#### Java
@@ -73,9 +73,9 @@ $ pulsar-admin namespaces policies test-tenant/test-namespace
#### REST API
-{% endpoint GET /admin/namespaces/:tenant/:cluster/:namespace %}
+{% endpoint GET /admin/v2/namespaces/:tenant/:namespace %}
-[More
info](reference-rest-api.md#/admin/namespaces/:tenant/:cluster/:namespace)
+[More info](reference-rest-api.md#/admin/namespaces/:tenant/:namespace)
#### Java
@@ -99,7 +99,7 @@ test-tenant/ns2
#### REST API
-{% endpoint GET /admin/namespaces/:tenant %}
+{% endpoint GET /admin/v2/namespaces/:tenant %}
[More info](reference-rest-api.md#/admin/namespaces/:tenant)
@@ -109,25 +109,6 @@ test-tenant/ns2
admin.namespaces().getNamespaces(tenant);
```
-### List namespaces within a cluster
-
-You can list all namespaces within a given Pulsar {% popover cluster %}.
-
-#### pulsar-admin
-
-Use the [`list-cluster`](reference-pulsar-admin.md#namespaces-list-cluster)
subcommand and specify the cluster:
-
-```shell
-$ pulsar-admin namespaces list-cluster test-tenant/cl1
-test-tenant/ns1
-test-tenant/ns2
-```
-
-#### REST API
-
-{% endpoint GET /admin/namespaces/:tenant/:cluster %}
-
-[More info](reference-rest-api.md#/admin/namespaces/:tenant/:cluster)
#### Java
@@ -149,9 +130,9 @@ $ pulsar-admin namespaces delete test-tenant/ns1
#### REST
-{% endpoint DELETE /admin/namespaces/:tenant/:cluster/:namespace %}
+{% endpoint DELETE /admin/v2/namespaces/:tenant/:namespace %}
-[More
info](reference-rest-api.md#/admin/namespaces/:tenant/:cluster/:namespace)
+[More info](reference-rest-api.md#/admin/namespaces/:tenant/:namespace)
#### Java
@@ -174,7 +155,7 @@ $ pulsar-admin namespaces set-clusters test-tenant/ns1 \
###### REST
```
-{% endpoint POST /admin/namespaces/:tenant/:namespace/replication %}
+{% endpoint POST /admin/v2/namespaces/:tenant/:namespace/replication %}
```
###### Java
@@ -200,7 +181,7 @@ cl2
###### REST
```
-GET /admin/namespaces/{tenant}/{namespace}/replication
+GET /admin/v2/namespaces/{tenant}/{namespace}/replication
```
###### Java
@@ -219,7 +200,7 @@ Backlog quota helps broker to restrict bandwidth/storage of
a namespace once it
3. consumer_backlog_eviction: broker will start discarding backlog messages
- Backlog quota restriction can be taken care by defining restriction of
backlog-quota-type: destination_storage
+ Backlog quota restriction can be taken care by defining restriction of
backlog-quota-type: destination_storage
###### CLI
@@ -234,7 +215,7 @@ N/A
###### REST
```
-POST /admin/namespaces/{tenant}/{namespace}/backlogQuota
+POST /admin/v2/namespaces/{tenant}/{namespace}/backlogQuota
```
###### Java
@@ -259,13 +240,13 @@ $ pulsar-admin namespaces get-backlog-quotas
test-tenant/ns1
"limit": 10,
"policy": "producer_request_hold"
}
-}
+}
```
###### REST
```
-GET /admin/namespaces/{tenant}/{namespace}/backlogQuotaMap
+GET /admin/v2/namespaces/{tenant}/{namespace}/backlogQuotaMap
```
###### Java
@@ -276,7 +257,7 @@ admin.namespaces().getBacklogQuotaMap(namespace);
#### remove backlog quota policies
-It removes backlog quota policies for a given namespace
+It removes backlog quota policies for a given namespace
###### CLI
@@ -291,7 +272,7 @@ N/A
###### REST
```
-DELETE /admin/namespaces/{tenant}/{namespace}/backlogQuota
+DELETE /admin/v2/namespaces/{tenant}/{namespace}/backlogQuota
```
###### Java
@@ -310,7 +291,7 @@ Persistence policies allow to configure persistency-level
for all topic messages
- Bookkeeper-write-quorum: How many writes to make of each entry, default: 0
- - Ml-mark-delete-max-rate: Throttling rate of mark-delete operation (0
means no throttle), default: 0.0
+ - Ml-mark-delete-max-rate: Throttling rate of mark-delete operation (0
means no throttle), default: 0.0
###### CLI
@@ -325,7 +306,7 @@ N/A
###### REST
```
-POST /admin/persistent/{tenant}/{namespace}/persistence
+POST /admin/v2/namespaces/{tenant}/{namespace}/persistence
```
###### Java
@@ -337,7 +318,7 @@ admin.namespaces().setPersistence(namespace,new
PersistencePolicies(bookkeeperEn
#### get persistence policies
-It shows configured persistence policies of a given namespace.
+It shows configured persistence policies of a given namespace.
###### CLI
@@ -357,7 +338,7 @@ $ pulsar-admin namespaces get-persistence test-tenant/ns1
###### REST
```
-GET /admin/namespaces/{tenant}/{namespace}/persistence
+GET /admin/v2/namespaces/{tenant}/{namespace}/persistence
```
###### Java
@@ -369,7 +350,7 @@ admin.namespaces().getPersistence(namespace)
#### unload namespace bundle
-Namespace bundle is a virtual group of topics which belong to same namespace.
If broker gets overloaded with number of bundles then this command can help to
unload heavy bundle from that broker, so it can be served by some other less
loaded broker. Namespace bundle is defined with it’s start and end range such
as 0x00000000 and 0xffffffff.
+Namespace bundle is a virtual group of topics which belong to same namespace.
If broker gets overloaded with number of bundles then this command can help to
unload heavy bundle from that broker, so it can be served by some other less
loaded broker. Namespace bundle is defined with it’s start and end range such
as 0x00000000 and 0xffffffff.
###### CLI
@@ -384,7 +365,7 @@ N/A
###### REST
```
-PUT /admin/namespaces/{tenant}/{namespace}/unload
+PUT /admin/v2/namespaces/{tenant}/{namespace}/unload
```
###### Java
@@ -411,7 +392,7 @@ N/A
###### REST
```
-POST /admin/namespaces/{tenant}/{namespace}/messageTTL
+POST /admin/v2/namespaces/{tenant}/{namespace}/messageTTL
```
###### Java
@@ -438,7 +419,7 @@ $ pulsar-admin namespaces get-message-ttl test-tenant/ns1
###### REST
```
-GET /admin/namespaces/{tenant}/{namespace}/messageTTL
+GET /admin/v2/namespaces/{tenant}/{namespace}/messageTTL
```
###### Java
@@ -465,7 +446,7 @@ N/A
###### REST
```
-PUT /admin/namespaces/{tenant}/{namespace}/{bundle}/split
+PUT /admin/v2/namespaces/{tenant}/{namespace}/{bundle}/split
```
###### Java
@@ -477,7 +458,7 @@ admin.namespaces().splitNamespaceBundle(namespace, bundle)
#### clear backlog
-It clears all message backlog for all the topics those belong to specific
namespace. You can also clear backlog for a specific subscription as well.
+It clears all message backlog for all the topics those belong to specific
namespace. You can also clear backlog for a specific subscription as well.
###### CLI
@@ -492,7 +473,7 @@ N/A
###### REST
```
-POST /admin/namespaces/{tenant}/{namespace}/clearBacklog
+POST /admin/v2/namespaces/{tenant}/{namespace}/clearBacklog
```
###### Java
@@ -504,7 +485,7 @@
admin.namespaces().clearNamespaceBacklogForSubscription(namespace, subscription)
#### clear bundle backlog
-It clears all message backlog for all the topics those belong to specific
NamespaceBundle. You can also clear backlog for a specific subscription as
well.
+It clears all message backlog for all the topics those belong to specific
NamespaceBundle. You can also clear backlog for a specific subscription as well.
###### CLI
@@ -519,7 +500,7 @@ N/A
###### REST
```
-POST /admin/namespaces/{tenant}/{namespace}/{bundle}/clearBacklog
+POST /admin/v2/namespaces/{tenant}/{namespace}/{bundle}/clearBacklog
```
###### Java
@@ -546,7 +527,7 @@ N/A
###### REST
```
-POST /admin/namespaces/{tenant}/{namespace}/retention
+POST /admin/v2/namespaces/{tenant}/{namespace}/retention
```
###### Java
@@ -576,7 +557,7 @@ $ pulsar-admin namespaces get-retention test-tenant/ns1
###### REST
```
-GET /admin/namespaces/{tenant}/{namespace}/retention
+GET /admin/v2/namespaces/{tenant}/{namespace}/retention
```
###### Java
@@ -587,9 +568,9 @@ admin.namespaces().getRetention(namespace)
#### set dispatch throttling
-It sets message dispatch rate for all the topics under a given namespace.
-Dispatch rate can be restricted by number of message per X seconds
(`msg-dispatch-rate`) or by number of message-bytes per X second
(`byte-dispatch-rate`).
-dispatch rate is in second and it can be configured with
`dispatch-rate-period`. Default value of `msg-dispatch-rate` and
`byte-dispatch-rate` is -1 which
+It sets message dispatch rate for all the topics under a given namespace.
+Dispatch rate can be restricted by number of message per X seconds
(`msg-dispatch-rate`) or by number of message-bytes per X second
(`byte-dispatch-rate`).
+dispatch rate is in second and it can be configured with
`dispatch-rate-period`. Default value of `msg-dispatch-rate` and
`byte-dispatch-rate` is -1 which
disables the throttling.
###### CLI
@@ -604,7 +585,7 @@ $ pulsar-admin namespaces set-dispatch-rate test-tenant/ns1
\
###### REST
```
-POST /admin/namespaces/{tenant}/{namespace}/dispatchRate
+POST /admin/v2/namespaces/{tenant}/{namespace}/dispatchRate
```
###### Java
@@ -615,7 +596,7 @@ admin.namespaces().setDispatchRate(namespace, 1000,
1048576, 1)
#### get configured message-rate
-It shows configured message-rate for the namespace (topics under this
namespace can dispatch this many messages per second)
+It shows configured message-rate for the namespace (topics under this
namespace can dispatch this many messages per second)
###### CLI
@@ -634,7 +615,7 @@ $ pulsar-admin namespaces get-dispatch-rate test-tenant/ns1
###### REST
```
-GET /admin/namespaces/{tenant}/{namespace}/dispatchRate
+GET /admin/v2/namespaces/{tenant}/{namespace}/dispatchRate
```
###### Java
diff --git a/site2/docs/admin-api-non-persistent-topics.md
b/site2/docs/admin-api-non-persistent-topics.md
index eef44079a3..4e43ad81f7 100644
--- a/site2/docs/admin-api-non-persistent-topics.md
+++ b/site2/docs/admin-api-non-persistent-topics.md
@@ -122,7 +122,7 @@ $ pulsar-admin non-persistent stats \
#### REST API
-{% endpoint GET /admin/non-persistent/:tenant/:namespace/:destination/stats %}
+{% endpoint GET /admin/v2/non-persistent/:tenant/:namespace/:destination/stats
%}
#### Java
@@ -163,7 +163,7 @@ $ pulsar-admin non-persistent stats-internal \
#### REST API
-{% endpoint GET
/admin/non-persistent/:tenant/:namespace/:destination/internalStats %}
+{% endpoint GET
/admin/v2/non-persistent/:tenant/:namespace/:destination/internalStats %}
#### Java
@@ -187,7 +187,7 @@ $ bin/pulsar-admin non-persistent create-partitioned-topic \
#### REST API
-{% endpoint PUT
/admin/non-persistent/:tenant/:namespace/:destination/partitions %}
+{% endpoint PUT
/admin/v2/non-persistent/:tenant/:namespace/:destination/partitions %}
#### Java
@@ -217,7 +217,7 @@ $ pulsar-admin non-persistent
get-partitioned-topic-metadata \
#### REST API
-{% endpoint GET
/admin/non-persistent/:tenant/:namespace/:destination/partitions %}
+{% endpoint GET
/admin/v2/non-persistent/:tenant/:namespace/:destination/partitions %}
#### Java
@@ -242,7 +242,7 @@ $ pulsar-admin non-persistent unload \
#### REST API
-{% endpoint PUT /admin/non-persistent/:tenant/:namespace/:destination/unload %}
+{% endpoint PUT
/admin/v2/non-persistent/:tenant/:namespace/:destination/unload %}
[More
info](reference-rest-api.md#/admin/non-persistent/:tenant/:namespace/:destination/unload)
diff --git a/site2/docs/admin-api-persistent-topics.md
b/site2/docs/admin-api-persistent-topics.md
index 6a7cb2e1da..86aa0414e1 100644
--- a/site2/docs/admin-api-persistent-topics.md
+++ b/site2/docs/admin-api-persistent-topics.md
@@ -27,7 +27,7 @@ $ pulsar-admin persistent list \
#### REST API
-{% endpoint GET /admin/persistent/:tenant/:namespace %}
+{% endpoint GET /admin/v2/persistent/:tenant/:namespace %}
[More info](../../reference/RestApi#/admin/persistent/:tenant/:namespace)
@@ -55,7 +55,7 @@ $ pulsar-admin persistent grant-permission \
#### REST API
-{% endpoint POST /admin/namespaces/:tenant/:namespace/permissions/:role %}
+{% endpoint POST /admin/v2/namespaces/:tenant/:namespace/permissions/:role %}
[More
info](../../reference/RestApi#/admin/namespaces/:tenant/:namespace/permissions/:role)
@@ -88,7 +88,7 @@ $ pulsar-admin persistent permissions \
#### REST API
-{% endpoint GET /admin/namespaces/:tenant/:namespace/permissions %}
+{% endpoint GET /admin/v2/namespaces/:tenant/:namespace/permissions %}
[More
info](../../reference/RestApi#/admin/namespaces/:tenant:namespace/permissions)
@@ -122,7 +122,7 @@ $ pulsar-admin persistent revoke-permission \
#### REST API
-{% endpoint DELETE /admin/namespaces/:tenant:namespace/permissions/:role %}
+{% endpoint DELETE /admin/v2/namespaces/:tenant:namespace/permissions/:role %}
[More
info](../../reference/RestApi#/admin/namespaces/:tenant/:namespace/permissions/:role)
@@ -149,7 +149,7 @@ $ pulsar-admin persistent delete \
#### REST API
-{% endpoint DELETE /admin/persistent/:tenant/:namespace/:destination %}
+{% endpoint DELETE /admin/v2/persistent/:tenant/:namespace/:destination %}
[More
info](../../reference/RestApi#/admin/persistent/:tenant/:namespace/:destination)
@@ -175,7 +175,7 @@ $ pulsar-admin persistent unload \
#### REST API
-{% endpoint PUT /admin/persistent/:tenant/:namespace/:destination/unload %}
+{% endpoint PUT /admin/v2/persistent/:tenant/:namespace/:destination/unload %}
[More
info](../../reference/RestApi#/admin/persistent/:tenant/:namespace/:destination/unload)
@@ -286,7 +286,7 @@ $ pulsar-admin persistent stats \
#### REST API
-{% endpoint GET /admin/persistent/:tenant/:namespace/:destination/stats %}
+{% endpoint GET /admin/v2/persistent/:tenant/:namespace/:destination/stats %}
[More
info](../../reference/RestApi#/admin/persistent/:tenant:namespace/:destination/stats)
@@ -396,7 +396,7 @@ $ pulsar-admin persistent stats-internal \
#### REST API
-{% endpoint GET
/admin/persistent/:tenant/:namespace/:destination/internalStats %}
+{% endpoint GET
/admin/v2/persistent/:tenant/:namespace/:destination/internalStats %}
[More
info](../../reference/RestApi#/admin/persistent/:tenant/:namespace/:destination/internalStats)
@@ -426,7 +426,7 @@ msg-payload
#### REST API
-{% endpoint GET
/admin/persistent/:tenant/:namespace/:destination/subscription/:subName/position/:messagePosition
%}
+{% endpoint GET
/admin/v2/persistent/:tenant/:namespace/:destination/subscription/:subName/position/:messagePosition
%}
[More
info](../../reference/RestApi#/admin/persistent/:tenant/:namespace/:destination/subscription/:subName/position/:messagePosition)
@@ -454,7 +454,7 @@ $ pulsar-admin persistent skip \
#### REST API
-{% endpoint POST
/admin/persistent/:tenant/:namespace/:destination/subscription/:subName/skip/:numMessages
%}
+{% endpoint POST
/admin/v2/persistent/:tenant/:namespace/:destination/subscription/:subName/skip/:numMessages
%}
[More
info](../../reference/RestApi#/admin/persistent/:tenant/:namespace/:destination/subscription/:subName/skip/:numMessages)
@@ -482,7 +482,7 @@ $ pulsar-admin persistent skip-all \
#### REST API
-{% endpoint POST
/admin/persistent/:tenant/:namespace/:destination/subscription/:subName/skip_all
%}
+{% endpoint POST
/admin/v2/persistent/:tenant/:namespace/:destination/subscription/:subName/skip_all
%}
[More
info](../../reference/RestApi#/admin/persistent/:tenant/:namespace/:destination/subscription/:subName/skip_all)
@@ -509,7 +509,7 @@ $ pulsar-admin persistent reset-cursor \
#### REST API
-{% endpoint POST
/admin/persistent/:tenant/:namespace/:destination/subscription/:subName/resetcursor/:timestamp
%}
+{% endpoint POST
/admin/v2/persistent/:tenant/:namespace/:destination/subscription/:subName/resetcursor/:timestamp
%}
[More
info](../../reference/RestApi#/admin/persistent/:tenant/:namespace/:destination/subscription/:subName/resetcursor/:timestamp)
@@ -547,7 +547,7 @@ String destination =
"persistent://my-tenant/my-namespace/my-topic";
admin.lookup().lookupDestination(destination);
```
-### Get bundle
+### Get bundle
It gives range of the bundle which contains given topic
@@ -588,7 +588,7 @@ $ pulsar-admin persistent subscriptions \
#### REST API
-{% endpoint GET
/admin/persistent/:tenant/:namespace/:destination/subscriptions %}
+{% endpoint GET
/admin/v2/persistent/:tenant/:namespace/:destination/subscriptions %}
[More
info](../../reference/RestApi#/admin/persistent/:tenant/:namespace/:destination/subscriptions)
@@ -614,7 +614,7 @@ $ pulsar-admin persistent unsubscribe \
#### REST API
-{% endpoint POST
/admin/namespaces/:tenant/:namespace/unsubscribe/:subscription %}
+{% endpoint POST
/admin/v2/namespaces/:tenant/:namespace/unsubscribe/:subscription %}
[More
info](../../reference/RestApi#/admin/namespaces/:tenant/:namespace/unsubscribe/:subscription)
diff --git a/site2/docs/administration-dashboard.md
b/site2/docs/administration-dashboard.md
index e4e3625f0d..7f735a424c 100644
--- a/site2/docs/administration-dashboard.md
+++ b/site2/docs/administration-dashboard.md
@@ -17,7 +17,7 @@ The easiest way to use the dashboard is to run it inside a
[Docker](https://www.
To generate the Docker image:
```shell
-$ docker build -t pulsar-dashboard dashboard
+$ docker build -t apachepulsar/pulsar-dashboard dashboard
```
To run the dashboard:
@@ -33,6 +33,18 @@ You need to specify only one service URL for a Pulsar
cluster. Internally, the c
Once the Docker container is running, the web dashboard will be accessible via
`localhost` or whichever host is being used by Docker.
+> The `SERVICE_URL` that the dashboard uses needs to be reachable from inside
the Docker container
+
+If the Pulsar service is running in standalone mode in `localhost`, the
`SERVICE_URL` would have to
+be the IP of the machine.
+
+Similarly, given the Pulsar standalone advertises itself with localhost by
default, we need to
+explicitely set the advertise address to the host IP. For example:
+
+```shell
+$ bin/pulsar standalone --advertised-address 1.2.3.4
+```
+
### Known issues
Pulsar [authentication](administration-auth.md#authentication-providers) is
not supported at this point. The dashboard's data collector does not pass any
authentication-related data and will be denied access if the Pulsar broker
requires authentication.
diff --git a/site2/docs/administration-geo.md b/site2/docs/administration-geo.md
index 08c7b3ee29..db8e438b95 100644
--- a/site2/docs/administration-geo.md
+++ b/site2/docs/administration-geo.md
@@ -119,6 +119,8 @@ Each cluster reports its own local stats, including
incoming and outgoing replic
Given that global topics exist in multiple regions, it's not possible to
directly delete a global topic. Instead, you should rely on automatic topic
garbage collection.
-In Pulsar, a topic is automatically deleted when it's no longer used, that is
to say, when no producers or consumers are connected *and* there are no
subscriptions. For global topics, each region will use a fault-tolerant
mechanism to decide when it's safe to delete the topic locally.
+In Pulsar, a topic is automatically deleted when it's no longer used, that is
to say, when no producers or consumers are connected *and* there are no
subscriptions *and* no more messages are kept for retention. For global topics,
each region will use a fault-tolerant mechanism to decide when it's safe to
delete the topic locally.
+
+You can explicitly disable topic garbage collection by setting
`brokerDeleteInactiveTopicsEnabled` to `false` in your [broker
configuration](reference-configuration#broker).
To delete a global topic, close all producers and consumers on the topic and
delete all its local subscriptions in every replication cluster. When Pulsar
determines that no valid subscription for the topic remains across the system,
it will garbage collect the topic.
diff --git a/site2/docs/client-libraries-go.md
b/site2/docs/client-libraries-go.md
index 0f5283b896..a27eb17b0d 100644
--- a/site2/docs/client-libraries-go.md
+++ b/site2/docs/client-libraries-go.md
@@ -435,7 +435,7 @@ Parameter | Description
## TLS encryption and authentication
-In order to use [TLS encryption](administration-auth.md#), you'll need to
configure your client to do so:
+In order to use [TLS encryption](security-tls.md), you'll need to configure
your client to do so:
* Use `pulsar+ssl` URL type
* Set `TLSTrustCertsFilePath` to the path to the TLS certs used by your
client and the Pulsar broker
diff --git a/site2/docs/cookbooks-deduplication.md
b/site2/docs/cookbooks-deduplication.md
index 19abd48c6b..412faf86ed 100644
--- a/site2/docs/cookbooks-deduplication.md
+++ b/site2/docs/cookbooks-deduplication.md
@@ -37,21 +37,21 @@ Regardless of the value of `brokerDeduplicationEnabled`,
[enabling](#enabling) a
### Enabling message deduplication {#enabling}
-You can enable message deduplication on specific namespaces, regardless of the
the [default](#default) for the broker, using the [`pulsar-admin namespace
set-deduplication`](reference-pulsar-admin.md#namespace-set-deduplication)
command. You can use the `--enable`/`-e` flag and specify the namespace. Here's
an example:
+You can enable message deduplication on specific namespaces, regardless of the
the [default](#default) for the broker, using the [`pulsar-admin namespace
set-deduplication`](reference-pulsar-admin.md#namespace-set-deduplication)
command. You can use the `--enable`/`-e` flag and specify the namespace. Here's
an example with <tenant>/<namespace>:
```bash
$ bin/pulsar-admin namespaces set-deduplication \
- persistent://public/default/topic-1 \
+ public/default \
--enable # or just -e
```
### Disabling message deduplication {#disabling}
-You can disable message deduplication on a specific namespace using the same
method shown [above](#enabling), except using the `--disable`/`-d` flag
instead. Here's an example:
+You can disable message deduplication on a specific namespace using the same
method shown [above](#enabling), except using the `--disable`/`-d` flag
instead. Here's an example with <tenant>/<namespace>:
```bash
$ bin/pulsar-admin namespaces set-deduplication \
- persistent://public/default/topic-1 \
+ public/default \
--disable # or just -d
```
diff --git a/site2/docs/cookbooks-tiered-storage.md
b/site2/docs/cookbooks-tiered-storage.md
index 792592e4a2..d61d14321a 100644
--- a/site2/docs/cookbooks-tiered-storage.md
+++ b/site2/docs/cookbooks-tiered-storage.md
@@ -4,7 +4,7 @@ title: Tiered Storage
sidebar_label: Tiered Storage
---
-lsar's **Tiered Storage** feature allows older backlog data to be offloaded to
long term storage, thereby freeing up space in BookKeeper and reducing storage
costs. This cookbook walks you through using tiered storage in your Pulsar
cluster.
+Pulsar's **Tiered Storage** feature allows older backlog data to be offloaded
to long term storage, thereby freeing up space in BookKeeper and reducing
storage costs. This cookbook walks you through using tiered storage in your
Pulsar cluster.
## When should I use Tiered Storage?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
