Integrate with MaxMind out of the box

getsentry · Dec 9, 2020 · ab60a98 · ab60a98
1 parent f885ece
commit ab60a98
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 2 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -30,6 +30,7 @@ x-sentry-defaults: &sentry_defaults
     SENTRY_EVENT_RETENTION_DAYS:
   volumes:
     - 'sentry-data:/data'
+    - 'sentry-geoip:/geoip'
     - './sentry:/etc/sentry'
 x-snuba-defaults: &snuba_defaults
   << : *restart_policy
@@ -126,6 +127,18 @@ services:
       # If you have high volume and your search return incomplete results
       # You might want to change this to a higher value (and ensure your host has enough memory)
       MAX_MEMORY_USAGE_RATIO: 0.3
+  geoipupdate:
+    << : *restart_policy
+    image: 'maxmindinc/geoipupdate:latest'
+    environment:
+      GEOIPUPDATE_FREQUENCY: 168  # one week, in hours
+      GEOIPUPDATE_EDITION_IDS: GeoLite2-City
+      # Set the following (e.g., via docker-compose.override.yml) to enable IP geolocation.
+      # See https://develop.sentry.dev/self-hosted/geolocation/.
+      GEOIPUPDATE_ACCOUNT_ID:
+      GEOIPUPDATE_LICENSE_KEY:
+    volumes:
+      - 'sentry-geoip:/usr/share/GeoIP'
   snuba-api:
     << : *snuba_defaults
   # Kafka consumer responsible for feeding events into Clickhouse
@@ -233,6 +246,7 @@ services:
         read_only: true
         source: ./relay
         target: /work/.relay
+      - 'sentry-geoip:/geoip'
     depends_on:
       - kafka
       - redis
@@ -251,6 +265,8 @@ volumes:
     external: true
   sentry-symbolicator:
     external: true
+  sentry-geoip:
+    external: true
   sentry-secrets:
   sentry-smtp:
   sentry-zookeeper-log:

diff --git a/nginx/nginx.conf b/nginx/nginx.conf
@@ -44,8 +44,8 @@ http {
 	# it could be "close" to close a keepalive connection
 	proxy_set_header Connection '';
 	proxy_set_header Host $host;
-	proxy_set_header X-Real-IP $remote_addr;
-	proxy_set_header X-Forwarded-For $remote_addr;
+	proxy_set_header X-Real-IP $proxy_add_x_forwarded_for;
+	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 	proxy_set_header X-Forwarded-Proto $scheme;
 	proxy_set_header X-Request-Id $request_id;
 	proxy_read_timeout 30s;

diff --git a/relay/config.example.yml b/relay/config.example.yml
@@ -10,3 +10,4 @@ processing:
     - {name: "bootstrap.servers", value: "kafka:9092"}
     - {name: "message.max.bytes", value: 50000000} #50MB or bust
   redis: redis://redis:6379
+  geoip_path: "/geoip/GeoIP2-City.mmdb"
diff --git a/sentry/sentry.conf.example.py b/sentry/sentry.conf.example.py
@@ -260,6 +260,12 @@ def get_internal_network():
     }
 )
 
+#######################
+# MaxMind Integration #
+######################
+
+GEOIP_PATH_MMDB = '/geoip/GeoIP2-City.mmdb'
+
 #########################
 # Bitbucket Integration #
 ########################