Skip to content

Commit 81aba91

Browse files
jpraynaudjpraynaud
authored
Merge pull request #1026 from input-output-hk/jpraynaud/987-monitoring-infra
Add infrastructure monitoring
2 parents 093a3ef + 8df1e69 commit 81aba91

25 files changed

+316
-77
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,8 @@ jobs:
484484
ERA_READER_ADDRESS_URL: ${{ vars.ERA_READER_ADDRESS_URL }}
485485
ERA_READER_VERIFICATION_KEY_URL: ${{ vars.ERA_READER_VERIFICATION_KEY_URL }}
486486
ERA_READER_SECRET_KEY: ${{ secrets.ERA_READER_SECRET_KEY }}
487+
PROMETHEUS_AUTH_USERNAME: ${{ secrets.PROMETHEUS_AUTH_USERNAME }}
488+
PROMETHEUS_AUTH_PASSWORD: ${{ secrets.PROMETHEUS_AUTH_PASSWORD }}
487489

488490
defaults:
489491
run:
@@ -523,6 +525,8 @@ jobs:
523525
mithril_era_reader_verification_key_url = "${{ env.ERA_READER_VERIFICATION_KEY_URL }}"
524526
mithril_era_reader_secret_key = "${{ env.ERA_READER_SECRET_KEY }}"
525527
mithril_signers = ${{ matrix.mithril_signers }}
528+
prometheus_auth_username = "${{ env.PROMETHEUS_AUTH_USERNAME }}"
529+
prometheus_auth_password = "${{ env.PROMETHEUS_AUTH_PASSWORD }}"
526530
EOF
527531
terraform fmt ./env.variables.tfvars
528532
cat ./env.variables.tfvars

‎.github/workflows/pre-release.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,8 @@ jobs:
224224
ERA_READER_ADDRESS_URL: ${{ vars.ERA_READER_ADDRESS_URL }}
225225
ERA_READER_VERIFICATION_KEY_URL: ${{ vars.ERA_READER_VERIFICATION_KEY_URL }}
226226
ERA_READER_SECRET_KEY: ${{ secrets.ERA_READER_SECRET_KEY }}
227+
PROMETHEUS_AUTH_USERNAME: ${{ secrets.PROMETHEUS_AUTH_USERNAME }}
228+
PROMETHEUS_AUTH_PASSWORD: ${{ secrets.PROMETHEUS_AUTH_PASSWORD }}
227229

228230
defaults:
229231
run:
@@ -263,6 +265,8 @@ jobs:
263265
mithril_era_reader_verification_key_url = "${{ env.ERA_READER_VERIFICATION_KEY_URL }}"
264266
mithril_era_reader_secret_key = "${{ env.ERA_READER_SECRET_KEY }}"
265267
mithril_signers = ${{ matrix.mithril_signers }}
268+
prometheus_auth_username = "${{ env.PROMETHEUS_AUTH_USERNAME }}"
269+
prometheus_auth_password = "${{ env.PROMETHEUS_AUTH_PASSWORD }}"
266270
EOF
267271
terraform fmt ./env.variables.tfvars
268272
cat ./env.variables.tfvars

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@ jobs:
152152
ERA_READER_ADDRESS_URL: ${{ vars.ERA_READER_ADDRESS_URL }}
153153
ERA_READER_VERIFICATION_KEY_URL: ${{ vars.ERA_READER_VERIFICATION_KEY_URL }}
154154
ERA_READER_SECRET_KEY: ${{ secrets.ERA_READER_SECRET_KEY }}
155+
PROMETHEUS_AUTH_USERNAME: ${{ secrets.PROMETHEUS_AUTH_USERNAME }}
156+
PROMETHEUS_AUTH_PASSWORD: ${{ secrets.PROMETHEUS_AUTH_PASSWORD }}
155157

156158
defaults:
157159
run:
@@ -191,6 +193,8 @@ jobs:
191193
mithril_era_reader_verification_key_url = "${{ env.ERA_READER_VERIFICATION_KEY_URL }}"
192194
mithril_era_reader_secret_key = "${{ env.ERA_READER_SECRET_KEY }}"
193195
mithril_signers = ${{ matrix.mithril_signers }}
196+
prometheus_auth_username = "${{ env.PROMETHEUS_AUTH_USERNAME }}"
197+
prometheus_auth_password = "${{ env.PROMETHEUS_AUTH_PASSWORD }}"
194198
EOF
195199
terraform fmt ./env.variables.tfvars
196200
cat ./env.variables.tfvars

