v1.1.14

- updated goaccess from 1.7 to 1.7.1
- updated maxmind dbs to 3/21/2023
- added environment parameter to just include certain proxy hosts
- updated loop logic for reading files

Author: xavier-hernandez

Dockerfile

@@ -9,7 +9,7 @@ RUN apk add --no-cache \
 
 # download goaccess
 WORKDIR /goaccess-temp
-COPY /assests/goaccess/goaccess-1.7.tar.gz goaccess.tar.gz
+COPY /assests/goaccess/goaccess-1.7.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.13<\/span> )/" /goaccess/resources/tpls.html
+RUN sed -i "s/GWSocket<\/a>/GWSocket<\/a> ( <a href='https:\/\/tiny.one\/xgoan'>GOAN<\/a> <span>v1.1.14<\/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.7
-- GeoLite2-City.mmdb  (2023-02-10)
-- GeoLite2-Country.mmdb  (2023-02-10)
-- GeoLite2-ASN.mmdb  (2023-02-10)
+- GoAccess version: 1.7.1
+- GeoLite2-City.mmdb  (2023-03-21)
+- GeoLite2-Country.mmdb  (2023-03-21)
+- GeoLite2-ASN.mmdb  (2023-03-21)
 
 ---
 
@@ -95,6 +95,7 @@ services:
 | `-e BASIC_AUTH_USERNAME=user`         |   (Optional) Requires BASIC_AUTH to bet set to True.  Username for basic authentication.     |
 | `-e BASIC_AUTH_PASSWORD=pass`         |   (Optional) Requires BASIC_AUTH to bet set to True.  Password for basic authentication.     |
 | `-e EXCLUDE_IPS=`         |   (Optional) IP Addresses or range of IPs delimited by comma refer to https://goaccess.io/man. For example: 192.168.0.1-192.168.0.100 or 127.0.0.1,192.168.0.1-192.168.0.100   |
+| `-e INCLUDE_PROXY_HOSTS=`         |   (Optional) Only consume the list of provided proxy hosts. This is a comma separated list containing the proxy host number for example "11,21". This would consume proxy-host-11_access.log* and proxy-host-21_access.log* . The host number can be found right clicking on the 3 dots on the proxy host line in the GUI.  |
 | `-e LOG_TYPE=`         |   (Optional) By default the configuration will be set to read NPM logs. Options are: CUSTOM, NPM, NPM+R, TRAEFIK, NCSA_COMBINED. More information below.|
 | `-e LOG_TYPE_FILE_PATTERN=`         |   (Optional) Only to be used with LOG_TYPE=NCSA_COMBINED. This parameter will pass along the file type you are trying match. For example you can pass -e LOG_TYPE_FILE_PATTERN="*.log" or -e LOG_TYPE_FILE_PATTERN="access.log". The default is *.log. Please keep it simple as I have not tested this completely. Use at your own RISK! |
 | `-e LANG=zh_CN.UTF-8 -e LANGUAGE=zh_CN.UTF-8`         |   (Optional) Language localization added. GoAccess only has a few translations available. Please visit https://github.com/allinurl/goaccess/tree/master/po to see the translations available. <br/><br/>**Current Translations**<br/>de - German<br/>es - Spanish<br/>fr - French<br/>it - Italian<br/>ja - Japanese<br/>ko - Korean<br/>pt_BR - Portuguese (Brazil)<br/>ru - Russian<br/>sv - Swedish<br/>uk - English (United Kingdom)<br/>zh_CN - Chinese - Simplified|

assests/goaccess/goaccess-1.7.1.tar.gz

