Commit 1a678b93 authored by Noel Alonso's avatar Noel Alonso
Browse files

Añade credenciales para conectar con elasticsearch 

Se añaden a la url vía properties
Se pasan como variables de entorno en compose y ci
parent e932f725

.gitlab-ci.yml

+10 −4
Original line number Diff line number Diff line
@@ -216,6 +216,8 @@ deploy-view-dev: 
    OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    ELASTIC_CLUSTERNAME: ${DEV_ELASTIC_CLUSTERNAME}

    ELASTIC_USER: ${DEV_ELASTIC_USER}

    ELASTIC_PASSWORD: ${DEV_ELASTIC_PASSWORD}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind
@@ -224,7 +226,7 @@ deploy-view-dev: 
      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_CLUSTERNAME=${ELASTIC_CLUSTERNAME}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      ELASTIC_USER=${ELASTIC_USER} ELASTIC_PASSWORD=${ELASTIC_PASSWORD} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev/${CI_PROJECT_NAME}-view

    url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view
@@ -278,6 +280,8 @@ deploy-view-supporting-branch: 
    OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET}

    ELASTIC_CLUSTERNAME: ${DEV_ELASTIC_CLUSTERNAME}

    ELASTIC_USER: ${DEV_ELASTIC_USER}

    ELASTIC_PASSWORD: ${DEV_ELASTIC_PASSWORD}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  services:

    - docker:dind
@@ -285,8 +289,8 @@ deploy-view-supporting-branch: 
    - >

      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_CLUSTERNAME=${DEV_ELASTIC_CLUSTERNAME}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_CLUSTERNAME=${ELASTIC_CLUSTERNAME}

      ELASTIC_USER=${ELASTIC_USER} ELASTIC_PASSWORD=${ELASTIC_PASSWORD} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: dev/${CI_PROJECT_NAME}-view

    url: https://${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view
@@ -341,6 +345,8 @@ deploy-view-pro: 
    OAUTH_CLIENT_ID: ${PRO_OAUTH_CLIENT_ID}

    OAUTH_CLIENT_SECRET: ${PRO_OAUTH_CLIENT_SECRET}

    ELASTIC_CLUSTERNAME: ${PRO_ELASTIC_CLUSTERNAME}

    ELASTIC_USER: ${PRO_ELASTIC_USER}

    ELASTIC_PASSWORD: ${PRO_ELASTIC_PASSWORD}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  services:

    - docker:dind
@@ -349,7 +355,7 @@ deploy-view-pro: 
      deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}

      SPRING_PROFILES_ACTIVE=${SPRING_PROFILES_ACTIVE} OAUTH_CLIENT_ID=${OAUTH_CLIENT_ID}

      OAUTH_CLIENT_SECRET=${OAUTH_CLIENT_SECRET} ELASTIC_CLUSTERNAME=${ELASTIC_CLUSTERNAME}

      PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

      ELASTIC_USER=${ELASTIC_USER} ELASTIC_PASSWORD=${ELASTIC_PASSWORD} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro/${CI_PROJECT_NAME}-view

    url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME}/view

deploy/docker-compose.vessels-view.tmpl.yml

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ services: 
      - OAUTH_CLIENT_ID

      - OAUTH_CLIENT_SECRET

      - ELASTIC_CLUSTERNAME

      - ELASTIC_USER

      - ELASTIC_PASSWORD

      - MICROSERVICE_NAME=${UNIT_NAME}-view

      - SPRING_KAFKA_CLIENT-ID={{.Service.Name}}-{{.Task.Slot}}

      - JAVA_OPTS=-Xmx568m -Xms256m

vessels-view/src/main/resources/application-pre.properties

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ spring.kafka.bootstrap-servers=kf-1:9092,kf-2:9092,kf-3:9092 
spring.kafka.properties.schema.registry.url=http://schema-registry:8081



#elastic

elastic.addresses=es6-1

elastic.addresses=${elastic.user}:${elastic.password}@es6-1

elastic.port=9300

redmic.elasticsearch.check.mappings=true

redmic.elasticsearch.create.mappings=true

vessels-view/src/main/resources/application-prod.properties

+3 −1
Original line number Diff line number Diff line
@@ -3,7 +3,9 @@ spring.kafka.bootstrap-servers=kf-1:9092,kf-2:9092,kf-3:9092 
spring.kafka.properties.schema.registry.url=http://schema-registry:8081



#elastic

elastic.addresses=es6-1,es6-2,es6-3

elastic.addresses=${elastic.user}:${elastic.password}@es6-1,\

	${elastic.user}:${elastic.password}@es6-2,\

	${elastic.user}:${elastic.password}@es6-3

elastic.port=9300

redmic.elasticsearch.check.mappings=true

redmic.elasticsearch.create.mappings=false

vessels-view/src/main/resources/application.properties

+2 −1
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ spring.jackson.serialization.write-dates-as-timestamps=false 
elastic.addresses=${elastic.addresses}

elastic.port=${elastic.port}

elastic.clusterName=${elastic.clusterName}

elastic.xpackSecurityUser=user:pass

elastic.user=user

elastic.password=password



redmic.elasticsearch.check.mappings=${redmic.elasticsearch.check.mappings}

redmic.elasticsearch.create.mappings=${redmic.elasticsearch.create.mappings}