‎mithril-infra/assets/docker/docker-compose-aggregator-auth.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ services:
1616
- all
1717
logging:
1818
driver: "${LOGGING_DRIVER}"
19+
options:
20+
tag: "{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}"
1921
volumes:
20-
- ./cardano-configurations/network/${NETWORK}:/config
22+
- ../data/${NETWORK}/mithril-aggregator/cardano/config/${NETWORK}:/config
2123
- ../data/${NETWORK}/mithril-aggregator/cardano/db:/db
2224
- ../data/${NETWORK}/mithril-aggregator/cardano/ipc:/ipc
2325
environment:
@@ -77,6 +79,8 @@ services:
7779
condition: service_started
7880
logging:
7981
driver: "${LOGGING_DRIVER}"
82+
options:
83+
tag: "{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}"
8084
labels:
8185
- 'traefik.enable=true'
8286
- 'traefik.http.routers.mithril-aggregator.rule=Host(`${AGGREGATOR_HOST}`)'

‎mithril-infra/assets/docker/docker-compose-aggregator-noauth.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ services:
1616
- all
1717
logging:
1818
driver: "${LOGGING_DRIVER}"
19+
options:
20+
tag: "{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}"
1921
volumes:
20-
- ./cardano-configurations/network/${NETWORK}:/config
22+
- ../data/${NETWORK}/mithril-aggregator/cardano/config/${NETWORK}:/config
2123
- ../data/${NETWORK}/mithril-aggregator/cardano/db:/db
2224
- ../data/${NETWORK}/mithril-aggregator/cardano/ipc:/ipc
2325
environment:
@@ -77,6 +79,8 @@ services:
7779
condition: service_started
7880
logging:
7981
driver: "${LOGGING_DRIVER}"
82+
options:
83+
tag: "{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}"
8084
labels:
8185
- 'traefik.enable=true'
8286
- 'traefik.http.routers.mithril-aggregator.rule=Host(`${AGGREGATOR_HOST}`)'

‎mithril-infra/assets/docker/docker-compose-monitoring.yaml‎

Lines changed: 64 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,87 @@ version: "3.9"
22

33
services:
44
prometheus:
5-
image: prom/prometheus:latest
5+
image: prom/prometheus:v2.45.0
66
container_name: prometheus
77
profiles:
88
- tools
9+
- monitoring
910
- all
1011
ports:
1112
- "9090:9090"
1213
command:
1314
- --config.file=/etc/prometheus/prometheus.yml
1415
volumes:
15-
- ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
16+
- ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro
17+
- ./prometheus/cardano.json:/etc/prometheus/cardano.json:ro
18+
logging:
19+
driver: "${LOGGING_DRIVER}"
20+
options:
21+
tag: "{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}"
22+
labels:
23+
- 'traefik.enable=true'
24+
- 'traefik.http.routers.prometheus.rule=Host(`${PROMETHEUS_HOST}`)'
25+
- 'traefik.http.routers.prometheus.tls=true'
26+
- 'traefik.http.routers.prometheus.tls.certresolver=lets-encrypt'
27+
- "traefik.http.routers.prometheus.middlewares=test-auth"
28+
- "traefik.http.middlewares.test-auth.basicauth.users=${AUTH_USER_PASSWORD}"
29+
30+
node-exporter:
31+
image: prom/node-exporter:latest
32+
container_name: node-exporter
33+
profiles:
34+
- tools
35+
- monitoring
36+
- all
37+
restart: unless-stopped
38+
volumes:
39+
- /proc:/host/proc:ro
40+
- /sys:/host/sys:ro
41+
- /:/rootfs:ro
42+
command:
43+
- '--path.procfs=/host/proc'
44+
- '--path.rootfs=/rootfs'
45+
- '--path.sysfs=/host/sys'
46+
- '--collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)'
47+
logging:
48+
driver: "${LOGGING_DRIVER}"
49+
options:
50+
tag: "{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}"
51+
52+
loki:
53+
image: grafana/loki:2.8.0
54+
container_name: loki
55+
profiles:
56+
- tools
57+
- monitoring
58+
- all
59+
ports:
60+
- "3100:3100"
61+
volumes:
62+
- ./loki/local-config.yaml:/etc/loki/local-config.yaml
63+
command: -config.file=/etc/loki/local-config.yaml
64+
logging:
65+
driver: "${LOGGING_DRIVER}"
66+
options:
67+
tag: "{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}"
1668

