Skip to content

Commit 8101159

Browse files
v1.1.21
- new maxmind dbs, 09/09/2023 - added LOG_TYPE_FILE_PATTERN to TRAEFIK - added processing the log even if there is an error - changed version number - updated readme
1 parent 5dc8ac7 commit 8101159

File tree

7 files changed

+12
-5
lines changed

7 files changed

+12
-5
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN make install
2323
WORKDIR /goaccess
2424
RUN cp /goaccess-temp/goaccess.tar.gz .
2525
RUN tar --strip-components=1 -xzvf goaccess.tar.gz
26-
RUN sed -i "s/GWSocket<\/a>/GWSocket<\/a> ( <a href='https:\/\/tiny.one\/xgoan'>GOAN<\/a> <span>v1.1.19<\/span> )/" /goaccess/resources/tpls.html
26+
RUN sed -i "s/GWSocket<\/a>/GWSocket<\/a> ( <a href='https:\/\/tiny.one\/xgoan'>GOAN<\/a> <span>v1.1.20<\/span> )/" /goaccess/resources/tpls.html
2727
RUN sed -i "s/bottom: 190px/bottom: 260px/" /goaccess/resources/css/app.css
2828
RUN ./configure --enable-utf8 --enable-geoip=mmdb --with-getline
2929
RUN make

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ services:
9797
| `-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 |
9898
| `-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. |
9999
| `-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.|
100-
| `-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! |
100+
| `-e LOG_TYPE_FILE_PATTERN=` | (Optional) Only to be used with LOG_TYPE=NCSA_COMBINED or TRAEFIK. 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! |
101101
| `-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|
102102

103103

assests/maxmind/GeoLite2-ASN.mmdb

-37.9 KB
Binary file not shown.

assests/maxmind/GeoLite2-City.mmdb

6 MB
Binary file not shown.
-17.6 KB
Binary file not shown.

resources/scripts/logs/traefik.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,14 @@ function traefik(){
6060

6161
echo -e "\n\tAdding proxy logs..."
6262
IFS=$'\n'
63-
for file in $(find "${goan_log_path}" -name 'access.log');
63+
64+
if [[ -z "${LOG_TYPE_FILE_PATTERN}" ]]; then
65+
LOG_TYPE_FILE_PATTERN="access.log"
66+
else
67+
LOG_TYPE_FILE_PATTERN="*.log"
68+
fi
69+
70+
for file in $(find "${goan_log_path}" -name "${LOG_TYPE_FILE_PATTERN}");
6471
do
6572
if [ -f $file ]
6673
then
@@ -114,6 +121,6 @@ function traefik(){
114121
if [[ "${DEBUG}" == "True" ]]; then
115122
/goaccess-debug/goaccess --debug-file=${goaccess_debug_file} --invalid-requests=${goaccess_invalid_file} --no-global-config --config-file=${goan_config} &
116123
else
117-
/goaccess/goaccess --no-global-config --config-file=${goan_config} &
124+
/goaccess/goaccess --num-tests=0 --no-global-config --config-file=${goan_config} &
118125
fi
119126
}

resources/scripts/start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ source $(dirname "$0")/logs/traefik.sh
88
source $(dirname "$0")/logs/custom.sh
99
source $(dirname "$0")/logs/ncsa_combined.sh
1010

11-
goan_version="GOAN v1.1.19"
11+
goan_version="GOAN v1.1.20"
1212
goan_log_path="/opt/log"
1313

1414
goaccess_ping_interval=15

0 commit comments

Comments
 (0)