You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2017/06/07 17:33:01 UTC
[5/6] incubator-trafficcontrol-website git commit: updates latest to
match master
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/83e232ca/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.txt b/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.txt
index 8e21e98..df674fa 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/deliveryservice.txt
@@ -487,11 +487,167 @@ Delivery Service
**GET /api/1.2/deliveryservices/:id/servers**
- Retrieves properties of CDN Edge servers assigned to a delivery service. Delivery service must be assigned to user if user is not admin or operations.
+ Retrieves properties of CDN EDGE or ORG servers assigned to a delivery service.
Authentication Required: Yes
- Role(s) Required: None
+ Role(s) Required: Admin or Operations or delivery service must be assigned to user.
+
+ **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
+ }
+ ]
+ }
+
+|
+
+**GET /api/1.2/deliveryservices/:id/unassigned_servers**
+
+ Retrieves properties of CDN EDGE or ORG servers not assigned to a delivery service.
+
+ Authentication Required: Yes
+
+ Role(s) Required: Admin or Operations or delivery service must be assigned to user
**Request Route Parameters**
@@ -855,8 +1011,8 @@ Health
.. _to-api-v12-ds-server:
-Server
-++++++
+Delivery Service Server
++++++++++++++++++++++++
**GET /api/1.2/deliveryserviceserver**
@@ -909,6 +1065,57 @@ Server
"limit": 2
}
+**POST /api/1.2/deliveryserviceserver**
+
+ Create one or more delivery service / server assignments.
+
+ Authentication Required: Yes
+
+ Role(s) Required: Admin or Operations or the delivery service is assigned to the user.
+
+ **Request Parameters**
+
+ +---------------------------------+----------+-------------------------------------------------------------------+
+ | Name | Required | Description |
+ +=================================+==========+===================================================================+
+ | ``dsId`` | yes | The ID of the delivery service. |
+ +---------------------------------+----------+-------------------------------------------------------------------+
+ | ``servers`` | yes | An array of server IDs. |
+ +---------------------------------+----------+-------------------------------------------------------------------+
+
+ **Request Example** ::
+
+ {
+ "dsId": 246,
+ "servers": [ 2, 3, 4, 5, 6 ]
+ }
+
+ **Response Properties**
+
+ +------------------------------------+--------+-------------------------------------------------------------------+
+ | Parameter | Type | Description |
+ +====================================+========+===================================================================+
+ | ``dsId`` | int | The ID of the delivery service. |
+ +------------------------------------+--------+-------------------------------------------------------------------+
+ | ``servers`` | array | An array of server IDs. |
+ +------------------------------------+--------+-------------------------------------------------------------------+
+
+ **Response Example** ::
+
+ {
+ "alerts": [
+ {
+ "level": "success",
+ "text": "Server assignments complete."
+ }
+ ],
+ "response": {
+ "dsId" : 246,
+ "servers" : [ 2, 3, 4, 5, 6 ],
+ }
+ }
+
+|
**DELETE /api/1.2/deliveryservice_server/:dsId/:serverId**
@@ -941,6 +1148,93 @@ Server
|
+.. _to-api-v12-ds-user:
+
+Delivery Service User
++++++++++++++++++++++
+
+**POST /api/1.2/deliveryservice_user**
+
+ Create one or more user / delivery service assignments.
+
+ Authentication Required: Yes
+
+ Role(s) Required: Admin or Operations
+
+ **Request Parameters**
+
+ +---------------------------------+----------+-------------------------------------------------------------------+
+ | Name | Required | Description |
+ +=================================+==========+===================================================================+
+ | ``userId`` | yes | The ID of the user. |
+ +---------------------------------+----------+-------------------------------------------------------------------+
+ | ``deliveryServices`` | yes | An array of delivery service IDs. |
+ +---------------------------------+----------+-------------------------------------------------------------------+
+
+ **Request Example** ::
+
+ {
+ "userId": 50,
+ "deliveryServices": [ 23, 34, 45, 56, 67 ]
+ }
+
+ **Response Properties**
+
+ +------------------------------------+--------+-------------------------------------------------------------------+
+ | Parameter | Type | Description |
+ +====================================+========+===================================================================+
+ | ``dsId`` | int | The ID of the delivery service. |
+ +------------------------------------+--------+-------------------------------------------------------------------+
+ | ``servers`` | array | An array of server IDs. |
+ +------------------------------------+--------+-------------------------------------------------------------------+
+
+ **Response Example** ::
+
+ {
+ "alerts": [
+ {
+ "level": "success",
+ "text": "Delivery service assignments complete."
+ }
+ ],
+ "response": {
+ "userId" : 50,
+ "deliveryServices": [ 23, 34, 45, 56, 67 ]
+ }
+ }
+
+|
+
+**DELETE /api/1.2/deliveryservice_user/:dsId/:userId**
+
+ Removes a delivery service from a user.
+
+ Authentication Required: Yes
+
+ Role(s) Required: Admin or Operations
+
+ **Request Route Parameters**
+
+ +-----------------+----------+---------------------------------------------------+
+ | Name | Required | Description |
+ +=================+==========+===================================================+
+ | ``dsId`` | yes | Delivery service ID. |
+ +-----------------+----------+---------------------------------------------------+
+ | ``userId`` | yes | User ID. |
+ +-----------------+----------+---------------------------------------------------+
+
+ **Response Example** ::
+
+ {
+ "alerts": [
+ {
+ "level": "success",
+ "text": "User and delivery service were unlinked."
+ }
+ ],
+ }
+
+|
.. _to-api-v12-ds-sslkeys:
@@ -1493,8 +1787,9 @@ SSL Keys
+------------------------+----------+---------------------------------------------------------------------------------------------------------+
| multiSiteOrigin | yes | 1 if enabled, 0 if disabled. |
+------------------------+----------+---------------------------------------------------------------------------------------------------------+
- | orgServerFqdn | yes | The origin server base URL (FQDN when used in this instance, includes the |
- | | | protocol (http:// or https://) for use in retrieving content from the origin server. |
+ | orgServerFqdn | yes|no | The origin server base URL (FQDN when used in this instance, includes the |
+ | | | protocol (http:// or https://) for use in retrieving content from the origin server. This field is |
+ | | | NOT required if type is ANY_MAP, STEERING OR CLIENT_STEERING. |
+------------------------+----------+---------------------------------------------------------------------------------------------------------+
| originShield | no | Origin shield |
+------------------------+----------+---------------------------------------------------------------------------------------------------------+
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/83e232ca/docs/latest/_sources/development/traffic_ops_api/v12/parameter.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/parameter.txt b/docs/latest/_sources/development/traffic_ops_api/v12/parameter.txt
index 569cb85..1ee6d24 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/parameter.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/parameter.txt
@@ -159,9 +159,118 @@ Parameter
|
+**GET /api/1.2/parameters/:id/unassigned_profiles**
+
+ Retrieves all profiles NOT assigned to the parameter.
+
+ Authentication Required: Yes
+
+ Role(s) Required: None
+
+ **Request Route Parameters**
+
+ +---------------+----------+----------------------------------------------------+
+ | Name | Required | Description |
+ +===============+==========+====================================================+
+ | ``id`` | yes | Parameter ID. |
+ +---------------+----------+----------------------------------------------------+
+
+ **Response Properties**
+
+ +-----------------+--------+----------------------------------------------------+
+ | Parameter | Type | Description |
+ +=================+========+====================================================+
+ | ``lastUpdated`` | array | The Time / Date this server entry was last updated |
+ +-----------------+--------+----------------------------------------------------+
+ | ``name`` | string | The name for the profile |
+ +-----------------+--------+----------------------------------------------------+
+ | ``id`` | string | Primary key |
+ +-----------------+--------+----------------------------------------------------+
+ | ``description`` | string | The description for the profile |
+ +-----------------+--------+----------------------------------------------------+
+
+ **Response Example** ::
+
+ {
+ "response": [
+ {
+ "lastUpdated": "2012-10-08 19:34:45",
+ "name": "CCR_TOP",
+ "id": "8",
+ "description": "Content Router for top.foobar.net"
+ }
+ ]
+ }
+
+|
+
**GET /api/1.2/profiles/:id/parameters**
+ Retrieves all parameters assigned to the profile.
+
+ Authentication Required: Yes
+
+ Role(s) Required: None
+
+ **Request Route Parameters**
+
+ +------------------+----------+-----------------------+
+ | Name | Required | Description |
+ +==================+==========+=======================+
+ | ``id`` | yes | Profile id |
+ +------------------+----------+-----------------------+
+
+ **Response Properties**
+
+ +------------------+---------+--------------------------------------------------------------------------------+
+ | Parameter | Type | Description |
+ +==================+=========+================================================================================+
+ | ``last_updated`` | string | The Time / Date this server entry was last updated |
+ +------------------+---------+--------------------------------------------------------------------------------+
+ | ``secure`` | boolean | When true, the parameter is accessible only by admin users. Defaults to false. |
+ +------------------+---------+--------------------------------------------------------------------------------+
+ | ``value`` | string | The parameter value, only visible to admin if secure is true |
+ +------------------+---------+--------------------------------------------------------------------------------+
+ | ``name`` | string | The parameter name |
+ +------------------+---------+--------------------------------------------------------------------------------+
+ | ``config_file`` | string | The parameter config_file |
+ +------------------+---------+--------------------------------------------------------------------------------+
+
+ **Response Example** ::
+
+ {
+ "response": [
+ {
+ "last_updated": "2012-09-17 21:41:22",
+ "secure": false,
+ "value": "foo.bar.net",
+ "name": "domain_name",
+ "config_file": "FooConfig.xml"
+ },
+ {
+ "last_updated": "2012-09-17 21:41:22",
+ "secure": false,
+ "value": "0,1,2,3,4,5,6",
+ "name": "Drive_Letters",
+ "config_file": "storage.config"
+ },
+ {
+ "last_updated": "2012-09-17 21:41:22",
+ "secure": true,
+ "value": "STRING __HOSTNAME__",
+ "name": "CONFIG proxy.config.proxy_name",
+ "config_file": "records.config"
+ }
+ ],
+ }
+
+|
+
+**GET /api/1.2/profiles/:id/unassigned_parameters**
+
+ Retrieves all parameters NOT assigned to the profile.
+
Authentication Required: Yes
Role(s) Required: None
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/83e232ca/docs/latest/_sources/development/traffic_ops_api/v12/profile.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/profile.txt b/docs/latest/_sources/development/traffic_ops_api/v12/profile.txt
index 72e3583..ae9fcda 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/profile.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/profile.txt
@@ -297,7 +297,8 @@ Profiles
+-----------------------+--------+----------+-----------------------------------------+
| ``description`` | string | yes | Profile description |
+-----------------------+--------+----------+-----------------------------------------+
- | ``cdn`` | int | no | CDN ID |
+ | ``cdn`` | int | no | CDN ID - must use the same ID as any |
+ | | | | servers assigned to the profile. |
+-----------------------+--------+----------+-----------------------------------------+
| ``type`` | string | yes | Profile type |
+-----------------------+--------+----------+-----------------------------------------+
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/83e232ca/docs/latest/_sources/development/traffic_ops_api/v12/server.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/server.txt b/docs/latest/_sources/development/traffic_ops_api/v12/server.txt
index d49fc75..27ccbf3 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/server.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/server.txt
@@ -576,7 +576,7 @@ Server
|
-**GET /api/1.2/servers/summary**
+**GET /api/1.2/servers/totals**
Retrieves a count of CDN servers by type.
@@ -622,6 +622,49 @@ Server
|
+**GET /api/1.2/servers/status**
+
+ Retrieves a count of CDN servers by status.
+
+ Authentication Required: Yes
+
+ Role(s) Required: None
+
+ **Response Properties**
+
+ +-----------------+--------+-----------------------------------------------------------------------------------------------------------------------+
+ | Parameter | Type | Description |
+ +=================+========+=======================================================================================================================+
+ | ``ONLINE`` | int | The number of ONLINE servers. Traffic Monitor will not monitor the state of ONLINE servers. True health is unknown. |
+ +-----------------+--------+-----------------------------------------------------------------------------------------------------------------------+
+ | ``REPORTED`` | int | The number of REPORTED servers. Traffic Monitor monitors the state of REPORTED servers and removes them if unhealthy. |
+ +-----------------+--------+-----------------------------------------------------------------------------------------------------------------------+
+ | ``OFFLINE`` | int | The number of OFFLINE servers. Used for longer-term maintenance. These servers are excluded from CRConfig.json. |
+ +-----------------+--------+-----------------------------------------------------------------------------------------------------------------------+
+ | ``ADMIN_DOWN`` | int | The number of ADMIN_DOWN servers. Used for short-term maintenance. These servers are included in CRConfig.json. |
+ +-----------------+--------+-----------------------------------------------------------------------------------------------------------------------+
+ | ``CCR_IGNORE`` | int | The number of CCR_IGNORE servers. These servers are excluded from CRConfig.json. |
+ +-----------------+--------+-----------------------------------------------------------------------------------------------------------------------+
+ | ``PRE_PROD`` | int | The number of PRE_PROD servers. Used for servers to be deployed. These servers are excluded from CRConfig.json. |
+ +-----------------+--------+-----------------------------------------------------------------------------------------------------------------------+
+
+ **Response Example** ::
+
+ {
+ "response":
+ {
+ "ONLINE": 100,
+ "OFFLINE": 23,
+ "REPORTED": 45,
+ "ADMIN_DOWN": 4,
+ "CCR_IGNORE": 1,
+ "PRE_PROD": 0,
+ }
+ }
+
+|
+
+
**GET /api/1.2/servers/hostname/:name/details**
Retrieves the details of a server.
@@ -878,67 +921,67 @@ Server
**Request Properties**
- +----------------+----------+------------------------------------------------+
- | Name | Required | Description |
- +================+==========+================================================+
- | hostName | yes | The host name part of the server. |
- +----------------+----------+------------------------------------------------+
- | domainName | yes | The domain name part of the FQDN of the cache. |
- +----------------+----------+------------------------------------------------+
- | cachegroup | yes | cache group name |
- +----------------+----------+------------------------------------------------+
- | interfaceName | yes | |
- +----------------+----------+------------------------------------------------+
- | ipAddress | yes | Must be unique per server profile. |
- +----------------+----------+------------------------------------------------+
- | ipNetmask | yes | |
- +----------------+----------+------------------------------------------------+
- | ipGateway | yes | |
- +----------------+----------+------------------------------------------------+
- | interfaceMtu | no | 1500 or 9000 |
- +----------------+----------+------------------------------------------------+
- | physLocation | yes | |
- +----------------+----------+------------------------------------------------+
- | type | yes | server type |
- +----------------+----------+------------------------------------------------+
- | profile | yes | |
- +----------------+----------+------------------------------------------------+
- | cdnName | yes | cdn name the server belongs to |
- +----------------+----------+------------------------------------------------+
- | tcpPort | no | |
- +----------------+----------+------------------------------------------------+
- | httpsPort | no | |
- +----------------+----------+------------------------------------------------+
- | xmppId | no | |
- +----------------+----------+------------------------------------------------+
- | xmppPasswd | no | |
- +----------------+----------+------------------------------------------------+
- | ip6Address | no | Must be unique per server profile. |
- +----------------+----------+------------------------------------------------+
- | ip6Gateway | no | |
- +----------------+----------+------------------------------------------------+
- | rack | no | |
- +----------------+----------+------------------------------------------------+
- | mgmtIpAddress | no | |
- +----------------+----------+------------------------------------------------+
- | mgmtIpNetmask | no | |
- +----------------+----------+------------------------------------------------+
- | mgmtIpGateway | no | |
- +----------------+----------+------------------------------------------------+
- | iloIpAddress | no | |
- +----------------+----------+------------------------------------------------+
- | iloIpNetmask | no | |
- +----------------+----------+------------------------------------------------+
- | iloIpGateway | no | |
- +----------------+----------+------------------------------------------------+
- | iloUsername | no | |
- +----------------+----------+------------------------------------------------+
- | iloPassword | no | |
- +----------------+----------+------------------------------------------------+
- | routerHostName | no | |
- +----------------+----------+------------------------------------------------+
- | routerPortName | no | |
- +----------------+----------+------------------------------------------------+
+ +----------------+----------+-------------------------------------------------+
+ | Name | Required | Description |
+ +================+==========+=================================================+
+ | hostName | yes | The host name part of the server. |
+ +----------------+----------+-------------------------------------------------+
+ | domainName | yes | The domain name part of the FQDN of the cache. |
+ +----------------+----------+-------------------------------------------------+
+ | cachegroup | yes | cache group name |
+ +----------------+----------+-------------------------------------------------+
+ | interfaceName | yes | |
+ +----------------+----------+-------------------------------------------------+
+ | ipAddress | yes | Must be unique per server profile. |
+ +----------------+----------+-------------------------------------------------+
+ | ipNetmask | yes | |
+ +----------------+----------+-------------------------------------------------+
+ | ipGateway | yes | |
+ +----------------+----------+-------------------------------------------------+
+ | interfaceMtu | no | 1500 or 9000 |
+ +----------------+----------+-------------------------------------------------+
+ | physLocation | yes | |
+ +----------------+----------+-------------------------------------------------+
+ | type | yes | server type |
+ +----------------+----------+-------------------------------------------------+
+ | profile | yes | Profile ID - Profile's CDN must match server's. |
+ +----------------+----------+-------------------------------------------------+
+ | cdnName | yes | cdn name the server belongs to |
+ +----------------+----------+-------------------------------------------------+
+ | tcpPort | no | |
+ +----------------+----------+-------------------------------------------------+
+ | httpsPort | no | |
+ +----------------+----------+-------------------------------------------------+
+ | xmppId | no | |
+ +----------------+----------+-------------------------------------------------+
+ | xmppPasswd | no | |
+ +----------------+----------+-------------------------------------------------+
+ | ip6Address | no | Must be unique per server profile. |
+ +----------------+----------+-------------------------------------------------+
+ | ip6Gateway | no | |
+ +----------------+----------+-------------------------------------------------+
+ | rack | no | |
+ +----------------+----------+-------------------------------------------------+
+ | mgmtIpAddress | no | |
+ +----------------+----------+-------------------------------------------------+
+ | mgmtIpNetmask | no | |
+ +----------------+----------+-------------------------------------------------+
+ | mgmtIpGateway | no | |
+ +----------------+----------+-------------------------------------------------+
+ | iloIpAddress | no | |
+ +----------------+----------+-------------------------------------------------+
+ | iloIpNetmask | no | |
+ +----------------+----------+-------------------------------------------------+
+ | iloIpGateway | no | |
+ +----------------+----------+-------------------------------------------------+
+ | iloUsername | no | |
+ +----------------+----------+-------------------------------------------------+
+ | iloPassword | no | |
+ +----------------+----------+-------------------------------------------------+
+ | routerHostName | no | |
+ +----------------+----------+-------------------------------------------------+
+ | routerPortName | no | |
+ +----------------+----------+-------------------------------------------------+
**Request Example** ::
@@ -1084,67 +1127,67 @@ Server
**Request Properties**
- +----------------+----------+------------------------------------------------+
- | Name | Required | Description |
- +================+==========+================================================+
- | hostName | yes | The host name part of the server. |
- +----------------+----------+------------------------------------------------+
- | domainName | yes | The domain name part of the FQDN of the cache. |
- +----------------+----------+------------------------------------------------+
- | cachegroup | yes | cache group name |
- +----------------+----------+------------------------------------------------+
- | interfaceName | yes | |
- +----------------+----------+------------------------------------------------+
- | ipAddress | yes | Must be unique per server profile. |
- +----------------+----------+------------------------------------------------+
- | ipNetmask | yes | |
- +----------------+----------+------------------------------------------------+
- | ipGateway | yes | |
- +----------------+----------+------------------------------------------------+
- | interfaceMtu | no | 1500 or 9000 |
- +----------------+----------+------------------------------------------------+
- | physLocation | yes | |
- +----------------+----------+------------------------------------------------+
- | type | yes | server type |
- +----------------+----------+------------------------------------------------+
- | profile | yes | |
- +----------------+----------+------------------------------------------------+
- | cdnName | yes | cdn name the server belongs to |
- +----------------+----------+------------------------------------------------+
- | tcpPort | no | |
- +----------------+----------+------------------------------------------------+
- | httpsPort | no | |
- +----------------+----------+------------------------------------------------+
- | xmppId | no | |
- +----------------+----------+------------------------------------------------+
- | xmppPasswd | no | |
- +----------------+----------+------------------------------------------------+
- | ip6Address | no | Must be unique per server profile. |
- +----------------+----------+------------------------------------------------+
- | ip6Gateway | no | |
- +----------------+----------+------------------------------------------------+
- | rack | no | |
- +----------------+----------+------------------------------------------------+
- | mgmtIpAddress | no | |
- +----------------+----------+------------------------------------------------+
- | mgmtIpNetmask | no | |
- +----------------+----------+------------------------------------------------+
- | mgmtIpGateway | no | |
- +----------------+----------+------------------------------------------------+
- | iloIpAddress | no | |
- +----------------+----------+------------------------------------------------+
- | iloIpNetmask | no | |
- +----------------+----------+------------------------------------------------+
- | iloIpGateway | no | |
- +----------------+----------+------------------------------------------------+
- | iloUsername | no | |
- +----------------+----------+------------------------------------------------+
- | iloPassword | no | |
- +----------------+----------+------------------------------------------------+
- | routerHostName | no | |
- +----------------+----------+------------------------------------------------+
- | routerPortName | no | |
- +----------------+----------+------------------------------------------------+
+ +----------------+----------+-------------------------------------------------+
+ | Name | Required | Description |
+ +================+==========+=================================================+
+ | hostName | yes | The host name part of the server. |
+ +----------------+----------+-------------------------------------------------+
+ | domainName | yes | The domain name part of the FQDN of the cache. |
+ +----------------+----------+-------------------------------------------------+
+ | cachegroup | yes | cache group name |
+ +----------------+----------+-------------------------------------------------+
+ | interfaceName | yes | |
+ +----------------+----------+-------------------------------------------------+
+ | ipAddress | yes | Must be unique per server profile. |
+ +----------------+----------+-------------------------------------------------+
+ | ipNetmask | yes | |
+ +----------------+----------+-------------------------------------------------+
+ | ipGateway | yes | |
+ +----------------+----------+-------------------------------------------------+
+ | interfaceMtu | no | 1500 or 9000 |
+ +----------------+----------+-------------------------------------------------+
+ | physLocation | yes | |
+ +----------------+----------+-------------------------------------------------+
+ | type | yes | server type |
+ +----------------+----------+-------------------------------------------------+
+ | profile | yes | Profile ID - Profile's CDN must match server's. |
+ +----------------+----------+-------------------------------------------------+
+ | cdnName | yes | cdn name the server belongs to |
+ +----------------+----------+-------------------------------------------------+
+ | tcpPort | no | |
+ +----------------+----------+-------------------------------------------------+
+ | httpsPort | no | |
+ +----------------+----------+-------------------------------------------------+
+ | xmppId | no | |
+ +----------------+----------+-------------------------------------------------+
+ | xmppPasswd | no | |
+ +----------------+----------+-------------------------------------------------+
+ | ip6Address | no | Must be unique per server profile. |
+ +----------------+----------+-------------------------------------------------+
+ | ip6Gateway | no | |
+ +----------------+----------+-------------------------------------------------+
+ | rack | no | |
+ +----------------+----------+-------------------------------------------------+
+ | mgmtIpAddress | no | |
+ +----------------+----------+-------------------------------------------------+
+ | mgmtIpNetmask | no | |
+ +----------------+----------+-------------------------------------------------+
+ | mgmtIpGateway | no | |
+ +----------------+----------+-------------------------------------------------+
+ | iloIpAddress | no | |
+ +----------------+----------+-------------------------------------------------+
+ | iloIpNetmask | no | |
+ +----------------+----------+-------------------------------------------------+
+ | iloIpGateway | no | |
+ +----------------+----------+-------------------------------------------------+
+ | iloUsername | no | |
+ +----------------+----------+-------------------------------------------------+
+ | iloPassword | no | |
+ +----------------+----------+-------------------------------------------------+
+ | routerHostName | no | |
+ +----------------+----------+-------------------------------------------------+
+ | routerPortName | no | |
+ +----------------+----------+-------------------------------------------------+
**Request Example** ::
@@ -1272,6 +1315,66 @@ Server
|
+**PUT /api/1.2/servers/{:id}/status**
+
+ Updates server status and queues updates on all child caches if server type is EDGE or MID. Also, captures offline reason if status is set to ADMIN_DOWN or OFFLINE and prepends offline reason with the user that initiated the status change.
+
+ Authentication Required: Yes
+
+ Role(s) Required: Admin or Operations
+
+ **Request Route Parameters**
+
+ +------+----------+-------------------------------+
+ | Name | Required | Description |
+ +======+==========+===============================+
+ | id | yes | The id of the server. |
+ +------+----------+-------------------------------+
+
+ **Request Properties**
+
+ +----------------+----------+-------------------------------------------------+
+ | Name | Required | Description |
+ +================+==========+=================================================+
+ | status | yes | Status ID or name. |
+ +----------------+----------+-------------------------------------------------+
+ | offlineReason | yes|no | Required if status is ADMIN_DOWN or OFFLINE. |
+ +----------------+----------+-------------------------------------------------+
+
+ **Request Example** ::
+
+ {
+ "status": "ADMIN_DOWN",
+ "offlineReason": "Bad drives"
+ }
+
+|
+
+ **Response Properties**
+
+ +-------------+--------+----------------------------------+
+ | Parameter | Type | Description |
+ +=============+========+==================================+
+ | ``alerts`` | array | A collection of alert messages. |
+ +-------------+--------+----------------------------------+
+ | ``>level`` | string | Success, info, warning or error. |
+ +-------------+--------+----------------------------------+
+ | ``>text`` | string | Alert message. |
+ +-------------+--------+----------------------------------+
+
+ **Response Example** ::
+
+ {
+ "alerts": [
+ {
+ "level": "success",
+ "text": "Updated status [ ADMIN_DOWN ] for foo.bar.net [ user23: bad drives ] and queued updates on all child caches"
+ }
+ ],
+ }
+
+|
+
**DELETE /api/1.2/servers/{:id}**
Allow user to delete server through api.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/83e232ca/docs/latest/_sources/development/traffic_ops_api/v12/topology.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/topology.txt b/docs/latest/_sources/development/traffic_ops_api/v12/topology.txt
index 89444f0..9b7cf9f 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/topology.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/topology.txt
@@ -23,11 +23,109 @@ Snapshot CRConfig
/api/1.2/snapshot/{:cdn_name}
+++++++++++++++++++++++++++++
+**GET /api/1.2/cdns/{:cdn_name}/snapshot**
+
+ Retrieves the CURRENT snapshot for a CDN which doesn't necessarily represent the current state of the CDN. The contents of this snapshot are currently used by Traffic Monitor and Traffic Router.
+
+ Authentication Required: Yes
+
+ Role(s) Required: Admin or Operations
+
+ **Request Route Parameters**
+
+ +----------------+----------+---------------------------------------------+
+ | Name | Required | Description |
+ +================+==========+=============================================+
+ | ``cdn_name`` | yes | CDN name. |
+ +----------------+----------+---------------------------------------------+
+
+ **Response Properties**
+
+ +-----------------------+--------+------------------------------------------------------------------------------+
+ | Parameter | Type | Description |
+ +=======================+========+==============================================================================+
+ | ``config`` | hash | General CDN configuration settings. |
+ +-----------------------+--------+------------------------------------------------------------------------------+
+ | ``contentRouters`` | hash | A list of Traffic Routers. |
+ +-----------------------+--------+------------------------------------------------------------------------------+
+ | ``contentServers`` | hash | A list of Traffic Servers and the delivery services associated with each. |
+ +-----------------------+--------+------------------------------------------------------------------------------+
+ | ``deliveryServices`` | hash | A list of delivery services. |
+ +-----------------------+--------+------------------------------------------------------------------------------+
+ | ``edgeLocations`` | hash | A list of cache groups. |
+ +-----------------------+--------+------------------------------------------------------------------------------+
+ | ``stats`` | hash | Snapshot properties. |
+ +-----------------------+--------+------------------------------------------------------------------------------+
+
+ **Response Example** ::
+
+ {
+ "response": {
+ "config": { ... },
+ "contentRouters": { ... },
+ "contentServers": { ... },
+ "deliveryServices": { ... },
+ "edgeLocations": { ... },
+ "stats": { ... },
+ },
+ }
+
+|
+
+**GET /api/1.2/cdns/{:cdn_name}/snapshot/new**
+
+ Retrieves a PENDING snapshot for a CDN which represents the current state of the CDN. The contents of this snapshot are NOT currently used by Traffic Monitor and Traffic Router. Once a snapshot is performed, this snapshot will become the CURRENT snapshot and will be used by Traffic Monitor and Traffic Router.
+
+ Authentication Required: Yes
+
+ Role(s) Required: Admin or Operations
+
+ **Request Route Parameters**
+
+ +----------------+----------+---------------------------------------------+
+ | Name | Required | Description |
+ +================+==========+=============================================+
+ | ``cdn_name`` | yes | CDN name. |
+ +----------------+----------+---------------------------------------------+
+
+ **Response Properties**
+
+ +-----------------------+--------+------------------------------------------------------------------------------+
+ | Parameter | Type | Description |
+ +=======================+========+==============================================================================+
+ | ``config`` | hash | General CDN configuration settings. |
+ +-----------------------+--------+------------------------------------------------------------------------------+
+ | ``contentRouters`` | hash | A list of Traffic Routers. |
+ +-----------------------+--------+------------------------------------------------------------------------------+
+ | ``contentServers`` | hash | A list of Traffic Servers and the delivery services associated with each. |
+ +-----------------------+--------+------------------------------------------------------------------------------+
+ | ``deliveryServices`` | hash | A list of delivery services. |
+ +-----------------------+--------+------------------------------------------------------------------------------+
+ | ``edgeLocations`` | hash | A list of cache groups. |
+ +-----------------------+--------+------------------------------------------------------------------------------+
+ | ``stats`` | hash | Snapshot properties. |
+ +-----------------------+--------+------------------------------------------------------------------------------+
+
+ **Response Example** ::
+
+ {
+ "response": {
+ "config": { ... },
+ "contentRouters": { ... },
+ "contentServers": { ... },
+ "deliveryServices": { ... },
+ "edgeLocations": { ... },
+ "stats": { ... },
+ },
+ }
+
+|
+
**PUT /api/1.2/snapshot/{:cdn_name}**
Authentication Required: Yes
- Role(s) Required: admin or oper
+ Role(s) Required: Admin or Operations
**Request Route Parameters**
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/83e232ca/docs/latest/_sources/development/traffic_ops_api/v12/user.txt
----------------------------------------------------------------------
diff --git a/docs/latest/_sources/development/traffic_ops_api/v12/user.txt b/docs/latest/_sources/development/traffic_ops_api/v12/user.txt
index c84dfc5..8681dca 100644
--- a/docs/latest/_sources/development/traffic_ops_api/v12/user.txt
+++ b/docs/latest/_sources/development/traffic_ops_api/v12/user.txt
@@ -220,6 +220,153 @@ Users
|
+
+**POST /api/1.2/users**
+
+ Create a user.
+
+ Authentication Required: Yes
+
+ Role(s) Required: admin or oper
+
+ **Request Properties**
+
+ +-------------------------+--------+----------+-------------------------------------------------+
+ | Parameter | Type | Required | Description |
+ +=========================+========+==========+=================================================+
+ |``addressLine1`` | string | no | |
+ +-------------------------+--------+----------+-------------------------------------------------+
+ |``addressLine2`` | string | no | |
+ +-------------------------+--------+----------+-------------------------------------------------+
+ |``city`` | string | no | |
+ +-------------------------+--------+----------+-------------------------------------------------+
+ |``confirmLocalPassword`` | string | yes | |
+ +-------------------------+--------+----------+-------------------------------------------------+
+ |``company`` | string | no | |
+ +-------------------------+--------+----------+-------------------------------------------------+
+ |``country`` | string | no | |
+ +-------------------------+--------+----------+-------------------------------------------------+
+ |``email`` | string | yes | |
+ +-------------------------+--------+----------+-------------------------------------------------+
+ |``fullName`` | string | yes | |
+ +-------------------------+--------+----------+-------------------------------------------------+
+ |``localPassword`` | string | yes | |
+ +-------------------------+--------+----------+-------------------------------------------------+
+ |``newUser`` | bool | no | |
+ +-------------------------+--------+----------+-------------------------------------------------+
+ |``phoneNumber`` | string | no | |
+ +-------------------------+--------+----------+-------------------------------------------------+
+ |``postalCode`` | string | no | |
+ +-------------------------+--------+----------+-------------------------------------------------+
+ |``publicSshKey`` | string | no | |
+ +-------------------------+--------+----------+-------------------------------------------------+
+ |``role`` | int | yes | |
+ +-------------------------+--------+----------+-------------------------------------------------+
+ |``stateOrProvince`` | string | no | |
+ +-------------------------+--------+----------+-------------------------------------------------+
+ | ``tenantId`` | int | no | Owning tenant ID |
+ +-------------------------+--------+----------+-------------------------------------------------+
+ |``username`` | string | yes | |
+ +-------------------------+--------+----------+-------------------------------------------------+
+
+
+ **Request Example** ::
+
+ {
+ "username": "tsimpson"
+ "tenantId": 1,
+ "fullName": "Tom Simpson"
+ "email": "email1@email.com"
+ "role": 6
+ "localPassword": "password"
+ "confirmLocalPassword": "password"
+ }
+
+|
+
+ **Response Properties**
+
+ +----------------------+--------+------------------------------------------------+
+ | Parameter | Type | Description |
+ +======================+========+================================================+
+ |``addressLine1`` | string | |
+ +----------------------+--------+------------------------------------------------+
+ |``addressLine2`` | string | |
+ +----------------------+--------+------------------------------------------------+
+ |``city`` | string | |
+ +----------------------+--------+------------------------------------------------+
+ |``company`` | string | |
+ +----------------------+--------+------------------------------------------------+
+ |``country`` | string | |
+ +----------------------+--------+------------------------------------------------+
+ |``email`` | string | |
+ +----------------------+--------+------------------------------------------------+
+ |``fullName`` | string | |
+ +----------------------+--------+------------------------------------------------+
+ |``gid`` | int | |
+ +----------------------+--------+------------------------------------------------+
+ |``id`` | int | |
+ +----------------------+--------+------------------------------------------------+
+ |``lastUpdated`` | string | |
+ +----------------------+--------+------------------------------------------------+
+ |``newUser`` | string | |
+ +----------------------+--------+------------------------------------------------+
+ |``phoneNumber`` | string | |
+ +----------------------+--------+------------------------------------------------+
+ |``postalCode`` | string | |
+ +----------------------+--------+------------------------------------------------+
+ |``publicSshKey`` | string | |
+ +----------------------+--------+------------------------------------------------+
+ |``registrationSent`` | bool | |
+ +----------------------+--------+------------------------------------------------+
+ |``role`` | int | |
+ +----------------------+--------+------------------------------------------------+
+ |``roleName`` | string | |
+ +----------------------+--------+------------------------------------------------+
+ |``stateOrProvince`` | string | |
+ +----------------------+--------+------------------------------------------------+
+ |``uid`` | int | |
+ +----------------------+--------+------------------------------------------------+
+ | ``tenantId`` | int | Owning tenant ID |
+ +----------------------+--------+------------------------------------------------+
+ |``username`` | string | |
+ +----------------------+--------+------------------------------------------------+
+
+ **Response Example** ::
+
+ {"alerts": [
+ {
+ "level":"success",
+ "text":"User creation was successful."
+ }
+ ],
+ "response: {
+ "addressLine1":"",
+ "addressLine2":"",
+ "city":"",
+ "company":"",
+ "country":"",
+ "email":"email1@email.com",
+ "fullName":"Tom Simpson",
+ "gid":0,
+ "id":2,
+ "lastUpdated":null,
+ "newUser":false,
+ "phoneNumber":"",
+ "postalCode":"",
+ "publicSshKey":"",
+ "registrationSent":false,
+ "role":6,
+ "roleName":"portal",
+ "stateOrProvince":"",
+ "tenantId": 1,
+ "uid":0,
+ "username":"tsimpson",
+ }
+ }
+
+|
+
**GET /api/1.2/users/:id/deliveryservices**
Retrieves all delivery services assigned to the user. See also `Using Traffic Ops - Delivery Service <http://trafficcontrol.apache.org/docs/latest/admin/traffic_ops_using.html#delivery-service>`_.
@@ -364,6 +511,8 @@ Users
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``sslKeyVersion`` | string | |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
+ | ``tenantId`` | int | Owning tenant ID. |
+ +--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``trRequestHeaders`` | string | |
+--------------------------+--------+--------------------------------------------------------------------------------------------------------------------------------------+
| ``trResponseHeaders`` | string | |
@@ -438,6 +587,7 @@ Users
"remapText": null,
"signed": false,
"sslKeyVersion": "0",
+ "tenantId": 1,
"trRequestHeaders": null,
"trResponseHeaders": "Access-Control-Allow-Origin: *",
"type": "HTTP",
@@ -854,7 +1004,7 @@ Role(s) Required: None
|
-**GET /api/1.2/user/:id/deliveryservices/available.json**
+**GET /api/1.2/user/:id/deliveryservices/available**
Authentication Required: Yes
@@ -873,10 +1023,12 @@ Role(s) Required: None
+----------------------+--------+------------------------------------------------+
| Parameter | Type | Description |
+======================+========+================================================+
- |``xmlId`` | string | |
- +----------------------+--------+------------------------------------------------+
|``id`` | string | |
+----------------------+--------+------------------------------------------------+
+ |``displayName`` | string | |
+ +----------------------+--------+------------------------------------------------+
+ |``xmlId`` | string | |
+ +----------------------+--------+------------------------------------------------+
**Response Example** ::
@@ -884,12 +1036,14 @@ Role(s) Required: None
{
"response": [
{
- "xmlId": "ns-img",
- "id": "90"
+ "id": "90",
+ "displayName": "Foo Bar DS",
+ "xmlId": "foo-bar"
},
{
- "xmlId": "ns-img-secure",
- "id": "280"
+ "id": "92",
+ "displayName": "Foo Baz DS",
+ "xmlId": "foo-baz"
}
],
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/83e232ca/docs/latest/admin/quick_howto/multi_site.html
----------------------------------------------------------------------
diff --git a/docs/latest/admin/quick_howto/multi_site.html b/docs/latest/admin/quick_howto/multi_site.html
index 91a1a4e..0613c6e 100644
--- a/docs/latest/admin/quick_howto/multi_site.html
+++ b/docs/latest/admin/quick_howto/multi_site.html
@@ -108,6 +108,7 @@
<li class="toctree-l2"><a class="reference internal" href="../traffic_ops_extensions.html">Managing Traffic Ops Extensions</a></li>
<li class="toctree-l2"><a class="reference internal" href="../traffic_portal.html">Traffic Portal Administration</a></li>
<li class="toctree-l2"><a class="reference internal" href="../traffic_monitor.html">Traffic Monitor Administration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../traffic_monitor_golang.html">Traffic Monitor Administration</a></li>
<li class="toctree-l2"><a class="reference internal" href="../traffic_router.html">Traffic Router Administration</a></li>
<li class="toctree-l2"><a class="reference internal" href="../traffic_stats.html">Traffic Stats Administration</a></li>
<li class="toctree-l2"><a class="reference internal" href="../traffic_server.html">Traffic Server Administration</a></li>
@@ -122,6 +123,7 @@
<li class="toctree-l2"><a class="reference internal" href="../../development/traffic_portal.html">Traffic Portal</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../development/traffic_router.html">Traffic Router</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../development/traffic_monitor.html">Traffic Monitor</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../development/traffic_monitor_golang.html">Traffic Monitor Golang</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../development/traffic_stats.html">Traffic Stats</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../development/traffic_server.html">Traffic Server</a></li>
</ul>
@@ -201,7 +203,7 @@
</ol>
<a class="reference internal image-reference" href="../../_images/D28614AA-9758-45ED-9EFD-3A284FC4218E.png"><img alt="../../_images/D28614AA-9758-45ED-9EFD-3A284FC4218E.png" class="align-center" src="../../_images/D28614AA-9758-45ED-9EFD-3A284FC4218E.png" style="width: 1468.0px; height: 166.0px;" /></a>
<ol class="arabic simple" start="4">
-<li>Check the multi-site check box in the delivery service screen and make sure that Content Routing Type is set to HTTP_LIVE_NATL:</li>
+<li>Check the multi-site check box in the delivery service screen:</li>
</ol>
<a class="reference internal image-reference" href="../../_images/mso-enable.png"><img alt="../../_images/mso-enable.png" class="align-center" src="../../_images/mso-enable.png" style="width: 1695.0px; height: 1079.0px;" /></a>
<ol class="arabic simple" start="5">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/83e232ca/docs/latest/admin/quick_howto/multi_site_ats5.html
----------------------------------------------------------------------
diff --git a/docs/latest/admin/quick_howto/multi_site_ats5.html b/docs/latest/admin/quick_howto/multi_site_ats5.html
index 55d85cf..425a5d4 100644
--- a/docs/latest/admin/quick_howto/multi_site_ats5.html
+++ b/docs/latest/admin/quick_howto/multi_site_ats5.html
@@ -203,7 +203,7 @@
</ol>
<a class="reference internal image-reference" href="../../_images/D28614AA-9758-45ED-9EFD-3A284FC4218E.png"><img alt="../../_images/D28614AA-9758-45ED-9EFD-3A284FC4218E.png" class="align-center" src="../../_images/D28614AA-9758-45ED-9EFD-3A284FC4218E.png" style="width: 1468.0px; height: 166.0px;" /></a>
<ol class="arabic simple" start="4">
-<li>Check the multi-site check box in the delivery service screen and make sure that Content Routing Type is set to HTTP_LIVE_NATL:</li>
+<li>Check the multi-site check box in the delivery service screen:</li>
</ol>
<a class="reference internal image-reference" href="../../_images/mso-enable.png"><img alt="../../_images/mso-enable.png" class="align-center" src="../../_images/mso-enable.png" style="width: 1695.0px; height: 1079.0px;" /></a>
<ol class="arabic simple" start="5">
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/83e232ca/docs/latest/admin/traffic_server.html
----------------------------------------------------------------------
diff --git a/docs/latest/admin/traffic_server.html b/docs/latest/admin/traffic_server.html
index bb43c99..c3b144f 100644
--- a/docs/latest/admin/traffic_server.html
+++ b/docs/latest/admin/traffic_server.html
@@ -300,6 +300,7 @@ This makes traffic control check periodically if ‘Queue Updates’ was
<div class="highlight-default"><div class="highlight"><pre><span></span><span class="o">*/</span><span class="mi">15</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">*</span> <span class="o">/</span><span class="n">opt</span><span class="o">/</span><span class="n">ort</span><span class="o">/</span><span class="n">traffic_ops_ort</span><span class="o">.</span><span class="n">pl</span> <span class="n">syncds</span> <span class="n">warn</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">traffops</span><span class="o">.</span><span class="n">kabletown</span><span class="o">.</span><span class="n">net</span> <span class="n">admin</span><span class="p">:</span><span class="n">password</span> <span class="o">></span> <span class="o">/</span><span class="n">tmp</span><span class="o">/</span><span class="n">ort</span><span class="o">/</span><span class="n">syncds</span><span class="o">.</span
><span class="n">log</span> <span class="mi">2</span><span class="o">>&</span><span class="mi">1</span>
</pre></div>
</div>
+<p>Changing <code class="docutils literal"><span class="pre">https://traffops.kabletown.net</span></code>, <code class="docutils literal"><span class="pre">admin</span></code>, and <code class="docutils literal"><span class="pre">password</span></code> to your CDN URL and credentials.</p>
<div class="admonition note">
<p class="first admonition-title">Note</p>
<p class="last">By default, running ort on an edge traffic server waits for it’s parent (mid) servers to download their configuration before
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/83e232ca/docs/latest/development/traffic_ops.html
----------------------------------------------------------------------
diff --git a/docs/latest/development/traffic_ops.html b/docs/latest/development/traffic_ops.html
index 06c11f3..31c15bd 100644
--- a/docs/latest/development/traffic_ops.html
+++ b/docs/latest/development/traffic_ops.html
@@ -803,9 +803,12 @@ Extensions::YourCustomExtension</p>
<h3>API 1.2 Reference<a class="headerlink" href="#api-1-2-reference" title="Permalink to this headline">ΒΆ</a></h3>
<div class="toctree-wrapper compound">
<ul>
+<li class="toctree-l1"><a class="reference internal" href="traffic_ops_api/v12/api_capability.html">API-Capabilities</a></li>
<li class="toctree-l1"><a class="reference internal" href="traffic_ops_api/v12/asn.html">ASN</a></li>
<li class="toctree-l1"><a class="reference internal" href="traffic_ops_api/v12/cachegroup.html">Cache Group</a></li>
+<li class="toctree-l1"><a class="reference internal" href="traffic_ops_api/v12/cachegroup_parameter.html">Cache Group parameters</a></li>
<li class="toctree-l1"><a class="reference internal" href="traffic_ops_api/v12/cache_stats.html">Cache Statistics</a></li>
+<li class="toctree-l1"><a class="reference internal" href="traffic_ops_api/v12/capability.html">Capabilities</a></li>
<li class="toctree-l1"><a class="reference internal" href="traffic_ops_api/v12/cdn.html">CDN</a></li>
<li class="toctree-l1"><a class="reference internal" href="traffic_ops_api/v12/changelog.html">Change Logs</a></li>
<li class="toctree-l1"><a class="reference internal" href="traffic_ops_api/v12/deliveryservice.html">Delivery Service</a></li>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/83e232ca/docs/latest/development/traffic_ops_api/routes.html
----------------------------------------------------------------------
diff --git a/docs/latest/development/traffic_ops_api/routes.html b/docs/latest/development/traffic_ops_api/routes.html
index 5ce5398..dc177d0 100644
--- a/docs/latest/development/traffic_ops_api/routes.html
+++ b/docs/latest/development/traffic_ops_api/routes.html
@@ -108,6 +108,7 @@
<li class="toctree-l2"><a class="reference internal" href="../../admin/traffic_ops_extensions.html">Managing Traffic Ops Extensions</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../admin/traffic_portal.html">Traffic Portal Administration</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../admin/traffic_monitor.html">Traffic Monitor Administration</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../../admin/traffic_monitor_golang.html">Traffic Monitor Administration</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../admin/traffic_router.html">Traffic Router Administration</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../admin/traffic_stats.html">Traffic Stats Administration</a></li>
<li class="toctree-l2"><a class="reference internal" href="../../admin/traffic_server.html">Traffic Server Administration</a></li>
@@ -122,6 +123,7 @@
<li class="toctree-l2"><a class="reference internal" href="../traffic_portal.html">Traffic Portal</a></li>
<li class="toctree-l2"><a class="reference internal" href="../traffic_router.html">Traffic Router</a></li>
<li class="toctree-l2"><a class="reference internal" href="../traffic_monitor.html">Traffic Monitor</a></li>
+<li class="toctree-l2"><a class="reference internal" href="../traffic_monitor_golang.html">Traffic Monitor Golang</a></li>
<li class="toctree-l2"><a class="reference internal" href="../traffic_stats.html">Traffic Stats</a></li>
<li class="toctree-l2"><a class="reference internal" href="../traffic_server.html">Traffic Server</a></li>
</ul>