You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/04/22 23:11:51 UTC
[3/4] mesos git commit: Reran `generate-endpoint-help.py` script for
endpoints redirection.
Reran `generate-endpoint-help.py` script for endpoints redirection.
Review: https://reviews.apache.org/r/46472/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/aac192c8
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/aac192c8
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/aac192c8
Branch: refs/heads/master
Commit: aac192c8f5d2945c76796019191d9907106fb419
Parents: ba4328d
Author: haosdent huang <ha...@gmail.com>
Authored: Fri Apr 22 14:10:45 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Fri Apr 22 14:11:39 2016 -0700
----------------------------------------------------------------------
docs/endpoints/index.md | 6 ++-
docs/endpoints/master/api/v1/scheduler.md | 4 ++
docs/endpoints/master/create-volumes.md | 13 ++++--
docs/endpoints/master/destroy-volumes.md | 13 ++++--
docs/endpoints/master/frameworks.md | 8 ++++
docs/endpoints/master/machine/down.md | 5 +++
docs/endpoints/master/machine/up.md | 5 +++
docs/endpoints/master/maintenance/schedule.md | 6 +++
docs/endpoints/master/maintenance/status.md | 12 ++++--
docs/endpoints/master/quota.md | 5 +++
docs/endpoints/master/redirect.md | 7 ++--
docs/endpoints/master/reserve.md | 15 +++++--
docs/endpoints/master/roles.json.md | 5 +++
docs/endpoints/master/roles.md | 5 +++
docs/endpoints/master/slaves.md | 9 ++++-
docs/endpoints/master/state-summary.md | 6 +++
docs/endpoints/master/state.json.md | 7 +++-
docs/endpoints/master/state.md | 7 +++-
docs/endpoints/master/tasks.json.md | 5 +++
docs/endpoints/master/tasks.md | 5 +++
docs/endpoints/master/teardown.md | 6 ++-
docs/endpoints/master/unreserve.md | 15 +++++--
docs/endpoints/master/weights.md | 5 +++
docs/endpoints/monitor/statistics.json.md | 41 +++++++++++++++++++
docs/endpoints/monitor/statistics.md | 41 +++++++++++++++++++
docs/endpoints/slave/health.md | 4 +-
docs/endpoints/slave/monitor/statistics.json.md | 42 --------------------
docs/endpoints/slave/monitor/statistics.md | 42 --------------------
docs/endpoints/slave/state.json.md | 4 +-
docs/endpoints/slave/state.md | 4 +-
30 files changed, 235 insertions(+), 117 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/index.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/index.md b/docs/endpoints/index.md
index d57239e..8ef110f 100644
--- a/docs/endpoints/index.md
+++ b/docs/endpoints/index.md
@@ -103,6 +103,10 @@ For example, http://agent.com:5051/files/browse
### metrics ###
* [/metrics/snapshot](metrics/snapshot.md)
+### monitor ###
+* [/monitor/statistics](monitor/statistics.md)
+* [/monitor/statistics.json](monitor/statistics.json.md)
+
### profiler ###
* [/profiler/start](profiler/start.md)
* [/profiler/stop](profiler/stop.md)
@@ -112,8 +116,6 @@ For example, http://agent.com:5051/files/browse
* [/containers](slave/containers.md)
* [/flags](slave/flags.md)
* [/health](slave/health.md)
-* [/monitor/statistics](slave/monitor/statistics.md)
-* [/monitor/statistics.json](slave/monitor/statistics.json.md)
* [/state](slave/state.md)
* [/state.json](slave/state.json.md)
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/api/v1/scheduler.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/api/v1/scheduler.md b/docs/endpoints/master/api/v1/scheduler.md
index f647dc0..d590121 100644
--- a/docs/endpoints/master/api/v1/scheduler.md
+++ b/docs/endpoints/master/api/v1/scheduler.md
@@ -13,6 +13,10 @@ Endpoint for schedulers to make calls against the master.
### DESCRIPTION ###
Returns 202 Accepted iff the request is accepted.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
### AUTHENTICATION ###
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/create-volumes.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/create-volumes.md b/docs/endpoints/master/create-volumes.md
index 5c86480..f6ec938 100644
--- a/docs/endpoints/master/create-volumes.md
+++ b/docs/endpoints/master/create-volumes.md
@@ -12,9 +12,16 @@ layout: documentation
Create persistent volumes on reserved resources.
### DESCRIPTION ###
-Returns 202 Accepted if the request was accepted. This does not
-imply that the volume was created successfully: volume
-creation is done asynchronously and may fail.
+Returns 202 ACCEPTED which indicates that the create
+operation has been validated successfully by the master.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
+The request is then forwarded asynchronously to the Mesos
+agent where the reserved resources are located.
+That asynchronous message may not be delivered or
+creating the volumes at the agent might fail.
Please provide "slaveId" and "volumes" values designating
the volumes to be created.
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/destroy-volumes.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/destroy-volumes.md b/docs/endpoints/master/destroy-volumes.md
index f75dd52..054e816 100644
--- a/docs/endpoints/master/destroy-volumes.md
+++ b/docs/endpoints/master/destroy-volumes.md
@@ -12,9 +12,16 @@ layout: documentation
Destroy persistent volumes.
### DESCRIPTION ###
-Returns 202 Accepted if the request was accepted. This does not
-imply that the volume was destroyed successfully: volume
-destruction is done asynchronously and may fail.
+Returns 202 ACCEPTED which indicates that the destroy
+operation has been validated successfully by the master.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
+The request is then forwarded asynchronously to the Mesos
+agent where the reserved resources are located.
+That asynchronous message may not be delivered or
+destroying the volumes at the agent might fail.
Please provide "slaveId" and "volumes" values designating
the volumes to be destroyed.
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/frameworks.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/frameworks.md b/docs/endpoints/master/frameworks.md
index 15ecabf..1aed723 100644
--- a/docs/endpoints/master/frameworks.md
+++ b/docs/endpoints/master/frameworks.md
@@ -12,5 +12,13 @@ layout: documentation
Exposes the frameworks info.
### DESCRIPTION ###
+Returns 200 OK when the frameworks info was queried successfully.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
+
+
+### AUTHENTICATION ###
This endpoint requires authentication iff HTTP authentication is
enabled.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/machine/down.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/machine/down.md b/docs/endpoints/master/machine/down.md
index f7e8141..d2d5e87 100644
--- a/docs/endpoints/master/machine/down.md
+++ b/docs/endpoints/master/machine/down.md
@@ -12,6 +12,11 @@ layout: documentation
Brings a set of machines down.
### DESCRIPTION ###
+Returns 200 OK when the operation was successful.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
POST: Validates the request body as JSON and transitions
the list of machines into DOWN mode. Currently, only
machines in DRAINING mode are allowed to be brought down.
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/machine/up.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/machine/up.md b/docs/endpoints/master/machine/up.md
index d96be72..aa2fb9b 100644
--- a/docs/endpoints/master/machine/up.md
+++ b/docs/endpoints/master/machine/up.md
@@ -12,6 +12,11 @@ layout: documentation
Brings a set of machines back up.
### DESCRIPTION ###
+Returns 200 OK when the operation was successful.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
POST: Validates the request body as JSON and transitions
the list of machines into UP mode. This also removes
the list of machines from the maintenance schedule.
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/maintenance/schedule.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/maintenance/schedule.md b/docs/endpoints/master/maintenance/schedule.md
index 3d69900..9244a34 100644
--- a/docs/endpoints/master/maintenance/schedule.md
+++ b/docs/endpoints/master/maintenance/schedule.md
@@ -12,6 +12,12 @@ layout: documentation
Returns or updates the cluster's maintenance schedule.
### DESCRIPTION ###
+Returns 200 OK when the requested maintenance operation was performed
+successfully.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
GET: Returns the current maintenance schedule as JSON.
POST: Validates the request body as JSON
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/maintenance/status.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/maintenance/status.md b/docs/endpoints/master/maintenance/status.md
index 249dae2..5174335 100644
--- a/docs/endpoints/master/maintenance/status.md
+++ b/docs/endpoints/master/maintenance/status.md
@@ -12,11 +12,17 @@ layout: documentation
Retrieves the maintenance status of the cluster.
### DESCRIPTION ###
+Returns 200 OK when the maintenance status was queried successfully.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
Returns an object with one list of machines per machine mode.
For draining machines, this list includes the frameworks' responses
-to inverse offers. NOTE: Inverse offer responses are cleared if
-the master fails over. However, new inverse offers will be sent
-once the master recovers.
+to inverse offers.
+**NOTE**:
+Inverse offer responses are cleared if the master fails over.
+However, new inverse offers will be sent once the master recovers.
### AUTHENTICATION ###
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/quota.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/quota.md b/docs/endpoints/master/quota.md
index b1e3462..682370f 100644
--- a/docs/endpoints/master/quota.md
+++ b/docs/endpoints/master/quota.md
@@ -12,6 +12,11 @@ layout: documentation
Sets quota for a role.
### DESCRIPTION ###
+Returns 200 OK when the quota has been changed successfully.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
POST: Validates the request body as JSON
and sets quota for a role.
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/redirect.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/redirect.md b/docs/endpoints/master/redirect.md
index 833d993..3387b64 100644
--- a/docs/endpoints/master/redirect.md
+++ b/docs/endpoints/master/redirect.md
@@ -12,9 +12,10 @@ layout: documentation
Redirects to the leading Master.
### DESCRIPTION ###
-This returns a 307 Temporary Redirect to the leading Master.
-If no Master is leading (according to this Master), then the
-Master will redirect to itself.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
**NOTES:**
1. This is the recommended way to bookmark the WebUI when
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/reserve.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/reserve.md b/docs/endpoints/master/reserve.md
index 8f38cc0..9bb04ed 100644
--- a/docs/endpoints/master/reserve.md
+++ b/docs/endpoints/master/reserve.md
@@ -9,12 +9,19 @@ layout: documentation
> /master/reserve
### TL;DR; ###
-Reserve resources dynamically on a specific slave.
+Reserve resources dynamically on a specific agent.
### DESCRIPTION ###
-Returns 202 Accepted if the request was accepted. This does not
-imply that the requested resources have been reserved successfully:
-resource reservation is done asynchronously and may fail.
+Returns 202 ACCEPTED which indicates that the reserve
+operation has been validated successfully by the master.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
+The request is then forwarded asynchronously to the Mesos
+agent where the reserved resources are located.
+That asynchronous message may not be delivered or
+reserving resources at the agent might fail.
Please provide "slaveId" and "resources" values designating
the resources to be reserved.
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/roles.json.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/roles.json.md b/docs/endpoints/master/roles.json.md
index 01e2653..b967547 100644
--- a/docs/endpoints/master/roles.json.md
+++ b/docs/endpoints/master/roles.json.md
@@ -12,6 +12,11 @@ layout: documentation
Information about roles.
### DESCRIPTION ###
+Returns 200 OK when information about roles was queried successfully.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
This endpoint provides information about roles as a JSON object.
It returns information about every role that is on the role
whitelist (if enabled), has one or more registered frameworks,
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/roles.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/roles.md b/docs/endpoints/master/roles.md
index 9c01d37..5468b5f 100644
--- a/docs/endpoints/master/roles.md
+++ b/docs/endpoints/master/roles.md
@@ -12,6 +12,11 @@ layout: documentation
Information about roles.
### DESCRIPTION ###
+Returns 200 OK when information about roles was queried successfully.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
This endpoint provides information about roles as a JSON object.
It returns information about every role that is on the role
whitelist (if enabled), has one or more registered frameworks,
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/slaves.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/slaves.md b/docs/endpoints/master/slaves.md
index 9e9fff7..90d0fb8 100644
--- a/docs/endpoints/master/slaves.md
+++ b/docs/endpoints/master/slaves.md
@@ -9,10 +9,15 @@ layout: documentation
> /master/slaves
### TL;DR; ###
-Information about registered slaves.
+Information about registered agents.
### DESCRIPTION ###
-This endpoint shows information about the slaves registered in
+Returns 200 OK when the request was processed successfully.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
+This endpoint shows information about the agents registered in
this master formatted as a JSON object.
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/state-summary.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/state-summary.md b/docs/endpoints/master/state-summary.md
index a0da400..4eb517e 100644
--- a/docs/endpoints/master/state-summary.md
+++ b/docs/endpoints/master/state-summary.md
@@ -12,6 +12,12 @@ layout: documentation
Summary of state of all tasks and registered frameworks in cluster.
### DESCRIPTION ###
+Returns 200 OK when a summary of the master's state was queried
+successfully.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
This endpoint gives a summary of the state of all tasks and
registered frameworks in the cluster as a JSON object.
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/state.json.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/state.json.md b/docs/endpoints/master/state.json.md
index 7998b80..4ccd146 100644
--- a/docs/endpoints/master/state.json.md
+++ b/docs/endpoints/master/state.json.md
@@ -12,8 +12,13 @@ layout: documentation
Information about state of master.
### DESCRIPTION ###
+Returns 200 OK when the state of the master was queried successfully.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
This endpoint shows information about the frameworks, tasks,
-executors and slaves running in the cluster as a JSON object.
+executors and agents running in the cluster as a JSON object.
Example (**Note**: this is not exhaustive):
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/state.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/state.md b/docs/endpoints/master/state.md
index 59518d6..5f45205 100644
--- a/docs/endpoints/master/state.md
+++ b/docs/endpoints/master/state.md
@@ -12,8 +12,13 @@ layout: documentation
Information about state of master.
### DESCRIPTION ###
+Returns 200 OK when the state of the master was queried successfully.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
This endpoint shows information about the frameworks, tasks,
-executors and slaves running in the cluster as a JSON object.
+executors and agents running in the cluster as a JSON object.
Example (**Note**: this is not exhaustive):
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/tasks.json.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/tasks.json.md b/docs/endpoints/master/tasks.json.md
index 29bb973..5d2c0e6 100644
--- a/docs/endpoints/master/tasks.json.md
+++ b/docs/endpoints/master/tasks.json.md
@@ -12,6 +12,11 @@ layout: documentation
Lists tasks from all active frameworks.
### DESCRIPTION ###
+Returns 200 OK when task information was queried successfully.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
Lists known tasks.
Query parameters:
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/tasks.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/tasks.md b/docs/endpoints/master/tasks.md
index ab9bb09..c7df686 100644
--- a/docs/endpoints/master/tasks.md
+++ b/docs/endpoints/master/tasks.md
@@ -12,6 +12,11 @@ layout: documentation
Lists tasks from all active frameworks.
### DESCRIPTION ###
+Returns 200 OK when task information was queried successfully.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
Lists known tasks.
Query parameters:
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/teardown.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/teardown.md b/docs/endpoints/master/teardown.md
index 9b62b26..4c14f59 100644
--- a/docs/endpoints/master/teardown.md
+++ b/docs/endpoints/master/teardown.md
@@ -12,9 +12,13 @@ layout: documentation
Tears down a running framework by shutting down all tasks/executors and removing the framework.
### DESCRIPTION ###
+Returns 200 OK if the framework was torn down successfully.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
Please provide a "frameworkId" value designating the running
framework to tear down.
-Returns 200 OK if the framework was correctly teared down.
### AUTHENTICATION ###
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/unreserve.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/unreserve.md b/docs/endpoints/master/unreserve.md
index 8e9a696..5cce428 100644
--- a/docs/endpoints/master/unreserve.md
+++ b/docs/endpoints/master/unreserve.md
@@ -9,12 +9,19 @@ layout: documentation
> /master/unreserve
### TL;DR; ###
-Unreserve resources dynamically on a specific slave.
+Unreserve resources dynamically on a specific agent.
### DESCRIPTION ###
-Returns 202 Accepted if the request was accepted. This does not
-imply that the requested resources have been unreserved successfully:
-resource unreservation is done asynchronously and may fail.
+Returns 202 ACCEPTED which indicates that the unreserve
+operation has been validated successfully by the master.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
+The request is then forwarded asynchronously to the Mesos
+agent where the reserved resources are located.
+That asynchronous message may not be delivered or
+unreserving resources at the agent might fail.
Please provide "slaveId" and "resources" values designating
the resources to be unreserved.
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/master/weights.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/master/weights.md b/docs/endpoints/master/weights.md
index 7c45173..1e54079 100644
--- a/docs/endpoints/master/weights.md
+++ b/docs/endpoints/master/weights.md
@@ -12,6 +12,11 @@ layout: documentation
Updates weights for the specified roles.
### DESCRIPTION ###
+Returns 200 OK when the weights update was successful.
+Returns 307 TEMPORARY_REDIRECT redirect to the leading master when
+current master is not the leader.
+Returns 503 SERVICE_UNAVAILABLE if the leading master cannot be
+found.
PUT: Validates the request body as JSON
and updates the weights for the specified roles.
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/monitor/statistics.json.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/monitor/statistics.json.md b/docs/endpoints/monitor/statistics.json.md
new file mode 100644
index 0000000..1830493
--- /dev/null
+++ b/docs/endpoints/monitor/statistics.json.md
@@ -0,0 +1,41 @@
+---
+title: Apache Mesos - HTTP Endpoints - /monitor/statistics.json
+layout: documentation
+---
+<!--- This is an automatically generated file. DO NOT EDIT! --->
+
+### USAGE ###
+> /monitor/statistics.json
+
+### TL;DR; ###
+Retrieve resource monitoring information.
+
+### DESCRIPTION ###
+Returns the current resource consumption data for containers
+running under this slave.
+
+Example:
+
+```
+[{
+ "executor_id":"executor",
+ "executor_name":"name",
+ "framework_id":"framework",
+ "source":"source",
+ "statistics":
+ {
+ "cpus_limit":8.25,
+ "cpus_nr_periods":769021,
+ "cpus_nr_throttled":1046,
+ "cpus_system_time_secs":34501.45,
+ "cpus_throttled_time_secs":352.597023453,
+ "cpus_user_time_secs":96348.84,
+ "mem_anon_bytes":4845449216,
+ "mem_file_bytes":260165632,
+ "mem_limit_bytes":7650410496,
+ "mem_mapped_file_bytes":7159808,
+ "mem_rss_bytes":5105614848,
+ "timestamp":1388534400.0
+ }
+}]
+```
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/monitor/statistics.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/monitor/statistics.md b/docs/endpoints/monitor/statistics.md
new file mode 100644
index 0000000..38dede0
--- /dev/null
+++ b/docs/endpoints/monitor/statistics.md
@@ -0,0 +1,41 @@
+---
+title: Apache Mesos - HTTP Endpoints - /monitor/statistics
+layout: documentation
+---
+<!--- This is an automatically generated file. DO NOT EDIT! --->
+
+### USAGE ###
+> /monitor/statistics
+
+### TL;DR; ###
+Retrieve resource monitoring information.
+
+### DESCRIPTION ###
+Returns the current resource consumption data for containers
+running under this slave.
+
+Example:
+
+```
+[{
+ "executor_id":"executor",
+ "executor_name":"name",
+ "framework_id":"framework",
+ "source":"source",
+ "statistics":
+ {
+ "cpus_limit":8.25,
+ "cpus_nr_periods":769021,
+ "cpus_nr_throttled":1046,
+ "cpus_system_time_secs":34501.45,
+ "cpus_throttled_time_secs":352.597023453,
+ "cpus_user_time_secs":96348.84,
+ "mem_anon_bytes":4845449216,
+ "mem_file_bytes":260165632,
+ "mem_limit_bytes":7650410496,
+ "mem_mapped_file_bytes":7159808,
+ "mem_rss_bytes":5105614848,
+ "timestamp":1388534400.0
+ }
+}]
+```
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/slave/health.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/slave/health.md b/docs/endpoints/slave/health.md
index 301a851..988567c 100644
--- a/docs/endpoints/slave/health.md
+++ b/docs/endpoints/slave/health.md
@@ -9,10 +9,10 @@ layout: documentation
> /slave(1)/health
### TL;DR; ###
-Health check of the Slave.
+Health check of the Agent.
### DESCRIPTION ###
-Returns 200 OK iff the Slave is healthy.
+Returns 200 OK iff the Agent is healthy.
Delayed responses are also indicative of poor health.
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/slave/monitor/statistics.json.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/slave/monitor/statistics.json.md b/docs/endpoints/slave/monitor/statistics.json.md
deleted file mode 100644
index f409a21..0000000
--- a/docs/endpoints/slave/monitor/statistics.json.md
+++ /dev/null
@@ -1,42 +0,0 @@
----
-title: Apache Mesos - HTTP Endpoints - /monitor/statistics.json
-layout: documentation
----
-<!--- This is an automatically generated file. DO NOT EDIT! --->
-
-### USAGE ###
-> /monitor/statistics.json
-> /slave(1)/monitor/statistics.json
-
-### TL;DR; ###
-Retrieve resource monitoring information.
-
-### DESCRIPTION ###
-Returns the current resource consumption data for containers
-running under this slave.
-
-Example:
-
-```
-[{
- "executor_id":"executor",
- "executor_name":"name",
- "framework_id":"framework",
- "source":"source",
- "statistics":
- {
- "cpus_limit":8.25,
- "cpus_nr_periods":769021,
- "cpus_nr_throttled":1046,
- "cpus_system_time_secs":34501.45,
- "cpus_throttled_time_secs":352.597023453,
- "cpus_user_time_secs":96348.84,
- "mem_anon_bytes":4845449216,
- "mem_file_bytes":260165632,
- "mem_limit_bytes":7650410496,
- "mem_mapped_file_bytes":7159808,
- "mem_rss_bytes":5105614848,
- "timestamp":1388534400.0
- }
-}]
-```
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/slave/monitor/statistics.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/slave/monitor/statistics.md b/docs/endpoints/slave/monitor/statistics.md
deleted file mode 100644
index ec9f095..0000000
--- a/docs/endpoints/slave/monitor/statistics.md
+++ /dev/null
@@ -1,42 +0,0 @@
----
-title: Apache Mesos - HTTP Endpoints - /monitor/statistics
-layout: documentation
----
-<!--- This is an automatically generated file. DO NOT EDIT! --->
-
-### USAGE ###
-> /monitor/statistics
-> /slave(1)/monitor/statistics
-
-### TL;DR; ###
-Retrieve resource monitoring information.
-
-### DESCRIPTION ###
-Returns the current resource consumption data for containers
-running under this slave.
-
-Example:
-
-```
-[{
- "executor_id":"executor",
- "executor_name":"name",
- "framework_id":"framework",
- "source":"source",
- "statistics":
- {
- "cpus_limit":8.25,
- "cpus_nr_periods":769021,
- "cpus_nr_throttled":1046,
- "cpus_system_time_secs":34501.45,
- "cpus_throttled_time_secs":352.597023453,
- "cpus_user_time_secs":96348.84,
- "mem_anon_bytes":4845449216,
- "mem_file_bytes":260165632,
- "mem_limit_bytes":7650410496,
- "mem_mapped_file_bytes":7159808,
- "mem_rss_bytes":5105614848,
- "timestamp":1388534400.0
- }
-}]
-```
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/slave/state.json.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/slave/state.json.md b/docs/endpoints/slave/state.json.md
index 92cd4e1..ac85369 100644
--- a/docs/endpoints/slave/state.json.md
+++ b/docs/endpoints/slave/state.json.md
@@ -9,11 +9,11 @@ layout: documentation
> /slave(1)/state.json
### TL;DR; ###
-Information about state of the Slave.
+Information about state of the Agent.
### DESCRIPTION ###
This endpoint shows information about the frameworks, executors
-and the slave's master as a JSON object.
+and the agent's master as a JSON object.
Example (**Note**: this is not exhaustive):
http://git-wip-us.apache.org/repos/asf/mesos/blob/aac192c8/docs/endpoints/slave/state.md
----------------------------------------------------------------------
diff --git a/docs/endpoints/slave/state.md b/docs/endpoints/slave/state.md
index 9777466..c7b61d7 100644
--- a/docs/endpoints/slave/state.md
+++ b/docs/endpoints/slave/state.md
@@ -9,11 +9,11 @@ layout: documentation
> /slave(1)/state
### TL;DR; ###
-Information about state of the Slave.
+Information about state of the Agent.
### DESCRIPTION ###
This endpoint shows information about the frameworks, executors
-and the slave's master as a JSON object.
+and the agent's master as a JSON object.
Example (**Note**: this is not exhaustive):