Skip to content

Commit 8ef419b

Browse files
authored
Merge branch 'Lissy93:master' into master
2 parents f3c8543 + 18c2af7 commit 8ef419b

File tree

13 files changed

+1207
-117
lines changed

13 files changed

+1207
-117
lines changed

.github/AUTHORS.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,15 @@ cauterize <[email protected]> - 2 commits
6464
k073l <[email protected]> - 2 commits
6565
liss-bot <[email protected]> - 2 commits
6666
patrickheeney <[email protected]> - 2 commits
67+
rtm516 <[email protected]> - 2 commits
6768
ᗪєνιη <υн> - 2 commits
6869
Alucarddelta <[email protected]> - 3 commits
6970
Tuzi555 <[email protected]> - 3 commits
7071
Walkx <[email protected]> - 3 commits
7172
aterox <[email protected]> - 3 commits
7273
bogyeong <[email protected]> - 3 commits
7374
stanly0726 <[email protected]> - 3 commits
75+
Alberto <aravac> - 4 commits
7476
David <laso> - 4 commits
7577
Lissy93 <[email protected]> - 4 commits
7678
Niklas <abe> - 4 commits
@@ -98,9 +100,9 @@ Alicia <yke> - 28 commits
98100
repo-visualizer <[email protected]> - 71 commits
99101
snyk-bot <[email protected]> - 74 commits
100102
Lissy93 <[email protected]> - 78 commits
101-
Alicia <o> - 130 commits
103+
Alicia <o> - 132 commits
102104
liss-bot <[email protected]> - 142 commits
103105
Lissy93 <[email protected]> - 208 commits
104-
Alicia <yke> - 250 commits
106+
Alicia <yke> - 253 commits
105107
Alicia <yke> - 440 commits
106108
Alicia <yke> - 1488 commits

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ CMD [ "yarn", "start" ]
5050
EXPOSE ${PORT}
5151

5252
# Run simple healthchecks every 5 mins, to check that everythings still great
53-
HEALTHCHECK --interval=5m --timeout=2s --start-period=30s CMD yarn health-check
53+
HEALTHCHECK --interval=5m --timeout=5s --start-period=30s CMD yarn health-check

README.md

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -552,28 +552,21 @@ Huge thanks to the sponsors helping to support Dashy's development!
552552
<sub><b>Eddy Lazzarin</b></sub>
553553
</a>
554554
</td>
555-
<td align="center">
556-
<a href="https://github.com/Geolim4">
557-
<img src="https://avatars.githubusercontent.com/u/1332071?u=5d84984897f094932c4829583fee19b121f3aab8&v=4" width="80;" alt="Geolim4"/>
558-
<br />
559-
<sub><b>Georges.L</b></sub>
560-
</a>
561-
</td>
562555
<td align="center">
563556
<a href="https://github.com/AnandChowdhary">
564557
<img src="https://avatars.githubusercontent.com/u/2841780?u=ca8e292b15abcc6cddaeae0abded0115c51b4789&v=4" width="80;" alt="AnandChowdhary"/>
565558
<br />
566559
<sub><b>Anand Chowdhary</b></sub>
567560
</a>
568-
</td></tr>
569-
<tr>
561+
</td>
570562
<td align="center">
571563
<a href="https://github.com/davidpaulyoung">
572564
<img src="https://avatars.githubusercontent.com/u/3418369?v=4" width="80;" alt="davidpaulyoung"/>
573565
<br />
574566
<sub><b>David Young</b></sub>
575567
</a>
576-
</td>
568+
</td></tr>
569+
<tr>
577570
<td align="center">
578571
<a href="https://github.com/k-rol">
579572
<img src="https://avatars.githubusercontent.com/u/4050412?u=1162510eec7b7aeb31d4c7c65d51d4f773d823b0&v=4" width="80;" alt="k-rol"/>
@@ -608,15 +601,15 @@ Huge thanks to the sponsors helping to support Dashy's development!
608601
<br />
609602
<sub><b>Brian McGonagill</b></sub>
610603
</a>
611-
</td></tr>
612-
<tr>
604+
</td>
613605
<td align="center">
614606
<a href="https://github.com/vlad-timofeev">
615607
<img src="https://avatars.githubusercontent.com/u/11474041?v=4" width="80;" alt="vlad-timofeev"/>
616608
<br />
617609
<sub><b>Vlad Timofeev</b></sub>
618610
</a>
619-
</td>
611+
</td></tr>
612+
<tr>
620613
<td align="center">
621614
<a href="https://github.com/PAPAMICA">
622615
<img src="https://avatars.githubusercontent.com/u/29079741?v=4" width="80;" alt="PAPAMICA"/>

