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

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/elastic/elasticsearch-exporter!5
parents 64e0140a 8ea57f59

deploy/.env

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ ES_CLUSTER_SETTINGS=false 
ES_INDICES=true

ES_INDICES_SETTINGS=false

ES_SHARDS=false

ES_SNAPSHOTS=true

ES_TIMEOUT=10s

ES_SNAPSHOTS=false

ES_TIMEOUT=30s

ES_CLUSTERINFO_INTERVAL=5m

ES_SSL_SKIP_VERIFY=true

deploy/docker-compose.tmpl.yml

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ services: 
      elastic-net:

      metric-net:

    healthcheck:

      test: wget --spider http://localhost:${UI_PORT}

      test: wget --spider --quiet http://localhost:${UI_PORT}

      interval: ${HEALTHCHECK_INTERVAL:-30s}

      timeout: ${HEALTHCHECK_TIMEOUT:-15s}

      retries: ${HEALTHCHECK_RETRIES:-10}
@@ -34,10 +34,10 @@ services: 
      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-0.1}'

          memory: ${RESOURCES_LIMITS_MEMORY:-256M}

          memory: ${RESOURCES_LIMITS_MEMORY:-128M}

        reservations:

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.001}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-128M}

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-32M}



networks:

  elastic-net: