Skip to content

Commit 2993f25

Browse files
authored
Merge pull request #20 from SoftBankHackathon2025/fix/grafana
fix 그라파나 버전 충돌 해결
2 parents 5cae4a1 + a652c33 commit 2993f25

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ services:
9999
- microservices
100100

101101
grafana:
102-
image: grafana/grafana:latest
102+
image: grafana/grafana:9.5.15
103103
container_name: grafana
104104
ports:
105105
- "3000:3000"

monitoring/grafana/provisioning/alerting/rules-health.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ groups:
1818
datasource: { type: prometheus, uid: DS_PROMETHEUS }
1919
expr: |
2020
sum by(instance)(
21-
(1 - min_over_time(up{instance="deploy:8080"}[2m]))
22-
or on (instance) absent(up{instance="deploy:8080"})
23-
or on (instance) (up{instance="deploy:8080"} * 0)
21+
(1 - min_over_time(up{instance="deploy:8082"}[2m]))
22+
or on (instance) absent(up{instance="deploy:8082"})
23+
or on (instance) (up{instance="deploy:8082"} * 0)
2424
)
2525
instant: false
2626
- refId: B
@@ -104,9 +104,9 @@ groups:
104104
datasource: { type: prometheus, uid: DS_PROMETHEUS }
105105
expr: |
106106
sum by(instance)(
107-
(1 - min_over_time(up{instance="frontend:8080"}[2m]))
108-
or on (instance) absent(up{instance="frontend:8080"})
109-
or on (instance) (up{instance="frontend:8080"} * 0)
107+
(1 - min_over_time(up{instance="frontend:8081"}[2m]))
108+
or on (instance) absent(up{instance="frontend:8081"})
109+
or on (instance) (up{instance="frontend:8081"} * 0)
110110
)
111111
instant: false
112112
- refId: B
@@ -190,9 +190,9 @@ groups:
190190
datasource: { type: prometheus, uid: DS_PROMETHEUS }
191191
expr: |
192192
sum by(instance)(
193-
(1 - min_over_time(up{instance="user:8080"}[2m]))
194-
or on (instance) absent(up{instance="user:8080"})
195-
or on (instance) (up{instance="user:8080"} * 0)
193+
(1 - min_over_time(up{instance="user:8083"}[2m]))
194+
or on (instance) absent(up{instance="user:8083"})
195+
or on (instance) (up{instance="user:8083"} * 0)
196196
)
197197
instant: false
198198
- refId: B

monitoring/prometheus.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ scrape_configs:
88
- targets: ['gateway:8080']
99
labels:
1010
application: 'gateway'
11-
- targets: ['frontend:8080']
11+
- targets: ['fe:8081']
1212
labels:
1313
application: 'frontend'
14-
- targets: ['deploy:8080']
14+
- targets: ['deploy:8082']
1515
labels:
1616
application: 'deploy'
17-
- targets: ['user:8080']
17+
- targets: ['user:8083']
1818
labels:
1919
application: 'user'
20-
- targets: ['eureka-server:8761']
20+
- targets: ['server:8761']
2121
labels:
2222
application: 'eureka'

0 commit comments

Comments
 (0)