trafficcontrol-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fri...@apache.org
Subject [16/18] incubator-trafficcontrol-website git commit: Update Downloads and latest docs pages for 2.0.0
Date Fri, 07 Jul 2017 12:44:57 GMT
Update Downloads and latest docs pages for 2.0.0


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/commit/6b5a5ffa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/tree/6b5a5ffa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/diff/6b5a5ffa

Branch: refs/heads/asf-site
Commit: 6b5a5ffa0c8d664f06c709c7efae2f09507366f8
Parents: f12be62
Author: Eric Friedrich <friede@apache.org>
Authored: Fri Jul 7 08:40:00 2017 -0400
Committer: Eric Friedrich <friede@apache.org>
Committed: Fri Jul 7 08:40:00 2017 -0400

----------------------------------------------------------------------
 .../_images/traffic_control_overview_3.png      | Bin 113129 -> 138671 bytes
 .../_sources/admin/traffic_ops_config.rst.txt   |  12 +-
 .../_sources/admin/traffic_ops_using.rst.txt    |  31 +-
 .../_sources/admin/traffic_router.rst.txt       |  20 +-
 .../latest/_sources/admin/traffic_stats.rst.txt |   6 +-
 .../latest/_sources/admin/traffic_vault.rst.txt |   2 +-
 .../development/traffic_monitor.rst.txt         |  28 +-
 .../_sources/development/traffic_ops.rst.txt    |   8 +-
 .../traffic_ops_api/v11/region.rst.txt          |   2 +-
 .../development/traffic_ops_api/v12/asn.rst.txt |   8 +
 .../traffic_ops_api/v12/cachegroup.rst.txt      |  53 +-
 .../development/traffic_ops_api/v12/cdn.rst.txt |  55 +-
 .../traffic_ops_api/v12/deliveryservice.rst.txt | 284 +++++--
 .../v12/deliveryservice_regex.rst.txt           | 374 +++++++++
 .../traffic_ops_api/v12/division.rst.txt        |   3 +-
 .../traffic_ops_api/v12/parameter.rst.txt       | 105 ++-
 .../traffic_ops_api/v12/phys_location.rst.txt   |   8 +
 .../traffic_ops_api/v12/region.rst.txt          |   9 +
 .../traffic_ops_api/v12/server.rst.txt          | 247 +++++-
 .../traffic_ops_api/v12/user.rst.txt            | 231 ++++++
 .../_sources/development/traffic_portal.rst.txt |   2 +-
 .../_sources/development/traffic_router.rst.txt |  36 +-
 .../_sources/overview/introduction.rst.txt      |  25 +-
 docs/latest/_static/basic.css                   |   7 -
 .../_static/fonts/fontawesome-webfont.svg       | 414 ++++++++++
 docs/latest/_static/pygments.css                |   4 -
 docs/latest/_static/tc_logo.png                 | Bin 101717 -> 89813 bytes
 docs/latest/_static/tc_logo_c_only.png          | Bin 0 -> 106800 bytes
 docs/latest/_static/theme_overrides.css         |  27 +-
 docs/latest/admin/index.html                    |  14 +-
 docs/latest/admin/quick_howto/dnssec.html       |  16 +-
 docs/latest/admin/quick_howto/federations.html  |  16 +-
 docs/latest/admin/quick_howto/index.html        |   8 +-
 docs/latest/admin/quick_howto/multi_site.html   |  18 +-
 docs/latest/admin/quick_howto/regionalgeo.html  |  28 +-
 docs/latest/admin/quick_howto/steering.html     |  14 +-
 docs/latest/admin/traffic_monitor.html          |  12 +-
 docs/latest/admin/traffic_ops_config.html       |  81 +-
 docs/latest/admin/traffic_ops_extensions.html   |  12 +-
 docs/latest/admin/traffic_ops_install.html      |  16 +-
 docs/latest/admin/traffic_ops_using.html        | 115 +--
 docs/latest/admin/traffic_portal.html           |  10 +-
 docs/latest/admin/traffic_router.html           | 100 ++-
 docs/latest/admin/traffic_server.html           |  20 +-
 docs/latest/admin/traffic_stats.html            |  26 +-
 docs/latest/admin/traffic_vault.html            |  10 +-
 docs/latest/basics/cache_revalidation.html      |  16 +-
 docs/latest/basics/caching_proxies.html         |  32 +-
 .../basics/content_delivery_networks.html       |   8 +-
 docs/latest/basics/http_11.html                 |  12 +-
 docs/latest/basics/index.html                   |   6 +-
 docs/latest/development/index.html              |  10 +-
 docs/latest/development/traffic_monitor.html    |  15 +-
 .../traffic_monitor/traffic_monitor_api.html    |   8 +-
 docs/latest/development/traffic_ops.html        |  64 +-
 .../development/traffic_ops_api/routes.html     |   8 +-
 .../development/traffic_ops_api/v11/asn.html    |  10 +-
 .../traffic_ops_api/v11/cachegroup.html         |  24 +-
 .../development/traffic_ops_api/v11/cdn.html    |  44 +-
 .../traffic_ops_api/v11/changelog.html          |  16 +-
 .../traffic_ops_api/v11/deliveryservice.html    |  58 +-
 .../development/traffic_ops_api/v11/hwinfo.html |  18 +-
 .../traffic_ops_api/v11/parameter.html          |  12 +-
 .../traffic_ops_api/v11/phys_location.html      |  22 +-
 .../traffic_ops_api/v11/profile.html            |  14 +-
 .../development/traffic_ops_api/v11/region.html |  23 +-
 .../development/traffic_ops_api/v11/role.html   |  10 +-
 .../development/traffic_ops_api/v11/server.html |  26 +-
 .../traffic_ops_api/v11/static_dns.html         |  10 +-
 .../development/traffic_ops_api/v11/status.html |  12 +-
 .../development/traffic_ops_api/v11/system.html |  14 +-
 .../traffic_ops_api/v11/to_extension.html       |  16 +-
 .../development/traffic_ops_api/v11/type.html   |  14 +-
 .../development/traffic_ops_api/v11/user.html   |  42 +-
 .../development/traffic_ops_api/v12/asn.html    |  36 +-
 .../traffic_ops_api/v12/cache_stats.html        |  16 +-
 .../traffic_ops_api/v12/cachegroup.html         | 138 +++-
 .../development/traffic_ops_api/v12/cdn.html    | 145 +++-
 .../traffic_ops_api/v12/changelog.html          |  16 +-
 .../traffic_ops_api/v12/deliveryservice.html    | 426 ++++++++--
 .../v12/deliveryservice_regex.html              | 822 +++++++++++++++++++
 .../v12/deliveryservice_stats.html              |  22 +-
 .../traffic_ops_api/v12/division.html           |  20 +-
 .../traffic_ops_api/v12/federation.html         |  20 +-
 .../development/traffic_ops_api/v12/hwinfo.html |  18 +-
 .../traffic_ops_api/v12/influxdb.html           |  10 +-
 .../traffic_ops_api/v12/parameter.html          | 184 +++--
 .../traffic_ops_api/v12/phys_location.html      |  42 +-
 .../traffic_ops_api/v12/profile.html            |  28 +-
 .../traffic_ops_api/v12/profile_parameter.html  |  30 +-
 .../development/traffic_ops_api/v12/region.html |  40 +-
 .../development/traffic_ops_api/v12/role.html   |  10 +-
 .../development/traffic_ops_api/v12/server.html | 434 +++++++++-
 .../traffic_ops_api/v12/static_dns.html         |  10 +-
 .../development/traffic_ops_api/v12/status.html |  12 +-
 .../development/traffic_ops_api/v12/system.html |  14 +-
 .../traffic_ops_api/v12/to_extension.html       |  16 +-
 .../traffic_ops_api/v12/topology.html           |  12 +-
 .../development/traffic_ops_api/v12/type.html   |  14 +-
 .../development/traffic_ops_api/v12/user.html   | 416 +++++++++-
 docs/latest/development/traffic_portal.html     |  10 +-
 docs/latest/development/traffic_router.html     |  53 +-
 .../traffic_router/traffic_router_api.html      |   8 +-
 docs/latest/development/traffic_server.html     |   8 +-
 docs/latest/development/traffic_stats.html      |  10 +-
 docs/latest/faq/administration.html             |  10 +-
 docs/latest/faq/development.html                |   6 +-
 docs/latest/faq/general.html                    |  10 +-
 docs/latest/faq/index.html                      |   6 +-
 docs/latest/genindex.html                       |  44 +-
 docs/latest/glossary.html                       |  14 +-
 docs/latest/index.html                          |  27 +-
 docs/latest/objects.inv                         | Bin 3722 -> 3773 bytes
 docs/latest/overview/index.html                 |   6 +-
 docs/latest/overview/introduction.html          |  42 +-
 docs/latest/overview/traffic_monitor.html       |  12 +-
 docs/latest/overview/traffic_ops.html           |   8 +-
 docs/latest/overview/traffic_portal.html        |   8 +-
 docs/latest/overview/traffic_router.html        |  20 +-
 docs/latest/overview/traffic_server.html        |   6 +-
 docs/latest/overview/traffic_stats.html         |   8 +-
 docs/latest/overview/traffic_vault.html         |   8 +-
 docs/latest/search.html                         |  16 +-
 docs/latest/searchindex.js                      |   2 +-
 downloads/index.html                            |  34 +-
 125 files changed, 5248 insertions(+), 1160 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/_images/traffic_control_overview_3.png
