Skip to content

Commit 1136ff6

Browse files
authored
Improve monitoring (#6466)
* improve compactor and try to reduce storage usage by monitoring tools
1 parent a5aab04 commit 1136ff6

File tree

11 files changed

+2054
-2233
lines changed

11 files changed

+2054
-2233
lines changed

development/docker-compose-observability.yml

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ services:
1414
- ./promtail/config.yml:/etc/promtail/config.yml
1515
- /var/run/docker.sock:/var/run/docker.sock
1616
- /var/lib/docker/containers:/var/lib/docker/containers
17+
logging:
18+
driver: "json-file"
19+
options:
20+
max-size: "20m"
21+
max-file: "3"
1722
depends_on:
1823
- loki
1924

@@ -64,6 +69,7 @@ services:
6469
image: prefecthq/prometheus-prefect-exporter:latest
6570
environment:
6671
PREFECT_API_URL: http://task-manager:4200/api
72+
LOG_LEVEL: WARNING
6773
ports:
6874
- "4201:8000"
6975
depends_on:
@@ -84,12 +90,22 @@ services:
8490
- prometheus_data:/prometheus
8591
command:
8692
- '--config.file=/etc/prometheus/prometheus.yml'
87-
- '--storage.tsdb.path=/prometheus'
8893
- '--web.console.libraries=/etc/prometheus/console_libraries'
8994
- '--web.console.templates=/etc/prometheus/consoles'
90-
- '--storage.tsdb.retention.time=1d'
95+
- '--storage.tsdb.path=/prometheus'
96+
- '--storage.tsdb.retention.time=4d'
97+
- '--storage.tsdb.retention.size=20GB'
98+
- '--storage.tsdb.wal-compression'
99+
- '--storage.tsdb.min-block-duration=1h'
100+
- '--storage.tsdb.max-block-duration=2h'
91101
- '--web.enable-lifecycle'
92102
- '--web.enable-remote-write-receiver'
103+
- '--log.level=warn'
104+
logging:
105+
driver: "json-file"
106+
options:
107+
max-size: "50m"
108+
max-file: "5"
93109
ports:
94110
- "9090:9090"
95111

@@ -105,6 +121,11 @@ services:
105121
- '--path.rootfs=/rootfs'
106122
- '--path.sysfs=/host/sys'
107123
- '--collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)'
124+
logging:
125+
driver: "json-file"
126+
options:
127+
max-size: "20m"
128+
max-file: "3"
108129
ports:
109130
- "9100:9100"
110131

@@ -119,6 +140,11 @@ services:
119140
- /var/lib/docker:/var/lib/docker:ro
120141
- /dev/disk/:/dev/disk:ro
121142
- /var/run/docker.sock:/var/run/docker.sock:ro
143+
logging:
144+
driver: "json-file"
145+
options:
146+
max-size: "20m"
147+
max-file: "3"
122148
ports:
123149
- "8080:8080"
124150

@@ -127,10 +153,20 @@ services:
127153
image: grafana/grafana:11.4.0
128154
volumes:
129155
- ./grafana/provisioning:/etc/grafana/provisioning
156+
- grafana_data:/var/lib/grafana
157+
- grafana_logs:/var/log/grafana
130158
environment:
131159
- GF_SECURITY_ADMIN_USER=admin
132160
- GF_SECURITY_ADMIN_PASSWORD=admin
133161
- GF_USERS_ALLOW_SIGN_UP=false
162+
- GF_LOG_LEVEL=warn
163+
- GF_LOG_MODE=console,file
164+
- GF_LOG_DIR=/var/log/grafana
165+
logging:
166+
driver: "json-file"
167+
options:
168+
max-size: "50m"
169+
max-file: "5"
134170
ports:
135171
- "3500:3000"
136172
depends_on:
@@ -139,6 +175,7 @@ services:
139175

140176
volumes:
141177
grafana_data:
178+
grafana_logs:
142179
prometheus_data:
143180
loki_data:
144181
tempo_data:

development/docker-compose.override.yml.tmp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@ services:
2121
# cache:
2222
# ports:
2323
# - "6379:6379"
24+
# task-manager:
25+
# ports:
26+
# - 4200:4200

0 commit comments

Comments
 (0)