@hyperwatch/hyperwatch 4.2.0 → 4.3.1

package/src/modules/signature.js

@@ -4,7 +4,12 @@ const api = require('../app/api');
 const { Aggregator } = require('../lib/aggregator');
 const { Formatter } = require('../lib/formatter');
 const pipeline = require('../lib/pipeline');
-const { aggregateSpeed, md5 } = require('../lib/util');
+const {
+  aggregateCount,
+  aggregateSum,
+  formatDuration,
+  md5,
+} = require('../lib/util');
 
 const { agentFormat } = require('./agent');
 
@@ -91,12 +96,18 @@ function start() {
       },
     ],
 
-    ['15m', (entry) => aggregateSpeed(entry, 'per_minute')],
-    ['24h', (entry) => aggregateSpeed(entry, 'per_hour')],
+    ['count15m', (entry) => aggregateCount(entry, 'per_minute')],
+    ['count24h', (entry) => aggregateCount(entry, 'per_hour')],
+
+    [
+      'execTime15m',
+      (entry) => formatDuration(aggregateSum(entry, 'per_minute')),
+    ],
+    ['execTime24h', (entry) => formatDuration(aggregateSum(entry, 'per_hour'))],
   ]);
 
   signatureFormatter.insertFormat('agent', agentFormat, {
-    before: '15m',
+    before: 'count15m',
     color: 'grey',
   });
 

package/src/modules/status.js

@@ -3,20 +3,20 @@ const monitoring = require('../lib/monitoring');
 const { formatTable } = require('../lib/util');
 const stylesheet = require('../stylesheet');
 