@@ -62,27 +62,37 @@ function npm(){
         IFS=$'\n'
         for file in $(find "${goan_log_path}" -name 'proxy*host-*.log' ! -name "*_error.log");
         do
-            if [ -f $file ]
-            then
-                if [ -r $file ] && R="Read = yes" || R="Read = No"
-                then
+            pressOn=0
+
+            if [ -n "${INCLUDE_PROXY_HOSTS}" ]; then
+                IFS=','
+                read -ra vHost <<< "$INCLUDE_PROXY_HOSTS"
+                for hostNum in "${vHost[@]}"; do
+                    if [[ "${goan_log_path}/proxy-host-${hostNum}_access.log" = "${file}" ]]; then
+                        pressOn=1
+                        break
+                    fi
+                done
+                unset IFS
+            else
+                pressOn=1
+            fi
+
+            if [[ $pressOn == 1 ]]; then
+                if [ -e "$file" ] && [ -r "$file" ]; then
                     echo "log-file ${file}" >> ${goan_config}
                     goan_log_count=$((goan_log_count+1))
-                    echo -ne ' \t '
-                    echo "Filename: $file | $R"
+                    echo -e "\tFile $file exists and is readable"
+                elif [ -e "$file_path" ]; then
+                    echo -e "\tFile $file exists but is not readable"
                 else
-                    echo -ne ' \t '
-                    echo "Filename: $file | $R"
+                    echo -e "\tFile $file does not exist"
                 fi
-            else
-                echo -ne ' \t '
-                echo "Filename: $file | Not a file"
             fi
         done
         unset IFS
 
         echo -e "\tFound (${goan_log_count}) proxy logs..."
-
         echo -e "\n\tSKIP ARCHIVED LOGS"
         echo -e "\t-------------------------------"
         if [[ "${SKIP_ARCHIVED_LOGS}" == "True" ]]
@@ -91,6 +101,7 @@ function npm(){
         else
             echo -e "\tFALSE"
             goan_archive_log_count=`ls -1 ${goan_log_path}/proxy-host-*_access.log*.gz 2> /dev/null | wc -l`
+            goan_archive_detail_log_count=0
 
             if [ $goan_archive_log_count != 0 ]
             then 
@@ -99,27 +110,40 @@ function npm(){
                 IFS=$'\n'
                 for file in $(find "${goan_log_path}" -name 'proxy-host-*_access.log*.gz' ! -name "*_error.log");
                 do
-                    if [ -f $file ]
-                    then
-                        if [ -r $file ] && R="Read = yes" || R="Read = No"
-                        then
-                            echo -ne ' \t '
-                            echo "Filename: $file | $R"
+                    pressOn=0
+
+                    if [ -n "${INCLUDE_PROXY_HOSTS}" ]; then
+                        IFS=','
+                        read -ra vHost <<< "$INCLUDE_PROXY_HOSTS"
+                        for hostNum in "${vHost[@]}"; do
+                            if echo "$file" | grep -q "proxy-host-${hostNum}_access.log"; then
+                                pressOn=1
+                                break
+                            fi
+                        done
+                        unset IFS
+                    else
+                        pressOn=1
+                    fi
+
+                    if [[ $pressOn == 1 ]]; then
+                        if [ -e "$file" ] && [ -r "$file" ]; then
+                            echo -e "\tFile $file exists and is readable"
+                            ((goan_archive_detail_log_count++))
+                            zcat -f ${file} >> ${archive_log}
+                        elif [ -e "$file_path" ]; then
+                            echo -e "\tFile $file exists but is not readable"
                         else
-                            echo -ne ' \t '
-                            echo "Filename: $file | $R"
+                            echo -e "\tFile $file does not exist"
                         fi
-                    else
-                        echo -ne ' \t '
-                        echo "Filename: $file | Not a file"
                     fi
                 done
                 unset IFS
 
-                echo -e "\tAdded (${goan_archive_log_count}) proxy archived logs from ${goan_log_path}..."
-                zcat -f ${goan_log_path}/proxy-host-*_access.log*.gz > ${archive_log}
+                echo -e "\n\tAdded (${goan_archive_detail_log_count}) proxy archived logs from ${goan_log_path}..."
+                
             else
-                echo -e "\tNo archived logs found at ${goan_log_path}..."
+                echo -e "\n\tNo archived logs found at ${goan_log_path}..."
             fi
         fi
 

assests/goaccess/goaccess-1.7.tar.gz

@@ -8,7 +8,7 @@ source $(dirname "$0")/logs/traefik.sh
 source $(dirname "$0")/logs/custom.sh
 source $(dirname "$0")/logs/ncsa_combined.sh
 
-goan_version="GOAN v1.1.13"
+goan_version="GOAN v1.1.14"
 goan_log_path="/opt/log"
 
 goaccess_ping_interval=15