Skip to content

Commit 059c982

Browse files
committed
move mimirtool to mimir.yaml
Signed-off-by: Weifeng Wang <[email protected]> move inbucket to grafana.yaml Signed-off-by: Weifeng Wang <[email protected]> Update pyroscope.yaml Update compose.yaml add .gitignore Signed-off-by: Weifeng Wang <[email protected]>
1 parent 5bdb1b9 commit 059c982

File tree

31 files changed

+189
-107
lines changed

31 files changed

+189
-107
lines changed

compose.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ version: '3.9'
1616
include:
1717
- path: ./docker-compose/common/compose-include/minio.yaml
1818
- path: ./docker-compose/common/compose-include/memcached.yaml
19-
- path: ./docker-compose/common/compose-include/inbucket.yaml
20-
- path: ./docker-compose/common/compose-include/mimirtool.yaml
2119
# Grafana LGTMP Stack Components
2220
- path: ./docker-compose/common/compose-include/loki.yaml
2321
- path: ./docker-compose/common/compose-include/grafana-agent.yaml

docker-compose/common/compose-include/grafana.yaml

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
11

2-
# Note:
3-
# include is available in Docker Compose version 2.20 and later, and Docker Desktop version 4.22 and later.
4-
include:
5-
- path: ./inbucket.yaml
6-
72
services:
3+
# Inbucket is an email testing service; it will accept email for any email
4+
# address and make it available to view without a password
5+
#
6+
# https://inbucket.org/packages/docker.html
7+
# https://github.com/inbucket/inbucket/blob/main/doc/config.md
8+
inbucket:
9+
labels:
10+
metrics.agent.grafana.com/scrape: false
11+
image: ${INBUCKET_IMAGE:-inbucket/inbucket:3.0.4}
12+
ports:
13+
- 2500 # SMTP
14+
- "39000:9000" # HTTP
15+
- 1100 # POP3
16+
volumes:
17+
- inbucket_data:/storage
18+
- inbucket_data:/config
19+
820
grafana:
921
labels:
1022
logs.agent.grafana.com/log-format: logfmt
@@ -21,5 +33,10 @@ services:
2133
- ../../../monitoring-mixins/memcached-mixin/deploy/dashboards_out:/var/lib/grafana/dashboards/memcached-mixin
2234
environment:
2335
GF_FEATURE_TOGGLES_ENABLE: traceqlEditor tracesEmbeddedFlameGraph traceqlSearch correlations metricsSummary traceToMetrics traceToProfiles
36+
GF_SMTP_ENABLED: true
37+
GF_SMTP_HOST: inbucket:2500
2438
ports:
2539
- "3000:3000"
40+
41+
volumes:
42+
inbucket_data:

docker-compose/common/compose-include/inbucket.yaml

Lines changed: 0 additions & 21 deletions
This file was deleted.

docker-compose/common/compose-include/mimir.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,19 @@ services:
2323
default:
2424
aliases:
2525
- mimir-memberlist
26+
27+
mimirtool:
28+
labels:
29+
metrics.agent.grafana.com/scrape: false
30+
image: ${MIMIRTOOL_IMAGE:-docker.io/grafana/mimirtool:2.11.0}
31+
volumes:
32+
- ../../../monitoring-mixins/crontab:/etc/crontabs/root
33+
- ../../../monitoring-mixins/agent-flow-mixin/deploy/agent-flow-mixin-alerts.yaml:/rules/agent-flow-mixin-alerts.yaml
34+
- ../../../monitoring-mixins/memcached-mixin/deploy/memcached-mixin-alerts.yaml:/rules/memcached-mixin-alerts.yaml
35+
- ../../../monitoring-mixins/mimir-mixin/deploy/mimir-mixin-rules.yaml:/rules/mimir-mixin-rules.yaml
36+
- ../../../monitoring-mixins/mimir-mixin/deploy/mimir-mixin-alerts.yaml:/rules/mimir-mixin-alerts.yaml
37+
environment:
38+
- MIMIR_ADDRESS=http://gateway:8080
39+
- MIMIR_TENANT_ID=anonymous
40+
entrypoint: crond -f
41+
restart: always

docker-compose/common/compose-include/mimirtool.yaml

Lines changed: 0 additions & 17 deletions
This file was deleted.

docker-compose/common/compose-include/pyroscope.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ services:
77
container_name: pyroscope
88
volumes:
99
- ../config/pyroscope:/etc/pyroscope
10+
- pyroscope_data:/data
1011
command:
1112
- -config.file=/etc/pyroscope/monolithic-mode-profiles.yaml
1213
- -target=all
@@ -20,3 +21,6 @@ services:
2021
# expose 34040 port so we can directly access pyroscope inside container
2122
ports:
2223
- "34040:4040"
24+
25+
volumes:
26+
pyroscope_data:

docker-compose/common/config/.env

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ PYROSCOPE_IMAGE=grafana/pyroscope:1.5.0
88
NGINX_IMAGE=nginxinc/nginx-unprivileged:1.25-alpine
99
MINIO_IMAGE=minio/minio:RELEASE.2024-03-15T01-07-19Z
1010
MEMCACHED_IMAGE=memcached:1.6.24-alpine
11-
MEMCACHED_EXPORTER_IMAGE=prom/memcached-exporter:v0.14.2
11+
MEMCACHED_EXPORTER_IMAGE=prom/memcached-exporter:v0.14.2
12+
INBUCKET_IMAGE=inbucket/inbucket:3.0.4

docker-compose/common/config/grafana/grafana.ini

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,3 @@ disable_total_stats = false
3030
[dashboards]
3131
;default_home_dashboard_path = /usr/share/grafana/public/dashboards/home.json
3232
default_home_dashboard_path = /var/lib/grafana/dashboards/minio-dashboard.json
33-
34-
[smtp]
35-
enabled = true
36-
host = inbucket:2500
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
*
2+
!.gitignore
3+
!compose.yaml
4+
!grafana.override.yaml
5+
!grafana-agent.override.yaml
6+
!mimirtool.override.yaml
7+
!README.md

docker-compose/microservices-mode/logs/compose.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ version: '3.9'
1010
include:
1111
- path: ../../common/compose-include/minio.yaml
1212
- path: ../../common/compose-include/memcached.yaml
13-
- path: ../../common/compose-include/mimir.yaml
1413
- path:
15-
- ../../common/compose-include/mimirtool.yaml
14+
- ../../common/compose-include/mimir.yaml
1615
- ./mimirtool.override.yaml
1716
- path:
1817
- ../../common/compose-include/grafana.yaml

0 commit comments

Comments
 (0)