Repository: incubator-trafficcontrol Updated Branches: refs/heads/master a8b2ae1a8 -> 2f3e74d5f
More fixes for various errors and warnings; builds clean now. Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/8f9f5e54 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/8f9f5e54 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/8f9f5e54 Branch: refs/heads/master Commit: 8f9f5e5435a04bc2301971734c7f639dd57b58a9 Parents: 88506f5 Author: Jan van Doorn <jan_vando...@cable.comcast.com> Authored: Thu Dec 22 13:43:22 2016 -0700 Committer: Jeremy Mitchell <mitchell...@gmail.com> Committed: Tue Dec 27 15:25:32 2016 -0700 ---------------------------------------------------------------------- docs/source/admin/traffic_ops_using.rst | 2 +- docs/source/admin/traffic_stats.rst | 2 +- docs/source/admin/traffic_vault.rst | 2 +- .../development/traffic_ops_api/v11/region.rst | 2 +- .../development/traffic_ops_api/v12/cdn.rst | 2 - .../traffic_ops_api/v12/division.rst | 3 +- .../traffic_ops_api/v12/parameter.rst | 59 ++++++++++---------- .../development/traffic_ops_api/v12/region.rst | 1 + docs/source/development/traffic_portal.rst | 2 +- 9 files changed, 38 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8f9f5e54/docs/source/admin/traffic_ops_using.rst ---------------------------------------------------------------------- diff --git a/docs/source/admin/traffic_ops_using.rst b/docs/source/admin/traffic_ops_using.rst index e15cb7b..eb3d0ee 100644 --- a/docs/source/admin/traffic_ops_using.rst +++ b/docs/source/admin/traffic_ops_using.rst @@ -316,7 +316,7 @@ The fields in the Delivery Service view are: | | - CZF only - If the requesting IP is not in the Coverage Zone File, do not serve the request. | | | - CZF + US - If the requesting IP is not in the Coverage Zone File or not in the United States, do not serve the request. | +--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| Geo Limit Redirect URL | (for HTTP routed delivery services only) This is the URL Traffic Router will redirect to when Geo Limit Failure. See :ref:`geolimit-failure-redirect-feature` | +| Geo Limit Redirect URL | (for HTTP routed delivery services only) This is the URL Traffic Router will redirect to when Geo Limit Failure. See :ref:`rl-tr-ngb` | +--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | Bypass FQDN | (for HTTP routed delivery services only) This is the FQDN Traffic Router will redirect to (with the same path) when the max Bps or Max Tps for this deliveryservice are exceeded. | +--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8f9f5e54/docs/source/admin/traffic_stats.rst ---------------------------------------------------------------------- diff --git a/docs/source/admin/traffic_stats.rst b/docs/source/admin/traffic_stats.rst index 98c9558..df720ae 100644 --- a/docs/source/admin/traffic_stats.rst +++ b/docs/source/admin/traffic_stats.rst @@ -37,7 +37,7 @@ Installation **Installing Grafana:** - Grafana is used to display Traffic Stats/InfluxDB data in Traffic Ops. Grafana is typically run on the same server as Traffic Stats but this is not a requirement. Grafana can be installed on any server that can access InfluxDB and can be accessed by Traffic Ops. Documentation on installing Grafana can be found on the `Grafana website <http://docs.grafana.org/installation/>`_. + Grafana is used to display Traffic Stats/InfluxDB data in Traffic Ops. Grafana is typically run on the same server as Traffic Stats but this is not a requirement. Grafana can be installed on any server that can access InfluxDB and can be accessed by Traffic Ops. Documentation on installing Grafana can be found on the `Grafana website <http://docs.grafana.org/installation/>`__. Configuration ========================= http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8f9f5e54/docs/source/admin/traffic_vault.rst ---------------------------------------------------------------------- diff --git a/docs/source/admin/traffic_vault.rst b/docs/source/admin/traffic_vault.rst index 35be160..d50ef25 100644 --- a/docs/source/admin/traffic_vault.rst +++ b/docs/source/admin/traffic_vault.rst @@ -20,7 +20,7 @@ Installing Traffic Vault ======================== In order to successfully store private keys you will need to install Riak. The latest version of Riak can be downloaded on the Riak `website <http://docs.basho.com/riak/latest/downloads/>`_. -The installation instructions for Riak can be found `here <http://docs.basho.com/riak/latest/ops/building/installing/>`_. +The installation instructions for Riak can be found `here <http://docs.basho.com/riak/latest/ops/building/installing/>`__. Production is currently running version 2.0.5 of Riak, but the latest version should suffice. http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8f9f5e54/docs/source/development/traffic_ops_api/v11/region.rst ---------------------------------------------------------------------- diff --git a/docs/source/development/traffic_ops_api/v11/region.rst b/docs/source/development/traffic_ops_api/v11/region.rst index faddbb1..d521f33 100644 --- a/docs/source/development/traffic_ops_api/v11/region.rst +++ b/docs/source/development/traffic_ops_api/v11/region.rst @@ -172,7 +172,7 @@ Regions "divisionName": "mydivision1" } } -| + **POST /api/1.1/divisions/:division_name/regions** Create Region http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8f9f5e54/docs/source/development/traffic_ops_api/v12/cdn.rst ---------------------------------------------------------------------- diff --git a/docs/source/development/traffic_ops_api/v12/cdn.rst b/docs/source/development/traffic_ops_api/v12/cdn.rst index 1819c69..d7e3c3c 100644 --- a/docs/source/development/traffic_ops_api/v12/cdn.rst +++ b/docs/source/development/traffic_ops_api/v12/cdn.rst @@ -1330,5 +1330,3 @@ SSL Keys } ] } -| - http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8f9f5e54/docs/source/development/traffic_ops_api/v12/division.rst ---------------------------------------------------------------------- diff --git a/docs/source/development/traffic_ops_api/v12/division.rst b/docs/source/development/traffic_ops_api/v12/division.rst index 934c393..e0f1756 100644 --- a/docs/source/development/traffic_ops_api/v12/division.rst +++ b/docs/source/development/traffic_ops_api/v12/division.rst @@ -21,7 +21,7 @@ Divisions .. _to-api-v12-division-route: /api/1.2/divisions -++++++++++++++++ +++++++++++++++++++ **GET /api/1.2/divisions** Get all divisions. @@ -154,6 +154,7 @@ Divisions "name": "mydivision1" } } + | http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8f9f5e54/docs/source/development/traffic_ops_api/v12/parameter.rst ---------------------------------------------------------------------- diff --git a/docs/source/development/traffic_ops_api/v12/parameter.rst b/docs/source/development/traffic_ops_api/v12/parameter.rst index 307d4c7..9de8451 100644 --- a/docs/source/development/traffic_ops_api/v12/parameter.rst +++ b/docs/source/development/traffic_ops_api/v12/parameter.rst @@ -293,31 +293,34 @@ Parameter +-----------------+---------+--------------------------------------------------------------------------------------+ - **Request Example** :: + **Request Example** - 1. single parameter format exampe: - { - "name":"param1", - "configFile":"configFile1" - "value":"value1", - "secure":0, - } + 1. single parameter format example: :: + + { + "name":"param1", + "configFile":"configFile1", + "value":"value1", + "secure":0 + } + + 2. array format example: :: + + [ + { + "name":"param1", + "configFile":"configFile1", + "value":"value1", + "secure":0 + }, + { + "name":"param2", + "configFile":"configFile2", + "value":"value2", + "secure":1 + } + ] - 2. array format example: - [ - { - "name":"param1", - "configFile":"configFile1" - "value":"value1", - "secure":0, - }, - { - "name":"param2", - "configFile":"configFile2" - "value":"value2", - "secure":1, - } - ] **Response Example** :: @@ -391,7 +394,7 @@ Parameter { "name":"param1", - "configFile":"configFile1" + "configFile":"configFile1", "value":"value1", "secure":"0", } @@ -443,8 +446,6 @@ Parameter **Response Example** :: - Response Example: - { "alerts": [ @@ -452,7 +453,7 @@ Parameter "level": "success", "text": "Parameter was successfully deleted." } - ], + ] } | @@ -496,8 +497,8 @@ Parameter { "name":"param1", - "configFile":"configFile1" - "value":"value1", + "configFile":"configFile1", + "value":"value1" } **Response Example** :: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8f9f5e54/docs/source/development/traffic_ops_api/v12/region.rst ---------------------------------------------------------------------- diff --git a/docs/source/development/traffic_ops_api/v12/region.rst b/docs/source/development/traffic_ops_api/v12/region.rst index 2fd96d9..11e2f18 100644 --- a/docs/source/development/traffic_ops_api/v12/region.rst +++ b/docs/source/development/traffic_ops_api/v12/region.rst @@ -172,6 +172,7 @@ Regions "divisionName": "mydivision1" } } + | **POST /api/1.2/divisions/:division_name/regions** http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8f9f5e54/docs/source/development/traffic_portal.rst ---------------------------------------------------------------------- diff --git a/docs/source/development/traffic_portal.rst b/docs/source/development/traffic_portal.rst index 7135bc7..8950d12 100644 --- a/docs/source/development/traffic_portal.rst +++ b/docs/source/development/traffic_portal.rst @@ -14,7 +14,7 @@ .. Traffic Portal -************* +************** Introduction ============