----------------------------------------------------------------------
diff --git a/docs/latest/_images/traffic_control_overview_3.png b/docs/latest/_images/traffic_control_overview_3.png
index 594983b..58f03d7 100644
Binary files a/docs/latest/_images/traffic_control_overview_3.png and b/docs/latest/_images/traffic_control_overview_3.png differ

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/_sources/admin/traffic_ops_config.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/admin/traffic_ops_config.rst.txt b/docs/latest/_sources/admin/traffic_ops_config.rst.txt
index 0ca57da..390788c 100644
--- a/docs/latest/_sources/admin/traffic_ops_config.rst.txt
+++ b/docs/latest/_sources/admin/traffic_ops_config.rst.txt
@@ -96,6 +96,14 @@ Below is a list of cache parameters that are likely to need changes from the def
 +--------------------------+-------------------+-------------------------------------------------------------------------------------------------------------------------+
 | purge_allow_ip           | ip_allow.config   | The IP address range that is allowed to execute the PURGE method on the caches (not related to :ref:`rl-purge`)         |
 +--------------------------+-------------------+-------------------------------------------------------------------------------------------------------------------------+
+| coalesce_masklen_v4	   | ip_allow.config   | The masklen to use when coalescing v4 networks into one line using http://search.cpan.org/~miker/NetAddr-IP-4.078/IP.pm |
++--------------------------+-------------------+-------------------------------------------------------------------------------------------------------------------------+
+| coalesce_number_v4 	   | ip_allow.config   | The number to use when coalescing v4 networks into one line using http://search.cpan.org/~miker/NetAddr-IP-4.078/IP.pm  |
++--------------------------+-------------------+-------------------------------------------------------------------------------------------------------------------------+
+| coalesce_masklen_v6	   | ip_allow.config   | The masklen to use when coalescing v6 networks into one line using http://search.cpan.org/~miker/NetAddr-IP-4.078/IP.pm |
++--------------------------+-------------------+-------------------------------------------------------------------------------------------------------------------------+
+| coalesce_masklen_v6	   | ip_allow.config   | The masklen to use when coalescing v6 networks into one line using http://search.cpan.org/~miker/NetAddr-IP-4.078/IP.pm |
++--------------------------+-------------------+-------------------------------------------------------------------------------------------------------------------------+
 | health.threshold.loadavg | rascal.properties | The Unix load average at which Traffic Router will stop sending traffic to this cache                                   |
 +--------------------------+-------------------+-------------------------------------------------------------------------------------------------------------------------+
 | health.threshold.\\      | rascal.properties | The amount of bandwidth that Traffic Router will try to keep available on the cache.                                    |
