@hyperwatch/hyperwatch 3.9.2 → 3.9.4

package/docs/input.md

@@ -152,10 +152,10 @@ Hyperwatch is distributed with two Nginx formats.
 - The default `combined` format:
   `'$remote_addr - $remote_user [$time_local] "$request" $status $bytes_sent "$http_referer" "$http_user_agent"'`
 
-- the `access_watch_combined` format that extracts important HTTP headers from the request:
+- the `hyperwatch_combined` format that extracts important HTTP headers from the request:
   `'$remote_addr - $remote_user [$time_local] "$request" $status $bytes_sent "$http_referer" "$http_user_agent" "$http_accept" "$http_accept_charset" "$http_accept_encoding" "$http_accept_language" "$http_connection" "$http_dnt" "$http_from" "$http_host"'`.
 
-If possible, we recommend you to use the `access_watch_combined` format to take full advantage of the Hyperwatch data augmentation in the pipeline.
+If possible, we recommend you to use the `hyperwatch_combined` format to take full advantage of the Hyperwatch data augmentation in the pipeline.
 
 ### Apache
 
@@ -176,10 +176,10 @@ Hyperwatch is distributed with two Apache formats.
 - The default `combined` format:
   `'%h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"'`
 
-- the `access_watch_combined` format that extracts important HTTP headers from the request:
+- the `hyperwatch_combined` format that extracts important HTTP headers from the request:
   `'%h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i" "%{Accept}i" "%{Accept-Charset}i" "%{Accept-Encoding}i" "%{Accept-Language}i" "%{Connection}i" "%{Dnt}i" "%{From}i" "%{Host}i"'`.
 
-If possible, we recommend you to use the `access_watch_combined` format to take full advantage of the Hyperwatch data augmentation in the pipeline.
+If possible, we recommend you to use the `hyperwatch_combined` format to take full advantage of the Hyperwatch data augmentation in the pipeline.
 
 ### Custom
 
@@ -225,8 +225,8 @@ npm start config/custom
 For more detailed log processing, it is recommended to use the _Hyperwatch combined_ log format:
 
 ```
-log_format access_watch_combined '$remote_addr - $remote_user [$time_local] "$request" $status $bytes_sent "$http_referer" "$http_user_agent" "$http_accept" "$http_accept_charset" "$http_accept_encoding" "$http_accept_language" "$http_connection" "$http_dnt" "$http_from" "$http_host" "$http_x_forwarded_for"'
-access_log /logs/access.log access_watch_combined;
+log_format hyperwatch_combined '$remote_addr - $remote_user [$time_local] "$request" $status $bytes_sent "$http_referer" "$http_user_agent" "$http_accept" "$http_accept_charset" "$http_accept_encoding" "$http_accept_language" "$http_connection" "$http_dnt" "$http_from" "$http_host"'
+access_log /logs/access.log hyperwatch_combined;
 ```
 
 With the following configuration for Hyperwatch:
@@ -234,7 +234,7 @@ With the following configuration for Hyperwatch:
 ```
 const defaultInput = input.file.create({
   path: '/logs/access.log',
-  parse: format.nginx.parser({format: format.nginx.formats.accessWatchCombined})
+  parse: format.nginx.parser({format: format.nginx.formats.hyperwatch_combined})
 })
 ```
 
@@ -243,8 +243,8 @@ const defaultInput = input.file.create({
 If behind a proxy, you might want to also report the `HTTP_X_FORWARDED_FOR` header to allow Hyperwatch to properly detect the client IP address.
 
 ```
-log_format access_watch_combined_with_x_forwarded_for '$remote_addr - $remote_user [$time_local] "$request" $status $bytes_sent "$http_referer" "$http_user_agent" "$http_accept" "$http_accept_charset" "$http_accept_encoding" "$http_accept_language" "$http_connection" "$http_dnt" "$http_from" "$http_host" "$http_x_forwarded_for"'
-access_log /logs/access.log access_watch_combined_with_x_forwarded_for;
+log_format hyperwatch_combined_with_x_forwarded_for '$remote_addr - $remote_user [$time_local] "$request" $status $bytes_sent "$http_referer" "$http_user_agent" "$http_accept" "$http_accept_charset" "$http_accept_encoding" "$http_accept_language" "$http_connection" "$http_dnt" "$http_from" "$http_host" "$http_x_forwarded_for"'
+access_log /logs/access.log hyperwatch_combined_with_x_forwarded_for;
 ```
 
 With the following configuration for Hyperwatch:

package/docs/tutorials/apache_input.md

@@ -51,7 +51,7 @@ module.exports = function (hyperwatch) {
   const syslogApacheHyperwatchCombinedInput = input.syslog.create({
     port: 1518,
     parse: format.apache.parser({
-      format: format.apache.formats.hyperwatchCombined,
+      format: format.apache.formats.hyperwatch_combined,
     }),
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperwatch/hyperwatch",
-  "version": "3.9.2",
+  "version": "3.9.4",
   "description": "Open Source HTTP Traffic Manager",
   "license": "Apache-2.0",
   "author": "François Hodierne <francois@hodierne.net>",
@@ -34,7 +34,7 @@
     "chalk": "^4.1.0",
     "country-code-emoji": "^2.3.0",
     "debug": "^4.3.4",
-    "dnsbl": "^3.2.0",
+    "dnsbl": "^4.0.0",
     "express": "^4.18.2",
     "express-ws": "^5.0.2",
     "geoip-lite": "^1.4.6",

package/src/format/apache.js

@@ -94,7 +94,7 @@ function parser({ format }) {
 
 const formats = {
   combined: '%h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"',
-  hyperwatchCombined:
+  hyperwatch_combined:
     '%h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i" "%{Accept}i" "%{Accept-Charset}i" "%{Accept-Encoding}i" "%{Accept-Language}i" "%{Connection}i" "%{Dnt}i" "%{From}i" "%{Host}i"',
 };
 

package/src/format/nginx.js

@@ -95,9 +95,7 @@ function parser({ format = formats.combined } = {}) {
 const formats = {
   combined:
     '$remote_addr - $remote_user [$time_local] "$request" $status $bytes_sent "$http_referer" "$http_user_agent"',
-  accessWatch:
-    '"$time_iso8601" "$remote_addr" "$http_host" "$request" $status "$http_user_agent" "$http_accept" "$http_accept_language" "$http_accept_charset" "$http_accept_encoding" "$http_from" "$http_dnt" "$http_connection" "$http_referer"',
-  hyperwatchCombined:
+  hyperwatch_combined:
     '$remote_addr - $remote_user [$time_local] "$request" $status $bytes_sent "$http_referer" "$http_user_agent" "$http_accept" "$http_accept_charset" "$http_accept_encoding" "$http_accept_language" "$http_connection" "$http_dnt" "$http_from" "$http_host"',
 };
 

package/src/modules/identity.js

@@ -178,6 +178,23 @@ function augment(log) {
       return hostname && hostname.endsWith('.007ac9.net')
         ? log.set('identity', 'Seekport')
         : log;
+    case 'Neevabot':
+      return hostname && hostname.endsWith('.neevabot.com')
+        ? log.set('identity', 'Neevabot')
+        : log;
+    case 'DataForSeoBot':
+      return hostname && hostname.endsWith('.dataforseo.com')
+        ? log.set('identity', 'DataForSeo')
+        : log;
+    case 'Qwantify':
+    case 'Qwantify-dev':
+      return hostname && hostname.endsWith('.qwant.com')
+        ? log.set('identity', 'Qwant')
+        : log;
+    case 'InfoTigerBot':
+      return hostname && hostname.endsWith('.infotiger.com')
+        ? log.set('identity', 'InfoTiger')
+        : log;
 
     // Per hostname + CIDR
     case 'Twitterbot':