Commit Graph

1661 Commits

Author SHA1 Message Date
Nelson Chan
4d262bbb6a Fix: Fix no certificate caused by session reuse 2021-07-23 11:22:37 +08:00
Louis Lam
d1370a62bd
Merge pull request #103 from Spiritreader/master
Fix parenthesis mistake in notification checker (fixes #86)
2021-07-23 09:11:14 +08:00
Sam
063fd6ef43 Merge branch 'master' of https://github.com/Spiritreader/uptime-kuma 2021-07-22 20:25:08 +02:00
Sam
1d4d7fa9c4 fix parenthesis mistake 2021-07-22 20:25:03 +02:00
Louis Lam
248b5292dc
Merge pull request #86 from Spiritreader/master
Implement retries (#56)
2021-07-23 00:11:24 +08:00
Matthew Macdonald-Wallace
47d830db1f Remove examples so they can go on the wiki instead 2021-07-22 16:15:19 +01:00
Matthew Macdonald-Wallace
3a8fbff514 Change casing in README, apply DRY to label values 2021-07-22 16:00:56 +01:00
Matthew Macdonald-Wallace
a93fd274fd Update README to include examples for Prometheus 2021-07-22 15:02:33 +01:00
Niyas
77fbfc23be
Pushover enhancements 2021-07-22 19:28:25 +05:30
Matthew Macdonald-Wallace
3b45006567 Move common labels into dedicated const 2021-07-22 14:58:22 +01:00
Niyas
b7a32d4ab6
Pushover enhancements 2021-07-22 19:26:54 +05:30
LouisLam
5a219554b3 grammar 2021-07-22 19:49:46 +08:00
LouisLam
70b1f197c1 rename "Retry Pings" to "Retries" 2021-07-22 19:02:44 +08:00
Matthew Macdonald-Wallace
720051a351 Typo in monitor status name 2021-07-22 11:18:20 +01:00
LouisLam
32a5e838ba add patch3.sql and fix duplicate id in EditMonitor.vue 2021-07-22 17:44:59 +08:00
LouisLam
86e18ac11d Merge branch 'master' into Spiritreader_master
# Conflicts:
#	src/pages/EditMonitor.vue
2021-07-22 17:34:41 +08:00
Matthew Macdonald-Wallace
3dcbae0889 Add labels to metrics for querying 2021-07-22 10:21:20 +01:00
Matthew Macdonald-Wallace
96242dce0d Expose check status and response time to Prometheus 2021-07-22 09:38:27 +01:00
Nelson Chan
f20ab4b0e3 Fix: use Optional chaining 2021-07-22 16:13:58 +08:00
Nelson Chan
96c60dd94a Feat: Add database storage for TLS info 2021-07-22 16:04:32 +08:00
Matthew Macdonald-Wallace
7acb265559 Remove bcryptjs and node-gyp, they should not be here... 2021-07-22 09:01:51 +01:00
Matthew Macdonald-Wallace
582fb2fe29 Export general metrics via the /metrics endpoint 2021-07-22 08:43:04 +01:00
Matthew Macdonald-Wallace
e3d4a896b1 Fix up some formatting 2021-07-22 08:33:21 +01:00
Matthew Macdonald-Wallace
9a1bf6006a Add initial package import and config 2021-07-22 08:24:25 +01:00
Matthew Macdonald-Wallace
ef41a32353
Merge pull request #1 from louislam/master
Pull down upstream
2021-07-22 08:23:24 +01:00
Nelson Chan
ccda6f05f5 Feat: Add Barebones certificate info display 2021-07-22 14:26:43 +08:00
LouisLam
03b3bb5b30 fix if notification throw exception, the heartbeat is not stored in to the db. 2021-07-22 12:28:47 +08:00
LouisLam
7e4a1ad279 remove used vars 2021-07-22 11:15:53 +08:00
LouisLam
916b9da0dc Merge branch 'master' into something
# Conflicts:
#	server/notification.js
#	src/components/NotificationDialog.vue
2021-07-22 11:12:52 +08:00
LouisLam
a64ce81457 update package-lock.json 2021-07-22 10:55:55 +08:00
LouisLam
c575afc8e0 Merge remote-tracking branch 'origin/master' 2021-07-22 10:47:39 +08:00
Louis Lam
1e42343aee
Update patch1.sql
minor
2021-07-22 10:45:22 +08:00
LouisLam
afd4cf2425 Merge branch 'master' into simple_pagination 2021-07-22 10:42:30 +08:00
LouisLam
e02eb72863 add db migration 2021-07-22 02:02:35 +08:00
LouisLam
1c0dc18d72 Merge remote-tracking branch 'origin/master' 2021-07-22 01:30:22 +08:00
Louis Lam
c00612c1a9
Update --please-go-to--discussion--tab-if-you-want-to-ask-or-share-something.md 2021-07-21 16:29:15 +08:00
Louis Lam
32345fcbe9 Update issue templates 2021-07-21 16:28:31 +08:00
Louis Lam
fd90458e77 Update issue templates 2021-07-21 16:25:58 +08:00
Louis Lam
d89e6f4649
Merge pull request #89 from Saibamen/more_info_in_server_logs
More info in server logs
2021-07-21 11:34:27 +08:00
Adam Stachowicz
c4ca8e2acb More info in server logs 2021-07-21 00:41:38 +02:00
LouisLam
94b5a557bf Merge remote-tracking branch 'origin/master' 2021-07-20 23:43:59 +08:00
Sam
14e1d1f105
add .vscode directory to dockerignore 2021-07-20 17:39:21 +02:00
Sam
8b905b6b12
Indentation fix in editor
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-07-20 17:38:21 +02:00
Louis Lam
fa57d40c3c
Update README.md 2021-07-20 20:27:34 +08:00
Louis Lam
62e231e92b
Update README.md 2021-07-20 20:27:15 +08:00
LouisLam
02b4dfc100 prevent the telegram getUpdates URL go out of box 2021-07-20 20:18:56 +08:00
LouisLam
657acf748b update to 1.0.6 2021-07-20 20:04:54 +08:00
Sam
054269ecf0 fix notification when changing from pending -> up 2021-07-20 11:50:33 +02:00
Louis Lam
71dd68bb6d
Update README.md 2021-07-20 13:04:21 +08:00
Sam
02230930c5 Merge branch 'master' of https://github.com/Spiritreader/uptime-kuma 2021-07-19 18:26:00 +02:00