@@ -107,9 +115,9 @@ Below is a list of Traffic Server plugins that need to be configured in the para
 +------------------+---------------+------------------------------------------------------+------------------------------------------------------------------------------------------------------------+
 |       Name       |  Config file  |                     Description                      |                                                  Details                                                   |
 +==================+===============+======================================================+============================================================================================================+
-| astats_over_http | package       | The package version for the astats_over_http plugin. | `astats_over_http <http://trafficcontrol.apache.org/downloads/index.html>`_                                  |
+| astats_over_http | package       | The package version for the astats_over_http plugin. | `astats_over_http <http://trafficcontrol.apache.org/downloads/index.html>`_                                |
 +------------------+---------------+------------------------------------------------------+------------------------------------------------------------------------------------------------------------+
-| trafficserver    | package       | The package version for the trafficserver plugin.    | `trafficserver <http://trafficcontrol.apache.org/downloads/index.html>`_                                     |
+| trafficserver    | package       | The package version for the trafficserver plugin.    | `trafficserver <http://trafficcontrol.apache.org/downloads/index.html>`_                                   |
 +------------------+---------------+------------------------------------------------------+------------------------------------------------------------------------------------------------------------+
 | regex_revalidate | plugin.config | The config to be used for regex_revalidate.          | `regex_revalidate <https://docs.trafficserver.apache.org/en/5.3.x/reference/plugins/regex_remap.en.html>`_ |
 |                  |               | For example: --config regex_revalidate.config        |                                                                                                            |

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/_sources/admin/traffic_ops_using.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/admin/traffic_ops_using.rst.txt b/docs/latest/_sources/admin/traffic_ops_using.rst.txt
index 5b8525d..2bb1749 100644
--- a/docs/latest/_sources/admin/traffic_ops_using.rst.txt
+++ b/docs/latest/_sources/admin/traffic_ops_using.rst.txt
@@ -309,6 +309,8 @@ The fields in the Delivery Service view are:
 |                                                  | - 0 use in cache key and hand up to origin -this means each unique query string Is treated as a unique URL.                                                                                                         |
 |                                                  | - 1 Do not use in cache key, but pass up to origin - this means a 2 URLs that are the same except for the query string will match, and cache HIT, while the origin still sees original query string in the request. |
 |                                                  | - 2 Drop at edge - this means a 2 URLs that are the same except for  the query string will match, and cache HIT, while the origin will not see original query string in the request.                                |
+|                                                  |                                                                                                                                                                                                                     |
+|                                                  | **Note:** Choosing to drop query strings at the edge will preclude the use of a Regex Remap Expression. See :ref:`rl-regex-remap`.                                                                                  |
 +--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | Geo Limit?                                       | Some services are intended to be limited by geography. The possible settings are are:                                                                                                                               |
 |                                                  |                                                                                                                                                                                                                     |
@@ -316,7 +318,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.                                   |
 +--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -352,7 +354,7 @@ The fields in the Delivery Service view are:
 | Maximum Transactions per Second allowed globally | The maximum transactions per se this delivery service can serve across all EDGE caches before traffic will be diverted to the bypass destination. For a DNS delivery service, the Bypass Ipv4 or Ipv6  will be used |
 |                                                  | (depending on whether this was a A or AAAA request), and for HTTP delivery services the Bypass FQDN will be used.                                                                                                   |
 +--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| Geo Miss Default Latitude                        | Default Latitude for this delivery service. When client localization fails for bot Coverage Zone and Geo Lookup, this the client will be routed as if it was at this lat.                                           |
+| Geo Miss Default Latitude                        | Default Latitude for this delivery service. When client localization fails for both Coverage Zone and Geo Lookup, this the client will be routed as if it was at this lat.                                          |
 +--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | Geo Miss Default Longitude                       | Default Longitude for this delivery service. When client localization fails for bot Coverage Zone and Geo Lookup, this the client will be routed as if it was at this long.                                         |
 +--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -361,6 +363,8 @@ The fields in the Delivery Service view are:
 | Mid Header Rewrite Rules                         | Header Rewrite rules to apply for this delivery service at the MID tier. See :ref:`rl-header-rewrite`. [1]_                                                                                                         |
 +--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | Regex Remap Expression                           | Regex Remap rule to apply to this delivery service at the Edge tier. See `ATS documentation on regex_remap <https://docs.trafficserver.apache.org/en/latest/admin-guide/plugins/regex_remap.en.html>`_. [1]_        |
+|                                                  |                                                                                                                                                                                                                     |
+|                                                  | **Note:** you will not be able to save a Regex Remap Expression if you have Query String Handling set to drop query strings at the edge. See :ref:`rl-regex-remap`.                                                 |
 +--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | Cache URL expression                             | Cache URL rule to apply to this delivery service. See `ATS documentation on cacheurl <https://docs.trafficserver.apache.org/en/latest/admin-guide/plugins/cacheurl.en.html>`_. [1]_                                 |
 +--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -420,10 +424,10 @@ One of the most important settings when creating the delivery service is the sel
 +-----------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | HTTP_LIVE_NATNL | HTTP Content routing, same as HTTP_LIVE, but the MID tier is NOT bypassed.                                                                                                                                                                                                                                                   |
 +-----------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| DNS_LIVE_NATNL  | DNS Content routing, ut where for "standard" DNS content routing the objects are stored on disk, for this delivery service type the objects are stored                                                                                                                                                                       |
