v1.1.4 (#79)

- GoAccess version: 1.6.2 
- GeoLite2-City.mmdb  (2022-08-02)
- For future use but built into v1.1.4
     - Added second GoAccess alternate for use when debugging, builds with debugging on
     - DEBUG flag will turn on additional GoAccess debugging

Author: xavier-hernandez

Dockerfile

@@ -6,10 +6,22 @@ RUN apk add --no-cache \
         ncurses-dev \
         musl-libintl
 
+# download goaccess
+WORKDIR /goaccess-temp
+RUN wget https://tar.goaccess.io/goaccess-1.6.2.tar.gz
+
+# set up goacess-debug
+WORKDIR /goaccess-debug
+RUN cp /goaccess-temp/goaccess-1.6.2.tar.gz .
+RUN tar --strip-components=1  -xzvf goaccess-1.6.2.tar.gz
+RUN ./configure --enable-utf8 --enable-geoip=mmdb --with-getline --enable-debug
+RUN make
+RUN make install
+
 # set up goacess
 WORKDIR /goaccess
-RUN wget https://tar.goaccess.io/goaccess-1.6.tar.gz
-RUN tar --strip-components=1  -xzvf goaccess-1.6.tar.gz
+RUN cp /goaccess-temp/goaccess-1.6.2.tar.gz .
+RUN tar --strip-components=1  -xzvf goaccess-1.6.2.tar.gz
 RUN ./configure --enable-utf8 --enable-geoip=mmdb --with-getline
 RUN make
 RUN make install
@@ -28,14 +40,19 @@ RUN apk add --no-cache \
     rm -rf /var/lib/apt/lists/* && \
     rm /etc/nginx/nginx.conf
 
+COPY --from=builder /goaccess-debug /goaccess-debug
 COPY --from=builder /goaccess /goaccess
+
 COPY /resources/goaccess/goaccess.conf /goaccess-config/goaccess.conf.bak
 COPY /resources/goaccess/GeoLite2-City.mmdb /goaccess-config/GeoLite2-City.mmdb
 
 # set up nginx
 COPY /resources/nginx/nginx.conf /etc/nginx/nginx.conf
 ADD /resources/nginx/.htpasswd /opt/auth/.htpasswd
 
+# goaccess logs
+WORKDIR /goaccess-logs
+
 WORKDIR /goan
 ADD /resources/scripts/funcs funcs
 ADD /resources/scripts/logs logs

resources/goaccess/GeoLite2-City.mmdb

@@ -39,11 +39,6 @@ function custom_init(){
     fi
 }
 
-function custom_instance(){
-    echo -e "\nRUN CUSTOM GOACCESS"
-    /goaccess/goaccess --no-global-config --config-file=${goan_config} &
-}
-
 function custom(){
     custom_init
 
@@ -59,5 +54,11 @@ function custom(){
     echo "Custom instance processing: (might take some time depending on the number of files to parse)" >> ${nginx_html}
     echo "<br/></p></body></html>" >> ${nginx_html}
 
-    custom_instance
+    echo -e "\nRUN CUSTOM GOACCESS"
+    if [[ "${DEBUG}" == "True" ]]; then
+        /goaccess-debug/goaccess --debug-file=${goaccess_debug_file} --invalid-requests=${goaccess_invalid_file} --no-global-config --config-file=${goan_config} &
+    else
+        /goaccess/goaccess --no-global-config --config-file=${goan_config} &
+    fi
+
 }

resources/scripts/logs/custom.sh

@@ -33,11 +33,6 @@ function npm_init(){
     fi
 }
 
-function npm_instance(){
-    echo -e "\nRUN NPM GOACCESS"
-    /goaccess/goaccess --no-global-config --config-file=${goan_config} &
-}
-
 function npm_goaccess_config(){
     echo -e "\n\n\n" >> ${goan_config}
     echo "######################################" >> ${goan_config}
@@ -153,5 +148,10 @@ function npm(){
     echo "Logs processing: $(($goan_log_count + $goan_archive_log_count)) (might take some time depending on the number of files to parse)" >> ${nginx_html}
     echo "<br/></p></body></html>" >> ${nginx_html}
 
-    npm_instance
+    echo -e "\nRUN NPM GOACCESS"
+    if [[ "${DEBUG}" == "True" ]]; then
+        /goaccess-debug/goaccess --debug-file=${goaccess_debug_file} --invalid-requests=${goaccess_invalid_file} --no-global-config --config-file=${goan_config} &
+    else
+        /goaccess/goaccess --no-global-config --config-file=${goan_config} &
+    fi
 }

resources/scripts/logs/npm.sh

@@ -33,10 +33,6 @@ function npm_redirect_init(){
     fi
 }
 
-function npm_redirect_instance(){
-    echo -e "\nRUN NPM REDIRECT GOACCESS"
-    /goaccess/goaccess --no-global-config --config-file=${goan_config} &
-}
 
 function npm_redirect_goaccess_config(){
     echo -e "\n\n\n" >> ${goan_config}
@@ -153,5 +149,10 @@ function npm_redirect(){
     echo "Logs processing: $(($goan_log_count + $goan_archive_log_count)) (might take some time depending on the number of files to parse)" >> ${nginx_html}
     echo "<br/></p></body></html>" >> ${nginx_html}
 
-    npm_redirect_instance
+    echo -e "\nRUN NPM REDIRECT GOACCESS"
+    if [[ "${DEBUG}" == "True" ]]; then
+        /goaccess-debug/goaccess --debug-file=${goaccess_debug_file} --invalid-requests=${goaccess_invalid_file} --no-global-config --config-file=${goan_config} &
+    else
+        /goaccess/goaccess --no-global-config --config-file=${goan_config} &
+    fi
 }

resources/scripts/logs/npm_redirection.sh

@@ -33,11 +33,6 @@ function traefik_init(){
     fi
 }
 
-function traefik_instance(){
-    echo -e "\nRUN TRAEFIK GOACCESS"
-    /goaccess/goaccess --no-global-config --config-file=${goan_config} &
-}
-
 function traefik_goaccess_config(){
     echo -e "\n\n\n" >> ${goan_config}
     echo "######################################" >> ${goan_config}
@@ -122,5 +117,10 @@ function traefik(){
     echo "Logs processing: $(($goan_log_count)) (might take some time depending on the number of files to parse)" >> ${nginx_html}
     echo "<br/></p></body></html>" >> ${nginx_html}
 
-    traefik_instance
+    echo -e "\nRUN TRAEFIK GOACCESS"
+    if [[ "${DEBUG}" == "True" ]]; then
+        /goaccess-debug/goaccess --debug-file=${goaccess_debug_file} --invalid-requests=${goaccess_invalid_file} --no-global-config --config-file=${goan_config} &
+    else
+        /goaccess/goaccess --no-global-config --config-file=${goan_config} &
+    fi
 }

resources/scripts/logs/traefik.sh

@@ -6,9 +6,13 @@ source $(dirname "$0")/logs/npm_redirection.sh
 source $(dirname "$0")/logs/traefik.sh
 source $(dirname "$0")/logs/custom.sh
 
-goan_version="GOAN v1.1.3"
+goan_version="GOAN v1.1.4"
 goan_log_path="/opt/log"
 
+goaccess_ping_interval=15
+goaccess_debug_file=/goaccess-logs/goaccess.debug
+goaccess_invalid_file=/goaccess-logs/goaccess.invalid
+
 echo -e "\n${goan_version}\n"
 
 ### NGINX