Commit 07cafee3 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Corrige detalles de deploy, ci y rutas a servicios

parent 8067a28f

.dockerignore

0 → 100644
+2 −0
Original line number Diff line number Diff line 
*

!conf

.gitignore

0 → 100644
+0 −0

Empty file added.

.gitlab-ci.yml

+38 −16
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ docker-build-commit-non-master-branches: 
    - docker build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA} -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-latest .

    - docker push ${CI_REGISTRY_IMAGE}





docker-build-commit-master-branch:

  stage: package

  only:
@@ -59,17 +58,16 @@ container-scanning: 
  artifacts:

    paths: [gl-sast-container-report.json]



deploy-dev:

deploy-supporting-branch-develop:

  stage: deploy

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

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: metric

    SERVICES_TO_CHECK: metric_prometheus

    STATUS_CHECK_DELAY: 60

    SERVICE: prometheus

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    DEPLOY_DIR_NAME: deploy

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    UI_AUTH: ${DEV_UI_AUTH}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}
@@ -82,21 +80,49 @@ deploy-dev: 
    name: dev

    url: https://prometheus.${DEV_PUBLIC_HOSTNAME}

  only:

    - dev

    - branches

  except:

    - master

  when: manual



deploy-supporting-branch:

deploy-supporting-branch-production:

  stage: deploy

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

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: metric

    SERVICES_TO_CHECK: metric_prometheus

    STATUS_CHECK_DELAY: 60

    SERVICE: prometheus

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    DEPLOY_DIR_NAME: deploy

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml

    UI_AUTH: ${PRO_UI_AUTH}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}

  script:

    - create-nets.sh metric-net

    - >

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

      UI_AUTH=${UI_AUTH} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro

    url: https://prometheus.${PRO_PUBLIC_HOSTNAME}

  only:

    - branches

  except:

    - master

  when: manual



deploy-stable-branch-develop:

  stage: deploy

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

  variables:

    SSH_REMOTE: ${DEV_SSH_REMOTE}

    STACK: metric

    SERVICES_TO_CHECK: metric_prometheus

    STATUS_CHECK_DELAY: 60

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    UI_AUTH: ${DEV_UI_AUTH}

    PUBLIC_HOSTNAME: ${DEV_PUBLIC_HOSTNAME}

  script:
@@ -108,23 +134,19 @@ deploy-supporting-branch: 
    name: dev

    url: https://prometheus.${DEV_PUBLIC_HOSTNAME}

  only:

    - branches

  except:

    - master

    - dev

  when: manual



deploy-pro:

deploy-stable-branch-production:

  stage: deploy

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

  variables:

    SSH_REMOTE: ${PRO_SSH_REMOTE}

    STACK: metric

    SERVICES_TO_CHECK: metric_prometheus

    STATUS_CHECK_DELAY: 60

    SERVICE: prometheus

    IMAGE_NAME: ${CI_REGISTRY_IMAGE}

    IMAGE_TAG: ${CI_COMMIT_SHA}

    DEPLOY_DIR_NAME: deploy

    COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.prod.yml

    UI_AUTH: ${PRO_UI_AUTH}

    PUBLIC_HOSTNAME: ${PRO_PUBLIC_HOSTNAME}
@@ -135,7 +157,7 @@ deploy-pro: 
      UI_AUTH=${UI_AUTH} PUBLIC_HOSTNAME=${PUBLIC_HOSTNAME}

  environment:

    name: pro

    url: https://prometheus.${PUBLIC_HOSTNAME}

    url: https://prometheus.${PRO_PUBLIC_HOSTNAME}

  only:

    - master

  when: manual

conf/prometheus.yml

+11 −11
Original line number Diff line number Diff line
@@ -26,18 +26,18 @@ scrape_configs: 
  - job_name: 'kafka'

    dns_sd_configs:

    - names:

      - 'tasks.kf-1'

      - 'tasks.kf-2'

      - 'tasks.kf-3'

        - 'confluent_kf-1'

        - 'confluent_kf-2'

        - 'confluent_kf-3'

      type: 'A'

      port: 9998



  - job_name: 'zookeeper'

    dns_sd_configs:

    - names:

      - 'tasks.zk-1'

      - 'tasks.zk-2'

      - 'tasks.zk-3'

        - 'confluent_zk-1'

        - 'confluent_zk-2'

        - 'confluent_zk-3'

      type: 'A'

      port: 9998

deploy/docker-compose.tmpl.yml

+3 −0
Original line number Diff line number Diff line
@@ -49,9 +49,12 @@ networks: 
configs:

  node_rules:

    file: ./rules/swarm_node.rules.yml



  task_rules:

    file: ./rules/swarm_task.rules.yml



  job_rules:

    file: ./rules/swarm_job.rules.yml



  service_rules:

    file: ./rules/swarm_service.rules.yml
 
 No newline at end of file

check-rules.sh

+1 −1

File changed.

Contains only whitespace changes.

Dockerfile

+4 −4

File changed.

Contains only whitespace changes.