Merge lp:~andreserl/maas/lp1598028 into lp:~maas-committers/maas/trunk

[Andres Rodriguez]

Ensure we only shown the events for the last day, with the ability to see more events per day, to ensure WebUI doesn't freeze due to having tons of events.

Nowadays, MAAS can have hundreds of events a day. Loading 30 days worth of events might be lagging the webui. With this, we ensure we only log the day's events and add the abiilty for users to add day by day instead of loading 30 days

[Jeffrey C Jones (trapnine)]

LGTM

review: Approve

[Gavin Panella (allenap)]

One thing.

[MAAS Lander (maas-lander)]

The attempt to merge lp:~andreserl/maas/lp1598028 into lp:maas failed. Below is the output from the failed tests.

Get:1 http://security.ubuntu.com/ubuntu xenial-security InRelease [94.5 kB]
Hit:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Get:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [95.7 kB]
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Get:5 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/main Sources [162 kB]
Get:6 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/universe Sources [82.1 kB]
Get:7 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/multiverse Sources [2,552 B]
Get:8 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/main amd64 Packages [313 kB]
Get:9 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/main Translation-en [117 kB]
Get:10 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/universe amd64 Packages [294 kB]
Get:11 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/universe Translation-en [98.5 kB]
Get:12 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/multiverse amd64 Packages [4,688 B]
Get:13 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/multiverse Translation-en [2,140 B]
Fetched 1,266 kB in 0s (2,637 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bash bind9 bind9utils build-essential bzr bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-all python3-apt python3-bson python3-convoy python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-netaddr python3-netifaces python3-novaclient python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-simplejson python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version (2.4.18-2ubuntu3).
archdetect-deb is already the newest version (1.117ubu...

[MAAS Lander (maas-lander)]

The attempt to merge lp:~andreserl/maas/lp1598028 into lp:maas failed. Below is the output from the failed tests.

Hit:1 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Get:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [95.7 kB]
Hit:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Get:4 http://security.ubuntu.com/ubuntu xenial-security InRelease [94.5 kB]
Get:5 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/main Sources [163 kB]
Get:6 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/universe Sources [82.1 kB]
Get:7 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/main amd64 Packages [315 kB]
Get:8 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/main Translation-en [119 kB]
Get:9 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/universe amd64 Packages [293 kB]
Get:10 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates/universe Translation-en [98.8 kB]
Get:11 http://security.ubuntu.com/ubuntu xenial-security/main Sources [31.7 kB]
Get:12 http://security.ubuntu.com/ubuntu xenial-security/universe Sources [8,508 B]
Get:13 http://security.ubuntu.com/ubuntu xenial-security/main amd64 Packages [121 kB]
Get:14 http://security.ubuntu.com/ubuntu xenial-security/main Translation-en [46.6 kB]
Get:15 http://security.ubuntu.com/ubuntu xenial-security/universe amd64 Packages [35.7 kB]
Get:16 http://security.ubuntu.com/ubuntu xenial-security/universe Translation-en [21.5 kB]
Fetched 1,526 kB in 0s (2,617 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bash bind9 bind9utils build-essential bzr bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-all python3-apt python3-bson python3-convoy python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-netaddr python3-netifaces python3-novaclient python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-simplejson python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading pack...

=== modified file 'src/maasserver/static/js/angular/controllers/node_events.js'
--- src/maasserver/static/js/angular/controllers/node_events.js	2016-03-28 13:54:47 +0000
+++ src/maasserver/static/js/angular/controllers/node_events.js	2016-07-15 02:05:39 +0000
@@ -23,7 +23,7 @@
         $scope.node = null;
         $scope.events = [];
         $scope.eventsLoaded = false;
-        $scope.days = 30;
+        $scope.days = 1;
 
         // Called once the node is loaded.
         function nodeLoaded(node) {
@@ -56,7 +56,7 @@
 
         // Called to load more events.
         $scope.loadMore = function() {
-            $scope.days += 30;
+            $scope.days += 1;
             eventsManager.loadMaximumDays($scope.days);
         };
 

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_events.js'
--- src/maasserver/static/js/angular/controllers/tests/test_node_events.js	2016-03-28 13:54:47 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_node_events.js	2016-07-15 02:05:39 +0000
@@ -101,7 +101,7 @@
         expect($scope.node).toBeNull();
         expect($scope.events).toEqual([]);
         expect($scope.eventsLoaded).toEqual(false);
-        expect($scope.days).toEqual(30);
+        expect($scope.days).toEqual(1);
     });
 
     it("calls loadManager with MachinesManager", function() {
@@ -235,7 +235,7 @@
 
     describe("loadMore", function() {
 
-        it("adds 30 days to $scope.days", function() {
+        it("adds 1 days to $scope.days", function() {
             var defer = $q.defer();
             var controller = makeController(defer);
             MachinesManager._activeItem = node;
@@ -244,7 +244,7 @@
             $rootScope.$digest();
             $scope.loadMore();
 
-            expect($scope.days).toBe(60);
+            expect($scope.days).toBe(2);
         });
 
         it("calls loadMaximumDays with $scope.days", function() {
@@ -258,7 +258,7 @@
             $rootScope.$digest();
             $scope.loadMore();
 
-            expect(manager.loadMaximumDays).toHaveBeenCalledWith(60);
+            expect(manager.loadMaximumDays).toHaveBeenCalledWith(2);
         });
     });
 });

=== modified file 'src/maasserver/static/js/angular/factories/events.js'
--- src/maasserver/static/js/angular/factories/events.js	2015-03-30 18:57:08 +0000
+++ src/maasserver/static/js/angular/factories/events.js	2016-07-15 02:05:39 +0000
@@ -19,7 +19,7 @@
             this._handler = "event";
             this._nodeId = nodeId;
             this._factory = factory;
-            this._maxDays = 30;
+            this._maxDays = 1;
         }
 
         EventsManager.prototype = new Manager();

=== modified file 'src/maasserver/static/js/angular/factories/tests/test_events.js'
--- src/maasserver/static/js/angular/factories/tests/test_events.js	2015-03-30 14:45:39 +0000
+++ src/maasserver/static/js/angular/factories/tests/test_events.js	2016-07-15 02:05:39 +0000
@@ -139,7 +139,7 @@
             expect(eventManager._nodeId).toBe(nodeId);
             expect(eventManager._handler).toBe("event");
             expect(eventManager._factory).toBe(EventsManagerFactory);
-            expect(eventManager._maxDays).toBe(30);
+            expect(eventManager._maxDays).toBe(1);
         });
 
         describe("_initBatchLoadParameters", function() {
@@ -147,7 +147,7 @@
             it("returns parameters with node_id and max_days", function() {
                 expect(eventManager._initBatchLoadParameters()).toEqual({
                     "node_id": nodeId,
-                    "max_days": 30
+                    "max_days": 1
                 });
             });
         });
@@ -198,7 +198,7 @@
                     defer.promise);
                 spyOn(eventManager, "isLoading").and.returnValue(true);
                 eventManager.loadMaximumDays(maxDays);
-                expect(eventManager._maxDays).toBe(30);
+                expect(eventManager._maxDays).toBe(1);
 
                 defer.resolve();
                 $rootScope.$digest();

=== modified file 'src/maasserver/static/partials/node-events.html'
--- src/maasserver/static/partials/node-events.html	2016-04-11 16:23:26 +0000
+++ src/maasserver/static/partials/node-events.html	2016-07-15 02:05:39 +0000
@@ -11,8 +11,8 @@
             <h1 class="page-header__title eight-col">
                 {$ node.fqdn $}
                 <span class="page-header__title--identicator">
-                    {$ events.length $} machine events in the past {$ days $} days
-                    <a href="" class="page-header__title-loadmore" data-ng-click="loadMore()">load 30 more days</a>
+                    {$ events.length $} machine events in the past {$ days $} day(s)
+                    <a href="" class="page-header__title-loadmore" data-ng-click="loadMore()">load 1 more day</a>
                 </span>
             </h1>
             <div class="page-header__actions four-col last-col">