docs/assets/CONTRIBUTORS.svg

Lines changed: 67 additions & 64 deletions
Loading

docs/assets/repo-visualization.svg

Lines changed: 1 addition & 1 deletion
Loading

docs/credits.md

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -32,28 +32,21 @@
3232
<sub><b>Eddy Lazzarin</b></sub>
3333
</a>
3434
</td>
35-
<td align="center">
36-
<a href="https://github.com/Geolim4">
37-
<img src="https://avatars.githubusercontent.com/u/1332071?u=5d84984897f094932c4829583fee19b121f3aab8&v=4" width="80;" alt="Geolim4"/>
38-
<br />
39-
<sub><b>Georges.L</b></sub>
40-
</a>
41-
</td>
4235
<td align="center">
4336
<a href="https://github.com/AnandChowdhary">
4437
<img src="https://avatars.githubusercontent.com/u/2841780?u=ca8e292b15abcc6cddaeae0abded0115c51b4789&v=4" width="80;" alt="AnandChowdhary"/>
4538
<br />
4639
<sub><b>Anand Chowdhary</b></sub>
4740
</a>
48-
</td></tr>
49-
<tr>
41+
</td>
5042
<td align="center">
5143
<a href="https://github.com/davidpaulyoung">
5244
<img src="https://avatars.githubusercontent.com/u/3418369?v=4" width="80;" alt="davidpaulyoung"/>
5345
<br />
5446
<sub><b>David Young</b></sub>
5547
</a>
56-
</td>
48+
</td></tr>
49+
<tr>
5750
<td align="center">
5851
<a href="https://github.com/k-rol">
5952
<img src="https://avatars.githubusercontent.com/u/4050412?u=1162510eec7b7aeb31d4c7c65d51d4f773d823b0&v=4" width="80;" alt="k-rol"/>
@@ -88,15 +81,15 @@
8881
<br />
8982
<sub><b>Brian McGonagill</b></sub>
9083
</a>
91-
</td></tr>
92-
<tr>
84+
</td>
9385
<td align="center">
9486
<a href="https://github.com/vlad-timofeev">
9587
<img src="https://avatars.githubusercontent.com/u/11474041?v=4" width="80;" alt="vlad-timofeev"/>
9688
<br />
9789
<sub><b>Vlad Timofeev</b></sub>
9890
</a>
99-
</td>
91+
</td></tr>
92+
<tr>
10093
<td align="center">
10194
<a href="https://github.com/PAPAMICA">
10295
<img src="https://avatars.githubusercontent.com/u/29079741?v=4" width="80;" alt="PAPAMICA"/>
@@ -232,6 +225,13 @@
232225
<sub><b>UrekD</b></sub>
233226
</a>
234227
</td>
228+
<td align="center">
229+
<a href="https://github.com/albcp">
230+
<img src="https://avatars.githubusercontent.com/u/3170731?v=4" width="80;" alt="albcp"/>
231+
<br />
232+
<sub><b>Alberto</b></sub>
233+
</a>
234+
</td>
235235
<td align="center">
236236
<a href="https://github.com/Tracreed">
237237
<img src="https://avatars.githubusercontent.com/u/6306365?v=4" width="80;" alt="Tracreed"/>
@@ -252,15 +252,15 @@
252252
<br />
253253
<sub><b>Totto16</b></sub>
254254
</a>
255-
</td>
255+
</td></tr>
256+
<tr>
256257
<td align="center">
257258
<a href="https://github.com/alucarddelta">
258259
<img src="https://avatars.githubusercontent.com/u/20882097?v=4" width="80;" alt="alucarddelta"/>
259260
<br />
260261
<sub><b>Brent</b></sub>
261262
</a>
262-
</td></tr>
263-
<tr>
263+
</td>
264264
<td align="center">
265265
<a href="https://github.com/Bogyie">
266266
<img src="https://avatars.githubusercontent.com/u/82003678?v=4" width="80;" alt="Bogyie"/>
@@ -282,13 +282,21 @@
282282
<sub><b>Rúben Silva</b></sub>
283283
</a>
284284
</td>
285+
<td align="center">
286+
<a href="https://github.com/rtm516">
287+
<img src="https://avatars.githubusercontent.com/u/5401186?v=4" width="80;" alt="rtm516"/>
288+
<br />
289+
<sub><b>rtm516</b></sub>
290+
</a>
291+
</td>
285292
<td align="center">
286293
<a href="https://github.com/onedr0p">
287294
<img src="https://avatars.githubusercontent.com/u/213795?v=4" width="80;" alt="onedr0p"/>
288295
<br />
289296
<sub><b>ᗪєνιη ᗷυнʟ</b></sub>
290297
</a>
291-
</td>
298+
</td></tr>
299+
<tr>
292300
<td align="center">
293301
<a href="https://github.com/alexdelprete">
294302
<img src="https://avatars.githubusercontent.com/u/7027842?v=4" width="80;" alt="alexdelprete"/>
@@ -302,8 +310,7 @@
302310
<br />
303311
<sub><b>Stephen Rigney</b></sub>
304312
</a>
305-
</td></tr>
306-
<tr>
313+
</td>
307314
<td align="center">
308315
<a href="https://github.com/moemoeq">
309316
<img src="https://avatars.githubusercontent.com/u/1808434?v=4" width="80;" alt="moemoeq"/>
@@ -324,20 +331,6 @@
324331
<br />
325332
<sub><b>Matthias Bilger</b></sub>
326333
</a>
327-
</td>
328-
<td align="center">
329-
<a href="https://github.com/thomasdissert">
330-
<img src="https://avatars.githubusercontent.com/u/11446531?v=4" width="80;" alt="thomasdissert"/>
331-
<br />
332-
<sub><b>Thomas Dissert</b></sub>
333-
</a>
334-
</td>
335-
<td align="center">
336-
<a href="https://github.com/k073l">
337-
<img src="https://avatars.githubusercontent.com/u/21180271?v=4" width="80;" alt="k073l"/>
338-
<br />
339-
<sub><b>K073l</b></sub>
340-
</a>
341334
</td></tr>
342335
</table>
343336
<!-- readme: contributors -end -->

