puppet-herald 0.2.0 → 0.8.0

data/lib/puppet-herald/public/node/node.html

@@ -1,7 +1,13 @@
-<div class="panel panel-primary" ng-controller="NodeController as ctrl">
+<div ui-view>
+
+<div class="panel panel-default">
   <!-- Default panel contents -->
-  <div class="panel-heading">Reports for 
-    <samp>{{ ctrl.node.name }}</samp> <span class="badge">{{ ctrl.node.reports.length }}</span>
+  <div class="panel-heading">All reports for: 
+    <samp>{{ ctrl.node.name }}</samp> <span class="badge" ng-pluralize
+    count="ctrl.pagination.elements()"
+    when="{'0': 'no reports',
+      '1': '1 report',
+      'other': '{} reports'}"></span>
   </div>
 
   <!-- Table -->
@@ -16,17 +22,29 @@
       </tr>
     </thead>
     <tbody>
-      <tr ng-repeat="report in ctrl.node.reports | orderBy:'-time'">
+      <tr 
+        dir-paginate="report in ctrl.node.reports | itemsPerPage: ctrl.pagination.limit() | orderBy: '-time'"
+        total-items="ctrl.pagination.elements()">
         <td>{{ $index + 1 }}</td>
-        <td>{{ report.configuration_version }}</td>
-        <td><ng-status-button 
+        <td><samp>{{ report.configuration_version }}</samp></td>
+        <td><ws-status-button 
           status="report.status" 
           id="report.id"
-          route="'/report/:id'"
-          ></ng-status-button></td>
+          idname="'reportId'"
+          route="'report'"
+          ></ws-status-button></td>
         <td>{{ report.environment }}</td>
-        <td am-time-ago="report.time"></td>
+        <td title="{{ report.time }}">{{ report.time | amCalendar }}</td>
       </tr>
     </tbody>
   </table>
+</div>
+
+<nav class="text-center">
+  <dir-pagination-controls
+    on-page-change="ctrl.onPageChange(newPageNumber)"
+    boundary-links="true"
+    ></dir-pagination-controls>
+</nav>
+
 </div>

data/lib/puppet-herald/public/node/node.js

@@ -1,27 +1,55 @@
+(function() {
+
 'use strict';
 
 angular.module('herald.node', [
-  'ngRoute',
+  'ui.router',
   'herald.page',
   'herald.directives',
+  'herald.pagination',
   'angularMoment'
 ])
 
-.config(['$routeProvider', function($routeProvider) {
-  $routeProvider.when('/node/:nodeId', {
-    templateUrl: 'node/node.html',
-    controller: 'NodeController'
-  });
-}])
+.controller('NodeController', 
+    ['$http', '$stateParams', 'Page', 'PaginationFactory', 
+        function($http, $stateParams, Page, PaginationFactory) {
 
-.controller('NodeController', ['$http', '$routeParams', 'Page', function($http, $routeParams, Page) {
   var ctrl = this;
+  Page.title('Reports');
+  ctrl.pagination = PaginationFactory.DEFAULT;
+  ctrl.cache = PaginationFactory.createPageCache(60); // 60 seconds cache
   ctrl.node = null;
-  Page.title('Node');
-  this.nodeId = $routeParams.nodeId;
+  ctrl.nav = {
+    node: null,
+    report: null
+  };
+  this.nodeId = $stateParams.nodeId;
+  var gateway = '/api/v1/nodes/' + this.nodeId;
+
+  function setNode(nodeData) {
+    ctrl.node = nodeData;
+    ctrl.nav.node = ctrl.node.name;
+  }
 
-  $http.get('/api/v1/nodes/' + this.nodeId).success(function(data) {
-    ctrl.node = data;
-    Page.title('Node', data.name);
-  });
-}]);
+  function getResultsPage(pageNumber) {
+    ctrl.pagination.page(pageNumber);
+    if (ctrl.cache.isLoaded(pageNumber)) {
+      setNode(ctrl.cache.get(pageNumber));
+      return;
+    }
+    var config = { headers: ctrl.pagination.toHeaders() };
+    $http.get(gateway, config).success(function(data, status, headers, config) {
+      setNode(data);
+      ctrl.pagination = PaginationFactory.fromHeaders(headers);
+      var loadedPage = ctrl.pagination.page();
+      Page.title('Reports for', data.name);
+      ctrl.cache.set(loadedPage, data);
+    });
+  }
+  getResultsPage(ctrl.pagination.page());
+  ctrl.onPageChange = function(newPage) {
+    getResultsPage(newPage);
+  };
+}]);
+  
+})();

data/lib/puppet-herald/public/nodes/nodes.html

@@ -1,6 +1,11 @@
-<div class="panel panel-primary" ng-controller="NodesController as nodes">
+<div ui-view>
+<div class="panel panel-default">
   <!-- Default panel contents -->
-  <div class="panel-heading">Nodes <span class="badge">{{ nodes.all.length }}</span></div>
+  <div class="panel-heading">All Puppet nodes <span class="badge" ng-pluralize
+    count="ctrl.pagination.elements()"
+    when="{'0': 'none',
+      '1': '1 node',
+      'other': '{} nodes'}"></span></div>
 
   <!-- Table -->
   <table class="table table-striped table-hover">
@@ -14,16 +19,29 @@
       </tr>
     </thead>
     <tbody>
-      <tr ng-repeat="node in nodes.all | orderBy:'last_run'">
+      <tr
+        dir-paginate="node in ctrl.all | itemsPerPage: ctrl.pagination.limit() | orderBy:'-last_run'"
+        total-items="ctrl.pagination.elements()"
+        >
         <td>{{ $index + 1 }}</td>
-        <td>{{ node.name }}</td>
-        <td><ng-status-button
+        <td><samp>{{ node.name }}</samp></td>
+        <td><ws-status-button
           status="node.status"
           id="node.id"
-          route="'/node/:id'"></ng-status-button></td>
+          idname="'nodeId'"
+          route="'node'"></ws-status-button></td>
         <td>{{ node.no_of_reports }}</td>
-        <td am-time-ago="node.last_run"></td>
+        <td title="{{ node.last_run }}">{{ node.last_run | amCalendar }}</td>
       </tr>
     </tbody>
   </table>
+</div>
+
+<nav class="text-center">
+  <dir-pagination-controls
+    on-page-change="ctrl.onPageChange(newPageNumber)"
+    boundary-links="true"
+    ></dir-pagination-controls>
+</nav>
+
 </div>

data/lib/puppet-herald/public/nodes/nodes.js

@@ -1,25 +1,40 @@
+(function() {
+
 'use strict';
 
 angular.module('herald.nodes', [
-  'ngRoute',
   'herald.directives',
   'herald.page',
+  'herald.pagination',
   'angularMoment'
 ])
 
-.config(['$routeProvider', function($routeProvider) {
-  $routeProvider.when('/nodes', {
-    templateUrl: 'nodes/nodes.html',
-    controller: 'NodesController'
-  });
-}])
-
-.controller('NodesController', ['$http', 'Page', function($http, Page) {
-  Page.title('All nodes');
+.controller('NodesController', ['$http', 'Page', 'PaginationFactory', function($http, Page, PaginationFactory) {
+  Page.title('All Puppet nodes');
   var ctrl = this;
+  ctrl.title = 
+  ctrl.pagination = PaginationFactory.DEFAULT;
+  ctrl.cache = PaginationFactory.createPageCache(60); // 60 seconds cache
   ctrl.all = [];
 
-  $http.get('/api/v1/nodes').success(function(data) {
-    ctrl.all = data;
-  });
-}]);
+  function getResultsPage(pageNumber) {
+    ctrl.pagination.page(pageNumber);
+    if (ctrl.cache.isLoaded(pageNumber)) {
+      ctrl.all = ctrl.cache.get(pageNumber);
+      return;
+    }
+    var config = { headers: ctrl.pagination.toHeaders() };
+    $http.get('/api/v1/nodes', config).success(function(data, status, headers, config) {
+      ctrl.all = data;
+      ctrl.pagination = PaginationFactory.fromHeaders(headers);
+      var loadedPage = ctrl.pagination.page();
+      ctrl.cache.set(loadedPage, data);
+    });
+  }
+  getResultsPage(ctrl.pagination.page());
+  ctrl.onPageChange = function(newPage) {
+    getResultsPage(newPage);
+  };
+}]);
+
+})();

data/lib/puppet-herald/public/report/report.html

@@ -1,25 +1,72 @@
-<div class="panel panel-primary" ng-controller="ReportController as ctrl">
+<div class="panel panel-default">
   <!-- Default panel contents -->
-  <div class="panel-heading">Report: 
-    <samp>{{ ctrl.report.configuration_version }}</samp>
-    <span class="badge">{{ ctrl.report.log_entries.length }}</span>
+  <div class="panel-heading">
+
+    <span class="">
+      Report: 
+      <samp>{{ ctrl.report.configuration_version }}</samp>
+      <span class="badge" ng-pluralize
+    count="ctrl.report.log_entries.length"
+    when="{'0': 'no output',
+      '1': '1 line',
+      'other': '{} lines'}"></span>
+    </span>
+
+    <div class="btn-group">&nbsp;&nbsp;&nbsp;&nbsp;</div>
+    Show more information: 
+    <div class="btn-group">
+      <button 
+        type="button"
+        class="btn btn-default btn-sm dropdown-toggle"
+        ng-init="dropdown = false"
+        ng-click="dropdown = !dropdown">
+        {{ settings.report.info ? 'Yes' : 'No' }} <span class="caret"></span>
+      </button>
+      <ul 
+        class="dropdown-menu"
+        role="menu"
+        ng-click="event.preverntDefault();"
+        ng-class="{'ws-show-block': dropdown}">
+        <li><a href="" ng-click="settings.report.info = true; dropdown = !dropdown">Yes</a></li>
+        <li><a href="" ng-click="settings.report.info = false; dropdown = !dropdown">No</a></li>
+      </ul>
+    </div>
   </div>
 
-  <!-- Table -->
-  <table class="table table-condensed table-hover herald-table-report">
-    <thead>
+  <table class="table table-hover" ng-show="settings.report.info">
+    <tbody>
+      <tr>
+        <th>Host</th>
+        <td><samp>{{ ctrl.report.host }}</samp></td>
+        <th>Status</th>
+        <td><span class="label label-{{ ctrl.report.status | colorizeStatus }}">{{ ctrl.report.status | uppercase }}</span></td>
+      </tr>
       <tr>
-        <th>#</th>
-        <th>Line</th>
+        <th>Date of report</th>
+        <td title="{{ ctrl.report.time }}">{{ ctrl.report.time | amCalendar }}</td>
+        <th>Configuration version</th>
+        <td><samp>{{ ctrl.report.configuration_version }}</samp></td>
       </tr>
-    </thead>
+      <tr>
+        <th>Environment</th>
+        <td>{{ ctrl.report.environment }}</td>
+        <th>Puppet version</th>
+        <td><samp>{{ ctrl.report.puppet_version }}</samp></td>
+      </tr>
+    </tbody>
+  </table>
+
+  <!-- Table -->
+  <table
+    class="table table-condensed table-hover herald-table-report"
+    ng-class="{puppet3: settings.colorSyntax.selected.value == 'puppet3'}">
     <tbody>
       <tr>
-        <td></td>
-        <td># puppet {{ ctrl.report.kind }} [...]</td>
+        <td class="unselectable"></td>
+        <td class="unselectable"># puppet {{ ctrl.report.kind }} [...]</td>
       </tr>
       <tr ng-repeat="entry in ctrl.report.log_entries | orderBy:'time'">
-        <td>{{ $index + 1 }}</td>
+        <td class="unselectable">{{ $index + 1 }}</td>
         <td class="herald-log-{{ entry.level }}">{{ entry.level | capitalize }}: {{ entry.source }}: {{ entry.message }}</td>
       </tr>
     </tbody>

data/lib/puppet-herald/public/report/report.js

@@ -1,26 +1,33 @@
+(function() {
+
 'use strict';
 
 angular.module('herald.report', [
-  'ngRoute',
+  'ui.router',
   'herald.page',
   'herald.directives'
 ])
 
-.config(['$routeProvider', function($routeProvider) {
-  $routeProvider.when('/report/:reportId', {
-    templateUrl: 'report/report.html',
-    controller: 'ReportController'
-  });
-}])
-
-.controller('ReportController', ['$http', '$routeParams', 'Page', function($http, $routeParams, Page) {
-  Page.title('Report');
+.controller('ReportController', ['$http', '$stateParams', 'Page', function($http, $stateParams, Page) {
   var ctrl = this;
+  Page.title('Puppet report');
   ctrl.report = null;
-  this.reportId = $routeParams.reportId;
+  ctrl.nav = {
+    node: null,
+    report: null
+  };
+  this.reportId = $stateParams.reportId;
+
+  function setReport(reportData) {
+    ctrl.report = reportData;
+    ctrl.nav.node = ctrl.report.host;
+    ctrl.nav.report = ctrl.report.configuration_version;
+  }
 
   $http.get('/api/v1/reports/' + this.reportId).success(function(data) {
-    ctrl.report = data;
-    Page.title('Report', data.configuration_version);
+    setReport(data);
+    Page.title('Puppet report', data.configuration_version);
   });
-}]);
+}]);
+
+})();

data/lib/puppet-herald/public/router.js

@@ -0,0 +1,55 @@
+(function(){
+  'use strict';
+
+  var router = angular.module('herald.router', [
+    'ui.router',
+    'herald.nodes',
+    'herald.node',
+    'herald.report',
+    'ncy-angular-breadcrumb'
+  ]);
+
+  router.config(['$stateProvider', '$urlRouterProvider', function($stateProvider, $urlRouterProvider) {
+    $urlRouterProvider.otherwise('/');
+    $stateProvider
+
+      .state('home', {
+        url: '/',
+        abstract: true,
+        templateUrl: 'general/app.html'
+      })
+
+      .state('nodes', {
+        url: '',
+        templateUrl: 'nodes/nodes.html',
+        controller: 'NodesController as ctrl',
+        parent: 'home',
+        ncyBreadcrumb: {
+          label: ' '
+        }
+      })
+
+      .state('node', {
+        url: 'node-{nodeId:int}',
+        templateUrl: 'node/node.html',
+        controller: 'NodeController as ctrl',
+        parent: 'nodes',
+        ncyBreadcrumb: {
+          label: "All reports for: {{ ctrl.nav.node }}"
+        }
+      })
+
+      .state('report', {
+        parent: 'node',
+        url: '/report-{reportId:int}',
+        templateUrl: 'report/report.html',
+        controller: 'ReportController as ctrl',
+        ncyBreadcrumb: {
+          label: 'Report: {{ ctrl.nav.report }}'
+        }
+      })
+
+    ;
+  }]);
+
+})();

data/lib/puppet-herald/purgecronjob.rb

@@ -0,0 +1,35 @@
+# A module for Herald
+module PuppetHerald
+  # A cron job for Herald
+  class PurgeCronJob
+    # Number of seconds in a day
+    #
+    # @return [Integer]
+    SECONDS_IN_DAY = 86_400
+
+    # Run a purge job
+    #
+    # @return [nil]
+    def run!
+      require 'puppet-herald'
+      require 'puppet-herald/models/report'
+      limit = ENV['PUPPET_HERALD_PURGE_LIMIT'] || '90d'
+      date = parse_limit limit
+      PuppetHerald.logger.info "Running a purge reports job with limit: `#{limit}` that is `#{date}`..."
+      reports = PuppetHerald::Models::Report.purge_older_then(date)
+      PuppetHerald.logger.info "Job completed. Purged: #{reports} reports."
+      nil
+    end
+
+    # Parse a limit and returns number of seconds
+    #
+    # @param limit [String] a limit as string
+    # @return [DateTime] a date in the past - now minus limit
+    def parse_limit(limit)
+      require 'rufus/scheduler'
+      seconds = Rufus::Scheduler.parse limit
+      now = DateTime.now
+      now - Rational(seconds, SECONDS_IN_DAY)
+    end
+  end
+end