80927332cb
Merge remote-tracking branch 'origin/master' into feat/monitor-list-improved-filtering
1 year ago
21d556528f
Fix #3420 timezone issue ( #3425 )
1 year ago
357466cc90
Minor
1 year ago
b038d09349
Minor
1 year ago
c6d0c431bd
Merge pull request #3080 from duanearnett/feature/add-channel-notification-for-slack
...
Adds configurable @channel notification for Slack integrations
1 year ago
345e61abca
Merge remote-tracking branch 'origin/master' into feat/badge-generator-placeholders
...
# Conflicts:
# package-lock.json
# package.json
1 year ago
dd1526deff
Merge pull request #3421 from louislam/some-update
...
Some update
1 year ago
be26bb75d9
Update version handling
1 year ago
99fb5836e2
Add SMSC (СМСЦентр) provider notification ( #3335 ) By @FlatronBuda
...
* Add SMSC, code from #3334
Co-authored-by: FlatronBuda <>
* Update server/notification-providers/smsc.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update server/notification-providers/smsc.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update server/notification-providers/smsc.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update according to @FlatronBuda
* Move to the regional list
---------
Co-authored-by: Frank Elsinga <frank@elsinga.de>
1 year ago
2f5a565ce4
Merge pull request #3381 from n-thumann/fix_ipv6_handling
...
Fix handling of IPv6 addresses in getClientIP
1 year ago
6f4af30701
Merge branch 'master' of https://github.com/louislam/uptime-kuma into status-page-expiry
1 year ago
b1f266ceb1
Added expiry changes to status page and fixes
1 year ago
6bece8796e
✨ feat: json-query monitor added ( #3253 )
...
* ✨ feat: json-query monitor added
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: import warning error
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: br tag and remove comment
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: supporting compare string with other types
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: switch to a better lib for json query
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: better description on json query and using `v-html` in jsonQueryDescription element to fix `a` tags
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: result variable in error message
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: typos in json query description
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* 📝 docs: `HTTP(s) Json Query` added to monitor list in `README.md`
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: needed white space in `README.md`
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Nostr dm notifications (#3051 )
* Add nostr DM notification provider
* require crypto for node 18 compatibility
* remove whitespace
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* move closer to where it is used
* simplify success or failure logic
* don't clobber the non-alert msg
* Update server/notification-providers/nostr.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* polyfills required for node <= 18
* resolve linter warnings
* missing comma
---------
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Drop nostr
* Rebuild package-lock.json
* Lint
---------
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: zappityzap <128872140+zappityzap@users.noreply.github.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
1 year ago
e7d1b4e14a
Merge pull request #3174 from chakflying/fix/push-monitor-safe-restart
...
Fix: Use safeBeat in push monitor
1 year ago
e5c6783781
Merge pull request #3205 from woj-tek/master
...
Add option to use ApiKeys in Twilio in addition to main account credentials
1 year ago
d825dbf828
Merge pull request #3188 from chakflying/fix/radius-timeout
...
Fix: Set radius connection timeout to monitor default
1 year ago
293015ff35
Parse `x-www-form-urlencoded` for /test-webhook
1 year ago
18d8b3a8e0
Merge remote-tracking branch 'origin/master' into feat/webhook-custom-body
1 year ago
cdb38d49eb
Merge pull request #3380 from chakflying/experiment/incremental-vacuum-job
...
Feat: Run incremental_vacuum and optimize
1 year ago
fe40d819bd
Update send403 to sendHttpError
1 year ago
3dbd8277f0
Merge remote-tracking branch 'origin/master' into feat/global-status-page-badge
...
# Conflicts:
# .gitignore
1 year ago
ed6b4e5ae5
Merge remote-tracking branch 'origin/master' into miles/invert-keyword
...
# Conflicts:
# server/database.js
1 year ago
3b9c95a8a8
Prevent users from specifying an unexpected executable as Chromium ( #3348 )
1 year ago
cdf6922bdd
Fix handling of IPv6 addresses in getClientIP
1 year ago
9954ba82e7
Feat: Run incremental_vacuum and optimize
1 year ago
13ae878ee8
Merge pull request #3347 from louislam/1.22.X
...
1.22.x merge to master
1 year ago
4ea5771f97
Status page certificate expiry
1 year ago
1774bb86dc
🐛 fix lint warning ( #3355 )
1 year ago
bd5496d267
Fixed update checker making requests to uptime.kuma.pet even when turned off ( #2281 )
...
* fix: update checker
- fixed bug where it would make the request to uptime.kuma.pet regardless of the `checkUpdate` config;
- defined constants in the top of the document for easier configuration/documentation;
- removed unnecessary compareVersions: we were comparing the same var on both sides res.data.beta, so it will always be equal.
* improvement: better logging and added doc
* improved UPDATE_CHECKER_INTERVAL_MS const
---------
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
1 year ago
df8fcffb19
Drop unused code
1 year ago
8c60e902e1
Remove an unused variable
1 year ago
ccc39b9516
Move all old db patch files to `db/old_migrations/`
1 year ago
de74efb2e6
Merge pull request #3169 from janow25/docker-health-check
...
Added Docker Health Status Support
1 year ago
e26abc3156
Improve the setup database
1 year ago
d286c534bd
Improve the setup database for embedded MariaDB
1 year ago
7975caf29e
Update db migration and dockerfile
1 year ago
16a1a66e09
Merge remote-tracking branch 'origin/master' into 2.0.X
...
# Conflicts:
# docker/alpine-base.dockerfile
# docker/debian-base.dockerfile
# docker/dockerfile
# package.json
# server/database.js
# server/jobs/util-worker.js
# server/model/maintenance.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# server/uptime-kuma-server.js
1 year ago
9ee2780e9e
Merge pull request #2871 from pruekk/chore/missing-notificationList
...
chore: notification toggle missing when import from backup
1 year ago
a386f1fc9e
[Experiment] Use incremental vacuum to speed up delete? ( #2800 )
...
* DB: Use incremental vacuum
* Chore: Add log for delete monitor exec. time
* WIP: Test synchronous NORMAL
1 year ago
3e5e7e6e32
Fix: Incorrect options for cert-exp badge
1 year ago
0e725569e5
Feat: Add placeholders for badge generator
...
Chore: Save as dev dep.
1 year ago
2e2747fb52
Handling DATE_ADD
1 year ago
5388a37a26
Fix port NaN not working in MariaDB
1 year ago
4f6035899d
Real browser monitor type ( #3308 )
1 year ago
dd77baabe1
Merge pull request #3234 from kefoster951/fix_redis_auth
...
Fix redis authentication reattempt issue
1 year ago
820f2eec9f
Merge remote-tracking branch 'origin/1.23.X'
1 year ago
7cc9783436
Fix: Active needs to return bool instead of 0
1 year ago
b4b6e07e6b
Merge pull request #3310 from chakflying/chore/auth-logging
...
Chore: Add logging for failed auth
1 year ago
7a34103da6
Added fix to remove children when type changed
1 year ago
c9d6e576ab
Chore: Remove redundant assign
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
1 year ago
97d38ee1a8
Feat: Add custom body for Webhook Notif.
1 year ago
cc94609423
Chore: Add logging for failed auth
1 year ago
a00561ff09
Strip trailing slashes to avoid 404
1 year ago
6708eed121
Fixed error handling if client is closed
1 year ago
3c56a6f395
Merge branch 'louislam:master' into fix_redis_auth
1 year ago
2b46693995
Merge pull request #3239 from madnight/master
...
Fix: prometheus monitor_status metric has 4 values
1 year ago
d37c33ad42
Update server/util-server.js
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
1 year ago
c4c3fc81b2
Merge pull request #2693 from julian-piehl/group-monitors
...
Group monitors
1 year ago
37ae8eb44a
Fix: prometheus monitor_status metric has 4 values
...
The prometheus monitor_status metric has actually 4 values. This can easily be verified by looking up the related source code or by using the metric in grafana an see values like 2 (which indicates timeout).
1 year ago
8897385690
Fixed linting
1 year ago
6132a45c7c
fixed when auth is needed but not provided
1 year ago
f68452c47a
Added changes to stop auth attempts after an error
1 year ago
58ec53fb1d
Fix: Try to close mysql connection properly
1 year ago
9a8bea5761
Changes 'Mention Channel' -> 'Notify Channel'
...
- Updates variable names
- Updates any Slack mention references
1 year ago
56f448bfe5
fix: maintenance heredity
1 year ago
2b46da0f47
style: fix linting
1 year ago
9bd76c2795
Merge branch 'master' into group-monitors
1 year ago
376d84c742
Merge branch 'master' into feature/add-channel-notification-for-slack
1 year ago
343a1d3344
Merge pull request #3203 from CommanderStorm/applied_timezone_formatting
...
chore: Made sure that every notification provider uses `timezone`/`localTime`
1 year ago
f3fe392ec4
Add option to use ApiKeys in Twilio in addition to main account credentials
1 year ago
f3c09f2bbd
made every Notification provider supply time like dingding after #3152
1 year ago
8ed2b59410
Resolve conflict
1 year ago
0b8dddba24
Merge remote-tracking branch 'origin/master' into skaempfe#2593
...
# Conflicts:
# server/model/monitor.js
# src/pages/Details.vue
1 year ago
bc95875aa0
Merge pull request #3156 from maximilian-krauss/feat/add-pushover-ttl
...
feat: Adds message ttl to pushover notification
1 year ago
c1efe0f26d
Add a warning for Node.js >= 20
1 year ago
a0d0d5b015
fix: sends pushover ttl only if defined
1 year ago
8d05d80a5f
feat: Adds message ttl to pushover notification
1 year ago
5200e10aab
Removes ternary operator for Slack channel mention
2 years ago
f1a396b0f7
Fix: Align radius timeout to default
2 years ago
f70b971810
Fix: Improve error message
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2 years ago
00f733d352
Adds ability to notify channel when Slack webhook triggered
...
- Adds field to toggle channel mentions on/off for Slack integration
- Adds special mention for @channel when enabled
Reference:
[Slack docs](https://api.slack.com/reference/surfaces/formatting#special-mentions )
2 years ago
317024ed72
Fix: Use safebeat for push monitor
2 years ago
f604d96c5b
splited if to inner if
2 years ago
f30f00655f
small fix for down containers
2 years ago
891f09def7
removed log
2 years ago
6b5e179bb0
linting
2 years ago
f653aba735
added docker health status
2 years ago
bb15fa0179
Merge pull request #3154 from chakflying/fix/clear-data-remove-worker-thread
...
Fix: Remove use of worker threads in clear-old-data
2 years ago
8d24891b8e
Merge pull request #3054 from TechWilk/keyword-not-found-whitespace
...
Trim before truncating "keword not found" message
2 years ago
80c8fd7372
Chore: Remove util-worker
2 years ago
a27386bb92
Fix: Use croner for clear-old-data
2 years ago
ce70b3fc62
feat: add a space to separate the words
2 years ago
06fba5b55a
feat: show time as server timezone in dingding notification
2 years ago
7f5d0e5490
Merge remote-tracking branch 'origin/1.21.X'
...
# Conflicts:
# package-lock.json
2 years ago
0eaaa8b6fa
Minor
2 years ago
5cd506e340
Minor
2 years ago
f0beccf6bf
Fix `Same As Server Timezone` do not save correctly
2 years ago
72c16c3aa2
Fix eslint warnings
2 years ago
d23cb0b382
Fix maintenance do not start after 1.21.2
2 years ago
8207f16396
Merge remote-tracking branch 'origin/master' into ntfy-bearer-authorization
2 years ago
Louis Lam
Tarun Singh
Muhammed Hussein karimi
nthumann
Nelson Chan
DevMirza
Francisco Marques
Nelson Chan
Lasse Bang Mikkelsen
Kenneth Foster
kefoster951
Fabian Beuke
duane
Peace
Peace
duane
Wojciech Kapcia
Frank Elsinga
Maximilian Krauß
Janne Nowak
AnnAngela