+| DNS_LIVE_NATNL  | DNS Content routing, but where for "standard" DNS content routing the objects are stored on disk, for this delivery service type the objects are stored                                                                                                                                                                      |
 |                 | on the RAM disks. Use this for linear TV. The MID tier is NOT bypassed for this type.                                                                                                                                                                                                                                        |
 +-----------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| DNS_LIVE        | DNS Content routing, same as DNS_LIVE_NATIONAL, but the MID tier is bypassed.                                                                                                                                                                                                                                                |
+| DNS_LIVE        | DNS Content routing, same as DNS_LIVE_NATNL, but the MID tier is bypassed.                                                                                                                                                                                                                                                   |
 +-----------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | ANY_MAP         | ANY_MAP is not known to Traffic Router. For this deliveryservice, the "Raw remap text" field in the input form will be used as the remap line on the cache.                                                                                                                                                                  |
 +-----------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -505,7 +509,7 @@ Parts
                 0110: use part1 and part 2 of path only
                 01: use everything except the fqdn
 
-        ``P=<parts string (0's and 1's>``
+        ``P=<parts string (0's and 1's)>``
 
 Signature
         The signature over the parts + the query string up to and
@@ -598,7 +602,7 @@ Multi Site Origin
 
 Normally, the mid servers are not aware of any redundancy at the origin layer. With Multi Site Origin enabled this changes - Traffic Server (and Traffic Ops) are now made aware of the fact there are multiple origins, and can be configured to do more advanced failover and loadbalancing actions.
 
-With This feature enabled, origin servers (or origin server VIP names for a site) are going to be entered as servers in to the Traiffic Ops UI. Server type is With This feature enabled, origin servers (or origin server VIP names for a site) are going to be entered as servers in to the Traiffic Ops UI. Server type is ""
+With This feature enabled, origin servers (or origin server VIP names for a site) are going to be entered as servers in to the Traiffic Ops UI. Server type is ""
 
 
 Parameters in the Origin profile that influence this feature:
@@ -719,6 +723,21 @@ CCR Profile or Traffic Router Profile
 +-----------------------------------------+------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 
 
+.. index::
+  Regex Remap Expression
+
+.. _rl-regex-remap:
+
+Regex Remap Expression
+++++++++++++++++++++++
+The regex remap expression allows to to use a regex and resulting match group(s) in order to modify the request URIs that are sent to origin. For example: ::
+
+  ^/original/(.*) http://origin.example.com/remapped/$1
+
+.. Note:: If **Query String Handling** is set to ``2 Drop at edge``, then you will not be allowed to save a regex remap expression, as dropping query strings actually relies on a regex remap of its own. However, if there is a need to both drop query strings **and** remap request URIs, this can be accomplished by setting **Query String Handling** to ``1 Do not use in cache key, but pass up to origin``, and then using a custom regex remap expression to do the necessary remapping, while simultaneously dropping query strings. The following example will capture the original request URI up to, but not including, the query string and then forward to a remapped URI: ::
+
+  ^/([^?]*).* http://origin.example.com/remapped/$1
+
 ..   index::
   HOST_REGEXP
   PATH_REGEXP

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/_sources/admin/traffic_router.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/admin/traffic_router.rst.txt b/docs/latest/_sources/admin/traffic_router.rst.txt
index 01ab6b3..4fe4759 100644
--- a/docs/latest/_sources/admin/traffic_router.rst.txt
+++ b/docs/latest/_sources/admin/traffic_router.rst.txt
@@ -36,7 +36,7 @@ The following are requirements to ensure an accurate set up:
 1. If no suitable profile exists, create a new profile for Traffic Router.
 
 2. Enter the Traffic Router server into Traffic Ops, assign it to a Traffic Router profile, and ensure that its status is set to ``ONLINE``.
-3. Ensure the FQDN of the Traffic Monitor is resolvable in DNS. This FQDN must be resolvable by the clients expected to use this CDN.
+3. Ensure the FQDN of the Traffic Router is resolvable in DNS. This FQDN must be resolvable by the clients expected to use this CDN.
 4. Install a traffic router: ``sudo yum install traffic_router``.
 5. Edit ``/opt/traffic_router/conf/traffic_monitor.properties`` and specify the correct online Traffic Monitor(s) for your CDN. See :ref:`rl-tr-config-files`
 	# traffic_monitor.properties: url that should normally point to this file
@@ -492,3 +492,21 @@ During the test it will provide feedback about request latency and transactions
 
 While it is running it is suggested that you monitor your Traffic Router nodes for memory and CPU utilization.
 
+Tuning Recommendations
+======================
+
+The following is an example of /opt/tomcat/bin/setenv.sh that has been tested on a multi core server running under HTTPS load test requests.
+This is following the general recommendation to use the G1 garbage collector for JVM applications running on multi core machines.
+In addition to using the G1 garbage collector the InitiatingHeapOccupancyPercent was lowered to run garbage collection more frequently which
+improved overall throughput for Traffic Router and reduced 'Stop the World' garbage collection. Note that setting the min and max heap settings
+in setenv.sh will override init scripts in /etc/init.d/tomcat.
+
+  /opt/tomcat/bin/setenv.sh::
+
+
+      #! /bin/sh
+      export CATALINA_OPTS="$CATALINA_OPTS -server"
+      export CATALINA_OPTS="$CATALINA_OPTS -Xms2g -Xmx2g"
+      export CATALINA_OPTS="$CATALINA_OPTS -XX:+UseG1GC"
+      export CATALINA_OPTS="$CATALINA_OPTS -XX:+UnlockExperimentalVMOptions"
+      export CATALINA_OPTS="$CATALINA_OPTS -XX:InitiatingHeapOccupancyPercent=30"

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/_sources/admin/traffic_stats.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/admin/traffic_stats.rst.txt b/docs/latest/_sources/admin/traffic_stats.rst.txt
index ae9d91b..df720ae 100644
--- a/docs/latest/_sources/admin/traffic_stats.rst.txt
+++ b/docs/latest/_sources/admin/traffic_stats.rst.txt
@@ -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
 =========================
@@ -147,11 +147,11 @@ They are specific for traffic stats and are not meant to be generic to influxdb.
 		3. Run it:
 			- ./create_ts_databases -help
 			- optional flags:
-				- influxUrl -  The influxdb url and port
+				- url -  The influxdb url and port
 				- replication -  The number of nodes in the cluster
 				- user - The user to use
 				- password - The password to use
-			- example: ./create_ts_databases -influxUrl=localhost:8086 -replication=3 -user=joe -password=mysecret
+			- example: ./create_ts_databases -url=localhost:8086 -replication=3 -user=joe -password=mysecret
 
 **sync_ts_databases**
 	This script is used to sync one influxdb environment to another.  Only data from continuous queries is synced as it is downsampled data and much smaller in size than syncing raw data.  Possible use cases are syncing from Production to Development or Syncing a new cluster once brought online.

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/_sources/admin/traffic_vault.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/admin/traffic_vault.rst.txt b/docs/latest/_sources/admin/traffic_vault.rst.txt
index 35be160..d50ef25 100644
--- a/docs/latest/_sources/admin/traffic_vault.rst.txt
+++ b/docs/latest/_sources/admin/traffic_vault.rst.txt
@@ -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-website/blob/6b5a5ffa/docs/latest/_sources/development/traffic_monitor.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_monitor.rst.txt b/docs/latest/_sources/development/traffic_monitor.rst.txt
index 012cbb3..6ed025d 100644
--- a/docs/latest/_sources/development/traffic_monitor.rst.txt
+++ b/docs/latest/_sources/development/traffic_monitor.rst.txt
@@ -61,18 +61,20 @@ To install the Traffic Monitor Developer environment:
 2. Change directories into ``traffic_control/traffic_monitor``.
 3. Edit the following parameters in src/test/resources/conf/traffic_monitor_config.js:
 
-+-----------------+------------------------------------------------------------+
-|    Parameter    |                           Value                            |
-+=================+============================================================+
-| ``tm.hostname`` | FQDN of the Traffic Ops instance (do not include http://). |
-+-----------------+------------------------------------------------------------+
-| ``tm.username`` | Admin username for Traffic Ops                             |
-+-----------------+------------------------------------------------------------+
-| ``tm.password`` | Password for admin user                                    |
-+-----------------+------------------------------------------------------------+
-| ``cdnName``     | Name of the CDN this Traffic Monitor will monitor          |
-+-----------------+------------------------------------------------------------+
-
+  +-----------------+------------------------------------------------------------+
+  |    Parameter    |                           Value                            |
+  +=================+============================================================+
+  | ``tm.hostname`` | FQDN of the Traffic Ops instance (do not include http://). |
+  +-----------------+------------------------------------------------------------+
+  | ``tm.username`` | Admin username for Traffic Ops                             |
+  +-----------------+------------------------------------------------------------+
+  | ``tm.password`` | Password for admin user                                    |
+  +-----------------+------------------------------------------------------------+
+  | ``cdnName``     | Name of the CDN this Traffic Monitor will monitor          |
+  +-----------------+------------------------------------------------------------+
+
+  Note: any change done later in the configuration file requires a mvn build in order to be applied.
+ 
 4. Import the existing git repo into Eclipse:
 
 	a. File -> Import -> Git -> Projects from Git; Next
@@ -109,4 +111,4 @@ API
   :hidden:
   :maxdepth: 1
 
-  traffic_monitor/traffic_monitor_api
\ No newline at end of file
+  traffic_monitor/traffic_monitor_api

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/_sources/development/traffic_ops.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_ops.rst.txt b/docs/latest/_sources/development/traffic_ops.rst.txt
index 5ec31e4..57ea3ef 100644
--- a/docs/latest/_sources/development/traffic_ops.rst.txt
+++ b/docs/latest/_sources/development/traffic_ops.rst.txt
@@ -35,6 +35,11 @@ To work on Traffic Ops you need a \*nix (MacOS and Linux are most commonly used)
 * MySQL 5.1.52
 * `Goose <https://bitbucket.org/liamstask/goose/>`_
 
+Addionally, the installation of the following RPMs (or equivalent) is required:
+
+* All RPMs listed in :ref:`rl-ps`
+* mysql-test
+
 Traffic Ops Project Tree Overview
 =======================================
 
@@ -592,7 +597,7 @@ API 1.1 Reference
   traffic_ops_api/v11/type
   traffic_ops_api/v11/user
 
-API 1.2 Reference 
+API 1.2 Reference
 -----------------
 
 .. toctree:: 
@@ -604,6 +609,7 @@ API 1.2 Reference
   traffic_ops_api/v12/cdn
   traffic_ops_api/v12/changelog
   traffic_ops_api/v12/deliveryservice
+  traffic_ops_api/v12/deliveryservice_regex
   traffic_ops_api/v12/deliveryservice_stats
   traffic_ops_api/v12/division
   traffic_ops_api/v12/federation

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/_sources/development/traffic_ops_api/v11/region.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_ops_api/v11/region.rst.txt b/docs/latest/_sources/development/traffic_ops_api/v11/region.rst.txt
index faddbb1..d521f33 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v11/region.rst.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v11/region.rst.txt
@@ -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-website/blob/6b5a5ffa/docs/latest/_sources/development/traffic_ops_api/v12/asn.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/asn.rst.txt b/docs/latest/_sources/development/traffic_ops_api/v12/asn.rst.txt
index d3ae765..b5803cd 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/asn.rst.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/asn.rst.txt
@@ -30,6 +30,14 @@ ASN
 
   Role(s) Required: None
 
+  **Request Query Parameters**
+
+  +---------------------+----------+---------------------------------------------+
+  |   Name              | Required |                Description                  |
+  +=====================+==========+=============================================+
+  |   ``cachegroup``    |    no    | Filter ASNs by cache group ID               |
+  +---------------------+----------+---------------------------------------------+
+
   **Response Properties**
 
   +------------------+--------+-------------------------------------------------------------------------+

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/_sources/development/traffic_ops_api/v12/cachegroup.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/cachegroup.rst.txt b/docs/latest/_sources/development/traffic_ops_api/v12/cachegroup.rst.txt
index 2d9f08d..bc9f775 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/cachegroup.rst.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/cachegroup.rst.txt
@@ -29,6 +29,14 @@ Cache Group
 
   Role(s) Required: None
 
+  **Request Query Parameters**
+
+  +-----------------+----------+---------------------------------------------------+
+  | Name            | Required | Description                                       |
+  +=================+==========+===================================================+
+  | ``type``        | no       | Filter cache groups by Type ID.                   |
+  +-----------------+----------+---------------------------------------------------+
+
   **Response Properties**
 
   +-----------------------------------+--------+--------------------------------------------------------------------------+
@@ -184,6 +192,47 @@ Cache Group
 
 |
 
+**GET /api/1.2/cachegroups/:id/parameters**
+
+  Authentication Required: Yes
+
+  Role(s) Required: None
+
+  **Response Properties**
+
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+  | Parameter                         | Type   | Description                                                              |
+  +===================================+========+==========================================================================+
+  | ``id``                            |   int  | Local unique identifier for the parameter                                |
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+  | ``name``                          | string | Name of the parameter                                                    |
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+  | ``value``                         | string | Value of the parameter                                                   |
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+  | ``configFile``                    | string | Config file associated with the parameter                                |
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+  | ``secure``                        |  bool  | Is the parameter value only visible to admin users                       |
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+  | ``lastUpdated``                   | string | The Time / Date this entry was last updated                              |
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+
+  **Response Example** ::
+
+    {
+     "response": [
+        {
+            "id": "1100",
+            "name": "cgw.originUrl",
+            "value": "http://to-short.g.foo.net/data/",
+            "configFile": "foo.config",
+            "secure": false,
+            "lastUpdated": "2015-08-27 15:11:49"
+        },
+        { ... }
+     ]
+    }
+
+|
 
 **GET /api/1.2/cachegroup/:parameter_id/parameter**
 
@@ -587,7 +636,9 @@ Cache Group
   +==============+=========+===============================================+
   | action       | string  | queue or dequeue                              |
   +--------------+---------+-----------------------------------------------+
-  | cdn          | string  | cdn name                                      |
+  | cdn          | string  | cdn name or cdn ID is required                |
+  +--------------+---------+-----------------------------------------------+
+  | cdnId        | string  | cdn ID or cdn name is required                |
   +--------------+---------+-----------------------------------------------+
 
   **Response Properties**

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/_sources/development/traffic_ops_api/v12/cdn.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/cdn.rst.txt b/docs/latest/_sources/development/traffic_ops_api/v12/cdn.rst.txt
index 1819c69..da10799 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/cdn.rst.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/cdn.rst.txt
@@ -331,6 +331,59 @@ CDN
 
 |
 
+**POST /api/1.2/cdns/{:id}/queue_update**
+
+  Queue or dequeue updates for all servers assigned to a specific CDN.
+
+  Authentication Required: Yes
+
+  Role(s) Required: admin or oper
+
+  **Request Route Parameters**
+
+  +-----------------+----------+----------------------+
+  | Name            | Required | Description          |
+  +=================+==========+======================+
+  | id              | yes      | the cdn id.          |
+  +-----------------+----------+----------------------+
+
+  **Request Properties**
+
+  +--------------+---------+-----------------------------------------------+
+  | Name         | Type    | Description                                   |
+  +==============+=========+===============================================+
+  | action       | string  | queue or dequeue                              |
+  +--------------+---------+-----------------------------------------------+
+
+  **Request Example** ::
+
+    {
+        "action": "queue"
+    }
+
+
+  **Response Properties**
+
+  +-----------------+---------+----------------------------------------------------+
+  | Name            | Type    | Description                                        |
+  +=================+=========+====================================================+
+  | action          | string  | The action processed, queue or dequeue.            |
+  +-----------------+---------+----------------------------------------------------+
+  | cdnId           | integer | cdn id                                             |
+  +-----------------+---------+----------------------------------------------------+
+
+  **Response Example** ::
+
+    {
+      "response": {
+            "action": "queue",
+            "cdn": 1
+        }
+    }
+
+|
+
+
 Health
 ++++++
 
@@ -1330,5 +1383,3 @@ SSL Keys
         }
       ]
     }
