Commit 94f88b3f authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Pone al día el proyecto y optimiza recursos 

Configura parámetros de cadvisor para optimizar el uso de recursos,
deshabilitando funcionalidades no usadas y espaciando el intervalo de
consulta.

Actualiza valores por defecto de imagen docker usada (la oficial ha
cambiado de ruta), límites de memoria y tiempo de actualización.

Añade puntos de montaje para identificación de la máquina y para la zona
horaria.

Actualiza y unifica ficheros compose y plantilla CI utilizada.
parent 045109c2

.gitlab-ci.yml

+1 −1
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

deploy/.env

+7 −0
Original line number Diff line number Diff line 
# options: advtcp,app,cpu,cpuLoad,cpu_topology,cpuset,disk,diskIO,hugetlb,memory,memory_numa,network,oom_event,percpu,perf_event,process,referenced_memory,resctrl,sched,tcp,udp

DISABLE_METRICS=advtcp,cpu_topology,cpuset,disk,hugetlb,memory_numa,oom_event,percpu,process,referenced_memory,resctrl,sched,tcp,udp



HOUSEKEEPING_INTERVAL=10s



STORE_CONTAINER_LABELS=false

WHITELISTED_CONTAINER_LABELS=com.docker.stack.namespace,com.docker.swarm.node.id,com.docker.swarm.service.id,com.docker.swarm.service.name,com.docker.swarm.task.id,com.docker.swarm.task.name

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

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



services:

  cadvisor:

    image: ${IMAGE_NAME:-gcr.io/google-containers/cadvisor}:${IMAGE_TAG:-latest}

    image: ${IMAGE_NAME:-gcr.io/cadvisor/cadvisor}:${IMAGE_TAG:-latest}

    command:

      - --docker_only

      - --disable_metrics=${DISABLE_METRICS}

      - --housekeeping_interval=${HOUSEKEEPING_INTERVAL}

      - --store_container_labels=${STORE_CONTAINER_LABELS}

      - --whitelisted_container_labels=${WHITELISTED_CONTAINER_LABELS}

    networks:

      metric-net:

    volumes:

      - /:/rootfs:ro

      - /sys:/sys:ro

      - /var/run/docker.sock:/var/run/docker.sock:ro

      - /etc/machine-id:/etc/machine-id:ro

      - /etc/localtime:/etc/localtime:ro

      - ${DOCKER_DATA_PATH:-/var/lib/docker}:/var/lib/docker:ro

    healthcheck:

      test: wget --spider -q -t 1 http://localhost:8080/healthz

      interval: ${HEALTHCHECK_INTERVAL:-1m}

      timeout: ${HEALTHCHECK_TIMEOUT:-30s}

      retries: ${HEALTHCHECK_RETRIES:-10}

      start_period: ${HEALTHCHECK_START_PERIOD:-2m}

    deploy:

      mode: global

      restart_policy:

        delay: ${RESTART_DELAY:-10s}

      update_config:

        delay: ${UPDATE_DELAY:-1m}

        delay: ${UPDATE_DELAY:-30s}

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.5}'

          memory: ${RESOURCES_LIMITS_MEMORY:-512M}

          memory: ${RESOURCES_LIMITS_MEMORY:-256M}

        reservations:

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-128M}

deploy/docker-compose.dev.yml

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
version: '3.5'

deploy/docker-compose.prod.yml

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
version: '3.5'