@hyperwatch/hyperwatch 4.3.1 → 5.0.1

package/src/modules/signature.js

@@ -1,9 +1,10 @@
-const { is, Set } = require('immutable');
+const { is } = require('immutable');
 
 const api = require('../app/api');
-const { Aggregator } = require('../lib/aggregator');
+const { Aggregator, lastSeen, statusCount } = require('../lib/aggregator');
 const { Formatter } = require('../lib/formatter');
 const pipeline = require('../lib/pipeline');
+const { touch, prune, countRecent } = require('../lib/recent-map');
 const {
   aggregateCount,
   aggregateSum,
@@ -40,6 +41,9 @@ function normalisedIdentityHeader(headers) {
   return obj;
 }
 
+const addressCount15m = (entry) => countRecent(entry.get('addresses'), 15 * 60);
+const addressCount24h = (entry) => countRecent(entry.get('addresses'));
+
 function computeSignature(headers) {
   const string = Object.keys(headers)
     .map((key) => [key, headers[key]].join(':'))
@@ -65,8 +69,10 @@ function init() {
   pipeline.getNode('main').map(augment).registerNode('main');
 }
 
+let _aggregator;
+
 function start() {
-  const aggregator = new Aggregator();
+  const aggregator = (_aggregator = new Aggregator());
 
   aggregator.setIdentifier((log) => log.getIn(['signature', 'id']));
 
@@ -75,15 +81,24 @@ function start() {
   signatureFormatter.setFormats([
     ['signature', (entry) => entry.getIn(['signature', 'id'])],
     ['identity', (entry) => entry.get('identity')],
-    ['addressCount', (entry) => entry.get('addresses').size],
+    ['addressCount15m', addressCount15m],
+    ['addressCount24h', addressCount24h],
     [
       'addresses',
       (entry) =>
-        entry
-          .get('addresses')
-          .map((address) => address.get('value'))
-          .slice(0, 10)
-          .join('<br>'),
+        entry.has('addresses')
+          ? entry.get('addresses').keySeq().slice(0, 10).join('<br>')
+          : '',
+    ],
+    [
+      'lastAddress',
+      (entry) => {
+        const addr = entry.get('lastAddress');
+        if (!addr) {
+          return '';
+        }
+        return addr.get('hostname') || addr.get('value') || '';
+      },
     ],
 
     [
@@ -96,9 +111,15 @@ function start() {
       },
     ],
 
+    ['lastSeen', lastSeen],
     ['count15m', (entry) => aggregateCount(entry, 'per_minute')],
     ['count24h', (entry) => aggregateCount(entry, 'per_hour')],
 
+    ['2xx15m', statusCount('2xx_per_minute')],
+    ['2xx24h', statusCount('2xx_per_hour')],
+    ['4xx15m', statusCount('4xx_per_minute')],
+    ['4xx24h', statusCount('4xx_per_hour')],
+
     [
       'execTime15m',
       (entry) => formatDuration(aggregateSum(entry, 'per_minute')),
@@ -121,10 +142,12 @@ function start() {
     }
 
     const address = log.get('address');
-    if (!entry.has('addresses')) {
-      entry = entry.set('addresses', new Set([address]));
-    } else if (!entry.get('addresses').has(address)) {
-      entry = entry.update('addresses', (set) => set.add(address));
+    entry = entry.set('lastAddress', address);
+    // Distinct IPs with last-seen time, pruned to 24h; backs both the 15m
+    // and 24h counts
+    const value = address && address.get('value');
+    if (value) {
+      entry = entry.update('addresses', (map) => touch(map, value));
     }
 
     return entry;
@@ -132,7 +155,16 @@ function start() {
 
   aggregator.setEnricher(enricher);
 
-  pipeline.getNode('main').map((log) => aggregator.processLog(log));
+  aggregator.setEntryGc((entry) =>
+    entry.has('addresses') ? entry.update('addresses', prune) : entry
+  );
+
+  aggregator.sorters.addressCount15m = addressCount15m;
+  aggregator.sorters.addressCount24h = addressCount24h;
+
+  pipeline
+    .getNode('main')
+    .map((log) => aggregator.processLog(log), 'aggregator');
 
   api.registerAggregator('signatures', aggregator);
 }
@@ -140,4 +172,7 @@ function start() {
 module.exports = {
   init,
   start,
+  get aggregator() {
+    return _aggregator;
+  },
 };

package/src/modules/sparkline.js

@@ -1,6 +1,10 @@
 const aggregator = require('../lib/aggregator');
 
-const sparkline = (entry, key) => {
+const sparkline = (entry, key, output) => {
+  if (output === 'text') {
+    return;
+  }
+
   const id = entry.get('id');
 
   const points = entry
@@ -22,8 +26,8 @@ sparkline ('${id}', ${JSON.stringify(points)}, '#797979', 14, 5);
 };
 
 function init() {
-  aggregator.defaultFormatter.insertFormat('activity', (entry) =>
-    sparkline(entry, 'per_minute')
+  aggregator.defaultFormatter.insertFormat('activity', (entry, output) =>
+    sparkline(entry, 'per_minute', output)
   );
 }
 

package/src/modules/status.js

@@ -23,10 +23,15 @@ function mapper(entry, format) {
 }
 
 function start() {
-  api.get('/status(.:format(txt|json))?', (req, res) => {
+  api.get('/status{.:format}', (req, res) => {
     const raw = req.query.raw ? true : false;
     const format = req.params.format || (raw ? 'json' : null);
 
+    if (format && !['json', 'txt'].includes(format)) {
+      res.sendStatus(404);
+      return;
+    }
+
     let rawData = monitoring.getAllComputed();
 
     if (req.query.type) {