-const aggregateSpeed = (entry, path) =>
+const aggregateCount = (entry, path) =>
   entry.hasIn(path) ? entry.getIn(path).reduce((p, c) => p + c, 0) : null;
 
 function mapper(entry, format) {
   return {
     name: entry.get('name'),
     type: entry.get('type'),
-    '15m':
-      aggregateSpeed(entry, ['speeds', 'processed', 'per_minute']) ||
-      aggregateSpeed(entry, ['speeds', 'accepted', 'per_minute']) ||
+    count15m:
+      aggregateCount(entry, ['speeds', 'processed', 'per_minute']) ||
+      aggregateCount(entry, ['speeds', 'accepted', 'per_minute']) ||
       (format !== 'json' ? '' : null),
-    '24h':
-      aggregateSpeed(entry, ['speeds', 'processed', 'per_hour']) ||
-      aggregateSpeed(entry, ['speeds', 'accepted', 'per_hour']) ||
+    count24h:
+      aggregateCount(entry, ['speeds', 'processed', 'per_hour']) ||
+      aggregateCount(entry, ['speeds', 'accepted', 'per_hour']) ||
       (format !== 'json' ? '' : null),
     status: entry.get('status'),
   };

package/src/plugins/proxy.js

@@ -1,218 +1,24 @@
 const { Map } = require('immutable');
 const proxyaddr = require('proxy-addr');
 
+// Run `node scripts/fetch-cloudflare-ips.js` to update
+const cloudflareIps = require('../data/cloudflare-ips.json');
+// Run `node scripts/fetch-cloudfront-ips.js` to update
+const cloudfrontIps = require('../data/cloudfront-ips.json');
+
 const ipRanges = {
-  cloudflare: [
-    // Source: https://www.cloudflare.com/ips/
-    '173.245.48.0/20',
-    '103.21.244.0/22',
-    '103.22.200.0/22',
-    '103.31.4.0/22',
-    '141.101.64.0/18',
-    '108.162.192.0/18',
-    '190.93.240.0/20',
-    '188.114.96.0/20',
-    '197.234.240.0/22',
-    '198.41.128.0/17',
-    '162.158.0.0/15',
-    '104.16.0.0/13',
-    '104.24.0.0/14',
-    '172.64.0.0/13',
-    '131.0.72.0/22',
-    '2400:cb00::/32',
-    '2606:4700::/32',
-    '2803:f800::/32',
-    '2405:b500::/32',
-    '2405:8100::/32',
-    '2a06:98c0::/29',
-    '2c0f:f248::/32',
-  ],
-  cloudfront: [
-    // Source: scripts/cloudfront-ips.js
-    '3.10.17.128/25',
-    '3.11.53.0/24',
-    '3.35.130.128/25',
-    '3.101.158.0/23',
-    '3.128.93.0/24',
-    '3.134.215.0/24',
-    '3.160.0.0/14',
-    '3.231.2.0/25',
-    '3.234.232.224/27',
-    '3.236.48.0/23',
-    '3.236.169.192/26',
-    '13.32.0.0/15',
-    '13.35.0.0/16',
-    '13.48.32.0/24',
-    '13.54.63.128/26',
-    '13.59.250.0/26',
-    '13.113.196.64/26',
-    '13.113.203.0/24',
-    '13.124.199.0/24',
-    '13.210.67.128/26',
-    '13.224.0.0/14',
-    '13.228.69.0/24',
-    '13.233.177.192/26',
-    '13.249.0.0/16',
-    '15.158.0.0/16',
-    '15.188.184.0/24',
-    '15.207.13.128/25',
-    '15.207.213.128/25',
-    '18.64.0.0/14',
-    '18.68.0.0/16',
-    '18.154.0.0/15',
-    '18.160.0.0/15',
-    '18.164.0.0/15',
-    '18.172.0.0/15',
-    '18.192.142.0/23',
-    '18.200.212.0/23',
-    '18.216.170.128/25',
-    '18.229.220.192/26',
-    '18.238.0.0/15',
-    '18.244.0.0/15',
-    '34.195.252.0/24',
-    '34.216.51.0/25',
-    '34.223.12.224/27',
-    '34.223.80.192/26',
-    '34.226.14.0/24',
-    '35.158.136.0/24',
-    '35.162.63.192/26',
-    '35.167.191.128/26',
-    '36.103.232.0/25',
-    '36.103.232.128/26',
-    '44.227.178.0/24',
-    '44.234.90.252/30',
-    '44.234.108.128/25',
-    '52.15.127.128/26',
-    '52.46.0.0/18',
-    '52.47.139.0/24',
-    '52.52.191.128/26',
-    '52.56.127.0/25',
-    '52.57.254.0/24',
-    '52.66.194.128/26',
-    '52.78.247.128/26',
-    '52.82.128.0/19',
-    '52.84.0.0/15',
-    '52.124.128.0/17',
-    '52.199.127.192/26',
-    '52.212.248.0/26',
-    '52.220.191.0/26',
-    '52.222.128.0/17',
-    '54.182.0.0/16',
-    '54.192.0.0/16',
-    '54.230.0.0/17',
-    '54.230.128.0/18',
-    '54.230.200.0/21',
-    '54.230.208.0/20',
-    '54.230.224.0/19',
-    '54.233.255.128/26',
-    '54.239.128.0/18',
-    '54.239.192.0/19',
-    '54.240.128.0/18',
-    '58.254.138.128/26',
-    '58.254.138.0/25',
-    '64.252.64.0/18',
-    '64.252.128.0/18',
-    '65.8.0.0/16',
-    '65.9.0.0/17',
-    '65.9.128.0/18',
-    '70.132.0.0/18',
-    '71.152.0.0/17',
-    '99.79.169.0/24',
-    '99.84.0.0/16',
-    '99.86.0.0/16',
-    '108.138.0.0/15',
-    '108.156.0.0/14',
-    '111.13.171.192/26',
-    '111.13.171.128/26',
-    '111.13.185.64/27',
-    '111.13.185.32/27',
-    '116.129.226.0/25',
-    '116.129.226.128/26',
-    '118.193.97.128/25',
-    '118.193.97.64/26',
-    '119.147.182.128/26',
-    '119.147.182.0/25',
-    '120.52.12.64/26',
-    '120.52.22.96/27',
-    '120.52.39.128/27',
-    '120.52.153.192/26',
-    '120.232.236.128/26',
-    '120.232.236.0/25',
-    '120.253.240.192/26',
-    '120.253.241.160/27',
-    '120.253.245.192/27',
-    '120.253.245.128/26',
-    '130.176.0.0/17',
-    '130.176.128.0/18',
-    '130.176.192.0/19',
-    '130.176.224.0/20',
-    '143.204.0.0/16',
-    '144.220.0.0/16',
-    '180.163.57.0/25',
-    '180.163.57.128/26',
-    '204.246.164.0/22',
-    '204.246.168.0/22',
-    '204.246.172.0/24',
-    '204.246.173.0/24',
-    '204.246.174.0/23',
-    '204.246.176.0/20',
-    '205.251.200.0/21',
-    '205.251.208.0/20',
-    '205.251.249.0/24',
-    '205.251.250.0/23',
-    '205.251.252.0/23',
-    '205.251.254.0/24',
-    '216.137.32.0/19',
-    '223.71.11.0/27',
-    '223.71.71.96/27',
-    '223.71.71.128/25',
-    '204.246.164.0/22',
-    '204.246.168.0/22',
-    '204.246.174.0/23',
-    '204.246.176.0/20',
-    '205.251.192.0/19',
-    '205.251.249.0/24',
-    '205.251.250.0/23',
-    '205.251.252.0/23',
-    '205.251.254.0/24',
-    '216.137.32.0/19',
-    '2400:7fc0:500::/40',
-    '2404:c2c0:500::/40',
-    '2409:8c00:2421:400::/56',
-    '2409:8c00:2421:300::/56',
-    '2600:9000:eee::/48',
-    '2600:9000:f580::/41',
-    '2600:9000:5310::/44',
-    '2600:9000:f520::/44',
-    '2600:9000:f534::/46',
-    '2600:9000:5308::/45',
-    '2600:9000:fff::/48',
-    '2600:9000:1000::/36',
-    '2600:9000:2000::/36',
-    '2600:9000:4000::/36',
-    '2600:9000:5320::/43',
-    '2600:9000:5340::/42',
-    '2600:9000:5380::/41',
-    '2600:9000:f538::/45',
-    '2600:9000:f400::/40',
-    '2600:9000:f800::/37',
-    '2600:9000:ddd::/48',
-    '2600:9000:f500::/43',
-    '2600:9000:f000::/38',
-    '2600:9000:f540::/42',
-    '2600:9000:f600::/39',
-    '2600:9000:3000::/36',
-  ],
+  cloudflare: cloudflareIps,
+  cloudfront: cloudfrontIps,
+  // To update: https://docs.sucuri.net/website-firewall/sucuri-firewall-troubleshooting-guide/
   sucuri: [
-    // Source: https://docs.sucuri.net/website-firewall/sucuri-firewall-troubleshooting-guide/
     '192.88.134.0/23',
     '185.93.228.0/22',
     '66.248.200.0/22',
     '2a02:fe80::/29',
     '208.109.0.0/22',
   ],
+  // To update: https://docs-cybersec.thalesgroup.com/bundle/z-kb-articles-knowledgebase-support/page/290228110.html
   imperva: [
-    // Source: https://docs.imperva.com/howto/c85245b7
     '199.83.128.0/21',
     '198.143.32.0/19',
     '149.126.72.0/21',
@@ -223,6 +29,7 @@ const ipRanges = {
     '107.154.0.0/16',
     '45.60.0.0/16',
     '45.223.0.0/16',
+    '131.125.128.0/17',
     '2a02:e980::/29',
   ],
 };

package/src/script.js

@@ -1,4 +1,3 @@
-/* eslint-env browser */
 /* eslint-disable-next-line no-unused-vars  */
 function sparkline(
   canvasId,

package/scripts/cloudfront-ips.js

@@ -1,56 +0,0 @@
-/* eslint-disable-next-line node/no-unpublished-require */
-const fetch = require('node-fetch');
-
-async function main() {
-  const response = await fetch(
-    'https://ip-ranges.amazonaws.com/ip-ranges.json'
-  );
-
-  const ipRanges = await response.json();
-
-  console.log(
-    ipRanges.prefixes
-      .filter((p) => p.service === 'CLOUDFRONT')
-      .map((el) => el.ip_prefix)
-      .sort((a, b) => {
-        const aArray = a.split('.').map(Number);
-        const bArray = b.split('.').map(Number);
-        if (aArray[0] === bArray[0]) {
-          if (aArray[1] === bArray[1]) {
-            if (aArray[2] === bArray[2]) {
-              return aArray[3] > bArray[3] ? 1 : -1;
-            }
-            return aArray[2] > bArray[2] ? 1 : -1;
-          }
-          return aArray[1] > bArray[1] ? 1 : -1;
-        }
-        return aArray[0] > bArray[0] ? 1 : -1;
-      })
-      .map((el) => `"${el}"`)
-      .join(',\n')
-  );
-
-  console.log(
-    ipRanges.ipv6_prefixes
-      .filter((p) => p.service === 'CLOUDFRONT')
-      .map((el) => el.ipv6_prefix)
-      .sort((a, b) => {
-        const aArray = a.split(':').map(Number);
-        const bArray = b.split(':').map(Number);
-        if (aArray[0] === bArray[0]) {
-          if (aArray[1] === bArray[1]) {
-            if (aArray[2] === bArray[2]) {
-              return aArray[3] > bArray[3] ? 1 : -1;
-            }
-            return aArray[2] > bArray[2] ? 1 : -1;
-          }
-          return aArray[1] > bArray[1] ? 1 : -1;
-        }
-        return aArray[0] > bArray[0] ? 1 : -1;
-      })
-      .map((el) => `"${el}"`)
-      .join(',\n')
-  );
-}
-
-main();