docs/widgets.md

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ Dashy has support for displaying dynamic content in the form of widgets. There a
3535
- [GitHub Trending](#github-trending)
3636
- [GitHub Profile Stats](#github-profile-stats)
3737
- [Healthchecks Status](#healthchecks status)
38+
- [Mvg Departure](#mvg-departure)
39+
- [Mvg Connection](#mvg-connection)
3840
- **[Self-Hosted Services Widgets](#self-hosted-services-widgets)**
3941
- [System Info](#system-info)
4042
- [Cron Monitoring](#cron-monitoring-health-checks)
@@ -58,6 +60,7 @@ Dashy has support for displaying dynamic content in the form of widgets. There a
5860
- [Nextcloud PHP OPcache](#nextcloud-php-opcache-stats)
5961
- [Sabnzbd](#sabnzbd)
6062
- [Gluetun VPN Info](#gluetun-vpn-info)
63+
- [Drone CI Build](#drone-ci-builds)
6164
- **[System Resource Monitoring](#system-resource-monitoring)**
6265
- [CPU Usage Current](#current-cpu-usage)
6366
- [CPU Usage Per Core](#cpu-usage-per-core)
@@ -1173,6 +1176,92 @@ Display status of one or more HealthChecks project(s). Works with healthcheck.io
11731176

11741177
---
11751178

1179+
### MVG Departure
1180+
1181+
Display departure time of a MVG (Münchner Verkehrs Gesellschaft) station.
1182+
1183+
From https://www.mvg.de/impressum.html:
1184+
1185+
> [...] Die Verarbeitung unserer Inhalte oder Daten durch Dritte erfordert unsere ausdrückliche Zustimmung. Für private, nicht-kommerzielle Zwecke, wird eine gemäßigte Nutzung ohne unsere ausdrückliche Zustimmung geduldet. Jegliche Form von Data-Mining stellt keine gemäßigte Nutzung dar.[...]
1186+
1187+
In other words: Private, noncomercial, moderate use of the API is tolerated. They don’t consider data mining as moderate use. (This is not a legal advice)
1188+
1189+
#### Options
1190+
1191+
**Field** | **Type** | **Required** | **Description**
1192+
--- | --- | --- | ---
1193+
**`location`** | `string` | Required | The name of the location (exact) or the location id, startin with `de:09162:`
1194+
**`limit`** | `integer` | _Optional_ | Limit number of entries, defaults to 10.
1195+
**`title`** | `string` | _Optional_ | A custom title to be displayed.
1196+
**`header`** | `bool` | _Optional_ | Shall the title be shown?
1197+
**`filters`** | `object` | _Optional_ | Filter results
1198+
**`filters.line`** | `string/array` | _Optional_ | Filter results for given line(s).
1199+
**`filters.product`** | `string/array` | _Optional_ | Filter results for specific product (TRAM, UBAHN, SBAHN, BUS).
1200+
**`filters.destination`** | `string/object` | _Optional_ | Filter results for specific destination(s)
1201+
1202+
```yaml
1203+
- type: mvg
1204+
options:
1205+
location: Marienplatz
1206+
limit: 5
1207+
```
1208+
1209+
#### Info
1210+
1211+
- **CORS**: 🟢 Enabled
1212+
- **Auth**: 🟢 Not Required
1213+
- **Price**: 🟢 Free / Private use only
1214+
- **Host**: [MVG](https://mvg.de)
1215+
- **Privacy**: _See [MVG Datenschutz](https://www.mvg.de/datenschutz-mvg.html)_
1216+
1217+
---
1218+
1219+
### MVG Connection
1220+
1221+
Display the next connection for two addresses/coordinates, stations or POI within Munich using MVG MVG (Münchner Verkehrs Gesellschaft).
1222+
1223+
From https://www.mvg.de/impressum.html:
1224+
1225+
> [...] Die Verarbeitung unserer Inhalte oder Daten durch Dritte erfordert unsere ausdrückliche Zustimmung. Für private, nicht-kommerzielle Zwecke, wird eine gemäßigte Nutzung ohne unsere ausdrückliche Zustimmung geduldet. Jegliche Form von Data-Mining stellt keine gemäßigte Nutzung dar.[...]
1226+
1227+
In other words: Private, noncomercial, moderate use of the API is tolerated. They don’t consider data mining as moderate use. (This is not a legal advice)
1228+
1229+
#### Options
1230+
1231+
**Field** | **Type** | **Required** | **Description**
1232+
--- | --- | --- | ---
1233+
**`origin`** | `string` | Required | Origin of the connection.
1234+
**`destination`** | `string` | Required | Destination of the connection.
1235+
**`title`** | `string` | _Optional_ | A custom title to be displayed.
1236+
**`header`** | `bool` | _Optional_ | Shall the title be shown?
1237+
**`filters`** | `object` | _Optional_ | Filter results
1238+
**`filters.line`** | `string/array` | _Optional_ | Filter results for given line(s).
1239+
**`filters.product`** | `string/array` | _Optional_ | Filter results for specific product (TRAM, UBAHN, SBAHN, BUS).
1240+
**`filters.destination`** | `string/object` | _Optional_ | Filter results for specific destination(s)
1241+
1242+
```yaml
1243+
- type: mvg-connection
1244+
options:
1245+
from: Marienplatz
1246+
from: Dachauer Straße 123
1247+
header: true
1248+
filters:
1249+
product: [UBAHN]
1250+
line: [U1,U2,U4,U5]
1251+
1252+
```
1253+
1254+
#### Info
1255+
1256+
- **CORS**: 🟢 Enabled
1257+
- **Auth**: 🟢 Not Required
1258+
- **Price**: 🟢 Free / Private use only
1259+
- **Host**: [MVG](https://mvg.de)
1260+
- **Privacy**: _See [MVG Datenschutz](https://www.mvg.de/datenschutz-mvg.html)_
1261+
1262+
---
1263+
1264+
11761265
## Self-Hosted Services Widgets
11771266

11781267
### System Info
@@ -1947,6 +2036,42 @@ Display info from the Gluetun VPN container public IP API. This can show the IP
19472036

19482037
---
19492038

2039+
### Drone CI Builds
2040+
2041+
Display the last builds from a [Drone CI](https://www.drone.ci) instance. A self-hosted CI system that uses docker.
2042+
2043+
<p align="center"><img width="380" src="https://i.ibb.co/nQM3BXj/Bildschirm-foto-2023-01-07-um-01-31-45.png" /></p>
2044+
2045+
#### Options
2046+
2047+
**Field** | **Type** | **Required** | **Description**
2048+
--- | --- | --- | ---
2049+
**`host`** | `string` | Required | The histname of the Drone CI instance.
2050+
**`apiKey`** | `string` | Required | The API key (https://<your-drone-instance>/account).
2051+
**`limit`** | `integer` | _Optional_ | Limit the amounts of listed builds.
2052+
**`repo`** | `string` | _Optional_ | Show only builds of the specified repo
2053+
2054+
#### Example
2055+
2056+
```yaml
2057+
- type: drone-io
2058+
updateInterval: 30
2059+
options:
2060+
host: https://drone.somedomain.com
2061+
apiKey: my-very-secret-api-key
2062+
limit: 10
2063+
```
2064+
2065+
#### Info
2066+
2067+
- **CORS**: 🟢 Enabled
2068+
- **Auth**: 🟢 Required
2069+
- **Price**: 🟢 Free
2070+
- **Host**: Self-Hosted (see [Drone](https://www.drone.io))
2071+
- **Privacy**: _See [Drone](https://www.drone.io)_
2072+
2073+
---
2074+
19502075
## System Resource Monitoring
19512076

19522077
### Glances

0 commit comments

Comments
 (0)