-|
-

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/6b5a5ffa/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.rst.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.rst.txt b/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.rst.txt
index 379ea37..9e81b92 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.rst.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.rst.txt
@@ -32,6 +32,17 @@ Delivery Service
 
   Role(s) Required: None
 
+  **Request Query Parameters**
+
+  +-----------------+----------+---------------------------------------------------+
+  | Name            | Required | Description                                       |
+  +=================+==========+===================================================+
+  | ``cdn``         | no       | Filter delivery services by CDN ID.               |
+  +-----------------+----------+---------------------------------------------------+
+  | ``type``        | no       | Filter delivery services by Type ID.              |
+  +-----------------+----------+---------------------------------------------------+
+
+
   **Response Properties**
 
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
@@ -188,9 +199,6 @@ Delivery Service
             "dnsBypassTtl": "30",
             "dscp": "40",
             "edgeHeaderRewrite": null,
-            "exampleURLs": [
-                "http://edge.foo-ds.foo.bar.net"
-            ],
             "geoLimit": "0",
             "geoLimitCountries": null,
             "geoLimitRedirectURL": null,
@@ -255,6 +263,14 @@ Delivery Service
 
   Role(s) Required: None
 
+  **Request Route Parameters**
+
+  +-----------------+----------+---------------------------------------------------+
+  | Name            | Required | Description                                       |
+  +=================+==========+===================================================+
+  | ``id``          | yes      | Delivery service ID.                              |
+  +-----------------+----------+---------------------------------------------------+
+
   **Response Properties**
 
   +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
@@ -471,6 +487,162 @@ Delivery Service
 
 |
 
+**GET /api/1.2/deliveryservices/:id/servers**
+
+  Retrieves properties of CDN Edge servers assigned to a delivery service.
+
+  Authentication Required: Yes
+
+  Role(s) Required: None
+
+  **Request Route Parameters**
+
+  +-----------------+----------+---------------------------------------------------+
+  | Name            | Required | Description                                       |
+  +=================+==========+===================================================+
+  | ``id``          | yes      | Delivery service ID.                              |
+  +-----------------+----------+---------------------------------------------------+
+
+  **Response Properties**
+
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  |     Parameter      |  Type  |                                                Description                                                 |
+  +====================+========+============================================================================================================+
+  | ``cachegroup``     | string | The cache group name (see :ref:`to-api-v11-cachegroup`).                                                   |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``cachegroupId``   | string | The cache group id.                                                                                        |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``cdnId``          | string | Id of the CDN to which the server belongs to.                                                              |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``cdnName``        | string | Name of the CDN to which the server belongs to.                                                            |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``domainName``     | string | The domain name part of the FQDN of the cache.                                                             |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``guid``           | string | An identifier used to uniquely identify the server.                                                        |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``hostName``       | string | The host name part of the cache.                                                                           |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``httpsPort``      | string | The HTTPS port on which the main application listens (443 in most cases).                                  |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``id``             | string | The server id (database row number).                                                                       |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``iloIpAddress``   | string | The IPv4 address of the lights-out-management port.                                                        |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``iloIpGateway``   | string | The IPv4 gateway address of the lights-out-management port.                                                |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``iloIpNetmask``   | string | The IPv4 netmask of the lights-out-management port.                                                        |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``iloPassword``    | string | The password of the of the lights-out-management user (displays as ****** unless you are an 'admin' user). |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``iloUsername``    | string | The user name for lights-out-management.                                                                   |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``interfaceMtu``   | string | The Maximum Transmission Unit (MTU) to configure for ``interfaceName``.                                    |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``interfaceName``  | string | The network interface name used for serving traffic.                                                       |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``ip6Address``     | string | The IPv6 address/netmask for ``interfaceName``.                                                            |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``ip6Gateway``     | string | The IPv6 gateway for ``interfaceName``.                                                                    |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``ipAddress``      | string | The IPv4 address for ``interfaceName``.                                                                    |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``ipGateway``      | string | The IPv4 gateway for ``interfaceName``.                                                                    |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``ipNetmask``      | string | The IPv4 netmask for ``interfaceName``.                                                                    |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``lastUpdated``    | string | The Time and Date for the last update for this server.                                                     |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``mgmtIpAddress``  | string | The IPv4 address of the management port (optional).                                                        |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``mgmtIpGateway``  | string | The IPv4 gateway of the management port (optional).                                                        |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``mgmtIpNetmask``  | string | The IPv4 netmask of the management port (optional).                                                        |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``offlineReason``  | string | A user-entered reason why the server is in ADMIN_DOWN or OFFLINE status.                                   |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``physLocation``   | string | The physical location name (see :ref:`to-api-v11-phys-loc`).                                               |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``physLocationId`` | string | The physical location id (see :ref:`to-api-v11-phys-loc`).                                                 |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``profile``        | string | The assigned profile name (see :ref:`to-api-v11-profile`).                                                 |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``profileDesc``    | string | The assigned profile description (see :ref:`to-api-v11-profile`).                                          |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``profileId``      | string | The assigned profile Id (see :ref:`to-api-v11-profile`).                                                   |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``rack``           | string | A string indicating rack location.                                                                         |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``routerHostName`` | string | The human readable name of the router.                                                                     |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``routerPortName`` | string | The human readable name of the router port.                                                                |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``status``         | string | The Status string (See :ref:`to-api-v11-status`).                                                          |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``statusId``       | string | The Status id (See :ref:`to-api-v11-status`).                                                              |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``tcpPort``        | string | The default TCP port on which the main application listens (80 for a cache in most cases).                 |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``type``           | string | The name of the type of this server (see :ref:`to-api-v11-type`).                                          |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``typeId``         | string | The id of the type of this server (see :ref:`to-api-v11-type`).                                            |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+  | ``updPending``     |  bool  |                                                                                                            |
+  +--------------------+--------+------------------------------------------------------------------------------------------------------------+
+
+  **Response Example** ::
+
+   {
+      "response": [
+          {
+              "cachegroup": "us-il-chicago",
+              "cachegroupId": "3",
+              "cdnId": "3",
+              "cdnName": "CDN-1",
+              "domainName": "chi.kabletown.net",
+              "guid": null,
+              "hostName": "atsec-chi-00",
+              "id": "19",
+              "iloIpAddress": "172.16.2.6",
+              "iloIpGateway": "172.16.2.1",
+              "iloIpNetmask": "255.255.255.0",
+              "iloPassword": "********",
+              "iloUsername": "",
+              "interfaceMtu": "9000",
+              "interfaceName": "bond0",
+              "ip6Address": "2033:D0D0:3300::2:2/64",
+              "ip6Gateway": "2033:D0D0:3300::2:1",
+              "ipAddress": "10.10.2.2",
+              "ipGateway": "10.10.2.1",
+              "ipNetmask": "255.255.255.0",
+              "lastUpdated": "2015-03-08 15:57:32",
+              "mgmtIpAddress": "",
+              "mgmtIpGateway": "",
+              "mgmtIpNetmask": "",
+              "offlineReason": "N/A",
+              "physLocation": "plocation-chi-1",
+              "physLocationId": "9",
+              "profile": "EDGE1_CDN1_421_SSL",
+              "profileDesc": "EDGE1_CDN1_421_SSL profile",
+              "profileId": "12",
+              "rack": "RR 119.02",
+              "routerHostName": "rtr-chi.kabletown.net",
+              "routerPortName": "2",
+              "status": "ONLINE",
+              "statusId": "6",
+              "tcpPort": "80",
+              "httpsPort": "443",
+              "type": "EDGE",
+              "typeId": "3",
+              "updPending": false
+          },
+          {
+          ... more server data
+          }
+        ]
+    }
+
+|
+
 
 .. _to-api-v12-ds-health:
 
