From 8543a2c3442681d5947c8860b8abf1e5663ded20 Mon Sep 17 00:00:00 2001 From: ductnn Date: Wed, 30 Nov 2022 11:50:50 +0700 Subject: [PATCH 1/2] [draft]: add minio s3 --- .gitignore | 1 + caddy/Caddyfile | 4 ++++ config-minio | 4 ++++ docker-compose.minio.yml | 24 ++++++++++++++++++++++++ docker-compose.yml | 25 +++++++++++++++++++++++++ loki/loki-config.yaml | 35 +++++++++++++++++++++++++++++------ loki/promtail-config.yaml | 3 ++- 7 files changed, 89 insertions(+), 7 deletions(-) create mode 100644 config-minio create mode 100644 docker-compose.minio.yml diff --git a/.gitignore b/.gitignore index 70c688d..08bc5d2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .vs/ .vscode/ .idea/ +.data diff --git a/caddy/Caddyfile b/caddy/Caddyfile index 6f80933..d28f822 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -37,3 +37,7 @@ :3000 { reverse_proxy grafana:3000 } + +:9000 { + reverse_proxy minio:9000 +} diff --git a/config-minio b/config-minio new file mode 100644 index 0000000..2bf8b18 --- /dev/null +++ b/config-minio @@ -0,0 +1,4 @@ +MINIO_ACCESS_KEY=loki +MINIO_SECRET_KEY=supersecret +MINIO_PROMETHEUS_AUTH_TYPE=public +MINIO_UPDATE=off diff --git a/docker-compose.minio.yml b/docker-compose.minio.yml new file mode 100644 index 0000000..caa68ad --- /dev/null +++ b/docker-compose.minio.yml @@ -0,0 +1,24 @@ +version: "3" + +services: + + minio: + image: minio/minio + container_name: minio + entrypoint: + - sh + - -euc + - | + mkdir -p /data/loki-data && \ + mkdir -p /data/loki-ruler && + minio server /data + env_file: + - config-minio + ports: + - "9000:9000" + volumes: + - ./.data/minio:/data + restart: always + network_mode: host + labels: + org.label-schema.group: "monitoring" diff --git a/docker-compose.yml b/docker-compose.yml index 5625f8c..16978b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -72,6 +72,8 @@ services: container_name: loki volumes: - ./loki/loki-config.yaml:/etc/loki/loki-config.yaml + depends_on: + - minio command: -config.file=/etc/loki/loki-config.yaml expose: - 3100 @@ -139,6 +141,28 @@ services: labels: org.label-schema.group: "monitoring" + minio: + image: minio/minio + container_name: minio + entrypoint: + - sh + - -euc + - | + mkdir -p /data/loki-data && \ + mkdir -p /data/loki-ruler && + minio server /data + env_file: + - config-minio + expose: + - 9000 + volumes: + - ./.data/minio:/data + restart: always + networks: + - monitor-net + labels: + org.label-schema.group: "monitoring" + caddy: image: caddy:2.3.0 container_name: caddy @@ -149,6 +173,7 @@ services: - "9093:9093" - "9091:9091" - "3100:3100" + - "9000:9000" volumes: - ./caddy:/etc/caddy environment: diff --git a/loki/loki-config.yaml b/loki/loki-config.yaml index f7fff56..1aa4f53 100644 --- a/loki/loki-config.yaml +++ b/loki/loki-config.yaml @@ -10,24 +10,44 @@ server: common: path_prefix: /tmp/loki storage: - filesystem: - chunks_directory: /tmp/loki/chunks - rules_directory: /tmp/loki/rules - replication_factor: 1 + s3: + endpoint: minio:9000 + insecure: true + bucketnames: loki-data + access_key_id: loki + secret_access_key: supersecret + s3forcepathstyle: true ring: instance_addr: 127.0.0.1 kvstore: store: inmemory + # storage: + # filesystem: + # chunks_directory: /tmp/loki/chunks + # rules_directory: /tmp/loki/rules + # replication_factor: 1 + # ring: + # instance_addr: 127.0.0.1 + # kvstore: + # store: inmemory schema_config: configs: - - from: 2020-10-24 + - from: 2021-08-01 store: boltdb-shipper - object_store: filesystem + object_store: s3 schema: v11 index: prefix: index_ period: 24h + # configs: + # - from: 2020-10-24 + # store: boltdb-shipper + # object_store: filesystem + # schema: v11 + # index: + # prefix: index_ + # period: 24h limits_config: ingestion_rate_mb: 1024 @@ -35,3 +55,6 @@ limits_config: ruler: alertmanager_url: http://localhost:9093 + storage: + s3: + bucketnames: loki-ruler diff --git a/loki/promtail-config.yaml b/loki/promtail-config.yaml index 0875af2..d22e6be 100644 --- a/loki/promtail-config.yaml +++ b/loki/promtail-config.yaml @@ -7,7 +7,8 @@ positions: clients: # replace "loki" with server address for external hosts - - url: http://loki:3100/loki/api/v1/push + # - url: http://loki:3100/loki/api/v1/push + - url: http://localhost:3100/loki/api/v1/push scrape_configs: - job_name: flog_scrape From b131347e89c223114d7495ca653c20e7b79c09cd Mon Sep 17 00:00:00 2001 From: ductnn Date: Wed, 30 Nov 2022 14:23:56 +0700 Subject: [PATCH 2/2] update: config port --- caddy/Caddyfile | 4 ++++ docker-compose.yml | 2 ++ loki/loki-config.yaml | 2 +- loki/promtail-config.yaml | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/caddy/Caddyfile b/caddy/Caddyfile index d28f822..4c2f99d 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -41,3 +41,7 @@ :9000 { reverse_proxy minio:9000 } + +:9001 { + reverse_proxy minio:9001 +} diff --git a/docker-compose.yml b/docker-compose.yml index 16978b8..4423997 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -155,6 +155,7 @@ services: - config-minio expose: - 9000 + - 9001 volumes: - ./.data/minio:/data restart: always @@ -174,6 +175,7 @@ services: - "9091:9091" - "3100:3100" - "9000:9000" + - "9001:9001" volumes: - ./caddy:/etc/caddy environment: diff --git a/loki/loki-config.yaml b/loki/loki-config.yaml index 1aa4f53..92bba94 100644 --- a/loki/loki-config.yaml +++ b/loki/loki-config.yaml @@ -18,7 +18,7 @@ common: secret_access_key: supersecret s3forcepathstyle: true ring: - instance_addr: 127.0.0.1 + instance_addr: 0.0.0.0 kvstore: store: inmemory # storage: diff --git a/loki/promtail-config.yaml b/loki/promtail-config.yaml index d22e6be..b163374 100644 --- a/loki/promtail-config.yaml +++ b/loki/promtail-config.yaml @@ -7,8 +7,8 @@ positions: clients: # replace "loki" with server address for external hosts - # - url: http://loki:3100/loki/api/v1/push - - url: http://localhost:3100/loki/api/v1/push + - url: http://loki:3100/loki/api/v1/push + # - url: http://localhost:3100/loki/api/v1/push scrape_configs: - job_name: flog_scrape