100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Improve CloudWatch logs in CloudFormation template
Michal Rutka6c157e105766
diff --git a/mvp/aws-cloudformation.template.yml b/mvp/aws-cloudformation.template.ymlindex 3996741cb..544249e07 100644--- a/mvp/aws-cloudformation.template.yml+++ b/mvp/aws-cloudformation.template.yml@@ -229,13 +229,6 @@ Resources:- "\n"- "log_stream_name = {instance_id}/cfn-wire.log\n"- "datetime_format = \n"- - "[/var/log/docker]\n"- - "file = /var/log/docker.log\n"- - 'log_group_name = '- - !Ref 'CloudFormationLogs'- - "\n"- - "log_stream_name = {instance_id}/docker.log\n"- - "datetime_format = %d/%b/%Y:%H:%M:%S\n"mode: '000444'owner: rootgroup: root@@ -338,9 +331,8 @@ Resources:export PASSWORD=${OpenRemotePassword}export EMAIL_USER=${AccessKeys}export EMAIL_PASSWORD=$(or configure_aws --secret ${AccessKeys.SecretAccessKey} --quiet)- export EMAIL_HOST=email-smtp.eu-west-1.amazonaws.com+ export EMAIL_HOST=email-smtp.${AWS::Region}.amazonaws.comdocker-compose -f mvp-docker-compose.yml -p openremote up -d- docker-compose -f mvp-docker-compose.yml -p openremote logs --no-color -f &> /var/log/docker.log &echo USER=${AccessKeys} > access.txtecho SECRET=${AccessKeys.SecretAccessKey} >> access.txtecho export EMAIL_PASSWORD=$(or configure_aws --secret ${AccessKeys.SecretAccessKey} --quiet) >> access.txtdiff --git a/mvp/mvp-docker-compose.yml b/mvp/mvp-docker-compose.ymlindex 91dec2379..0c0079386 100644--- a/mvp/mvp-docker-compose.yml+++ b/mvp/mvp-docker-compose.yml@@ -26,6 +26,14 @@ volumes:postgresql-data:deployment-data:+x-app: &awslogs+ logging:+ driver: awslogs+ options:+ awslogs-region: ${AWS_REGION:-eu-west-1}+ awslogs-group: ${DEPLOYMENT_NAME:-openremote}+ awslogs-create-group: 'true'+services:proxy:image: openremote/proxy:${PROXY_VERSION:-2.1.2.3}@@ -58,6 +66,7 @@ services:environment:DOMAINNAME: ${DOMAINNAME:-localhost}LE_EMAIL: admin@${DOMAINNAME}+ <<: *awslogsmanager:image: openremote/manager:${MANAGER_VERSION:-latest}@@ -91,6 +100,7 @@ services:SETUP_EMAIL_PORT: ${SETUP_EMAIL_PORT:-587}SETUP_EMAIL_FROM_KEYCLOAK: no-reply@${DOMAINNAME}SETUP_EMAIL_FROM_DEFAULT: admin@${DOMAINNAME}+ <<: *awslogskeycloak:image: openremote/keycloak:${KEYCLOAK_VERSION:-13.0.1.0}@@ -116,6 +126,7 @@ services:environment:KEYCLOAK_PASSWORD: ${PASSWORD:-secret}KEYCLOAK_FRONTEND_URL: "${EXTERNAL_URL:-https://localhost}/auth"+ <<: *awslogspostgresql:image: openremote/postgresql:${POSTGRESQL_VERSION:-9.6.21.0}@@ -135,3 +146,4 @@ services:delay: 20mvolumes:- postgresql-data:/var/lib/postgresql/data+ <<: *awslogs