Skip to content

Commit

Permalink
[website] Fix content inconsistency between site and site2 (apache#2235)
Browse files Browse the repository at this point in the history
### Motivation

There were a few changes merged to site after site2 is merged.
This PR is to address the content inconsistency between site and site2

 ### Changes

Fix content inconsistency
  • Loading branch information
sijie authored and merlimat committed Jul 26, 2018
1 parent 1632708 commit f98e099
Show file tree
Hide file tree
Showing 9 changed files with 94 additions and 99 deletions.
18 changes: 9 additions & 9 deletions site2/docs/admin-api-brokers.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand All @@ -23,7 +23,7 @@ In addition to being configurable when you start them up, brokers can also be [d

### List active brokers

Fetch all available active brokers that are serving traffic.
Fetch all available active brokers that are serving traffic.

#### pulsar-admin

Expand All @@ -38,7 +38,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)

Expand All @@ -50,7 +50,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

Expand All @@ -70,7 +70,7 @@ $ pulsar-admin brokers namespaces use \
```
###### REST

{% endpoint GET /admin/brokers/:cluster/:broker:/ownedNamespaces %}
{% endpoint GET /admin/v2/brokers/:cluster/:broker:/ownedNamespaces %}

###### Java

Expand All @@ -85,7 +85,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

Expand All @@ -99,7 +99,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)

Expand All @@ -122,7 +122,7 @@ brokerShutdownTimeoutMs

#### REST API

{% endpoint GET /admin/brokers/configuration %}
{% endpoint GET /admin/v2/brokers/configuration %}

[More info](reference-rest-api.md#/admin/brokers/configuration)

Expand All @@ -145,7 +145,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)

Expand Down
14 changes: 7 additions & 7 deletions site2/docs/admin-api-clusters.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -32,7 +32,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)

Expand Down Expand Up @@ -103,7 +103,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)

Expand All @@ -129,7 +129,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)

Expand Down Expand Up @@ -159,7 +159,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)

Expand All @@ -185,7 +185,7 @@ cluster-2

#### REST API

{% endpoint GET /admin/clusters %}
{% endpoint GET /admin/v2/clusters %}

[More info](reference-rest-api.md#/admin/clusters)

Expand All @@ -209,7 +209,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)

Expand Down
Loading

0 comments on commit f98e099

Please sign in to comment.