Commit 0169fd31 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'main' 

Usa fichero config y actualiza valores de deploy

See merge request redmic-project/log/loki!3
parents 827c34d5 72054382

deploy/.env

+9 −1
Original line number Diff line number Diff line 
LOKI_AUTH_ENABLED=false

LOKI_ANALYTICS_REPORTING_ENABLED=true

LOKI_SERVER_LOG_LEVEL=warn

LOKI_QUERY_SCHEDULER_MAX_OUTSTANDING_REQUESTS_PER_TENANT=2048

LOKI_RULER_EXTERNAL_URL=https://alertmanager.change.me

LOKI_LIMITS_CONFIG_RETENTION_PERIOD=720h



LOKI_CONFIG_FILE_PATH=/etc/loki/loki.yaml

DATA_VOL_NAME=loki-vol



DATA_VOL_DEVICE=:/loki-vol/

VOL_TYPE=nfs4

VOL_ADDR=127.0.0.1

VOL_OPTIONS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14

VOL_OPTS=rw,nolock,noatime,tcp,rsize=8192,wsize=8192,timeo=14



VOL_BACKING=shared

VOL_PERFMODE=maxio

deploy/config/loki.yaml

0 → 100644
+55 −0
Original line number Diff line number Diff line 
auth_enabled: ${LOKI_AUTH_ENABLED}



analytics:

  reporting_enabled: ${LOKI_ANALYTICS_REPORTING_ENABLED}



server:

  http_listen_address: 0.0.0.0

  grpc_listen_address: 0.0.0.0

  http_listen_port: 3100

  grpc_listen_port: 9095

  log_level: ${LOKI_SERVER_LOG_LEVEL}



common:

  path_prefix: /loki

  storage:

    filesystem:

      chunks_directory: /loki/chunks

      rules_directory: /loki/rules

  replication_factor: 1

  ring:

    kvstore:

      store: inmemory



schema_config:

  configs:

    - from: 2020-10-24

      store: boltdb-shipper

      object_store: filesystem

      schema: v11

      index:

        prefix: index_

        period: 24h



ruler:

  alertmanager_url: http://alertmanager:9093

  external_url: ${LOKI_RULER_EXTERNAL_URL}



query_scheduler:

  max_outstanding_requests_per_tenant: ${LOKI_QUERY_SCHEDULER_MAX_OUTSTANDING_REQUESTS_PER_TENANT}



compactor:

  working_directory: /loki/compactor

  shared_store: filesystem

  retention_enabled: true



limits_config:

  retention_period: ${LOKI_LIMITS_CONFIG_RETENTION_PERIOD}

  query_timeout: 5m



chunk_store_config:

  chunk_cache_config:

    embedded_cache:

      enabled: true

      max_size_mb: 50

      ttl: 1h

deploy/docker-compose.dev.yml

+2 −2
Original line number Diff line number Diff line 
version: '3.5'

version: '3.9'



volumes:

  data-vol:
@@ -6,5 +6,5 @@ volumes: 
    driver: local

    driver_opts:

      type: ${VOL_TYPE}

      o: addr=${VOL_ADDR},${VOL_OPTIONS}

      o: addr=${VOL_ADDR},${VOL_OPTS}

      device: ${DATA_VOL_DEVICE}

deploy/docker-compose.prod.yml

+3 −3
Original line number Diff line number Diff line 
version: '3.5'

version: '3.9'



services:

  loki:
@@ -12,5 +12,5 @@ volumes: 
    name: ${DATA_VOL_NAME}

    driver: 'cloudstor:aws'

    driver_opts:

      backing: ${VOL_BACKING:-shared}

      perfmode: ${VOL_PERFMODE:-maxio}
 
      backing: ${VOL_BACKING}

      perfmode: ${VOL_PERFMODE}

deploy/docker-compose.tmpl.yml

+27 −5
Original line number Diff line number Diff line 
version: '3.5'

version: '3.9'



services:

  loki:

    image: ${IMAGE_NAME:-grafana/loki}:${IMAGE_TAG:-latest}

    command: -config.file=${LOKI_CONFIG_FILE_PATH} -config.expand-env=true -target=all

    environment:

      LOKI_AUTH_ENABLED:

      LOKI_ANALYTICS_REPORTING_ENABLED:

      LOKI_SERVER_LOG_LEVEL:

      LOKI_QUERY_SCHEDULER_MAX_OUTSTANDING_REQUESTS_PER_TENANT:

      LOKI_RULER_EXTERNAL_URL:

      LOKI_LIMITS_CONFIG_RETENTION_PERIOD:

    networks:

      log-net:

      metric-net:

    volumes:

      - data-vol:/loki

    configs:

      - source: config-file

        target: ${LOKI_CONFIG_FILE_PATH}

      - source: rules-file

        target: /loki/rules/fake/rules.yaml

    logging:

      driver: json-file

      driver: local

    deploy:

      mode: replicated

      replicas: ${REPLICAS:-1}
@@ -19,11 +32,11 @@ services: 
        delay: ${UPDATE_DELAY:-1m}

      resources:

        limits:

          cpus: '${RESOURCES_LIMITS_CPUS:-1}'

          memory: ${RESOURCES_LIMITS_MEMORY:-256M}

          cpus: '${RESOURCES_LIMITS_CPUS:-2}'

          memory: ${RESOURCES_LIMITS_MEMORY:-512M}

        reservations:

          cpus: '${RESOURCES_RESERVATIONS_CPUS:-0.1}'

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-128M}

          memory: ${RESOURCES_RESERVATIONS_MEMORY:-256M}



networks:

  log-net:
@@ -35,3 +48,12 @@ networks: 
    name: ${METRIC_NET_NAME:-metric-net}

    driver: ${METRIC_NET_DRIVER:-overlay}

    external: true



configs:

  config-file:

    name: ${CONFIG_FILE_NAME:-loki-config-yaml}

    file: ./config/loki.yaml



  rules-file:

    name: ${RULES_FILE_NAME:-loki-rules-yaml}

    file: ./rules/rules.yaml