From 01429a9b78051ca2c5c99d16a7f5f72968ebe35e Mon Sep 17 00:00:00 2001 From: Michael Lange Date: Thu, 13 Sep 2018 16:34:56 -0700 Subject: [PATCH] Remove old stat tracking code from the client page In favor of the new primary-metric components --- ui/app/controllers/clients/client.js | 11 ------ ui/app/routes/clients/client.js | 11 ------ ui/app/templates/clients/client.hbs | 54 ---------------------------- 3 files changed, 76 deletions(-) diff --git a/ui/app/controllers/clients/client.js b/ui/app/controllers/clients/client.js index 33873b361..7ded2c1be 100644 --- a/ui/app/controllers/clients/client.js +++ b/ui/app/controllers/clients/client.js @@ -37,17 +37,6 @@ export default Controller.extend(Sortable, Searchable, { return this.get('model.drivers').sortBy('name'); }), - stats: stats('model', function statsFetch() { - return url => this.get('token').authorizedRequest(url); - }), - - pollStats: task(function*() { - do { - yield this.get('stats').poll(); - yield timeout(1000); - } while (!Ember.testing); - }), - actions: { gotoAllocation(allocation) { this.transitionToRoute('allocations.allocation', allocation); diff --git a/ui/app/routes/clients/client.js b/ui/app/routes/clients/client.js index 6cf9332eb..9e2493030 100644 --- a/ui/app/routes/clients/client.js +++ b/ui/app/routes/clients/client.js @@ -38,15 +38,4 @@ export default Route.extend(WithWatchers, { watchAllocations: watchRelationship('allocations'), watchers: collect('watch', 'watchAllocations'), - - setupController(controller, model) { - this._super(...arguments); - if (model) { - controller.get('pollStats').perform(); - } - }, - - resetController(controller) { - controller.get('pollStats').cancelAll(); - }, }); diff --git a/ui/app/templates/clients/client.hbs b/ui/app/templates/clients/client.hbs index 7d83e4ae2..2c286e4ba 100644 --- a/ui/app/templates/clients/client.hbs +++ b/ui/app/templates/clients/client.hbs @@ -77,60 +77,6 @@ {{/if}} -
-
- Resource Utilization -
-
-
-
- CPU -
- {{stats-time-series data=stats.cpu chartClass="is-info"}} -
-
-
-
- - {{stats.cpu.lastObject.percent}} - -
-
-
- {{format-percentage stats.cpu.lastObject.percent total=1}} -
-
- {{stats.cpu.lastObject.used}} Mhz / {{stats.reservedCPU}} Mhz reserved -
-
- Memory -
- {{stats-time-series data=stats.memory chartClass="is-danger"}} -
-
-
-
- - {{stats.memory.lastObject.percent}} - -
-
-
- {{format-percentage stats.memory.lastObject.percent total=1}} -
-
- {{format-bytes stats.memory.lastObject.used}} MiB / {{stats.reservedMemory}} MiB reserved -
-
-
-
-
Resource Utilization