Skip to content
Snippets Groups Projects
Commit 755a4e3b authored by Erik Reid's avatar Erik Reid
Browse files

Finished feature DBOARD3-242-debugging.

parents cd83066e 10553d29
No related branches found
Tags 0.53
No related merge requests found
Hide whitespace changes
Inline Side-by-side
inventory_provider/routes/jobs.py
+ 0
− 1
View file @ 755a4e3b
...@@ -110,7 +110,6 @@ def load_task_log(): ...@@ -110,7 +110,6 @@ def load_task_log():
if 'task-received' in task: if 'task-received' in task:
event = task['task-received'][0] event = task['task-received'][0]
description = f'{event["name"]}{event["args"]}' description = f'{event["name"]}{event["args"]}'
description += f':{event["uuid"]}'
if 'task-failed' in task: if 'task-failed' in task:
if not description: if not description:
......
inventory_provider/snmp.py
+ 1
− 1
View file @ 755a4e3b
...@@ -74,7 +74,7 @@ def walk(agent_hostname, community, base_oid): # pragma: no cover ...@@ -74,7 +74,7 @@ def walk(agent_hostname, community, base_oid): # pragma: no cover
'snmp response pdu error %r at %r' % ( 'snmp response pdu error %r at %r' % (
pduErrorIndication, pduErrorIndication,
errorIndex and varBinds[int(errorIndex) - 1][0] or '?')) errorIndex and varBinds[int(errorIndex) - 1][0] or '?'))
if errorIndex == 0: if errorIndex != 0:
raise SNMPWalkError( raise SNMPWalkError(
'sanity failure: errorIndex != 0, ' 'sanity failure: errorIndex != 0, '
'but no error indication') 'but no error indication')
......
inventory_provider/static/update.html
+ 24
− 15
View file @ 755a4e3b
...@@ -13,57 +13,66 @@ ...@@ -13,57 +13,66 @@
<body> <body>
<div ng-controller="update"> <div ng-controller="update">
<div class="grid-container">
<div class="grid-item"> <div class="container p-3 my-3">
<button type="button" <button type="button"
class="btn btn-primary btn-lg" class="btn btn-primary btn-lg"
ng-click="launch_update()" ng-click="launch_update()"
ng-disabled="latch_pending">Update Inventory Provider</button> ng-disabled="latch_pending">Update Inventory Provider</button>
</div> </div>
<div class="grid-item" ng-class="latch_error||update_request_error ? 'error' : 'ok'"> <div class="container p-3 my-3 border" ng-class="latch_error||update_request_error ? 'error' : 'ok'">
{{ latch_info }} {{ latch_info }}
</div> </div>
<div class="grid-item" ng-class="update_request_error ? 'error' : 'ok'"> <div class="container p-3 my-3" ng-class="update_request_error ? 'error' : 'ok'">
{{ update_request_status }} {{ update_request_status }}
</div> </div>
<span class="grid-item" ng-show="errors.length"> <div class="container p-3 my-3 border" ng-show="errors.length">
<table class="table table-striped" summary="error messages"> <table class="table table-striped" summary="error messages">
<tr> <tr>
<th scope="col">errorss</th> <th>
<button ng-click="show_errors=!show_errors">{{show_errors ? "hide" : "show"}}</button>
</th>
<th scope="col">errors</th>
</tr> </tr>
<tr ng-repeat="description in errors"> <tr ng-if="show_errors" ng-repeat="description in errors">
<td>{{ description }}</td> <td>{{ description }}</td>
</tr> </tr>
</table> </table>
</span> </div>
<span class="grid-item" ng-show="warnings.length"> <div class="container p-3 my-3 border" ng-show="warnings.length">
<table class="table table-striped" summary="warning messages"> <table class="table table-striped" summary="warning messages">
<tr> <tr>
<th>
<button ng-click="show_warnings=!show_warnings">{{show_warnings ? "hide" : "show"}}</button>
</th>
<th scope="col">warnings</th> <th scope="col">warnings</th>
</tr> </tr>
<tr ng-repeat="description in warnings"> <tr ng-if="show_warnings" ng-repeat="description in warnings">
<td></td>
<td>{{ description }}</td> <td>{{ description }}</td>
</tr> </tr>
</table> </table>
</span> </div>
<span class="grid-item" ng-show="pending.length"> <div class="container p-3 my-3 border" ng-show="pending.length">
<table class="table table-striped" summary="pending tasks"> <table class="table table-striped" summary="pending tasks">
<tr> <tr>
<th>
<button ng-click="show_pending=!show_pending">{{show_pending ? "hide" : "show"}}</button>
</th>
<th scope="col">pending tasks</th> <th scope="col">pending tasks</th>
</tr> </tr>
<tr ng-repeat="description in pending"> <tr ng-if="show_pending" ng-repeat="description in pending">
<td>{{ description }}</td> <td>{{ description }}</td>
</tr> </tr>
</table> </table>
</span> </div>
</div> </div>
</div>
</body> </body>
</html> </html>
\ No newline at end of file
inventory_provider/static/update.js
+ 4
− 0
View file @ 755a4e3b
...@@ -14,6 +14,10 @@ myApp.controller('update', function($scope, $http, $timeout) { ...@@ -14,6 +14,10 @@ myApp.controller('update', function($scope, $http, $timeout) {
$scope.errors = []; $scope.errors = [];
$scope.warnings = []; $scope.warnings = [];
$scope.show_warnings = true;
$scope.show_errors = true;
$scope.show_pending = true;
$scope.check_status = function() { $scope.check_status = function() {
$http({ $http({
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment