Merge pull request #177 from xavier-hernandez/develop

v1.1.26

Dockerfile

@@ -9,7 +9,7 @@ RUN apk add --no-cache \
 
 # download goaccess
 WORKDIR /goaccess-temp
-COPY /assests/goaccess/goaccess-1.8.1.tar.gz goaccess.tar.gz
+COPY /assests/goaccess/goaccess-1.9.1.tar.gz goaccess.tar.gz
 
 # set up goacess-debug
 WORKDIR /goaccess-debug
@@ -23,7 +23,7 @@ RUN make install
 WORKDIR /goaccess
 RUN cp /goaccess-temp/goaccess.tar.gz .
 RUN tar --strip-components=1  -xzvf goaccess.tar.gz
-RUN sed -i "s/GWSocket<\/a>/GWSocket<\/a> ( <a href='https:\/\/tiny.one\/xgoan'>GOAN<\/a> <span>v1.1.25<\/span> )/" /goaccess/resources/tpls.html
+RUN sed -i "s/GWSocket<\/a>/GWSocket<\/a> ( <a href='https:\/\/tiny.one\/xgoan'>GOAN<\/a> <span>v1.1.26<\/span> )/" /goaccess/resources/tpls.html
 RUN sed -i "s/bottom: 190px/bottom: 260px/" /goaccess/resources/css/app.css
 RUN ./configure --enable-utf8 --enable-geoip=mmdb --with-getline
 RUN make

README.md

@@ -14,10 +14,10 @@ Still in development... You might need to wait a bit if you have a large amount
 ![Alt text](https://i.ibb.co/fNj9Dcy/goaccess1.jpg "GoAccess Dashboard")
 
 **Dependencies:**
-- GoAccess version: 1.8.1
-- GeoLite2-City.mmdb  (2024-01-20)
-- GeoLite2-Country.mmdb  (2024-01-20)
-- GeoLite2-ASN.mmdb  (2024-01-20)
+- GoAccess version: 1.9.1
+- GeoLite2-City.mmdb  (2024-02-10)
+- GeoLite2-Country.mmdb  (2024-02-10)
+- GeoLite2-ASN.mmdb  (2024-02-10)
 
 ---
 
@@ -61,6 +61,7 @@ services:
             - CUSTOM_BROWSERS=Kuma:Uptime,TestBrowser:Crawler #optional - comma delimited, more information below
             - HTML_REFRESH=5 #optional - Refresh the HTML report every X seconds. https://goaccess.io/man
             - KEEP_LAST=30 #optional - Keep the last specified number of days in storage. https://goaccess.io/man
+            - PROCESSING_THREADS=1 #optional - This parameter sets the number of concurrent processing threads in the program's execution, affecting log data analysis, typically adjusted based on CPU cores. Default is 1. https://goaccess.io/man
         volumes:
         - /path/to/host/nginx/logs:/opt/log
         - /path/to/host/custom:/opt/custom #optional, required if using log_type = CUSTOM
@@ -90,6 +91,7 @@ services:
             - CUSTOM_BROWSERS=Kuma:Uptime,TestBrowser:Crawler #optional - comma delimited, more information below
             - HTML_REFRESH=5 #optional - Refresh the HTML report every X seconds. https://goaccess.io/man
             - KEEP_LAST=30 #optional - Keep the last specified number of days in storage. https://goaccess.io/man
+            - PROCESSING_THREADS=1 #optional - This parameter sets the number of concurrent processing threads in the program's execution, affecting log data analysis, typically adjusted based on CPU cores. Default is 1. https://goaccess.io/man
         volumes:
         - /path/to/host/nginx/logs:/opt/log
         - /path/to/host/custom:/opt/custom #optional, required if using log_type = CUSTOM
@@ -111,6 +113,8 @@ services:
 | `-e CUSTOM_BROWSERS=`         |   - (Optional) Consumes the list of provided custom browsers. This is a comma separated list containing the custom browser(s) in the format `Browser:Browser_category`.<br/>- If your custom browser is already defined in the default `browsers.list` file, it will not be added. However, the `Browser_category` can be reused.<br/><br/> CUSTOM_BROWSERS list example: `Kuma:Crawlers,TestBrowser:Crawlers,Kuma:Uptime,Discordbot:Crawlers`<br/><br/>For the example above, only `Kuma:Crawlers` and `TestBrowser:Crawlers` will be appended to the `browsers.list` file. <br/><br/>`Kuma:Uptime` is ignored as the browser `Kuma` has already been defined in `Kuma:Crawlers`. `Discordbot:Crawlers` is ignored as the browser `Discordbot` is already defined in the [default browsers.list file](https://github.com/allinurl/goaccess/blob/master/config/browsers.list)<br/><br/>Note for users using CUSTOM LOG_TYPE:<br/><br/>If your `goaccess.conf` file references a browsers.list file other than the one located in the `/goaccess-config/ directory`, the CUSTOM_BROWSERS variable will be ignored.    |
 | `-e HTML_REFRESH=`         |   (Optional) Refresh the HTML report every X seconds. https://goaccess.io/man |
 | `-e KEEP_LAST=`         |   (Optional) Keep the last specified number of days in storage. https://goaccess.io/man|
+| `-e PROCESSING_THREADS=` | (Optional) This parameter sets the number of concurrent processing threads in the program's execution, affecting log data analysis, typically adjusted based on CPU cores. Default is 1.
+
 
 # **Additional environment information**  
 ` -e LOG_TYPE=`  

resources/scripts/funcs/environment.sh

@@ -83,15 +83,27 @@ function runGoAccess(){
         if is_integer "$HTML_REFRESH"; then
             goacess_options="$goacess_options --html-refresh=${HTML_REFRESH}"
         else
-            echo "Error: HTML_REFRESH does not contain an integer, ignoring".
+            echo -e "Error: HTML_REFRESH does not contain an integer, ignoring.\n"
         fi
     fi
 
     if [ -n "$KEEP_LAST" ]; then
         if is_integer "$KEEP_LAST"; then
             goacess_options="$goacess_options --keep-last=${KEEP_LAST}"
         else
-            echo "Error: KEEP_LAST does not contain an integer, ignoring".
+            echo -e "\nError: KEEP_LAST does not contain an integer, ignoring.\n"
+        fi
+    fi
+
+    if [ -n "$PROCESSING_THREADS" ]; then
+        if is_integer "$PROCESSING_THREADS"; then
+            if [ "$PROCESSING_THREADS" -ge 1 ] && [ "$PROCESSING_THREADS" -le 6 ]; then
+                goacess_options="$goacess_options --jobs=${PROCESSING_THREADS}"
+            else
+                echo -e "\nError: PROCESSING_THREADS must be between 1 and 6, ignoring.\n"
+            fi
+        else
+            echo -e "\nError: PROCESSING_THREADS does not contain an integer, ignoring.\n"
         fi
     fi
 

resources/scripts/start.sh

@@ -9,7 +9,7 @@ source $(dirname "$0")/logs/custom.sh
 source $(dirname "$0")/logs/ncsa_combined.sh
 source $(dirname "$0")/logs/nginx_access.sh
 
-goan_version="GOAN v1.1.25"
+goan_version="GOAN v1.1.26"
 goan_log_path="/opt/log"
 
 goaccess_ping_interval=15