Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
7874d0b
Setup for Opt-In Integration with OAuth provider including Traffic Po…
mattjackson220 Apr 17, 2019
a324ba4
Updated changelog.md and added test
mattjackson220 Apr 18, 2019
0a0c631
Setup for Opt-In Integration with OAuth provider including Traffic Po…
mattjackson220 Apr 17, 2019
5037c8d
Updated changelog.md and added test
mattjackson220 Apr 18, 2019
bfebf50
fixed merge conflict
mattjackson220 Apr 18, 2019
26bb05d
minor format fixes
mattjackson220 Apr 19, 2019
294af5a
Updates per comments on PR
mattjackson220 May 2, 2019
2385de4
Updates per comments on PR
mattjackson220 May 2, 2019
112072c
updates per comments
mattjackson220 May 8, 2019
577f420
added /sso redirect to root app to comply with OAuth standards
mattjackson220 May 9, 2019
c12ac9d
Merge branch 'master' into oauth_integration
mattjackson220 May 10, 2019
95fb2b0
updates per comments
mattjackson220 May 14, 2019
bbcb6dd
updates per comments
mattjackson220 May 14, 2019
93b481d
updated to use authorization code instead of token, getting rid of im…
mattjackson220 Jun 20, 2019
2348ec7
Merge branch 'master' into oauth_integration
mattjackson220 Jun 20, 2019
47f570f
Fix for missing port in redirect to https (#3647)
mattjackson220 Jun 21, 2019
c0578cf
CDN-in-a-Box now uses Snapshots instead of legacy CRConfig
ocket8888 Jun 20, 2019
9fa66d4
fixed jq query
ocket8888 Jun 21, 2019
244422a
removed the 'Health Tab' parts of the TO UI documentation (#3692)
ocket8888 Jun 25, 2019
b0ff791
removed the 'Misc' part of the TO UI documentation (#3695)
ocket8888 Jun 25, 2019
9f49c3f
updated so code is in POST body
mattjackson220 Jun 25, 2019
3c45e1a
removed the 'Servers' parts of the TO UI documentation (#3693)
ocket8888 Jun 25, 2019
cfeffd6
removed the 'Tools' parts of the TO UI documentation (#3694)
ocket8888 Jun 25, 2019
bb685a3
updated so all parameters are in POST body
mattjackson220 Jun 26, 2019
05f2de1
Fix the parameter name of deliveryserviceserver in document (#3456)
Shihta Jun 27, 2019
5132621
CiaB: added log path of trafficops in variables.env (#3666)
Shihta Jun 27, 2019
61a985c
CiaB: added log path of traffic monitor in variables.env (#3665)
Shihta Jun 27, 2019
3ea54b2
terminate disk check regex with a digit (#3699)
guzzijason Jul 5, 2019
466684c
Refactor deliveryservice API minor versioning (#3713)
Jul 9, 2019
89960f0
updated to parse token from json or as response body
mattjackson220 Jul 10, 2019
c753414
Fix TO-Go's internal shared riak cluster finalizer (#3706)
Jul 10, 2019
7162d88
Let auto-snapqueue and add-sslkeys be functions (#3475)
Shihta Jul 10, 2019
594839f
CIAB: Dynamically detect server netmask (#3264)
Shihta Jul 11, 2019
75df11b
updated per comments
mattjackson220 Jul 11, 2019
73d6be5
update per comment
mattjackson220 Jul 11, 2019
fb1ec46
update per comments
mattjackson220 Jul 15, 2019
165662e
vendored dgrijalva/jwt-go and lestrrat-go/jwx
mattjackson220 Jul 16, 2019
ba8f0cd
update for weasel with new dependencies
mattjackson220 Jul 16, 2019
deed638
update per comment
mattjackson220 Jul 16, 2019
96206d9
update per comment
mattjackson220 Jul 16, 2019
43d0d07
Cleaned up API endpoint documentation to point to DS overview (#3674)
ocket8888 Jul 16, 2019
36c0e0e
fixes trafficserver status check (#3730)
dg4prez Jul 16, 2019
2ccc46a
Pulled Profiles/Parameters docs out of TO UI and added it as an overv…
ocket8888 Jul 17, 2019
2957e52
Minor routes.go cleanup (#3736)
Jul 18, 2019
487efdc
TP: adds the ability to rearrange table columns as well as toggle col…
mitchell852 Jul 18, 2019
95366cc
Remove seconds in TP build date to fix OURCE bug (#3675)
alexluckerman Jul 19, 2019
e05493c
Removed restangular from ParameterService (#3623)
ocket8888 Jul 23, 2019
4c8b26e
Removed restangular from ProfileService (#3626)
ocket8888 Jul 23, 2019
0bfc7b7
Add TP test for DNSSEC keys (#3735)
alexluckerman Jul 23, 2019
685c7d3
Change redirect location after creating a parameter or profile (#3737)
alexluckerman Jul 23, 2019
1d2bc4a
Fix bug that causes DS requests to fulfill immediately while other re…
alexluckerman Jul 24, 2019
87f1546
Fix grove log fractional seconds
rob05c Jul 24, 2019
356799d
Make entire row clickable in TP assignment popups (#3725)
alexluckerman Jul 24, 2019
4b2a826
Fix PR template typo (#3751)
rob05c Jul 24, 2019
5e2661e
adds an issue template for the TC repo (#3708)
mitchell852 Jul 24, 2019
384c237
TP - delivery service form layout redesign (#3658)
mitchell852 Jul 25, 2019
d1cc708
Removed restangular from CoordinateService (#3609)
ocket8888 Jul 26, 2019
455c1b7
Removed restangular from CapabilityService (#3607)
ocket8888 Jul 26, 2019
c98cce9
Removed restangular from AuthService.js (#3601)
ocket8888 Jul 26, 2019
5da4a5b
Removed restangular from TypeService (#3597)
ocket8888 Jul 26, 2019
382fb84
Setup for Opt-In Integration with OAuth provider including Traffic Po…
mattjackson220 Apr 17, 2019
a846ee0
Updated changelog.md and added test
mattjackson220 Apr 18, 2019
668f39d
Setup for Opt-In Integration with OAuth provider including Traffic Po…
mattjackson220 Apr 17, 2019
6bd3b76
Updated changelog.md and added test
mattjackson220 Apr 18, 2019
ec5d4ec
minor format fixes
mattjackson220 Apr 19, 2019
a4cecb5
Updates per comments on PR
mattjackson220 May 2, 2019
ffab97d
Updates per comments on PR
mattjackson220 May 2, 2019
9e358e5
updates per comments
mattjackson220 May 8, 2019
711bf8e
added /sso redirect to root app to comply with OAuth standards
mattjackson220 May 9, 2019
3a29eb3
updates per comments
mattjackson220 May 14, 2019
6e58866
updates per comments
mattjackson220 May 14, 2019
2a46983
updated to use authorization code instead of token, getting rid of im…
mattjackson220 Jun 20, 2019
82f38fd
updated so code is in POST body
mattjackson220 Jun 25, 2019
ce288bc
updated so all parameters are in POST body
mattjackson220 Jun 26, 2019
3158c4c
updated to parse token from json or as response body
mattjackson220 Jul 10, 2019
ce881a0
updated per comments
mattjackson220 Jul 11, 2019
723e49e
update per comment
mattjackson220 Jul 11, 2019
ad3c029
update per comments
mattjackson220 Jul 15, 2019
f6dc403
vendored dgrijalva/jwt-go and lestrrat-go/jwx
mattjackson220 Jul 16, 2019
4c334eb
update for weasel with new dependencies
mattjackson220 Jul 16, 2019
b111f7c
update per comment
mattjackson220 Jul 16, 2019
813bf8c
update per comment
mattjackson220 Jul 16, 2019
a2f2d5c
Merge conficts
mattjackson220 Jul 29, 2019
ed07881
Merge branch 'oauth_integration' of https://github.com/mattjackson220…
mattjackson220 Jul 29, 2019
f347ae0
update per comments
mattjackson220 Jul 29, 2019
27461d8
Setup for Opt-In Integration with OAuth provider including Traffic Po…
mattjackson220 Apr 17, 2019
7010872
Updated changelog.md and added test
mattjackson220 Apr 18, 2019
e3c8163
minor format fixes
mattjackson220 Apr 19, 2019
c569f85
Updates per comments on PR
mattjackson220 May 2, 2019
c867470
Updates per comments on PR
mattjackson220 May 2, 2019
480df84
updates per comments
mattjackson220 May 8, 2019
e4bb18e
added /sso redirect to root app to comply with OAuth standards
mattjackson220 May 9, 2019
6c9c546
updates per comments
mattjackson220 May 14, 2019
6a52ac8
updates per comments
mattjackson220 May 14, 2019
e955b1f
updated to use authorization code instead of token, getting rid of im…
mattjackson220 Jun 20, 2019
dc76109
updated so code is in POST body
mattjackson220 Jun 25, 2019
831963d
updated so all parameters are in POST body
mattjackson220 Jun 26, 2019
b453c2a
updated to parse token from json or as response body
mattjackson220 Jul 10, 2019
97ab31b
updated per comments
mattjackson220 Jul 11, 2019
2814223
update per comment
mattjackson220 Jul 11, 2019
1345261
update per comments
mattjackson220 Jul 15, 2019
4a68fe0
vendored dgrijalva/jwt-go and lestrrat-go/jwx
mattjackson220 Jul 16, 2019
2e1834c
update for weasel with new dependencies
mattjackson220 Jul 16, 2019
9340f27
update per comment
mattjackson220 Jul 16, 2019
b5396e6
update per comment
mattjackson220 Jul 16, 2019
98759f7
Setup for Opt-In Integration with OAuth provider including Traffic Po…
mattjackson220 Apr 17, 2019
96a1a6f
Updated changelog.md and added test
mattjackson220 Apr 18, 2019
086ad68
Updated changelog.md and added test
mattjackson220 Apr 18, 2019
35cbe39
Updates per comments on PR
mattjackson220 May 2, 2019
14d3816
updated to use authorization code instead of token, getting rid of im…
mattjackson220 Jun 20, 2019
7a3ea65
update per comment
mattjackson220 Jul 16, 2019
0346476
update per comments
mattjackson220 Jul 29, 2019
066bda0
Merge branch 'oauth_integration' of https://github.com/mattjackson220…
mattjackson220 Jul 30, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .dependency_license
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ traffic_portal/app/src/assets/js/chartjs/angular-chart\..*, BSD
traffic_portal/app/src/assets/css/jsonformatter\..*, Apache
traffic_portal/app/src/assets/js/jsonformatter\..*, Apache
traffic_portal/app/src/assets/js/fast-json-patch\..*, MIT
traffic_portal/app/src/assets/css/colReorder.dataTables\..*, MIT
traffic_portal/app/src/assets/js/colReorder.dataTables\..*, MIT
traffic_ops/traffic_ops_golang/vendor/github\.com/dgrijalva/.*, MIT
traffic_ops/traffic_ops_golang/vendor/github\.com/lestrrat-go/.*, MIT

# Ignored - Do not report.
\.DS_Store, Ignore # Created automatically OSX.
Expand Down
1 change: 1 addition & 0 deletions .rat-excludes
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ j[mM]enu(?:\.jquery)?\.(?:css|js)(?: MIT. Properly documented in LICENSE ){0}
downloadjs\-min.*\.js(?: MIT. Properly documented in LICENSE ){0}
jquery\-ui\..*(?: MIT. Properly documented in LICENSE ){0}
jquery\.dataTables\..*(?: MIT. Properly documented in LICENSE ){0}
colReorder\.dataTables\..*(?: MIT. Properly documented in LICENSE ){0}
.*underscore.*(?: MIT. Properly documented in LICENSE ){0}
.*moment.*(?: MIT. Properly documented in LICENSE ){0}
.*jsdiff.*(?: BSD 3-clause. Properly documented in LICENSE ){0}
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- /api/1.4/cdns/dnsseckeys/refresh `GET`
- /api/1.1/cdns/name/:name/dnsseckeys `GET`
- /api/1.4/cdns/name/:name/dnsseckeys `GET`
- /api/1.4/user/login/oauth `POST`
- To support reusing a single riak cluster connection, an optional parameter is added to riak.conf: "HealthCheckInterval". This options takes a 'Duration' value (ie: 10s, 5m) which affects how often the riak cluster is health checked. Default is currently set to: "HealthCheckInterval": "5s".
- Added a new Go db/admin binary to replace the Perl db/admin.pl script which is now deprecated and will be removed in a future release. The new db/admin binary is essentially a drop-in replacement for db/admin.pl since it supports all of the same commands and options; therefore, it should be used in place of db/admin.pl for all the same tasks.
- Added an API 1.4 endpoint, /api/1.4/cdns/dnsseckeys/refresh, to perform necessary behavior previously served outside the API under `/internal`.
Expand All @@ -31,6 +32,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- In Traffic Portal, removes the need to specify line breaks using `__RETURN__` in delivery service edge/mid header rewrite rules, regex remap expressions, raw remap text and traffic router additional request/response headers.
- In Traffic Portal, provides the ability to clone delivery service assignments from one cache to another cache of the same type. Issue #2963.
- Traffic Ops now allows each delivery service to have a set of query parameter keys to be retained for consistent hash generation by Traffic Router.
- Added an API 1.4 endpoint, /api/1.4/user/login/oauth to handle SSO login using OAuth.
- Added /#!/sso page to Traffic Portal to catch redirects back from OAuth provider and POST token into the API.

### Changed
- Traffic Router, added TLS certificate validation on certificates imported from Traffic Ops
Expand All @@ -47,13 +50,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- Modified Traffic Router logging format to include an additional field for DNS log entries, namely `rhi`. This defaults to '-' and is only used when EDNS0 client subnet extensions are enabled and a client subnet is present in the request. When enabled and a subnet is present, the subnet appears in the `chi` field and the resolver address is in the `rhi` field.
- Changed traffic_ops_ort.pl so that hdr_rw-<ds>.config files are compared with strict ordering and line duplication when detecting configuration changes.
- Traffic Ops (golang), Traffic Monitor, Traffic Stats are now compiled using Go version 1.11. Grove was already being compiled with this version which improves performance for TLS when RSA certificates are used.
- Fixed issue #3497: TO API clients that don't specify the latest minor version will overwrite/default any fields introduced in later versions
- Issue 3476: Traffic Router returns partial result for CLIENT_STEERING Delivery Services when Regional Geoblocking or Anonymous Blocking is enabled.
- Upgraded Traffic Portal to AngularJS 1.7.8
- Issue 3275: Improved the snapshot diff performance and experience.
- Issue #3605: Fixed Traffic Monitor custom ports in health polling URL.
- Issue 3587: Fixed Traffic Ops Golang reverse proxy and Riak logs to be consistent with the format of other error logs.
- Database migrations have been collapsed. Rollbacks to migrations that previously existed are no longer possible.
- Issue #3750: Fixed Grove access log fractional seconds.
- Issue #3646: Fixed Traffic Monitor Thresholds.
- Added fields to traffic_portal_properties.json to configure SSO through OAuth.
- Added field to cdn.conf to configure whitelisted URLs for Json Key Set URL returned from OAuth provider.

## [3.0.0] - 2018-10-30
### Added
Expand Down
68 changes: 68 additions & 0 deletions ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<!--
************ STOP!! ************
If this issue identifies a security vulnerability, DO NOT submit it! Instead, contact
the Apache Software Foundation Security Team at security@trafficcontrol.apache.org and follow the
guidelines at https://www.apache.org/security/ regarding vulnerability disclosure.
-->

<!--
- For *SUPPORT QUESTIONS*, use the
[Traffic Control slack channels](https://traffic-control-cdn.slack.com) or [Traffic Control mailing lists](http://trafficcontrol.apache.org/mailing_lists/).
- Before submitting, please **SEARCH GITHUB** for a similar issue or PR. -->

## I'm submitting a ...
<!-- (check all that apply with "[x]") -->
<!--- security vulnerability (STOP!! - see above)-->
- [ ] bug report
- [ ] new feature / enhancement request
- [ ] improvement request (usability, performance, tech debt, etc.)
- [ ] other <!--(Please do not submit support requests here - see above)-->

## Traffic Control components affected ...
<!-- (check all that apply with "[x]") -->
- [ ] CDN in a Box
- [ ] Documentation
- [ ] Grove
- [ ] Traffic Control Client
- [ ] Traffic Monitor
- [ ] Traffic Ops
- [ ] Traffic Ops ORT
- [ ] Traffic Portal
- [ ] Traffic Router
- [ ] Traffic Stats
- [ ] Traffic Vault
- [ ] unknown

## Current behavior:
<!-- Describe how the bug manifests / how the current features are insufficient. -->

## Expected / new behavior:
<!-- Describe what the behavior would be without the bug / how the feature would improve Traffic Control -->

## Minimal reproduction of the problem with instructions:
<!--
If the current behavior is a bug or you can illustrate your feature request better with an example,
please provide the *STEPS TO REPRODUCE* and include the applicable TC version.
-->

## Anything else:
<!-- e.g. stacktraces, related issues, suggestions how to fix -->

<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
15 changes: 14 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -243,10 +243,15 @@ For the JSON formatter component:

For the DataTables component:
@traffic_portal/app/src/assets/css/jquery.dataTables.min_1.10.9.css
@traffic_portal/app/src/assets/js/jquery.dataTables.min_1.10.16.js
@traffic_portal/app/src/assets/js/jquery.dataTables.min_1.10.19_patched.js
@traffic_portal/app/src/assets/images/sort_*
./licenses/MIT-datatables

For the DataTables ColReorder component:
@traffic_portal/app/src/assets/css/colReorder.dataTables.min_1.5.1.css
@traffic_portal/app/src/assets/js/colReorder.dataTables.min_1.5.1.js
./licenses/MIT-ColReorder

For the moment.js component:
@traffic_portal/app/src/assets/js/moment-min_2.22.1.js
./licenses/MIT-momentjs
Expand Down Expand Up @@ -427,3 +432,11 @@ The modern-go/concurrent component is used under the Apache 2.0 license:
The modern-go/reflect2 component is used under the Apache 2.0 license:
@vendor/github.com/modern-go/reflect2/*
./vendor/github.com/modern-go/reflect2/LICENSE

For the lestrrat-go/jwx component:
@traffic_ops/traffic_ops_golang/vendor/github.com/lestrrat-go/jwx/*
./traffic_ops/traffic_ops_golang/vendor/github.com/lestrrat-go/jwx/LICENSE

For the dgrijalva/jwt-go component:
@traffic_ops/traffic_ops_golang/vendor/github.com/dgrijalva/jwt-go/*
./traffic_ops/traffic_ops_golang/vendor/github.com/dgrijalva/jwt-go/LICENSE
2 changes: 1 addition & 1 deletion PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ it includes tests (and most should), outline here the steps needed to run the
tests. If not, lay out the manual testing procedure and please explain why
tests are unnecessary for this Pull Request. -->

## If this is a bug fix, what versions of Traffic Ops are affected?
## If this is a bug fix, what versions of Traffic Control are affected?
<!-- If this PR fixes a bug, please list here all of the affected versions - to
the best of your knowledge. It's also pretty helpful to include a commit hash
of where 'master' is at the time this PR is opened (if it affects master),
Expand Down
18 changes: 9 additions & 9 deletions docs/source/admin/quick_howto/anonymous_blocking.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,29 +50,29 @@ Configure Anonymous Blocking
An optional element. It includes a list of :abbr:`CIDR (Classless Inter-Domain Routing)` blocks indicating the IPv4 and IPv6 subnets that are allowed by the rule. If this list exists and the value is not ``null``, client IPs will be matched against the :abbr:`CIDR (Classless Inter-Domain Routing)` list, and if there is any match, the request will be allowed. If there is no match in the white list, further anonymous blocking logic will continue.


#. Add the following three Anonymous Blocking parameters in Traffic Portal into CRConfig.json:
#. Add the following three Anonymous Blocking :ref:`Parameters` in Traffic Portal with the "CRConfig.json" :ref:`parameter-config-file`, and ensure they are assigned to all of the Traffic Routers that should perform Anonymous Blocking:

``anonymousip.policy.configuration``
The HTTP URL of the Anonymous Blocking configuration file. Traffic Router will fetch the file from this URL.
The URL of the Anonymous Blocking configuration file. Traffic Router will fetch the file from this URL.
``anonymousip.polling.url``
The HTTP URL of the Anonymous IP Database. Traffic Router will fetch the file from this URL.
The URL of the Anonymous IP Database. Traffic Router will fetch the file from this URL.
``anonymousip.polling.interval``
The interval that Traffic Router polls the Anonymous Blocking configuration file and Anonymous IP Database.

.. figure:: anonymous_blocking/01.png
:scale: 100%
:width: 40%
:align: center

#. Enable Anonmyous Blocking for a :term:`Delivery Service`
#. Enable Anonmyous Blocking for a :term:`Delivery Service` using the :ref:`Delivery Services view in Traffic Portal <tp-services-delivery-service>` (don't forget to save changes!)

.. figure:: anonymous_blocking/02.png
:scale: 100%
:width: 40%
:align: center

#. Go to :menuselection:`Tools --> Snapshot CRConfig`, perform :guilabel:`Diff CRConfig` and click :guilabel:`Write CRConfig`.
#. Go to :ref:`the Traffic Portal CDNs view <tp-cdns>`, click on :guilabel:`Diff CDN Config Snapshot`, and click :guilabel:`Perform Snapshot`.

.. figure:: regionalgeo/03.png
:scale: 70%
.. figure:: anonymous_blocking/03.png
:width: 40%
:align: center


Expand Down
Binary file modified docs/source/admin/quick_howto/anonymous_blocking/01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/source/admin/quick_howto/anonymous_blocking/02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions docs/source/admin/quick_howto/ciab.rst
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,9 @@ The enroller runs within CDN in a Box using :option:`--dir` which provides the a

Auto Snapshot/Queue-Updates
---------------------------
An automatic snapshot of the current Traffic Ops CDN configuration/toplogy will be performed once the "enroller" has finished loading all of the data and a minimum number of servers have been enrolled. To enable this feature, set the boolean ``AUTO_SNAPQUEUE_ENABLED`` to ``true`` [8]_. The snapshot and queue-updates actions will not be performed until all servers in ``AUTO_SNAPQUEUE_SERVERS`` (comma-delimited string) have been enrolled. The current enrolled servers will be polled every ``AUTO_SNAPQUEUE_POLL_INTERVAL`` seconds, and each action (snapshot and queue-updates) will be delayed ``AUTO_SNAPQUEUE_ACTION_WAIT`` seconds [9]_.
An automatic :term:`Snapshot` of the current Traffic Ops CDN configuration/topology will be performed once the "enroller" has finished loading all of the data and a minimum number of servers have been enrolled. To enable this feature, set the boolean ``AUTO_SNAPQUEUE_ENABLED`` to ``true`` [8]_. The :term:`Snapshot` and :term:`Queue Updates` actions will not be performed until all servers in ``AUTO_SNAPQUEUE_SERVERS`` (comma-delimited string) have been enrolled. The current enrolled servers will be polled every ``AUTO_SNAPQUEUE_POLL_INTERVAL`` seconds, and each action (:term:`Snapshot` and :term:`Queue Updates`) will be delayed ``AUTO_SNAPQUEUE_ACTION_WAIT`` seconds [9]_.

.. [8] Automatic Snapshot/Queue-Updates is enabled by default in :file:`infrastructure/cdn-in-a-box/variables.env`.
.. [8] Automatic :term:`Snapshot`/:term:`Queue Updates` is enabled by default in `variables.env`_.
.. [9] Server poll interval and delay action wait are defaulted to a value of 2 seconds.

Mock Origin Service
Expand Down
6 changes: 3 additions & 3 deletions docs/source/admin/quick_howto/ds_requests.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*************************
Delivery Service Requests
*************************
When enabled in :file:`traffic_portal_properties.json`, Delivery Service Requests are created when *all* users attempt to create, update or delete a :term:`Delivery Service`. This allows users with higher level permissions ("operations" or "admin") to review the changes for completeness and accuracy before deploying the changes. In addition, most :term:`Delivery Service` changes require cache configuration updates (aka queue updates) and/or a CDN :term:`Snapshot`. Both of these actions are reserved for users with elevated permissions.
When enabled in :file:`traffic_portal_properties.json`, Delivery Service Requests are created when *all* users attempt to create, update or delete a :term:`Delivery Service`. This allows users with higher level permissions ("operations" or "admin") to review the changes for completeness and accuracy before deploying the changes. In addition, most :term:`Delivery Service` changes require configuration updates (i.e. :term:`Queue Updates`) and/or a CDN :term:`Snapshot`. Both of these actions are reserved for users with elevated permissions.

A list of the Delivery Service requests associated with your :term:`Tenant` can be found under :menuselection:`Services --> Delivery Service Requests`

Expand Down Expand Up @@ -53,10 +53,10 @@ Reject the Delivery Service Request
Rejecting a Delivery Service Request will set status to 'rejected' and the request can no longer be modified. This will auto-assign the request to the user doing the rejection.

Fulfill the Delivery Service Request
Fulfilling a Delivery Service Request will show the requested changes and, once committed, will apply the desired changes and set status to 'pending'. The request is pending because many types of changes will require :term:`cache server` configuration updates (aka queue updates) and/or a CDN snapshot. Once queue updates and/or CDN snapshot is complete, the request should be marked 'complete'.
Fulfilling a Delivery Service Request will show the requested changes and, once committed, will apply the desired changes and set status to 'pending'. The request is pending because many types of changes will require :term:`cache server` configuration updates (i.e. :term:`Queue Updates`) and/or a CDN :term:`Snapshot`. Once :term:`Queue Updates` and/or CDN :term:`Snapshot` is complete, the request should be marked 'complete'.

Complete the Delivery Service Request
Only after the Delivery Service Request has been fulfilled and the changes have been applied can a Delivery Service Request be marked as 'complete'. Marking a Delivery Service Request as 'complete' is currently a manual step because some changes require :term:`cache server` configuration updates (aka queue updates) and/or a CDN :term:`Snapshot`. Once that is done and the changes have been deployed, the request status should be changed from 'pending' to 'complete'.
Only after the Delivery Service Request has been fulfilled and the changes have been applied can a Delivery Service Request be marked as 'complete'. Marking a Delivery Service Request as 'complete' is currently a manual step because some changes require :term:`cache server` configuration updates (i.e. :term:`Queue Updates`) and/or a CDN :term:`Snapshot`. Once that is done and the changes have been deployed, the request status should be changed from 'pending' to 'complete'.

Delete the Delivery Service request
Delivery Service Requests with a status of 'draft' or 'submitted' can always be deleted entirely if appropriate.
1 change: 1 addition & 0 deletions docs/source/admin/quick_howto/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Traffic Control is a complicated system, and documenting it is not trivial. Some
ds_requests
federations
multi_site
oauth_login
regionalgeo
static_dns
steering
Loading