allow user to specify specific apps to see in the logs

This commit allows a user to specifiy which apps will be shown in the viewer.

Author: Simon Esprit

static/viewer.css

@@ -40,7 +40,7 @@ body {
   float: right;
 }
 
-#filters {
+#filters, #apps {
     float: left;
     clear: both;
     margin-top: 15px;

static/viewer.js

@@ -74,6 +74,7 @@ function Filter(app_expr, severity_expr, action, state) {
         return matchRuleShort(appname, this.app_expr);
     };
 
+    // TODO refactor this so that apps can reuse this logic!
     this.evaluateSeverity = function (severity) {
         rule_int = this.severityToInt(this.sev_expr.replace(/\W/g, ''));
         sev_int = this.severityToInt(severity);
@@ -158,6 +159,17 @@ function Filter(app_expr, severity_expr, action, state) {
     };
 }
 
+function App(app_expr, state) {
+    this.app_expr = app_expr;
+    // state = enabled | disabled
+    this.state = state;
+
+    // TODO at some point refactor this as this is the same for the filter!
+    this.evaluateApp = function (appname) {
+        return matchRuleShort(appname, this.app_expr);
+    };
+}
+
 /* Class that acts as a wrapper around the WebSocket class.
    It's goal is to create a robust connection with the server.
    This means that it will test the connection & reconnect if needed.
@@ -256,16 +268,51 @@ app.controller('MessagesController', ['$scope', '$window', function ($scope, $wi
     // this buffer will hold messages while the app is paused
     $scope.paused_messages = [];
 
+    $scope.apps = [];
+    // put a placeholder app
+    $scope.apps.push(new App("my_app", "disabled"));
+
     $scope.filters = [];
     // put a placeholder filter
     var filter = new Filter("myapp", ">= warning", "hide", "disabled");
     $scope.filters.push(filter);
 
+    $scope.applyApps = function (message) {
+        if (!message)
+            return null;
+
+        var hasAppEnabled = false;
+
+        for (var index = 0; index < $scope.apps.length; index++) {
+            var app = $scope.apps[index];
+            if (app.state == "enabled") {
+                hasAppEnabled = true;
+                if (app.evaluateApp(message.appname)) {
+                    return message;
+                }
+            }
+            else
+                continue;
+        }
+
+        // if we got here and an enabled app was found, it means none of them match the message so we discard it
+        if(hasAppEnabled) {
+            console.log("discarded message with non-matching app");
+            return null;
+        }
+        else {
+            return message;
+        }
+    };
+
     /*
      * Function to evaluate all user-specified filters on a message.
      * These filters will modify the message and return it.
      */
     $scope.applyFilters = function (message) {
+        if (!message)
+            return null;
+
         for (var index = 0; index < $scope.filters.length; index++) {
             message = $scope.filters[index].handleMessage(message);
             // if filter removed the message, stop immediately
@@ -284,7 +331,10 @@ app.controller('MessagesController', ['$scope', '$window', function ($scope, $wi
 			        return;
 			    }
 
-			    // first evaluate filters, if this becomes too intense for the browser, offload it to server
+			    // first check if only specific apps should be shown
+			    message = $scope.applyApps(message);
+
+			    // evaluate filters, if this becomes too intense for the browser, offload it to server
 			    message = $scope.applyFilters(message);
 			    if (!message) {
 			        console.log("filtered out message");
@@ -342,6 +392,14 @@ app.controller('MessagesController', ['$scope', '$window', function ($scope, $wi
 	    $scope.filters.splice(index, 1);
 	};
 
+	$scope.addApp = function () {
+	    $scope.apps.push(new App("my_app", "disabled"));
+	};
+
+	$scope.removeApp = function (index) {
+	    $scope.apps.splice(index, 1);
+	};
+
 	$scope.gotoEndTable = function () {
 	    // scroll to bottom of table
 		var objDiv = document.getElementById("viewer");

templates/viewer.html

@@ -19,10 +19,27 @@ <h3>Syslogw <small>Web Viewer</small></h3>
         </div>
         <div id="controller">
             <button type="button" class="btn btn-primary btn-warning" ng-click="onClear()">Clear</button>
+            <button data-toggle="collapse" data-target="#apps" class="btn btn-primary btn-warning">Apps</button>
             <button data-toggle="collapse" data-target="#filters" class="btn btn-primary btn-warning">Filters</button>
             <button type="button" class="btn btn-primary btn-warning" ng-click="onPause()" ng-hide="isPaused">Pause</button>
             <button type="button" class="btn btn-primary btn-success" ng-click="onResume()" ng-show="isPaused">Resume</button>
         </div>
+        <div id="apps" class="collapse">
+            <form class="form-inline filter" ng-repeat="app in apps">
+                <input type="text" class="form-control" placeholder="*" ng-model="app.app_expr">
+                <select class="form-control" ng-model="app.state">
+                    <option>enabled</option>
+                    <option>disabled</option>
+                </select>
+                <button type="button" class="btn btn-danger" ng-hide="$last" ng-click="removeApp($index)">
+                    <span class="glyphicon glyphicon-remove"></span>
+                </button>
+                <button type="button" class="btn btn-success" ng-show="$last" ng-click="addApp()">
+                    <span class="glyphicon glyphicon-plus"></span>
+                </button>
+            </form>
+
+        </div>
         <div id="filters" class="collapse">
             <form class="form-inline filter" ng-repeat="filter in filters">
                 <input type="text" class="form-control" id="app_expr" placeholder="myapp*" ng-model="filter.app_expr">