1769
promtail:
18-
image: grafana/promtail:1.4.1
70+
image: grafana/promtail:2.8.0
1971
container_name: promtail
2072
profiles:
2173
- tools
74+
- monitoring
2275
- all
76+
ports:
77+
- "9080:9080"
2378
volumes:
2479
- /var/lib/docker/containers:/var/lib/docker/containers
25-
- ./promtail-config.yml:/etc/promtail/promtail-config.yml
26-
command: -config.file=/etc/promtail/promtail-config.yml
80+
- ./promtail/promtail-config.yml:/etc/promtail/promtail-config.yml
81+
command: -config.file=/etc/promtail/promtail-config.yml -config.expand-env=true
82+
logging:
83+
driver: "${LOGGING_DRIVER}"
84+
options:
85+
tag: "{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}"
2786

2887
networks:
2988
default:

‎mithril-infra/assets/docker/docker-compose-reverse-proxy.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ services:
1717
- /var/run/docker.sock:/var/run/docker.sock:ro
1818
logging:
1919
driver: "${LOGGING_DRIVER}"
20+
options:
21+
tag: "{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}"
2022

2123
networks:
2224
default:

‎mithril-infra/assets/docker/docker-compose-signer-unverified-alone.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ services:
3030
- ../data/${NETWORK}/mithril-aggregator/cardano/ipc:/ipc
3131
logging:
3232
driver: "${LOGGING_DRIVER}"
33+
options:
34+
tag: "{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}"
3335

3436
networks:
3537
default:

‎mithril-infra/assets/docker/docker-compose-signer-unverified-norelay.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version: "3.9"
55
services:
66
cardano-node-signer:
77
image: cardano-node/${CARDANO_IMAGE_ID}-modified
8-
container_name: cardano-node-signer-${SIGNER_ID}
8+
container_name: cardano-node-full-signer-${SIGNER_ID}
99
restart: always
1010
build:
1111
context: .
@@ -18,8 +18,10 @@ services:
1818
- all
1919
logging:
2020
driver: "${LOGGING_DRIVER}"
21+
options:
22+
tag: "{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}"
2123
volumes:
22-
- ./cardano-configurations/network/${NETWORK}:/config
24+
- ../data/${NETWORK}/mithril-signer-${SIGNER_ID}/cardano/config/full/${NETWORK}:/config
2325
- ../data/${NETWORK}/mithril-signer-${SIGNER_ID}/cardano/db/passive:/db
2426
- ../data/${NETWORK}/mithril-signer-${SIGNER_ID}/cardano/ipc:/ipc
2527
environment:
@@ -66,6 +68,8 @@ services:
6668
condition: service_started
6769
logging:
6870
driver: "${LOGGING_DRIVER}"
71+
options:
72+
tag: "{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}"
6973

7074
networks:
7175
default:

‎mithril-infra/assets/docker/docker-compose-signer-unverified.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ version: "3.9"
55
services:
66
cardano-node-signer:
77
image: cardano-node/${CARDANO_IMAGE_ID}-modified
8-
container_name: cardano-node-signer-${SIGNER_ID}
8+
container_name: cardano-node-full-signer-${SIGNER_ID}
99
restart: always
1010
build:
1111
context: .
@@ -18,8 +18,10 @@ services:
1818
- all
1919
logging:
2020
driver: "${LOGGING_DRIVER}"
21+
options:
22+
tag: "{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}"
2123
volumes:
22-
- ./cardano-configurations/network/${NETWORK}:/config
24+
- ../data/${NETWORK}/mithril-signer-${SIGNER_ID}/cardano/config/full/${NETWORK}:/config
2325
- ../data/${NETWORK}/mithril-signer-${SIGNER_ID}/cardano/db/passive:/db
2426
- ../data/${NETWORK}/mithril-signer-${SIGNER_ID}/cardano/ipc:/ipc
2527
environment:
@@ -76,6 +78,8 @@ services:
7678
condition: service_started
7779
logging:
7880
driver: "${LOGGING_DRIVER}"
81+
options:
82+
tag: "{{.ImageName}}|{{.Name}}|{{.ImageFullID}}|{{.FullID}}"
7983

8084
networks:
8185
default:

0 commit comments

Comments
 (0)