Unifica config en compose, añade var. AWS para S3 (2e611122) · Commits · REDMIC Project / Elastic / Elasticsearch

.gitlab-ci.yml

+14 −1

Original line number	Diff line number	Diff line
		@@ -113,11 +113,16 @@ deploy-supporting-branch:
		ELASTIC_USER: ${DEV_ELASTIC_USER}
		ELASTIC_USER_PASS: ${DEV_ELASTIC_USER_PASS}
		ELASTIC_USER_ROLE: ${DEV_ELASTIC_USER_ROLE}
		AWS_ACCESS_KEY_ID: ${DEV_AWS_ACCESS_KEY_ID}
		AWS_SECRET_ACCESS_KEY: ${DEV_AWS_SECRET_ACCESS_KEY}
		ES_PLUGINS: ${DEV_ES_PLUGINS}
		script:
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		OLD_ELASTIC_ADMIN_PASS=${OLD_ELASTIC_ADMIN_PASS} ELASTIC_ADMIN_PASS=${ELASTIC_ADMIN_PASS}
		ELASTIC_USER=${ELASTIC_USER} ELASTIC_USER_PASS=${ELASTIC_USER_PASS} ELASTIC_USER_ROLE=${ELASTIC_USER_ROLE}
		ES_PLUGINS=${ES_PLUGINS} AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
		AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
		environment:
		name: dev
		only:
		@@ -140,6 +145,9 @@ deploy-pro:
		ELASTIC_USER: ${PRO_ELASTIC_USER}
		ELASTIC_USER_PASS: ${PRO_ELASTIC_USER_PASS}
		ELASTIC_USER_ROLE: ${PRO_ELASTIC_USER_ROLE}
		AWS_ACCESS_KEY_ID: ${PRO_AWS_ACCESS_KEY_ID}
		AWS_SECRET_ACCESS_KEY: ${PRO_AWS_SECRET_ACCESS_KEY}
		ES_PLUGINS: ${PRO_ES_PLUGINS}
		script:
		- create-nets.sh elastic-net
		- >
		@@ -150,6 +158,8 @@ deploy-pro:
		AWS_REGION=${AWS_REGION} OLD_ELASTIC_ADMIN_PASS=${OLD_ELASTIC_ADMIN_PASS}
		ELASTIC_ADMIN_PASS=${ELASTIC_ADMIN_PASS} ELASTIC_USER=${ELASTIC_USER}
		ELASTIC_USER_PASS=${ELASTIC_USER_PASS} ELASTIC_USER_ROLE=${ELASTIC_USER_ROLE}
		ES_PLUGINS=${ES_PLUGINS} AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
		AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
		- >
		export SERVICES_TO_CHECK=elastic_${CI_PROJECT_NAME}-2
		COMPOSE_FILE=docker-compose.${CI_PROJECT_NAME}-2.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-2.prod.yml
		@@ -158,6 +168,8 @@ deploy-pro:
		AWS_REGION=${AWS_REGION} OLD_ELASTIC_ADMIN_PASS=${OLD_ELASTIC_ADMIN_PASS}
		ELASTIC_ADMIN_PASS=${ELASTIC_ADMIN_PASS} ELASTIC_USER=${ELASTIC_USER}
		ELASTIC_USER_PASS=${ELASTIC_USER_PASS} ELASTIC_USER_ROLE=${ELASTIC_USER_ROLE}
		ES_PLUGINS=${ES_PLUGINS} AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
		AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
		- >
		export SERVICES_TO_CHECK=elastic_${CI_PROJECT_NAME}-3
		COMPOSE_FILE=docker-compose.${CI_PROJECT_NAME}-3.tmpl.yml:docker-compose.${CI_PROJECT_NAME}-3.prod.yml
		@@ -166,7 +178,8 @@ deploy-pro:
		AWS_REGION=${AWS_REGION} OLD_ELASTIC_ADMIN_PASS=${OLD_ELASTIC_ADMIN_PASS}
		ELASTIC_ADMIN_PASS=${ELASTIC_ADMIN_PASS} ELASTIC_USER=${ELASTIC_USER}
		ELASTIC_USER_PASS=${ELASTIC_USER_PASS} ELASTIC_USER_ROLE=${ELASTIC_USER_ROLE}
		ES_PLUGINS=${ES_PLUGINS} AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
		ES_PLUGINS=${ES_PLUGINS} AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
		AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
		environment:
		name: pro
		only:

deploy/.env

+1 −0

Original line number	Diff line number	Diff line
		@@ -2,3 +2,4 @@ PORT1=9200
		PORT2=9300
		ELASTIC_USER=user
		ELASTIC_USER_PASS=pass
		ES_PLUGINS=repository-s3

deploy/docker-compose.elasticsearch-1.dev.yml

+0 −13

Original line number	Diff line number	Diff line
		@@ -15,19 +15,6 @@ services:
		- target: ${PORT2}
		published: ${PORT2}
		mode: host
		deploy:
		mode: replicated
		replicas: 1
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '1'
		memory: 1G
		reservations:
		memory: 820M

		volumes:
		elasticsearch-vol:

deploy/docker-compose.elasticsearch-1.prod.yml

+0 −12

Original line number	Diff line number	Diff line
		@@ -9,22 +9,10 @@ services:
		- ES_DISCOVERY_ZEN_PING_UNICAST_HOSTS=['elasticsearch-1', 'elasticsearch-2', 'elasticsearch-3']
		- USER_MANAGEMENT_DELAY=200
		deploy:
		mode: replicated
		replicas: 1
		placement:
		constraints:
		- node.role == worker
		- engine.labels.availability_zone == ${AWS_REGION}a
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '1'
		memory: 2G
		reservations:
		memory: 1639M

		volumes:
		elasticsearch-vol:

deploy/docker-compose.elasticsearch-1.tmpl.yml

+15 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,21 @@ services:
		- ELASTIC_USER
		- ELASTIC_USER_PASS
		- ELASTIC_USER_ROLE
		- AWS_ACCESS_KEY_ID
		- AWS_SECRET_ACCESS_KEY
		deploy:
		mode: replicated
		replicas: 1
		restart_policy:
		condition: on-failure
		delay: 1m
		window: 3m
		resources:
		limits:
		cpus: '1'
		memory: 1G
		reservations:
		memory: 820M
		#healthcheck:
		#test: >
		#status=$$(curl --write-out %{http_code} --silent --output /dev/null -u "${ELASTIC_USER}:${ELASTIC_USER_PASS}" localhost:${PORT1}/_cluster/health);