simono41/geoip2influx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9 from wollsi/master

Browse source 
added ip types for IPv6 addresses
This commit is contained in:
GilbN 2021-10-06 19:18:35 +02:00 committed by GitHub
commit b3dcebf20a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
geoip2influx.py
View file

@ -36,6 +36,10 @@ g2i_log_path = env.get('GEOIP2INFLUX_LOG_PATH','/config/log/geoip2influx/geoip2i
# Logging # Logging
logging.basicConfig(level=log_level,format='GEOIP2INFLUX %(asctime)s :: %(levelname)s :: %(message)s',datefmt='%d/%b/%Y %H:%M:%S',handlers=[logging.StreamHandler(),logging.FileHandler(g2i_log_path)]) logging.basicConfig(level=log_level,format='GEOIP2INFLUX %(asctime)s :: %(levelname)s :: %(message)s',datefmt='%d/%b/%Y %H:%M:%S',handlers=[logging.StreamHandler(),logging.FileHandler(g2i_log_path)])
# global variables
monitored_ip_types = ['PUBLIC', 'ALLOCATED APNIC', 'ALLOCATED ARIN', 'ALLOCATED RIPE NCC', 'ALLOCATED LACNIC', 'ALLOCATED AFRINIC']
def regex_tester(log_path, N): def regex_tester(log_path, N):
time_out = time() + 60 time_out = time() + 60
re_ipv4 = compile(r'(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})') re_ipv4 = compile(r'(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})')
@ -196,7 +200,7 @@ def logparse(
f'Line: {line}' f'Line: {line}'
) )
continue continue
if ipadd(ip).iptype() == 'PUBLIC' and ip: if ipadd(ip).iptype() in monitored_ip_types and ip:
info = gi.city(ip) info = gi.city(ip)
if info is not None: if info is not None:
geohash = encode(info.location.latitude, info.location.longitude) geohash = encode(info.location.latitude, info.location.longitude)
@ -226,7 +230,7 @@ def logparse(
if send_logs: if send_logs:
data = search(log, line) data = search(log, line)
if ipadd(ip).iptype() == 'PUBLIC' and ip: if ipadd(ip).iptype() in monitored_ip_types and ip:
info = gi.city(ip) info = gi.city(ip)
if info is not None: if info is not None:
datadict = data.groupdict() datadict = data.groupdict()