@@ -769,29 +941,34 @@ SSL Keys
 
   **Response Properties**
 
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  |    Parameter     |  Type  |                                                               Description                                                               |
-  +==================+========+=========================================================================================================================================+
-  | ``crt``          | string | base64 encoded crt file for delivery service                                                                                            |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``csr``          | string | base64 encoded csr file for delivery service                                                                                            |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``key``          | string | base64 encoded private key file for delivery service                                                                                    |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``businessUnit`` | string | The business unit entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``city``         | string | The city entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response          |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``organization`` | string | The organization entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response  |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``hostname``     | string | The hostname entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response      |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``country``      | string | The country entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response       |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``state``        | string | The state entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response         |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``version``      | string | The version of the certificate record in Riak                                                                                           |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  |    Parameter        |  Type  |                                                               Description                                                               |
+  +=====================+========+=========================================================================================================================================+
+  | ``crt``             | string | base64 encoded crt file for delivery service                                                                                            |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``csr``             | string | base64 encoded csr file for delivery service                                                                                            |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``key``             | string | base64 encoded private key file for delivery service                                                                                    |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``cdn``             | string | The CDN of the delivery service for which the certs were generated.                                                                     |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``deliveryservice`` | string | The XML ID of the delivery service for which the cert was generated.                                                                    |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``businessUnit``    | string | The business unit entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``city``            | string | The city entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response          |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``organization``    | string | The organization entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response  |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``hostname``        | string | The hostname generated by Traffic Ops that is used as the common name when generating the certificate.                                  |
+  |                     |        | This will be a FQDN for DNS delivery services and a wildcard URL for HTTP delivery services.                                            |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``country``         | string | The country entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response       |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``state``           | string | The state entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response         |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``version``         | string | The version of the certificate record in Riak                                                                                           |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
 
   **Response Example** ::
 
