Commit e153fb25 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/metric/karma!6
parents d85d6bda 848a9888

.gitlab-ci.yml

+1 −3
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment.yml'

    file: '/deployment-service/docker-deploy.yml'



stages:

  - deploy
@@ -9,5 +9,3 @@ stages: 
.deploy:

  variables:

    STACK: metric
 
  environment:

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

deploy/.env

+4 −0
Original line number Diff line number Diff line
@@ -9,4 +9,8 @@ ALERTMANAGER_NAME=alertmanager 
ALERTMANAGER_INTERVAL=30s

ALERTMANAGER_TIMEOUT=10s

ALERTMANAGER_PROXY=true



ALERTMANAGER_SUBDOMAIN=alertmanager



TRAEFIK_AUTH=user:$apr1$md5password

TRAEFIK_HEALTHCHECK_AUTH=changeme

deploy/compose.dev.yaml

0 → 100644
+1 −0
Original line number Diff line number Diff line 
services: {}

deploy/compose.prod.yaml

0 → 100644
+1 −0
Original line number Diff line number Diff line 
services: {}

deploy/docker-compose.tmpl.yml→deploy/compose.tmpl.yaml

+10 −9
Original line number Diff line number Diff line 
version: '3.5'



services:

  karma:

    image: ${IMAGE_NAME:-lmierzwa/karma}:${IMAGE_TAG:-latest}

    image: ${IMAGE_NAME:-ghcr.io/prymitive/karma}:${IMAGE_TAG:-latest}

    environment:

      HOST:

      PORT:
@@ -27,12 +25,15 @@ services: 
      update_config:

        delay: ${UPDATE_DELAY:-1m}

      labels:

        traefik.frontend.auth.basic.users: ${UI_AUTH}

        traefik.frontend.rule: Host:${TRAEFIK_SUBDOMAIN:-karma}.${PUBLIC_HOSTNAME}

        traefik.backend: karma

        traefik.backend.healthcheck.path: ${TRAEFIK_HEALTHCHECK_PATH:-/health}

        traefik.backend.healthcheck.interval: ${TRAEFIK_HEALTHCHECK_INTERVAL:-30s}

        traefik.port: '${PORT}'

        traefik.enable: ${TRAEFIK_ENABLE:-true}

        traefik.http.routers.karma.entrypoints: ${TRAEFIK_ENTRYPOINT:-http}

        traefik.http.routers.karma.rule: Host(`${TRAEFIK_SUBDOMAIN:-karma}.${PUBLIC_HOSTNAME}`)

        traefik.http.middlewares.karma-auth.basicauth.users: ${TRAEFIK_AUTH}

        traefik.http.routers.karma.middlewares: karma-auth

        traefik.http.services.karma.loadbalancer.server.port: ${PORT}

        traefik.http.services.karma.loadbalancer.healthcheck.path: ${TRAEFIK_HEALTHCHECK_PATH:-/health}

        traefik.http.services.karma.loadbalancer.healthcheck.interval: ${TRAEFIK_HEALTHCHECK_INTERVAL:-30s}

        traefik.http.services.karma.loadbalancer.healthcheck.headers.authorization: ${TRAEFIK_HEALTHCHECK_AUTH}

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.1}'