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 2018/05/14 21:14:41 UTC

[incubator-trafficcontrol] branch master updated (a7a22ed -> 4ad23e7)

This is an automated email from the ASF dual-hosted git repository.

mitchell852 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git.


    from a7a22ed  updated PR #736 to use JsonUtils instead of org.json
     new 6c7796e  added anonymousBlockingEnabled to TP properties
     new 1bcc414  added Anonymous Blocking field to TP UI
     new 4ad23e7  cleanup formatting

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../form.deliveryService.HTTP.tpl.html             | 13 +++++++++++++
 .../app/src/traffic_portal_properties.json         | 22 +++++++++++++++-------
 2 files changed, 28 insertions(+), 7 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
mitchell852@apache.org.

[incubator-trafficcontrol] 02/03: added Anonymous Blocking field to TP UI

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git

commit 1bcc4141610731fdfdc17ba4bf0f23352818f96e
Author: Jesse Rivas <je...@comcast.com>
AuthorDate: Fri May 4 11:05:59 2018 -0600

    added Anonymous Blocking field to TP UI
---
 .../form/deliveryService/form.deliveryService.HTTP.tpl.html | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
index 741a7d6..c0e1beb 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
@@ -326,6 +326,19 @@ under the License.
                     </div>
                 </div>
 
+                <div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.anonymousBlockingEnabled), 'has-feedback': hasError(deliveryServiceForm.anonymousBlockingEnabled)}">
+                    <label class="control-label col-md-2 col-sm-2 col-xs-12">
+                        <span uib-popover-html="label('anonymousBlockingEnabled', 'desc')" popover-trigger="mouseenter" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">* {{label('anonymousBlockingEnabled', 'title')}}</span>
+                    </label>
+                    <div class="col-md-10 col-sm-10 col-xs-12">
+                        <select name="anonymousBlockingEnabled" class="form-control" ng-model="deliveryService.anonymousBlockingEnabled" ng-options="x.value as x.label for x in falseTrue" required>
+                            <option value="">Select...</option>
+                        </select>
+                        <small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.anonymousBlockingEnabled, 'required')">Required</small>
+                        <small class="input-diff" ng-show="settings.isRequest && open() && deliveryService.anonymousBlockingEnabled != dsCurrent.anonymousBlockingEnabled">Current Value: [ {{dsCurrent.anonymousBlockingEnabled}} ]</small>
+                    </div>
+                </div>
+
                 <div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.geoProvider), 'has-feedback': hasError(deliveryServiceForm.geoProvider)}">
                     <label class="control-label col-md-2 col-sm-2 col-xs-12">
                         <span uib-popover-html="label('geoProvider', 'desc')" popover-trigger="mouseenter" popover-placement="top" popover-append-to-body="true" popover-class="popover-class">* {{label('geoProvider', 'title')}}</span>

-- 
To stop receiving notification emails like this one, please contact
mitchell852@apache.org.

[incubator-trafficcontrol] 03/03: cleanup formatting

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git

commit 4ad23e7ff532962aa4d6a0269604d839a84a9556
Author: Jesse Rivas <je...@comcast.com>
AuthorDate: Tue May 8 13:42:19 2018 -0600

    cleanup formatting
---
 traffic_portal/app/src/traffic_portal_properties.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/traffic_portal/app/src/traffic_portal_properties.json b/traffic_portal/app/src/traffic_portal_properties.json
index 5a557c5..a50a78d 100644
--- a/traffic_portal/app/src/traffic_portal_properties.json
+++ b/traffic_portal/app/src/traffic_portal_properties.json
@@ -260,10 +260,10 @@
             "title": "Global Max TPS",
             "desc": "The maximum transactions this delivery service can serve across all EDGE caches before traffic will be diverted to the bypass destination. For a DNS delivery service, the Bypass Ipv4 or Ipv6 will be used (depending on whether this was a A or AAAA request), and for HTTP delivery services the Bypass FQDN will be used."
           },
-	      "fqPacingRate": {
+          "fqPacingRate": {
             "title": "Fair Queuing Pacing Rate Bps",
             "desc": "The maximum bytes per second a cache will delivery on any single TCP connection. This uses the Linux kernel's Fair Queuing setsockopt(SO_MAX_PACING_RATE) to limit the rate of delivery."
-	      },
+          },
           "httpBypassFqdn": {
             "title": "HTTP Bypass FQDN",
             "desc": "This is the FQDN Traffic Router will redirect to (with the same path) when the max Bps or Max Tps for this delivery service are exceeded."

-- 
To stop receiving notification emails like this one, please contact
mitchell852@apache.org.

[incubator-trafficcontrol] 01/03: added anonymousBlockingEnabled to TP properties

Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git

commit 6c7796e79409e97b9e3c58cedca2080bf0b85117
Author: Jesse Rivas <je...@comcast.com>
AuthorDate: Fri May 4 10:38:11 2018 -0600

    added anonymousBlockingEnabled to TP properties
---
 .../app/src/traffic_portal_properties.json         | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/traffic_portal/app/src/traffic_portal_properties.json b/traffic_portal/app/src/traffic_portal_properties.json
index 452d724..5a557c5 100644
--- a/traffic_portal/app/src/traffic_portal_properties.json
+++ b/traffic_portal/app/src/traffic_portal_properties.json
@@ -128,7 +128,8 @@
           "logsEnabled": false,
           "geoProvider": 0,
           "geoLimit": 0,
-          "ccrDnsTtl": 30
+          "ccrDnsTtl": 30,
+          "anonymousBlockingEnabled": false
         },
         "DNS": {
           "routingName": "cdn",
@@ -144,7 +145,8 @@
           "missLong": -87.627778,
           "signingAlgorithm": null,
           "ccrDnsTtl": 30,
-          "regionalGeoBlocking": false
+          "regionalGeoBlocking": false,
+          "anonymousBlockingEnabled": false
         },
         "HTTP": {
           "routingName": "cdn",
@@ -162,7 +164,8 @@
           "missLat": 41.881944,
           "missLong": -87.627778,
           "signingAlgorithm": null,
-          "ccrDnsTtl": 3600
+          "ccrDnsTtl": 3600,
+          "anonymousBlockingEnabled": false
         },
         "STEERING": {
           "dscp": 0,
@@ -172,7 +175,8 @@
           "geoProvider": 0,
           "geoLimit": 0,
           "regionalGeoBlocking": false,
-          "ccrDnsTtl": 30
+          "ccrDnsTtl": 30,
+          "anonymousBlockingEnabled": false
         },
         "descriptions": {
           "_comments": "This is the text used to configure delivery service field titles/descriptions",
@@ -180,6 +184,10 @@
             "title": "Active",
             "desc": "When this is set to false Traffic Router will not serve DNS or HTTP responses for this delivery service."
           },
+          "anonymousBlockingEnabled": {
+            "title": "Anonymous Blocking",
+            "desc": "Set to true to enable blocking of anonymous IPs for this delivery service -- requires MaxMind's Anonymous IP database."
+          },
           "cacheurl": {
             "title": "Cache URL expression",
             "desc": "Cache URL rule to apply to this delivery service.<br><br>See <a href=\"https://docs.trafficserver.apache.org/en/latest/admin-guide/plugins/cacheurl.en.html\" target=\"_blank\">ATS documentation on cacheurl...</a>"
@@ -252,10 +260,10 @@
             "title": "Global Max TPS",
             "desc": "The maximum transactions this delivery service can serve across all EDGE caches before traffic will be diverted to the bypass destination. For a DNS delivery service, the Bypass Ipv4 or Ipv6 will be used (depending on whether this was a A or AAAA request), and for HTTP delivery services the Bypass FQDN will be used."
           },
-	  "fqPacingRate": {
-	    "title": "Fair Queuing Pacing Rate Bps",
+	      "fqPacingRate": {
+            "title": "Fair Queuing Pacing Rate Bps",
             "desc": "The maximum bytes per second a cache will delivery on any single TCP connection. This uses the Linux kernel's Fair Queuing setsockopt(SO_MAX_PACING_RATE) to limit the rate of delivery."
-	   },
+	      },
           "httpBypassFqdn": {
             "title": "HTTP Bypass FQDN",
             "desc": "This is the FQDN Traffic Router will redirect to (with the same path) when the max Bps or Max Tps for this delivery service are exceeded."

-- 
To stop receiving notification emails like this one, please contact
mitchell852@apache.org.