@@ -802,6 +979,8 @@ SSL Keys
           "key": "key",
           "csr": "csr"
         },
+        "deliveryservice": "my-ds",
+        "cdn": "qa",
         "businessUnit": "CDN_Eng",
         "city": "Denver",
         "organization": "KableTown",
@@ -839,29 +1018,34 @@ SSL Keys
 
   **Response Properties**
 
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  |    Parameter     |  Type  |                                                               Description                                                               |
-  +==================+========+=========================================================================================================================================+
-  | ``crt``          | string | base64 encoded crt file for delivery service                                                                                            |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``csr``          | string | base64 encoded csr file for delivery service                                                                                            |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``key``          | string | base64 encoded private key file for delivery service                                                                                    |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``businessUnit`` | string | The business unit entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``city``         | string | The city entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response          |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``organization`` | string | The organization entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response  |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``hostname``     | string | The hostname entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response      |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``country``      | string | The country entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response       |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``state``        | string | The state entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response         |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
-  | ``version``      | string | The version of the certificate record in Riak                                                                                           |
-  +------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  |    Parameter        |  Type  |                                                               Description                                                               |
+  +=====================+========+=========================================================================================================================================+
+  | ``crt``             | string | base64 encoded crt file for delivery service                                                                                            |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``csr``             | string | base64 encoded csr file for delivery service                                                                                            |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``key``             | string | base64 encoded private key file for delivery service                                                                                    |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``cdn``             | string | The CDN of the delivery service for which the certs were generated.                                                                     |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``deliveryservice`` | string | The XML ID of the delivery service for which the cert was generated.                                                                    |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``businessUnit``    | string | The business unit entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``city``            | string | The city entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response          |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``organization``    | string | The organization entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response  |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``hostname``        | string | The hostname generated by Traffic Ops that is used as the common name when generating the certificate.                                  |
+  |                     |        | This will be a FQDN for DNS delivery services and a wildcard URL for HTTP delivery services.                                            |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``country``         | string | The country entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response       |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``state``           | string | The state entered by the user when generating certs.  Field is optional and if not provided by the user will not be in response         |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
+  | ``version``         | string | The version of the certificate record in Riak                                                                                           |
+  +---------------------+--------+-----------------------------------------------------------------------------------------------------------------------------------------+
 
   **Response Example** ::
 
@@ -872,6 +1056,8 @@ SSL Keys
           "key": "key",
           "csr": "csr"
         },
+        "deliveryservice": "my-ds",
+        "cdn": "qa",
         "businessUnit": "CDN_Eng",
         "city": "Denver",
         "organization": "KableTown",


Mime
View raw message