release v2.4.0 merge

Author: smilebasti

Dockerfile

@@ -7,7 +7,7 @@ RUN mkdir -p /root/.config/NPMGRAF
 
 ## install curl for slim image
 RUN apt-get update && apt-get install -y \
-    curl \
+    curl gcc \
     && rm -rf /var/lib/apt/lists/*
 
 COPY requirements.txt /root/.config/NPMGRAF/requirements.txt
@@ -30,3 +30,6 @@ COPY start.sh /root/start.sh
 RUN chmod +x  /root/start.sh
 
 ENTRYPOINT ["/root/start.sh"]
+
+
+

Getipinfo.py

@@ -5,7 +5,10 @@
 measurement_name = (sys.argv[5]) # get measurement from argv
 print ('Measurement-name: '+measurement_name) 
 
-# argv1 = outsideip, agrv2 = Domain, argv3 length, argv4 tragetip
+# argv1 = outsideip, agrv2 = Domain, argv3 length, argv4 tragetip, sys.argv[5] bucketname, sys.argv[6] date, sys.argv[7] asn
+
+
+asn = str(sys.argv[7])
 
 import geoip2.database
 import socket 
@@ -27,20 +30,22 @@
 Target = str(sys.argv[4])
 reader.close()
 
-reader = geoip2.database.Reader('/geolite/GeoLite2-ASN.mmdb')
-response = reader.asn(str(sys.argv[1]))
-Asn = response.autonomous_system_organization
-reader.close()
+if asn =='true':
+    reader = geoip2.database.Reader('/geolite/GeoLite2-ASN.mmdb')
+    response = reader.asn(str(sys.argv[1]))
+    Asn = response.autonomous_system_organization
+    reader.close()
 
 # print to log
 print (Country)
 print (State)
 print (City)
 print (Zip)
-print (Asn)
 print (Long)
 print (Lat)
 print (ISO)
+if asn =='true':
+    print (Asn)
 print ('Outside IP: ', IP)
 print ('Target IP: ', Target)
 print ('Domain: ', Domain)
@@ -110,7 +115,8 @@
 point.tag("Name", Country)
 point.tag("IP", IP),
 point.tag("Target", Target)
-point.tag("Asn", Asn)
+if asn =='true':
+    point.tag("Asn", Asn)
 
 point.field("Domain", Domain)
 point.field("latitude", Lat)
@@ -120,7 +126,8 @@
 point.field("key", ISO)
 point.field("IP", IP)
 point.field("Target", Target)
-point.field("Asn", Asn)
+if asn =='true':
+    point.field("Asn", Asn)
 point.field("Name", Country)
 point.field("duration", duration)
 point.field("metric", 1)

changelog.md

@@ -4,11 +4,15 @@
 - Get lenght and device
 - grafana more internal panels and plain numbers
 
-- use alpine as base image
 ### Not planned features
 - maybe analys fallback/default/error logs
 - grafan 10.1 missle map (route feature only one and not multiple possible)
 
+## v2.4.0
+- add ASN as optional feature see #32 and #33 thanks to @maxdd
+- added ASN to Grafana
+- added no filter Grafana Dashboard #20121
+
 ## v2.3.2
 - Grafana Dashboard added Filter
 - Fix spelling in Readme

docker-compose.yml

@@ -37,7 +37,7 @@ services:
       - ./mysql:/var/lib/mysql
 
   npmgraf:
-    image: smilebasti/npmgrafstats:latest # set tag to 'latest-arm' for arm/v7 and arm64 image
+    image: smilebasti/npmgrafstats:latest # change to ghcr.io/smilebasti/npmgrafstats if you prefer Github Container Registry
     restart: unless-stopped
     environment:
       REDIRECTION_LOGS: '<set TRUE or FALSE or ONLY>' # TRUE or FALSE or ONLY
@@ -76,7 +76,7 @@ services:
     environment:
       GEOIPUPDATE_ACCOUNT_ID: '<replace>'
       GEOIPUPDATE_LICENSE_KEY: '<replace>'
-      GEOIPUPDATE_EDITION_IDS: 'GeoLite2-City GeoLite2-ASN'
+      GEOIPUPDATE_EDITION_IDS: 'GeoLite2-City  GeoLite2-ASN'  #GeoLite2-ASN is optional
       GEOIPUPDATE_FREQUENCY: 24
     volumes:
       - ./geolite:/usr/share/GeoIP