Actualiza config y deploy para adaptarse a v6.5.x (ab044240) · Commits · REDMIC Project / Elastic / Kibana

.env

+1 −2

Original line number	Diff line number	Diff line
		ELASTICSEARCH_URL=http://elasticsearch:9200
		PORT=5601
		ELASTICSEARCH_URL=es-1
		ELASTICSEARCH_PORT=9200

.gitlab-ci.yml

+62 −25

Original line number	Diff line number	Diff line
		image: docker:stable

		stages:
		- deploy

		variables:
		IMAGE_NAME: docker.elastic.co/kibana/kibana
		IMAGE_TAG: '5.6.5'

		deploy-dev:
		stage: deploy
		image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest

		variables:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		IMAGE_TAG: '6.5.1'
		STACK: elastic
		SERVICES_TO_CHECK: elastic_${CI_PROJECT_NAME}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		ELASTIC_USER_PASS: ${DEV_ELASTIC_ADMIN_PASS}
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

		services:
		- docker:dind

		deploy-supporting-branch-develop:
		stage: deploy
		variables:
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		ELASTICSEARCH_URL: ${DEV_ELASTICSEARCH_URL}
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
		UI_AUTH: ${DEV_UI_AUTH}
		script:
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		ELASTIC_USER_PASS=${ELASTIC_USER_PASS} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} ELASTICSEARCH_URL=${ELASTICSEARCH_URL}
		PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} UI_AUTH=${UI_AUTH}
		environment:
		name: dev
		url: https://kibana.${DEV_PUBLIC_HOSTNAME}
		only:
		- dev
		- branches
		except:
		- master
		when: manual

		deploy-pro:
		deploy-stable-branch-develop:
		stage: deploy
		variables:
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		ELASTICSEARCH_URL: ${DEV_ELASTICSEARCH_URL}
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
		UI_AUTH: ${DEV_UI_AUTH}
		script:
		- >
		deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} ELASTICSEARCH_URL=${ELASTICSEARCH_URL}
		PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} UI_AUTH=${UI_AUTH}
		environment:
		name: dev
		url: https://kibana.${DEV_PUBLIC_HOSTNAME}
		only:
		- master
		when: manual

		deploy-supporting-branch-production:
		stage: deploy
		image: registry.gitlab.com/redmic-project/docker/docker-deploy:latest
		variables:
		DOCKER_DRIVER: overlay2
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		STACK: elastic
		SERVICES_TO_CHECK: elastic_${CI_PROJECT_NAME}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml
		ELASTIC_USER_PASS: ${PRO_ELASTIC_ADMIN_PASS}
		ELASTICSEARCH_URL: ${PRO_ELASTICSEARCH_URL}
		PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}
		services:
		- docker:dind
		UI_AUTH: ${PRO_UI_AUTH}
		script:
		- >
		deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} ELASTICSEARCH_URL=${ELASTICSEARCH_URL}
		PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} UI_AUTH=${UI_AUTH}
		environment:
		name: pro
		url: https://kibana.${PRO_PUBLIC_HOSTNAME}
		only:
		- branches
		except:
		- master
		when: manual

		deploy-stable-branch-production:
		stage: deploy
		variables:
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml
		ELASTICSEARCH_URL: ${PRO_ELASTICSEARCH_URL}
		PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}
		UI_AUTH: ${PRO_UI_AUTH}
		script:
		- >
		deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		ELASTIC_USER_PASS=${ELASTIC_USER_PASS} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} ELASTICSEARCH_URL=${ELASTICSEARCH_URL}
		PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME} UI_AUTH=${UI_AUTH}
		environment:
		name: pro
		url: https://kibana.${PRO_PUBLIC_HOSTNAME}

docker-compose.dev.yml

+0 −24

Original line number	Diff line number	Diff line
		version: '3.5'

		services:
		kibana:
		ports:
		- target: ${PORT}
		published: ${PORT}
		mode: host
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "${PORT}"
		traefik.docker.network: traefik-net
		traefik.frontend.rule: Host:kibana.${PUBLIC_HOSTNAME}
		traefik.backend: kibana
		restart_policy:
		delay: 1m
		window: 2m
		resources:
		limits:
		cpus: '0.5'
		memory: 1G
		reservations:
		memory: 820M

docker-compose.prod.yml

+0 −16

Original line number	Diff line number	Diff line
		@@ -3,22 +3,6 @@ version: '3.5'
		services:
		kibana:
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "${PORT}"
		traefik.docker.network: traefik-net
		traefik.frontend.rule: Host:kibana.${PUBLIC_HOSTNAME}
		traefik.backend: kibana
		placement:
		constraints:
		- node.role == worker
		restart_policy:
		delay: 1m
		window: 2m
		resources:
		limits:
		cpus: '0.5'
		memory: 1G
		reservations:
		memory: 820M

docker-compose.tmpl.yml

+23 −6

Original line number	Diff line number	Diff line
		@@ -2,17 +2,34 @@ version: '3.5'

		services:
		kibana:
		image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}
		image: docker.elastic.co/kibana/kibana:${IMAGE_TAG:-latest}
		environment:
		SERVER_NAME: kibana.${PUBLIC_HOSTNAME}
		ELASTICSEARCH_URL: http://${ELASTICSEARCH_URL}:${ELASTICSEARCH_PORT}
		ELASTICSEARCH_PASSWORD: "${ELASTIC_USER_PASS}"
		- SERVER_NAME=kibana.${PUBLIC_HOSTNAME}
		- ELASTICSEARCH_URL
		networks:
		- elastic-net
		- elastic6-net
		- traefik-net
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.docker.network: traefik-net
		traefik.frontend.auth.basic.users: ${UI_AUTH}
		traefik.frontend.rule: Host:kibana.${PUBLIC_HOSTNAME}
		traefik.backend: kibana
		traefik.port: "${PORT}"
		restart_policy:
		delay: 10s
		window: 2m
		resources:
		limits:
		cpus: '0.5'
		memory: 1G
		reservations:
		memory: 820M

		networks:
		elastic-net:
		elastic6-net:
		external: true

		traefik-net: