Merge branch 'master' of https://github.com/gilbN/geoip2influx

Dockerfile

@@ -8,6 +8,7 @@ echo " ## Installing packages ## " && \
 apk add --no-cache --virtual=build-dependencies \
     python3 \
     py3-pip \
+    logrotate \
     libmaxminddb && \
 echo " ## Installing python modules ## " && \
 pip3 install --no-cache-dir -r requirements.txt

README.md

@@ -35,8 +35,8 @@ Add the ones that differ on your system.
 | LOG_MEASUREMENT | nginx_access_logs | InfluxDB measurement name for nginx logs. Optional, defaults to the example. |
 | SEND_NGINX_LOGS | true | Set to `false` to disable nginx logs. Optional, defaults to `true`. |
 | GEOIP2INFLUX_LOG_LEVEL | info | Sets the log level in geoip2influx.log. Use `debug` for verbose logging Optional, defaults to info. |
-| INFLUX_RETENTION | 30d | Sets the retention for the database. Optional, defaults to example.|
-| INFLUX_SHARD | 2d | Set the shard for the database. Optional, defaults to example. |
+| INFLUX_RETENTION | 7d | Sets the retention for the database. Optional, defaults to example.|
+| INFLUX_SHARD | 1d | Set the shard for the database. Optional, defaults to example. |
 | MAXMINDDB_LICENSE_KEY | xxxxxxx | Add your Maxmind licence key |
 
 

geoip2influx.py

@@ -40,8 +40,8 @@ influxdb_port = env.get('INFLUX_HOST_PORT', '8086')
 influxdb_database = env.get('INFLUX_DATABASE', 'geoip2influx')
 influxdb_user = env.get('INFLUX_USER', 'root')
 influxdb_user_pass = env.get('INFLUX_PASS', 'root')
-influxdb_retention = env.get('INFLUX_RETENTION','30d')
-influxdb_shard = env.get('INFLUX_SHARD', '2d')
+influxdb_retention = env.get('INFLUX_RETENTION','7d')
+influxdb_shard = env.get('INFLUX_SHARD', '1d')
 geo_measurement = env.get('GEO_MEASUREMENT', 'geoip2influx')
 log_measurement = env.get('LOG_MEASUREMENT', 'nginx_access_logs')
 send_nginx_logs = env.get('SEND_NGINX_LOGS','true')

requirements.txt

@@ -1,4 +1,4 @@
-geoip2
-geohash2
-influxdb
-IPy
+geoip2==3.0.0
+geohash2==1.1
+influxdb==5.3.0
+IPy==1.0