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

Merge branch 'dev' into 'master' 

Aplica límite de memoria de Java, aumenta recursos

See merge request redmic-project/etl/nifi!24
parents 90f2ca71 eda5161c

deploy/.env

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ TRUSTSTORE_TYPE=PKCS12 
AUTH=ldap

NIFI_WEB_HTTPS_HOST=0.0.0.0

NIFI_WEB_HTTPS_PORT=8443

NIFI_JVM_HEAP_INIT=2g

NIFI_JVM_HEAP_MAX=3g



TRAEFIK_SUBDOMAIN=nifi

deploy/docker-compose.dev.yml

+0 −7
Original line number Diff line number Diff line
@@ -6,13 +6,6 @@ services: 
      placement:

        constraints:

          - node.hostname == ${PLACEMENT_CONSTRAINTS_NODE_HOSTNAME:-hostname}

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-1}'

          memory: ${RESOURCES_LIMITS_MEMORY:-1G}

        reservations:

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.2}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-820M}



volumes:

  conf-vol:

deploy/docker-compose.prod.yml

+0 −7
Original line number Diff line number Diff line
@@ -6,13 +6,6 @@ services: 
      placement:

        constraints:

          - node.role == worker

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-1}'

          memory: ${RESOURCES_LIMITS_MEMORY:-2G}

        reservations:

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.2}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-1639M}



volumes:

  conf-vol:

deploy/docker-compose.tmpl.yml

+9 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ services: 
      AUTH:

      NIFI_WEB_HTTPS_HOST:

      NIFI_WEB_HTTPS_PORT:

      NIFI_JVM_HEAP_INIT:

      NIFI_JVM_HEAP_MAX:

    networks:

      traefik-net:

      kafka-net:
@@ -57,6 +59,13 @@ services: 
        delay: ${RESTART_DELAY:-10s}

      update_config:

        delay: ${UPDATE_DELAY:-10m}

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-2}'

          memory: ${RESOURCES_LIMITS_MEMORY:-5G}

        reservations:

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.2}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-3G}

      labels:

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

        traefik.frontend.headers.customRequestHeaders: X-ProxyScheme:https||X-ProxyHost:${TRAEFIK_SUBDOMAIN}.${PUBLIC_HOSTNAME}||X-ProxyPort:443||X-ProxyContextPath:/