Merge pull request #43 from humanmade/analytics-support

Add full config for analytics and increase memlimit on elasticsearch
humanmade · Jul 26, 2019 · 81c3f06 · 81c3f06
2 parents 2a9db53 + a6ad90a
commit 81c3f06
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -46,8 +46,8 @@ x-php: &php
     S3_UPLOADS_REGION: not-needed
     TACHYON_URL: https://${COMPOSE_PROJECT_NAME:-default}.altis.dev/tachyon
     PHP_SENDMAIL_PATH: /usr/sbin/sendmail -t -i -S mailhog:1025
-    HM_ANALYTICS_PINPOINT_ENDPOINT: https://pinpoint-${COMPOSE_PROJECT_NAME:-default}.altis.dev
-    HM_ANALYTICS_COGNITO_ENDPOINT: https://cognito-${COMPOSE_PROJECT_NAME:-default}.altis.dev
+    ALTIS_ANALYTICS_PINPOINT_ENDPOINT: https://pinpoint-${COMPOSE_PROJECT_NAME:-default}.altis.dev
+    ALTIS_ANALYTICS_COGNITO_ENDPOINT: https://cognito-${COMPOSE_PROJECT_NAME:-default}.altis.dev
 
 x-analytics: &analytics
   ports:
@@ -118,8 +118,7 @@ services:
       memlock:
         soft: -1
         hard: -1
-    mem_limit: "768m"
-    memswap_limit: "768m"
+    mem_limit: 1g
     volumes:
       - es-data:/usr/share/elasticsearch/data
     ports:

diff --git a/inc/namespace.php b/inc/namespace.php
@@ -68,7 +68,11 @@ function bootstrap() {
 	}
 
 	if ( $config['analytics'] ) {
-		define( 'HM_ANALYTICS_PINPOINT_ENDPOINT', getenv( 'HM_ANALYTICS_PINPOINT_ENDPOINT' ) );
-		define( 'HM_ANALYTICS_COGNITO_ENDPOINT', getenv( 'HM_ANALYTICS_COGNITO_ENDPOINT' ) );
+		define( 'ALTIS_ANALYTICS_PINPOINT_ID', '12345678901234567890123456' );
+		define( 'ALTIS_ANALYTICS_PINPOINT_REGION', 'us-east-1' );
+		define( 'ALTIS_ANALYTICS_COGNITO_ID', 'us-east-1:f6f6f6-fafa-f5f5-8f8f-1234567890' );
+		define( 'ALTIS_ANALYTICS_COGNITO_REGION', 'us-east-1' );
+		define( 'ALTIS_ANALYTICS_PINPOINT_ENDPOINT', getenv( 'ALTIS_ANALYTICS_PINPOINT_ENDPOINT' ) );
+		define( 'ALTIS_ANALYTICS_COGNITO_ENDPOINT', getenv( 'ALTIS_ANALYTICS_COGNITO_ENDPOINT' ) );
 	}
 }