Omite publicación del servicio mediante Traefik (ee5a6561) · Commits · REDMIC Project / Elastic / Elasticsearch Exporter

.gitlab-ci.yml

+16 −24

Original line number	Diff line number	Diff line
		@@ -17,14 +17,12 @@ deploy-supporting-branch-develop:
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICES_TO_CHECK: ${STACK}_elasticsearch-exporter
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
		script:
		- >
		deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		UI_AUTH=${UI_AUTH} ES_USER=${ES_USER} ES_PASS=${ES_PASS} ES_HOST=${ES_HOST} ES_ALL=${ES_ALL}
		ES_CLUSTER_SETTINGS=${ES_CLUSTER_SETTINGS} ES_INDICES=${ES_INDICES} ES_INDICES_SETTINGS=${ES_INDICES_SETTINGS}
		ES_SHARDS=${ES_SHARDS} ES_SHARDS_SETTINGS=${ES_SHARDS_SETTINGS} ES_SNAPSHOTS=${ES_SNAPSHOTS}
		ES_TIMEOUT=${ES_TIMEOUT} ES_CLUSTERINFO_INTERVAL=${ES_CLUSTERINFO_INTERVAL}
		deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} ES_USER=${ES_USER} ES_PASS=${ES_PASS}
		ES_HOST=${ES_HOST} ES_ALL=${ES_ALL} ES_CLUSTER_SETTINGS=${ES_CLUSTER_SETTINGS} ES_INDICES=${ES_INDICES}
		ES_INDICES_SETTINGS=${ES_INDICES_SETTINGS} ES_SHARDS=${ES_SHARDS} ES_SHARDS_SETTINGS=${ES_SHARDS_SETTINGS}
		ES_SNAPSHOTS=${ES_SNAPSHOTS} ES_TIMEOUT=${ES_TIMEOUT} ES_CLUSTERINFO_INTERVAL=${ES_CLUSTERINFO_INTERVAL}
		environment:
		name: dev
		only:
		@@ -39,14 +37,12 @@ deploy-stable-branch-develop:
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICES_TO_CHECK: ${STACK}_elasticsearch-exporter
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
		script:
		- >
		deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		UI_AUTH=${UI_AUTH} ES_USER=${ES_USER} ES_PASS=${ES_PASS} ES_HOST=${ES_HOST} ES_ALL=${ES_ALL}
		ES_CLUSTER_SETTINGS=${ES_CLUSTER_SETTINGS} ES_INDICES=${ES_INDICES} ES_INDICES_SETTINGS=${ES_INDICES_SETTINGS}
		ES_SHARDS=${ES_SHARDS} ES_SHARDS_SETTINGS=${ES_SHARDS_SETTINGS} ES_SNAPSHOTS=${ES_SNAPSHOTS}
		ES_TIMEOUT=${ES_TIMEOUT} ES_CLUSTERINFO_INTERVAL=${ES_CLUSTERINFO_INTERVAL}
		deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} ES_USER=${ES_USER} ES_PASS=${ES_PASS}
		ES_HOST=${ES_HOST} ES_ALL=${ES_ALL} ES_CLUSTER_SETTINGS=${ES_CLUSTER_SETTINGS} ES_INDICES=${ES_INDICES}
		ES_INDICES_SETTINGS=${ES_INDICES_SETTINGS} ES_SHARDS=${ES_SHARDS} ES_SHARDS_SETTINGS=${ES_SHARDS_SETTINGS}
		ES_SNAPSHOTS=${ES_SNAPSHOTS} ES_TIMEOUT=${ES_TIMEOUT} ES_CLUSTERINFO_INTERVAL=${ES_CLUSTERINFO_INTERVAL}
		environment:
		name: dev
		only:
		@@ -59,14 +55,12 @@ deploy-supporting-branch-production:
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		SERVICES_TO_CHECK: ${STACK}_elasticsearch-exporter
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml
		PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}
		script:
		- >
		deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		UI_AUTH=${UI_AUTH} ES_USER=${ES_USER} ES_PASS=${ES_PASS} ES_HOST=${ES_HOST} ES_ALL=${ES_ALL}
		ES_CLUSTER_SETTINGS=${ES_CLUSTER_SETTINGS} ES_INDICES=${ES_INDICES} ES_INDICES_SETTINGS=${ES_INDICES_SETTINGS}
		ES_SHARDS=${ES_SHARDS} ES_SHARDS_SETTINGS=${ES_SHARDS_SETTINGS} ES_SNAPSHOTS=${ES_SNAPSHOTS}
		ES_TIMEOUT=${ES_TIMEOUT} ES_CLUSTERINFO_INTERVAL=${ES_CLUSTERINFO_INTERVAL}
		deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} ES_USER=${ES_USER} ES_PASS=${ES_PASS}
		ES_HOST=${ES_HOST} ES_ALL=${ES_ALL} ES_CLUSTER_SETTINGS=${ES_CLUSTER_SETTINGS} ES_INDICES=${ES_INDICES}
		ES_INDICES_SETTINGS=${ES_INDICES_SETTINGS} ES_SHARDS=${ES_SHARDS} ES_SHARDS_SETTINGS=${ES_SHARDS_SETTINGS}
		ES_SNAPSHOTS=${ES_SNAPSHOTS} ES_TIMEOUT=${ES_TIMEOUT} ES_CLUSTERINFO_INTERVAL=${ES_CLUSTERINFO_INTERVAL}
		environment:
		name: pro
		only:
		@@ -81,14 +75,12 @@ deploy-stable-branch-production:
		SSH_REMOTE: ${PRO_SSH_REMOTE}
		SERVICES_TO_CHECK: ${STACK}_elasticsearch-exporter
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml
		PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}
		script:
		- >
		deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}
		UI_AUTH=${UI_AUTH} ES_USER=${ES_USER} ES_PASS=${ES_PASS} ES_HOST=${ES_HOST} ES_ALL=${ES_ALL}
		ES_CLUSTER_SETTINGS=${ES_CLUSTER_SETTINGS} ES_INDICES=${ES_INDICES} ES_INDICES_SETTINGS=${ES_INDICES_SETTINGS}
		ES_SHARDS=${ES_SHARDS} ES_SHARDS_SETTINGS=${ES_SHARDS_SETTINGS} ES_SNAPSHOTS=${ES_SNAPSHOTS}
		ES_TIMEOUT=${ES_TIMEOUT} ES_CLUSTERINFO_INTERVAL=${ES_CLUSTERINFO_INTERVAL}
		deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} ES_USER=${ES_USER} ES_PASS=${ES_PASS}
		ES_HOST=${ES_HOST} ES_ALL=${ES_ALL} ES_CLUSTER_SETTINGS=${ES_CLUSTER_SETTINGS} ES_INDICES=${ES_INDICES}
		ES_INDICES_SETTINGS=${ES_INDICES_SETTINGS} ES_SHARDS=${ES_SHARDS} ES_SHARDS_SETTINGS=${ES_SHARDS_SETTINGS}
		ES_SNAPSHOTS=${ES_SNAPSHOTS} ES_TIMEOUT=${ES_TIMEOUT} ES_CLUSTERINFO_INTERVAL=${ES_CLUSTERINFO_INTERVAL}
		environment:
		name: pro
		only:

deploy/.env

+0 −2

Original line number	Diff line number	Diff line
		UI_AUTH=user:$apr1$md5password
		UI_SUBDOMAIN=esexporter
		UI_PORT=9114
		ES_PROTOCOL=http
		ES_USER=user

deploy/docker-compose.tmpl.yml

+0 −10

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ services:
		networks:
		- elastic-net
		- metric-net
		- traefik-net
		healthcheck:
		test: wget --spider http://localhost:${UI_PORT}
		interval: 30s
		@@ -29,11 +28,6 @@ services:
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.frontend.auth.basic.users: ${UI_AUTH}
		traefik.frontend.rule: Host:${UI_SUBDOMAIN}.${PUBLIC_HOSTNAME}
		traefik.backend: elasticsearch-exporter
		traefik.port: '${UI_PORT}'
		restart_policy:
		delay: 30s
		window: 1m
		@@ -52,7 +46,3 @@ networks:
		metric-net:
		name: ${METRIC_NET_NAME:-metric-net}
		external: true

		traefik-net:
		name: ${TRAEFIK_NET_NAME:-traefik-net}
		external: true