diff --git a/.data/minio/.minio.sys/buckets/.bloomcycle.bin/xl.meta b/.data/minio/.minio.sys/buckets/.bloomcycle.bin/xl.meta deleted file mode 100644 index 9be1609..0000000 Binary files a/.data/minio/.minio.sys/buckets/.bloomcycle.bin/xl.meta and /dev/null differ diff --git a/.data/minio/.minio.sys/buckets/.usage-cache.bin/xl.meta b/.data/minio/.minio.sys/buckets/.usage-cache.bin/xl.meta deleted file mode 100644 index 248376a..0000000 Binary files a/.data/minio/.minio.sys/buckets/.usage-cache.bin/xl.meta and /dev/null differ diff --git a/.data/minio/.minio.sys/buckets/.usage.json/xl.meta b/.data/minio/.minio.sys/buckets/.usage.json/xl.meta deleted file mode 100644 index 25e8e60..0000000 Binary files a/.data/minio/.minio.sys/buckets/.usage.json/xl.meta and /dev/null differ diff --git a/.data/minio/.minio.sys/buckets/loki-data/.usage-cache.bin/xl.meta b/.data/minio/.minio.sys/buckets/loki-data/.usage-cache.bin/xl.meta deleted file mode 100644 index 9e3bae1..0000000 Binary files a/.data/minio/.minio.sys/buckets/loki-data/.usage-cache.bin/xl.meta and /dev/null differ diff --git a/.data/minio/.minio.sys/buckets/loki-ruler/.usage-cache.bin/xl.meta b/.data/minio/.minio.sys/buckets/loki-ruler/.usage-cache.bin/xl.meta deleted file mode 100644 index 7fe27de..0000000 Binary files a/.data/minio/.minio.sys/buckets/loki-ruler/.usage-cache.bin/xl.meta and /dev/null differ diff --git a/.data/minio/.minio.sys/config/config.json/xl.meta b/.data/minio/.minio.sys/config/config.json/xl.meta deleted file mode 100644 index 47a26a0..0000000 Binary files a/.data/minio/.minio.sys/config/config.json/xl.meta and /dev/null differ diff --git a/.data/minio/.minio.sys/config/iam/format.json/xl.meta b/.data/minio/.minio.sys/config/iam/format.json/xl.meta deleted file mode 100644 index 1fdeab5..0000000 Binary files a/.data/minio/.minio.sys/config/iam/format.json/xl.meta and /dev/null differ diff --git a/.data/minio/.minio.sys/format.json b/.data/minio/.minio.sys/format.json deleted file mode 100644 index cd94cdf..0000000 --- a/.data/minio/.minio.sys/format.json +++ /dev/null @@ -1 +0,0 @@ -{"version":"1","format":"xl-single","id":"dccaeeea-ba25-4618-bae8-d4575666cc86","xl":{"version":"3","this":"44b0e3be-76a9-4c55-a0e2-0ee26a0f5e6d","sets":[["44b0e3be-76a9-4c55-a0e2-0ee26a0f5e6d"]],"distributionAlgo":"SIPMOD+PARITY"}} \ No newline at end of file diff --git a/.data/minio/.minio.sys/pool.bin/xl.meta b/.data/minio/.minio.sys/pool.bin/xl.meta deleted file mode 100644 index e2e32cd..0000000 Binary files a/.data/minio/.minio.sys/pool.bin/xl.meta and /dev/null differ diff --git a/.data/minio/.minio.sys/tmp/.trash/7c9b25f6-9f50-4eff-a14f-f9a8310744ba b/.data/minio/.minio.sys/tmp/.trash/7c9b25f6-9f50-4eff-a14f-f9a8310744ba deleted file mode 100644 index a1b6f10..0000000 Binary files a/.data/minio/.minio.sys/tmp/.trash/7c9b25f6-9f50-4eff-a14f-f9a8310744ba and /dev/null differ diff --git a/.data/minio/loki-data/index/index_19530/compactor-1687833630.gz/xl.meta b/.data/minio/loki-data/index/index_19530/compactor-1687833630.gz/xl.meta deleted file mode 100644 index 5189277..0000000 Binary files a/.data/minio/loki-data/index/index_19530/compactor-1687833630.gz/xl.meta and /dev/null differ diff --git a/.data/minio/loki-data/index/index_19530/compactor-1688517684.r.gz/xl.meta b/.data/minio/loki-data/index/index_19530/compactor-1688517684.r.gz/xl.meta new file mode 100644 index 0000000..0587a50 Binary files /dev/null and b/.data/minio/loki-data/index/index_19530/compactor-1688517684.r.gz/xl.meta differ diff --git a/.data/minio/loki-data/index/index_19531/compactor-1687833630.gz/xl.meta b/.data/minio/loki-data/index/index_19531/compactor-1687833630.gz/xl.meta deleted file mode 100644 index 4da24e7..0000000 Binary files a/.data/minio/loki-data/index/index_19531/compactor-1687833630.gz/xl.meta and /dev/null differ diff --git a/.data/minio/loki-data/index/index_19531/compactor-1688517684.r.gz/xl.meta b/.data/minio/loki-data/index/index_19531/compactor-1688517684.r.gz/xl.meta new file mode 100644 index 0000000..d6e93e2 Binary files /dev/null and b/.data/minio/loki-data/index/index_19531/compactor-1688517684.r.gz/xl.meta differ diff --git a/.data/minio/loki-data/index/index_19532/compactor-1687833630.gz/xl.meta b/.data/minio/loki-data/index/index_19532/compactor-1688517684.r.gz/xl.meta similarity index 71% rename from .data/minio/loki-data/index/index_19532/compactor-1687833630.gz/xl.meta rename to .data/minio/loki-data/index/index_19532/compactor-1688517684.r.gz/xl.meta index ef9455a..f221443 100644 Binary files a/.data/minio/loki-data/index/index_19532/compactor-1687833630.gz/xl.meta and b/.data/minio/loki-data/index/index_19532/compactor-1688517684.r.gz/xl.meta differ diff --git a/.data/minio/loki-data/index/index_19533/compactor-1687833630.gz/xl.meta b/.data/minio/loki-data/index/index_19533/compactor-1688517684.r.gz/xl.meta similarity index 57% rename from .data/minio/loki-data/index/index_19533/compactor-1687833630.gz/xl.meta rename to .data/minio/loki-data/index/index_19533/compactor-1688517684.r.gz/xl.meta index c872320..cfbe71f 100644 Binary files a/.data/minio/loki-data/index/index_19533/compactor-1687833630.gz/xl.meta and b/.data/minio/loki-data/index/index_19533/compactor-1688517684.r.gz/xl.meta differ diff --git a/.data/minio/loki-data/index/index_19534/compactor-1687833629.gz/xl.meta b/.data/minio/loki-data/index/index_19534/compactor-1688517684.r.gz/xl.meta similarity index 64% rename from .data/minio/loki-data/index/index_19534/compactor-1687833629.gz/xl.meta rename to .data/minio/loki-data/index/index_19534/compactor-1688517684.r.gz/xl.meta index 59d721a..6dc6338 100644 Binary files a/.data/minio/loki-data/index/index_19534/compactor-1687833629.gz/xl.meta and b/.data/minio/loki-data/index/index_19534/compactor-1688517684.r.gz/xl.meta differ diff --git a/.data/minio/loki-data/index/index_19535/compactor-1688517684.gz/xl.meta b/.data/minio/loki-data/index/index_19535/compactor-1688517684.gz/xl.meta new file mode 100644 index 0000000..c027f9b Binary files /dev/null and b/.data/minio/loki-data/index/index_19535/compactor-1688517684.gz/xl.meta differ diff --git a/.data/minio/loki-data/index/index_19535/e67e05131239-1687832423794609654-1687834253.gz/xl.meta b/.data/minio/loki-data/index/index_19535/e67e05131239-1687832423794609654-1687834253.gz/xl.meta deleted file mode 100644 index ccca6c3..0000000 Binary files a/.data/minio/loki-data/index/index_19535/e67e05131239-1687832423794609654-1687834253.gz/xl.meta and /dev/null differ diff --git a/.data/minio/loki-data/index/index_19536/compactor-1688517684.gz/xl.meta b/.data/minio/loki-data/index/index_19536/compactor-1688517684.gz/xl.meta new file mode 100644 index 0000000..d2d36da Binary files /dev/null and b/.data/minio/loki-data/index/index_19536/compactor-1688517684.gz/xl.meta differ diff --git a/.data/minio/loki-data/index/index_19537/compactor-1688517684.gz/xl.meta b/.data/minio/loki-data/index/index_19537/compactor-1688517684.gz/xl.meta new file mode 100644 index 0000000..cfba294 Binary files /dev/null and b/.data/minio/loki-data/index/index_19537/compactor-1688517684.gz/xl.meta differ diff --git a/.data/minio/loki-data/index/index_19538/compactor-1688517684.gz/xl.meta b/.data/minio/loki-data/index/index_19538/compactor-1688517684.gz/xl.meta new file mode 100644 index 0000000..72b9e70 Binary files /dev/null and b/.data/minio/loki-data/index/index_19538/compactor-1688517684.gz/xl.meta differ diff --git a/.data/minio/loki-data/index/index_19539/compactor-1688517684.gz/xl.meta b/.data/minio/loki-data/index/index_19539/compactor-1688517684.gz/xl.meta new file mode 100644 index 0000000..417889a Binary files /dev/null and b/.data/minio/loki-data/index/index_19539/compactor-1688517684.gz/xl.meta differ diff --git a/.data/minio/loki-data/index/index_19540/compactor-1688517684.gz/xl.meta b/.data/minio/loki-data/index/index_19540/compactor-1688517684.gz/xl.meta new file mode 100644 index 0000000..d9f2100 Binary files /dev/null and b/.data/minio/loki-data/index/index_19540/compactor-1688517684.gz/xl.meta differ diff --git a/.data/minio/loki-data/index/index_19541/compactor-1688517684.gz/xl.meta b/.data/minio/loki-data/index/index_19541/compactor-1688517684.gz/xl.meta new file mode 100644 index 0000000..e92dcb4 Binary files /dev/null and b/.data/minio/loki-data/index/index_19541/compactor-1688517684.gz/xl.meta differ diff --git a/.data/minio/loki-data/index/index_19542/compactor-1688517684.gz/xl.meta b/.data/minio/loki-data/index/index_19542/compactor-1688517684.gz/xl.meta new file mode 100644 index 0000000..f78c309 Binary files /dev/null and b/.data/minio/loki-data/index/index_19542/compactor-1688517684.gz/xl.meta differ diff --git a/.data/minio/loki-data/index/index_19543/compactor-1688517683.gz/xl.meta b/.data/minio/loki-data/index/index_19543/compactor-1688517683.gz/xl.meta new file mode 100644 index 0000000..abdbacb Binary files /dev/null and b/.data/minio/loki-data/index/index_19543/compactor-1688517683.gz/xl.meta differ diff --git a/.data/minio/loki-data/loki_cluster_seed.json/xl.meta b/.data/minio/loki-data/loki_cluster_seed.json/xl.meta deleted file mode 100644 index c066fb9..0000000 Binary files a/.data/minio/loki-data/loki_cluster_seed.json/xl.meta and /dev/null differ diff --git a/.data/minio/loki-data/tenant1/3973cefdf87504dd:1892376089a:18923761777:3e631d92/xl.meta b/.data/minio/loki-data/tenant1/3973cefdf87504dd:1892376089a:18923761777:3e631d92/xl.meta new file mode 100644 index 0000000..6817118 Binary files /dev/null and b/.data/minio/loki-data/tenant1/3973cefdf87504dd:1892376089a:18923761777:3e631d92/xl.meta differ diff --git a/.data/minio/loki-data/tenant1/565c04588a0a84c0:188e339f366:188f7e1fbfd:db7ab5e3/xl.meta b/.data/minio/loki-data/tenant1/565c04588a0a84c0:188e339f366:188f7e1fbfd:db7ab5e3/xl.meta deleted file mode 100644 index 0991247..0000000 Binary files a/.data/minio/loki-data/tenant1/565c04588a0a84c0:188e339f366:188f7e1fbfd:db7ab5e3/xl.meta and /dev/null differ diff --git a/.data/minio/loki-data/tenant1/579fb6e5fc0bd51d:18923760790:18923763760:eb462c7d/xl.meta b/.data/minio/loki-data/tenant1/579fb6e5fc0bd51d:18923760790:18923763760:eb462c7d/xl.meta new file mode 100644 index 0000000..319ebe1 Binary files /dev/null and b/.data/minio/loki-data/tenant1/579fb6e5fc0bd51d:18923760790:18923763760:eb462c7d/xl.meta differ diff --git a/.data/minio/loki-data/tenant1/674b8863feec0c30:188faa6eb85:188faa6ebde:a6939775/xl.meta b/.data/minio/loki-data/tenant1/674b8863feec0c30:188faa6eb85:188faa6ebde:a6939775/xl.meta deleted file mode 100644 index 5463cbd..0000000 Binary files a/.data/minio/loki-data/tenant1/674b8863feec0c30:188faa6eb85:188faa6ebde:a6939775/xl.meta and /dev/null differ diff --git a/.data/minio/loki-data/tenant1/674b8863feec0c30:1892375e601:1892375e602:276eaf95/xl.meta b/.data/minio/loki-data/tenant1/674b8863feec0c30:1892375e601:1892375e602:276eaf95/xl.meta new file mode 100644 index 0000000..a646a7b Binary files /dev/null and b/.data/minio/loki-data/tenant1/674b8863feec0c30:1892375e601:1892375e602:276eaf95/xl.meta differ diff --git a/.data/minio/loki-data/tenant1/cc304944ed11ab2a:189022d81a7:189237521dd:5d3bd0b4/xl.meta b/.data/minio/loki-data/tenant1/cc304944ed11ab2a:189022d81a7:189237521dd:5d3bd0b4/xl.meta new file mode 100644 index 0000000..95116a4 Binary files /dev/null and b/.data/minio/loki-data/tenant1/cc304944ed11ab2a:189022d81a7:189237521dd:5d3bd0b4/xl.meta differ diff --git a/.data/minio/loki-data/tenant1/cc304944ed11ab2a:1892375e56d:18923760fa2:d5d0a37e/xl.meta b/.data/minio/loki-data/tenant1/cc304944ed11ab2a:1892375e56d:18923760fa2:d5d0a37e/xl.meta new file mode 100644 index 0000000..3fafb60 Binary files /dev/null and b/.data/minio/loki-data/tenant1/cc304944ed11ab2a:1892375e56d:18923760fa2:d5d0a37e/xl.meta differ diff --git a/.data/minio/loki-data/tenant1/d85f0a2c59abc817:188faa6f1d8:188faa709ae:7087180f/xl.meta b/.data/minio/loki-data/tenant1/d85f0a2c59abc817:188faa6f1d8:188faa709ae:7087180f/xl.meta deleted file mode 100644 index 9ea6f2c..0000000 Binary files a/.data/minio/loki-data/tenant1/d85f0a2c59abc817:188faa6f1d8:188faa709ae:7087180f/xl.meta and /dev/null differ diff --git a/.data/minio/loki-data/tenant1/d85f0a2c59abc817:1892375ec3e:189237626d7:5e24be65/xl.meta b/.data/minio/loki-data/tenant1/d85f0a2c59abc817:1892375ec3e:189237626d7:5e24be65/xl.meta new file mode 100644 index 0000000..1067c54 Binary files /dev/null and b/.data/minio/loki-data/tenant1/d85f0a2c59abc817:1892375ec3e:189237626d7:5e24be65/xl.meta differ diff --git a/.data/minio/loki-data/tenant1/f2f6a244c525bf7e:189022d81e3:189237520a4:a4e5b2eb/xl.meta b/.data/minio/loki-data/tenant1/f2f6a244c525bf7e:189022d81e3:189237520a4:a4e5b2eb/xl.meta new file mode 100644 index 0000000..fe1e77a Binary files /dev/null and b/.data/minio/loki-data/tenant1/f2f6a244c525bf7e:189022d81e3:189237520a4:a4e5b2eb/xl.meta differ diff --git a/.data/minio/loki-data/tenant1/f2f6a244c525bf7e:1892375e525:1892375e526:c5ea71c0/xl.meta b/.data/minio/loki-data/tenant1/f2f6a244c525bf7e:1892375e525:1892375e526:c5ea71c0/xl.meta new file mode 100644 index 0000000..6178654 Binary files /dev/null and b/.data/minio/loki-data/tenant1/f2f6a244c525bf7e:1892375e525:1892375e526:c5ea71c0/xl.meta differ diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index c6e925e..ac5ccc3 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,4 +1,189 @@ +networks: + loki: + services: + read: + image: grafana/loki:2.8.2 + command: "-config.file=/etc/loki/config.yaml -target=read" + ports: + - 3101:3100 + - 7946 + - 9095 + volumes: + - ./loki-config.yaml:/etc/loki/config.yaml + depends_on: + - minio + healthcheck: + test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:3100/ready || exit 1" ] + interval: 10s + timeout: 5s + retries: 5 + networks: &loki-dns + loki: + aliases: + - loki + + write: + image: grafana/loki:2.8.2 + command: "-config.file=/etc/loki/config.yaml -target=write" + ports: + - 3102:3100 + - 7946 + - 9095 + volumes: + - ./loki-config.yaml:/etc/loki/config.yaml + healthcheck: + test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:3100/ready || exit 1" ] + interval: 10s + timeout: 5s + retries: 5 + depends_on: + - minio + networks: + <<: *loki-dns + + promtail: + image: grafana/promtail:2.8.2 + volumes: + - ./promtail-local-config.yaml:/etc/promtail/config.yaml:ro + - /var/run/docker.sock:/var/run/docker.sock + command: -config.file=/etc/promtail/config.yaml + depends_on: + - gateway + networks: + - loki + + minio: + image: minio/minio + entrypoint: + - sh + - -euc + - | + mkdir -p /data/loki-data && \ + mkdir -p /data/loki-ruler && \ + minio server /data + environment: + - MINIO_ROOT_USER=loki + - MINIO_ROOT_PASSWORD=supersecret + - MINIO_PROMETHEUS_AUTH_TYPE=public + - MINIO_UPDATE=off + ports: + - 9000 + volumes: + - ./.data/minio:/data + healthcheck: + test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ] + interval: 15s + timeout: 20s + retries: 5 + networks: + - loki + + grafana: + image: grafana/grafana:latest + environment: + - GF_PATHS_PROVISIONING=/etc/grafana/provisioning + - GF_AUTH_ANONYMOUS_ENABLED=true + - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin + depends_on: + - gateway + entrypoint: + - sh + - -euc + - | + mkdir -p /etc/grafana/provisioning/datasources + cat < /etc/grafana/provisioning/datasources/ds.yaml + apiVersion: 1 + datasources: + - name: Loki + type: loki + access: proxy + url: http://gateway:3100 + jsonData: + httpHeaderName1: "X-Scope-OrgID" + secureJsonData: + httpHeaderValue1: "tenant1" + EOF + /run.sh + ports: + - "3001:3000" + healthcheck: + test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:3001/api/health || exit 1" ] + interval: 10s + timeout: 5s + retries: 5 + networks: + - loki + + gateway: + image: nginx:latest + depends_on: + - read + - write + entrypoint: + - sh + - -euc + - | + cat < /etc/nginx/nginx.conf + user nginx; + worker_processes 5; ## Default: 1 + + events { + worker_connections 1000; + } + + http { + resolver 127.0.0.11; + + server { + listen 3100; + + location = / { + return 200 'OK'; + auth_basic off; + } + + location = /api/prom/push { + proxy_pass http://write:3100\$$request_uri; + } + + location = /api/prom/tail { + proxy_pass http://read:3100\$$request_uri; + proxy_set_header Upgrade \$$http_upgrade; + proxy_set_header Connection "upgrade"; + } + + location ~ /api/prom/.* { + proxy_pass http://read:3100\$$request_uri; + } + + location = /loki/api/v1/push { + proxy_pass http://write:3100\$$request_uri; + } + + location = /loki/api/v1/tail { + proxy_pass http://read:3100\$$request_uri; + proxy_set_header Upgrade \$$http_upgrade; + proxy_set_header Connection "upgrade"; + } + + location ~ /loki/api/.* { + proxy_pass http://read:3100\$$request_uri; + } + } + } + EOF + /docker-entrypoint.sh nginx -g "daemon off;" + ports: + - "3100:3100" + healthcheck: + test: ["CMD", "service", "nginx", "status"] + interval: 10s + timeout: 5s + retries: 5 + networks: + - loki + back: build: context: ./back