This is an automated email from the ASF dual-hosted git repository.
rawlin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 76e671c adds phys location column to server tables (#3477)
76e671c is described below
commit 76e671cdc64ca2ba9318a110afb45349e73c1b95
Author: Jeremy Mitchell <[email protected]>
AuthorDate: Tue Apr 9 15:32:15 2019 -0600
adds phys location column to server tables (#3477)
---
docs/source/admin/traffic_portal/usingtrafficportal.rst | 11 ++++++-----
.../cacheGroupServers/TableCacheGroupServersController.js | 2 +-
.../table/cacheGroupServers/table.cacheGroupServers.tpl.html | 2 ++
.../modules/table/cdnServers/TableCDNServersController.js | 2 +-
.../common/modules/table/cdnServers/table.cdnServers.tpl.html | 2 ++
.../TableDeliveryServiceServersController.js | 2 +-
.../table.deliveryServiceServers.tpl.html | 2 ++
.../physLocationServers/TablePhysLocationServersController.js | 2 +-
.../physLocationServers/table.physLocationServers.tpl.html | 2 ++
.../table/profileServers/TableProfileServersController.js | 2 +-
.../table/profileServers/table.profileServers.tpl.html | 2 ++
.../common/modules/table/servers/TableServersController.js | 2 +-
.../src/common/modules/table/servers/table.servers.tpl.html | 2 ++
.../table/statusServers/TableStatusServersController.js | 2 +-
.../modules/table/statusServers/table.statusServers.tpl.html | 2 ++
.../modules/table/typeServers/TableTypeServersController.js | 2 +-
.../modules/table/typeServers/table.typeServers.tpl.html | 2 ++
17 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/docs/source/admin/traffic_portal/usingtrafficportal.rst
b/docs/source/admin/traffic_portal/usingtrafficportal.rst
index bfd883d..b3632c0 100644
--- a/docs/source/admin/traffic_portal/usingtrafficportal.rst
+++ b/docs/source/admin/traffic_portal/usingtrafficportal.rst
@@ -271,11 +271,12 @@ A table of all servers (of all kinds) across all
:term:`Delivery Service`\ s and
.. seealso:: :ref:`health-proto`
-:Type: The type of server e.g. EDGE for an Edge-tier :term:`cache
server`
-:Profile: The name of the server's :term:`Profile`
-:CDN: The name of the CDN to which this server is assigned (if any)
-:Cache Group: The name of the :term:`Cache Group` to which this server belongs
-:ILO: If not empty, this is the IPv4 address of the server's
:abbr:`ILO (Integrated Lights-Out)` interface
+:Type: The type of server e.g. EDGE for an Edge-tier :term:`cache
server`
+:Profile: The name of the server's :term:`Profile`
+:CDN: The name of the CDN to which this server is assigned (if any)
+:Cache Group: The name of the :term:`Cache Group` to which this server belongs
+:Phys Location: The name of the :term:`Physical Location` to which this
server belongs
+:ILO: If not empty, this is the IPv4 address of the server's
:abbr:`ILO (Integrated Lights-Out)` interface
.. seealso:: `Hewlett Packard ILO Wikipedia Page
<https://en.wikipedia.org/wiki/HP_Integrated_Lights-Out>`_
diff --git
a/traffic_portal/app/src/common/modules/table/cacheGroupServers/TableCacheGroupServersController.js
b/traffic_portal/app/src/common/modules/table/cacheGroupServers/TableCacheGroupServersController.js
index 88e65be..02697a3 100644
---
a/traffic_portal/app/src/common/modules/table/cacheGroupServers/TableCacheGroupServersController.js
+++
b/traffic_portal/app/src/common/modules/table/cacheGroupServers/TableCacheGroupServersController.js
@@ -118,7 +118,7 @@ var TableCacheGroupsServersController =
function(cacheGroup, servers, $scope, $s
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100,
"All"]],
"iDisplayLength": 25,
"columnDefs": [
- { 'orderable': false, 'targets': 11 }
+ { 'orderable': false, 'targets': 12 }
],
"aaSorting": []
});
diff --git
a/traffic_portal/app/src/common/modules/table/cacheGroupServers/table.cacheGroupServers.tpl.html
b/traffic_portal/app/src/common/modules/table/cacheGroupServers/table.cacheGroupServers.tpl.html
index 7c36b33..416b395 100644
---
a/traffic_portal/app/src/common/modules/table/cacheGroupServers/table.cacheGroupServers.tpl.html
+++
b/traffic_portal/app/src/common/modules/table/cacheGroupServers/table.cacheGroupServers.tpl.html
@@ -54,6 +54,7 @@ under the License.
<th>Profile</th>
<th>CDN</th>
<th>Cache Group</th>
+ <th>Phys Location</th>
<th>ILO</th>
<th style="text-align: right;">Actions</th>
</tr>
@@ -76,6 +77,7 @@ under the License.
<td data-search="^{{::s.profile}}$">{{::s.profile}}</td>
<td data-search="^{{::s.cdnName}}$">{{::s.cdnName}}</td>
<td data-search="^{{::s.cachegroup}}$">{{::s.cachegroup}}</td>
+ <td
data-search="^{{::s.physLocation}}$">{{::s.physLocation}}</td>
<td data-search="^{{::s.iloIpAddress}}$"><a
ng-click="ssh(s.iloIpAddress, $event)">{{::s.iloIpAddress}}</a></td>
<td style="text-align: right;">
<span ng-if="s.type == 'RASCAL'"><a class="link
action-link" title="Go to" ng-click="gotoMonitor(s, $event)"><i class="fa fa-sm
fa-external-link"></i> </a></span>
diff --git
a/traffic_portal/app/src/common/modules/table/cdnServers/TableCDNServersController.js
b/traffic_portal/app/src/common/modules/table/cdnServers/TableCDNServersController.js
index d50ae91..4eb27d6 100644
---
a/traffic_portal/app/src/common/modules/table/cdnServers/TableCDNServersController.js
+++
b/traffic_portal/app/src/common/modules/table/cdnServers/TableCDNServersController.js
@@ -112,7 +112,7 @@ var TableCDNServersController = function(cdn, servers,
$scope, $state, $uibModal
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100,
"All"]],
"iDisplayLength": 25,
"columnDefs": [
- { 'orderable': false, 'targets': 11 }
+ { 'orderable': false, 'targets': 12 }
],
"aaSorting": []
});
diff --git
a/traffic_portal/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html
b/traffic_portal/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html
index 3f3ab32..2853fb4 100644
---
a/traffic_portal/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html
+++
b/traffic_portal/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html
@@ -54,6 +54,7 @@ under the License.
<th>Profile</th>
<th>CDN</th>
<th>Cache Group</th>
+ <th>Phys Location</th>
<th>ILO</th>
<th style="text-align: right;">Actions</th>
</tr>
@@ -76,6 +77,7 @@ under the License.
<td data-search="^{{::s.profile}}$">{{::s.profile}}</td>
<td data-search="^{{::s.cdnName}}$">{{::s.cdnName}}</td>
<td data-search="^{{::s.cachegroup}}$">{{::s.cachegroup}}</td>
+ <td
data-search="^{{::s.physLocation}}$">{{::s.physLocation}}</td>
<td data-search="^{{::s.iloIpAddress}}$"><a
ng-click="ssh(s.iloIpAddress, $event)">{{::s.iloIpAddress}}</a></td>
<td style="text-align: right;">
<span ng-if="s.type == 'RASCAL'"><a class="link
action-link" title="Go to" ng-click="gotoMonitor(s, $event)"><i class="fa fa-sm
fa-external-link"></i> </a></span>
diff --git
a/traffic_portal/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js
b/traffic_portal/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js
index c0412c8..3b1b1da 100644
---
a/traffic_portal/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js
+++
b/traffic_portal/app/src/common/modules/table/deliveryServiceServers/TableDeliveryServiceServersController.js
@@ -110,7 +110,7 @@ var TableDeliveryServiceServersController =
function(deliveryService, servers, $
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100,
"All"]],
"iDisplayLength": 25,
"columnDefs": [
- { 'orderable': false, 'targets': 11 }
+ { 'orderable': false, 'targets': 12 }
],
"aaSorting": []
});
diff --git
a/traffic_portal/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html
b/traffic_portal/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html
index 5a4a5c1..981dba4 100644
---
a/traffic_portal/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html
+++
b/traffic_portal/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html
@@ -45,6 +45,7 @@ under the License.
<th>Profile</th>
<th>CDN</th>
<th>Cache Group</th>
+ <th>Phys Location</th>
<th>ILO</th>
<th style="text-align: right;">Actions</th>
</tr>
@@ -67,6 +68,7 @@ under the License.
<td data-search="^{{::s.profile}}$">{{::s.profile}}</td>
<td data-search="^{{::s.cdnName}}$">{{::s.cdnName}}</td>
<td data-search="^{{::s.cachegroup}}$">{{::s.cachegroup}}</td>
+ <td
data-search="^{{::s.physLocation}}$">{{::s.physLocation}}</td>
<td data-search="^{{::s.iloIpAddress}}$"><a
ng-click="ssh(s.iloIpAddress, $event)">{{::s.iloIpAddress}}</a></td>
<td style="text-align: right;">
<a class="link action-link" title="Unlink Server from
Delivery Service" ng-click="confirmRemoveServer(s, $event)"><i class="fa fa-sm
fa-chain-broken"></i></a>
diff --git
a/traffic_portal/app/src/common/modules/table/physLocationServers/TablePhysLocationServersController.js
b/traffic_portal/app/src/common/modules/table/physLocationServers/TablePhysLocationServersController.js
index ad2cde3..6d46e83 100644
---
a/traffic_portal/app/src/common/modules/table/physLocationServers/TablePhysLocationServersController.js
+++
b/traffic_portal/app/src/common/modules/table/physLocationServers/TablePhysLocationServersController.js
@@ -50,7 +50,7 @@ var TablePhysLocationServersController =
function(physLocation, servers, $scope,
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100,
"All"]],
"iDisplayLength": 25,
"columnDefs": [
- { 'orderable': false, 'targets': 11 }
+ { 'orderable': false, 'targets': 12 }
],
"aaSorting": []
});
diff --git
a/traffic_portal/app/src/common/modules/table/physLocationServers/table.physLocationServers.tpl.html
b/traffic_portal/app/src/common/modules/table/physLocationServers/table.physLocationServers.tpl.html
index d415fa0..da06bcc 100644
---
a/traffic_portal/app/src/common/modules/table/physLocationServers/table.physLocationServers.tpl.html
+++
b/traffic_portal/app/src/common/modules/table/physLocationServers/table.physLocationServers.tpl.html
@@ -44,6 +44,7 @@ under the License.
<th>Profile</th>
<th>CDN</th>
<th>Cache Group</th>
+ <th>Phys Location</th>
<th>ILO</th>
<th style="text-align: right;">Actions</th>
</tr>
@@ -66,6 +67,7 @@ under the License.
<td data-search="^{{::s.profile}}$">{{::s.profile}}</td>
<td data-search="^{{::s.cdnName}}$">{{::s.cdnName}}</td>
<td data-search="^{{::s.cachegroup}}$">{{::s.cachegroup}}</td>
+ <td
data-search="^{{::s.physLocation}}$">{{::s.physLocation}}</td>
<td data-search="^{{::s.iloIpAddress}}$"><a
ng-click="ssh(s.iloIpAddress, $event)">{{::s.iloIpAddress}}</a></td>
<td style="text-align: right;">
<span ng-if="s.type == 'RASCAL'"><a class="link
action-link" title="Go to" ng-click="gotoMonitor(s, $event)"><i class="fa fa-sm
fa-external-link"></i> </a></span>
diff --git
a/traffic_portal/app/src/common/modules/table/profileServers/TableProfileServersController.js
b/traffic_portal/app/src/common/modules/table/profileServers/TableProfileServersController.js
index 94fe884..4de1fad 100644
---
a/traffic_portal/app/src/common/modules/table/profileServers/TableProfileServersController.js
+++
b/traffic_portal/app/src/common/modules/table/profileServers/TableProfileServersController.js
@@ -50,7 +50,7 @@ var TableProfileServersController = function(profile,
servers, $scope, $state, l
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100,
"All"]],
"iDisplayLength": 25,
"columnDefs": [
- { 'orderable': false, 'targets': 11 }
+ { 'orderable': false, 'targets': 12 }
],
"aaSorting": []
});
diff --git
a/traffic_portal/app/src/common/modules/table/profileServers/table.profileServers.tpl.html
b/traffic_portal/app/src/common/modules/table/profileServers/table.profileServers.tpl.html
index 9722dee..53dac86 100644
---
a/traffic_portal/app/src/common/modules/table/profileServers/table.profileServers.tpl.html
+++
b/traffic_portal/app/src/common/modules/table/profileServers/table.profileServers.tpl.html
@@ -44,6 +44,7 @@ under the License.
<th>Profile</th>
<th>CDN</th>
<th>Cache Group</th>
+ <th>Phys Location</th>
<th>ILO</th>
<th style="text-align: right;">Actions</th>
</tr>
@@ -66,6 +67,7 @@ under the License.
<td data-search="^{{::s.profile}}$">{{::s.profile}}</td>
<td data-search="^{{::s.cdnName}}$">{{::s.cdnName}}</td>
<td data-search="^{{::s.cachegroup}}$">{{::s.cachegroup}}</td>
+ <td
data-search="^{{::s.physLocation}}$">{{::s.physLocation}}</td>
<td data-search="^{{::s.iloIpAddress}}$"><a
ng-click="ssh(s.iloIpAddress, $event)">{{::s.iloIpAddress}}</a></td>
<td style="text-align: right;">
<span ng-if="s.type == 'RASCAL'"><a class="link
action-link" title="Go to" ng-click="gotoMonitor(s, $event)"><i class="fa fa-sm
fa-external-link"></i> </a></span>
diff --git
a/traffic_portal/app/src/common/modules/table/servers/TableServersController.js
b/traffic_portal/app/src/common/modules/table/servers/TableServersController.js
index 3e5bb01..700d3e6 100644
---
a/traffic_portal/app/src/common/modules/table/servers/TableServersController.js
+++
b/traffic_portal/app/src/common/modules/table/servers/TableServersController.js
@@ -118,7 +118,7 @@ var TableServersController = function(servers, $scope,
$state, $uibModal, locati
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
"iDisplayLength": 25,
"columnDefs": [
- { 'orderable': false, 'targets': 11 }
+ { 'orderable': false, 'targets': 12 }
],
"aaSorting": []
});
diff --git
a/traffic_portal/app/src/common/modules/table/servers/table.servers.tpl.html
b/traffic_portal/app/src/common/modules/table/servers/table.servers.tpl.html
index fe21082..6828ffa 100644
--- a/traffic_portal/app/src/common/modules/table/servers/table.servers.tpl.html
+++ b/traffic_portal/app/src/common/modules/table/servers/table.servers.tpl.html
@@ -53,6 +53,7 @@ under the License.
<th>Profile</th>
<th>CDN</th>
<th>Cache Group</th>
+ <th>Phys Location</th>
<th>ILO</th>
<th style="text-align: right;">Actions</th>
</tr>
@@ -75,6 +76,7 @@ under the License.
<td data-search="^{{::s.profile}}$">{{::s.profile}}</td>
<td data-search="^{{::s.cdnName}}$">{{::s.cdnName}}</td>
<td data-search="^{{::s.cachegroup}}$">{{::s.cachegroup}}</td>
+ <td
data-search="^{{::s.physLocation}}$">{{::s.physLocation}}</td>
<td data-search="^{{::s.iloIpAddress}}$"><a
ng-click="ssh(s.iloIpAddress, $event)">{{::s.iloIpAddress}}</a></td>
<td style="text-align: right;">
<span ng-if="s.type == 'RASCAL'"><a class="link
action-link" title="Go to" ng-click="gotoMonitor(s, $event)"><i class="fa fa-sm
fa-external-link"></i> </a></span>
diff --git
a/traffic_portal/app/src/common/modules/table/statusServers/TableStatusServersController.js
b/traffic_portal/app/src/common/modules/table/statusServers/TableStatusServersController.js
index dd2ba06..0f4f81a 100644
---
a/traffic_portal/app/src/common/modules/table/statusServers/TableStatusServersController.js
+++
b/traffic_portal/app/src/common/modules/table/statusServers/TableStatusServersController.js
@@ -50,7 +50,7 @@ var TableStatusServersController = function(status, servers,
$scope, $state, loc
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100,
"All"]],
"iDisplayLength": 25,
"columnDefs": [
- { 'orderable': false, 'targets': 11 }
+ { 'orderable': false, 'targets': 12 }
],
"aaSorting": []
});
diff --git
a/traffic_portal/app/src/common/modules/table/statusServers/table.statusServers.tpl.html
b/traffic_portal/app/src/common/modules/table/statusServers/table.statusServers.tpl.html
index 01331d9..1855433 100644
---
a/traffic_portal/app/src/common/modules/table/statusServers/table.statusServers.tpl.html
+++
b/traffic_portal/app/src/common/modules/table/statusServers/table.statusServers.tpl.html
@@ -44,6 +44,7 @@ under the License.
<th>Profile</th>
<th>CDN</th>
<th>Cache Group</th>
+ <th>Phys Location</th>
<th>ILO</th>
<th style="text-align: right;">Actions</th>
</tr>
@@ -66,6 +67,7 @@ under the License.
<td data-search="^{{::s.profile}}$">{{::s.profile}}</td>
<td data-search="^{{::s.cdnName}}$">{{::s.cdnName}}</td>
<td data-search="^{{::s.cachegroup}}$">{{::s.cachegroup}}</td>
+ <td
data-search="^{{::s.physLocation}}$">{{::s.physLocation}}</td>
<td data-search="^{{::s.iloIpAddress}}$"><a
ng-click="ssh(s.iloIpAddress, $event)">{{::s.iloIpAddress}}</a></td>
<td style="text-align: right;">
<span ng-if="s.type == 'RASCAL'"><a class="link
action-link" title="Go to" ng-click="gotoMonitor(s, $event)"><i class="fa fa-sm
fa-external-link"></i> </a></span>
diff --git
a/traffic_portal/app/src/common/modules/table/typeServers/TableTypeServersController.js
b/traffic_portal/app/src/common/modules/table/typeServers/TableTypeServersController.js
index 0123126..7364da0 100644
---
a/traffic_portal/app/src/common/modules/table/typeServers/TableTypeServersController.js
+++
b/traffic_portal/app/src/common/modules/table/typeServers/TableTypeServersController.js
@@ -50,7 +50,7 @@ var TableTypeServersController = function(type, servers,
$scope, $state, locatio
"aLengthMenu": [[25, 50, 100, -1], [25, 50, 100,
"All"]],
"iDisplayLength": 25,
"columnDefs": [
- { 'orderable': false, 'targets': 11 }
+ { 'orderable': false, 'targets': 12 }
],
"aaSorting": []
});
diff --git
a/traffic_portal/app/src/common/modules/table/typeServers/table.typeServers.tpl.html
b/traffic_portal/app/src/common/modules/table/typeServers/table.typeServers.tpl.html
index 8703468..e7805a9 100644
---
a/traffic_portal/app/src/common/modules/table/typeServers/table.typeServers.tpl.html
+++
b/traffic_portal/app/src/common/modules/table/typeServers/table.typeServers.tpl.html
@@ -44,6 +44,7 @@ under the License.
<th>Profile</th>
<th>CDN</th>
<th>Cache Group</th>
+ <th>Phys Location</th>
<th>ILO</th>
<th style="text-align: right;">Actions</th>
</tr>
@@ -66,6 +67,7 @@ under the License.
<td data-search="^{{::s.profile}}$">{{::s.profile}}</td>
<td data-search="^{{::s.cdnName}}$">{{::s.cdnName}}</td>
<td data-search="^{{::s.cachegroup}}$">{{::s.cachegroup}}</td>
+ <td
data-search="^{{::s.physLocation}}$">{{::s.physLocation}}</td>
<td data-search="^{{::s.iloIpAddress}}$"><a
ng-click="ssh(s.iloIpAddress, $event)">{{::s.iloIpAddress}}</a></td>
<td style="text-align: right;">
<span ng-if="s.type == 'RASCAL'"><a class="link
action-link" title="Go to" ng-click="gotoMonitor(s, $event)"><i class="fa fa-sm
fa-external-link"></i> </a></span>
