Skip to content

Commit 61b99cb

Browse files
committed
Merge branch 'main' into portal
2 parents 1f75cdd + b4d086d commit 61b99cb

File tree

5 files changed

+472
-421
lines changed

5 files changed

+472
-421
lines changed

Package.resolved

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Sources/App/Core/Supporters+GitHub.swift

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,6 @@ extension Array<Supporters.Community> {
172172
name: nil,
173173
avatarUrl: "https://avatars.githubusercontent.com/u/1046635?u=b0ddade45ded79cb570f09e083c24fbdd63e7bee&v=4"
174174
),
175-
.init(
176-
login: "sinoru",
177-
name: "Jaehong Kang",
178-
avatarUrl: "https://avatars.githubusercontent.com/u/1138433?u=b7aa6222751f10a24dce1c47d78f20ced83fd984&v=4"
179-
),
180175
.init(
181176
login: "JoshuaKaden",
182177
name: "Joshua Kaden",
@@ -192,11 +187,6 @@ extension Array<Supporters.Community> {
192187
name: "Will Field-Thompson",
193188
avatarUrl: "https://avatars.githubusercontent.com/u/1696960?u=480042020f9901e9459be75fc2e891081b6f0492&v=4"
194189
),
195-
.init(
196-
login: "radmakr",
197-
name: "Thomas Rademaker",
198-
avatarUrl: "https://avatars.githubusercontent.com/u/1885323?u=236e99eb7cb909bff3a7e9f5c85f120dc458fd27&v=4"
199-
),
200190
.init(
201191
login: "dokun1",
202192
name: "David Okun",
@@ -397,6 +387,11 @@ extension Array<Supporters.Community> {
397387
name: "Mattes Mohr",
398388
avatarUrl: "https://avatars.githubusercontent.com/u/64681110?u=2270894ff05a553bf3039f1d3df1e2dcd2c44cea&v=4"
399389
),
390+
.init(
391+
login: "SwiftyJoeyy",
392+
name: "Joe Maghzal",
393+
avatarUrl: "https://avatars.githubusercontent.com/u/69967145?u=476cafff997d6bc179934efed7a8aa339be51b08&v=4"
394+
),
400395
.init(
401396
login: "Emerge-Tools",
402397
name: "Emerge Tools",

mon.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020

2121
grafana:
2222
# https://github.com/grafana/grafana/releases
23-
image: grafana/grafana:11.5.1
23+
image: grafana/grafana:11.6.0
2424
environment:
2525
GF_SECURITY_ADMIN_PASSWORD: ${GF_SECURITY_ADMIN_PASSWORD}
2626
GF_USERS_ALLOW_SIGN_UP: 'false'
@@ -42,7 +42,7 @@ services:
4242

4343
loki:
4444
# https://github.com/grafana/loki/releases
45-
image: grafana/loki:3.3.2
45+
image: grafana/loki:3.4.2
4646
command: -config.file=/loki.yml
4747
configs:
4848
- source: loki_cfg
@@ -54,7 +54,7 @@ services:
5454
promtail:
5555
# https://github.com/grafana/loki/releases
5656
# (promtail is released in parallel with loki)
57-
image: grafana/promtail:3.3.2
57+
image: grafana/promtail:3.4.2
5858
command: -config.file=/promtail.yml
5959
configs:
6060
- source: promtail_cfg
@@ -71,7 +71,7 @@ services:
7171

7272
prometheus:
7373
# https://github.com/prometheus/prometheus/releases
74-
image: prom/prometheus:v3.1.0
74+
image: prom/prometheus:v3.2.1
7575
volumes:
7676
- prometheus_data:/prometheus
7777
command: --config.file=/prometheus.yml --storage.tsdb.retention.time=30d
@@ -96,7 +96,7 @@ services:
9696

9797
node-exporter:
9898
# https://github.com/prometheus/node_exporter/releases
99-
image: prom/node-exporter:v1.8.2
99+
image: prom/node-exporter:v1.9.0
100100
networks:
101101
- app_backend
102102
volumes:
@@ -110,7 +110,7 @@ services:
110110

111111
cadvisor:
112112
# https://github.com/google/cadvisor/releases
113-
image: gcr.io/cadvisor/cadvisor:v0.51.0
113+
image: gcr.io/cadvisor/cadvisor:v0.52.1
114114
networks:
115115
- app_backend
116116
volumes:

0 commit comments

Comments
 (0)