a0bd4b248b
Merge remote-tracking branch 'origin/master' into 2.0.X
...
# Conflicts:
# docker/debian-base.dockerfile
# package-lock.json
# package.json
# server/database.js
# src/router.js
9 months ago
573f158f7f
Fix: incorrect radius error handling
9 months ago
a0203372ce
Built-in nscd into the docker image (a better dns caching service) ( #3472 )
10 months ago
5ccf2d23fc
Fix: SMTP notification "Ignore TLS Error" option ( #2999 ) ( #3465 )
10 months ago
bf68e0a7bc
fix: define pushdeerlink
10 months ago
6984596568
Apply suggestions from code review
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
10 months ago
0684313ec9
feat: remove blank characters and ending '/' first
10 months ago
d7e12dc92d
feat: allow the user to configure PushDeer Server URL
10 months ago
1d9a28e9ab
feat: Tailscale ping monitor ( #3178 )
...
* Add boilerplate for tailscale ping
* tailscale initial commit draft
* Refactor TailscalePing & better error handling
Split check function into two methods and added async/await syntax for readability/modularity
Switched to promise-based error handling (takes into account different types of error such as "Execution error", "Error in output", "no matching peer", and "is local Tailscale IP") and throws them as JavaScript errors.
* Minor update
* minor update (again)
* Update server/monitor-types/tailscale-ping.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update server/monitor-types/tailscale-ping.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update server/monitor-types/tailscale-ping.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update server/monitor-types/tailscale-ping.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* timeout revision
* JSDoc
* Removed long explainers
* eslint tailscale-ping.js --fix
* reran eslint
* Fix: Use hostname rather than url
* Fixed NaN on monitor interval
now interval value is correctly passed to runTailscalePing
* Add warning message
---------
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
10 months ago
50d4091ded
Merge branch 'master' of https://github.com/louislam/uptime-kuma into status-page-expiry
10 months ago
278b88a9d9
✨ feat: added kafka producer ( #3268 )
...
* ✨ feat: added kafka producer
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: eslint warn
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: typings and auth problems
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: better variable name to trrack disconnection
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: grouping Kafka Producer special settings into one template
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* ✨ feat: add kafka producer translations into `en.json`
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: disable close-on-select on kafka broker picker
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: `en.json` invalid json (conflict resolve)
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 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
* Minor
* Fix a bug of clone
---------
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
10 months ago
f6c1b92fc6
Added http type check and tags based design
10 months ago
25c8196641
Support Node.js 20 again ( #3431 )
...
* Support >= Node.js 20.4.0
* Improve the Node.js warning, ban 20.0 to 20.3
* Update
* Minor
10 months ago
80927332cb
Merge remote-tracking branch 'origin/master' into feat/monitor-list-improved-filtering
10 months ago
21d556528f
Fix #3420 timezone issue ( #3425 )
10 months ago
357466cc90
Minor
10 months ago
b038d09349
Minor
10 months ago
c6d0c431bd
Merge pull request #3080 from duanearnett/feature/add-channel-notification-for-slack
...
Adds configurable @channel notification for Slack integrations
10 months ago
345e61abca
Merge remote-tracking branch 'origin/master' into feat/badge-generator-placeholders
...
# Conflicts:
# package-lock.json
# package.json
10 months ago
dd1526deff
Merge pull request #3421 from louislam/some-update
...
Some update
10 months ago
be26bb75d9
Update version handling
10 months 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>
10 months ago
2f5a565ce4
Merge pull request #3381 from n-thumann/fix_ipv6_handling
...
Fix handling of IPv6 addresses in getClientIP
10 months ago
6f4af30701
Merge branch 'master' of https://github.com/louislam/uptime-kuma into status-page-expiry
10 months ago
b1f266ceb1
Added expiry changes to status page and fixes
10 months 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>
10 months ago
e7d1b4e14a
Merge pull request #3174 from chakflying/fix/push-monitor-safe-restart
...
Fix: Use safeBeat in push monitor
10 months ago
e5c6783781
Merge pull request #3205 from woj-tek/master
...
Add option to use ApiKeys in Twilio in addition to main account credentials
10 months ago
d825dbf828
Merge pull request #3188 from chakflying/fix/radius-timeout
...
Fix: Set radius connection timeout to monitor default
10 months ago
293015ff35
Parse `x-www-form-urlencoded` for /test-webhook
10 months ago
18d8b3a8e0
Merge remote-tracking branch 'origin/master' into feat/webhook-custom-body
10 months ago
cdb38d49eb
Merge pull request #3380 from chakflying/experiment/incremental-vacuum-job
...
Feat: Run incremental_vacuum and optimize
10 months ago
fe40d819bd
Update send403 to sendHttpError
10 months ago
3dbd8277f0
Merge remote-tracking branch 'origin/master' into feat/global-status-page-badge
...
# Conflicts:
# .gitignore
10 months ago
ed6b4e5ae5
Merge remote-tracking branch 'origin/master' into miles/invert-keyword
...
# Conflicts:
# server/database.js
10 months ago
3b9c95a8a8
Prevent users from specifying an unexpected executable as Chromium ( #3348 )
10 months ago
cdf6922bdd
Fix handling of IPv6 addresses in getClientIP
10 months ago
9954ba82e7
Feat: Run incremental_vacuum and optimize
10 months ago
13ae878ee8
Merge pull request #3347 from louislam/1.22.X
...
1.22.x merge to master
10 months ago
4ea5771f97
Status page certificate expiry
10 months ago
1774bb86dc
🐛 fix lint warning ( #3355 )
10 months 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>
10 months ago
df8fcffb19
Drop unused code
10 months ago
8c60e902e1
Remove an unused variable
10 months ago
ccc39b9516
Move all old db patch files to `db/old_migrations/`
10 months ago
de74efb2e6
Merge pull request #3169 from janow25/docker-health-check
...
Added Docker Health Status Support
10 months ago
e26abc3156
Improve the setup database
10 months ago
d286c534bd
Improve the setup database for embedded MariaDB
10 months ago
7975caf29e
Update db migration and dockerfile
10 months 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
10 months ago
9ee2780e9e
Merge pull request #2871 from pruekk/chore/missing-notificationList
...
chore: notification toggle missing when import from backup
10 months 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
10 months ago
3e5e7e6e32
Fix: Incorrect options for cert-exp badge
10 months ago
0e725569e5
Feat: Add placeholders for badge generator
...
Chore: Save as dev dep.
10 months ago
2e2747fb52
Handling DATE_ADD
10 months ago
5388a37a26
Fix port NaN not working in MariaDB
10 months ago
4f6035899d
Real browser monitor type ( #3308 )
10 months ago
dd77baabe1
Merge pull request #3234 from kefoster951/fix_redis_auth
...
Fix redis authentication reattempt issue
10 months ago
820f2eec9f
Merge remote-tracking branch 'origin/1.23.X'
10 months ago
7cc9783436
Fix: Active needs to return bool instead of 0
10 months ago
b4b6e07e6b
Merge pull request #3310 from chakflying/chore/auth-logging
...
Chore: Add logging for failed auth
10 months ago
7a34103da6
Added fix to remove children when type changed
10 months ago
c9d6e576ab
Chore: Remove redundant assign
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
10 months ago
97d38ee1a8
Feat: Add custom body for Webhook Notif.
10 months ago
cc94609423
Chore: Add logging for failed auth
10 months ago
a00561ff09
Strip trailing slashes to avoid 404
11 months ago
6708eed121
Fixed error handling if client is closed
11 months ago
3c56a6f395
Merge branch 'louislam:master' into fix_redis_auth
11 months ago
2b46693995
Merge pull request #3239 from madnight/master
...
Fix: prometheus monitor_status metric has 4 values
11 months ago
d37c33ad42
Update server/util-server.js
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
11 months ago
c4c3fc81b2
Merge pull request #2693 from julian-piehl/group-monitors
...
Group monitors
11 months 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).
11 months ago
8897385690
Fixed linting
11 months ago
6132a45c7c
fixed when auth is needed but not provided
11 months ago
f68452c47a
Added changes to stop auth attempts after an error
11 months ago
58ec53fb1d
Fix: Try to close mysql connection properly
11 months ago
9a8bea5761
Changes 'Mention Channel' -> 'Notify Channel'
...
- Updates variable names
- Updates any Slack mention references
11 months ago
56f448bfe5
fix: maintenance heredity
11 months ago
2b46da0f47
style: fix linting
11 months ago
9bd76c2795
Merge branch 'master' into group-monitors
11 months ago
376d84c742
Merge branch 'master' into feature/add-channel-notification-for-slack
11 months ago
343a1d3344
Merge pull request #3203 from CommanderStorm/applied_timezone_formatting
...
chore: Made sure that every notification provider uses `timezone`/`localTime`
11 months ago
f3fe392ec4
Add option to use ApiKeys in Twilio in addition to main account credentials
11 months ago
f3c09f2bbd
made every Notification provider supply time like dingding after #3152
11 months ago
8ed2b59410
Resolve conflict
11 months ago
0b8dddba24
Merge remote-tracking branch 'origin/master' into skaempfe#2593
...
# Conflicts:
# server/model/monitor.js
# src/pages/Details.vue
11 months ago
bc95875aa0
Merge pull request #3156 from maximilian-krauss/feat/add-pushover-ttl
...
feat: Adds message ttl to pushover notification
11 months ago
c1efe0f26d
Add a warning for Node.js >= 20
11 months ago
a0d0d5b015
fix: sends pushover ttl only if defined
11 months ago
8d05d80a5f
feat: Adds message ttl to pushover notification
11 months ago
5200e10aab
Removes ternary operator for Slack channel mention
12 months ago
f1a396b0f7
Fix: Align radius timeout to default
12 months ago
f70b971810
Fix: Improve error message
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
12 months 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 )
12 months ago
317024ed72
Fix: Use safebeat for push monitor
12 months ago
f604d96c5b
splited if to inner if
12 months ago
f30f00655f
small fix for down containers
12 months ago
891f09def7
removed log
12 months ago
6b5e179bb0
linting
12 months ago
f653aba735
added docker health status
12 months ago
bb15fa0179
Merge pull request #3154 from chakflying/fix/clear-data-remove-worker-thread
...
Fix: Remove use of worker threads in clear-old-data
12 months ago
8d24891b8e
Merge pull request #3054 from TechWilk/keyword-not-found-whitespace
...
Trim before truncating "keword not found" message
12 months ago
80c8fd7372
Chore: Remove util-worker
12 months ago
a27386bb92
Fix: Use croner for clear-old-data
12 months ago
ce70b3fc62
feat: add a space to separate the words
12 months ago
06fba5b55a
feat: show time as server timezone in dingding notification
12 months ago
7f5d0e5490
Merge remote-tracking branch 'origin/1.21.X'
...
# Conflicts:
# package-lock.json
1 year ago
0eaaa8b6fa
Minor
1 year ago
5cd506e340
Minor
1 year ago
f0beccf6bf
Fix `Same As Server Timezone` do not save correctly
1 year ago
72c16c3aa2
Fix eslint warnings
1 year ago
d23cb0b382
Fix maintenance do not start after 1.21.2
1 year ago
8207f16396
Merge remote-tracking branch 'origin/master' into ntfy-bearer-authorization
1 year ago
0e516a42e5
Trim before truncating "keword not found" message
1 year ago
6356b1e50a
Merge pull request #2961 from chakflying/feat/flush-wal
...
Chore: Flush WAL on shutdown
1 year ago
11f4cb8725
Merge branch 'louislam:master' into ntfy-bearer-authorization
1 year ago
4c1ac5e870
Merge pull request #2863 from mtelgkamp/ntfy-notification-improvements
...
Improve ntfy notifications
1 year ago
9e320dc5fb
Expose timezone and local datetime to notification providers
1 year ago
2f3f929fbd
Merge pull request #2831 from mtelgkamp/mattermost-notification-improvements
...
Improve mattermost notifications
1 year ago
682f8e52a8
lint
1 year ago
171aff1226
add invert keyword feature
1 year ago
1f7f1f70bf
Merge branch 'louislam:master' into ntfy-bearer-authorization
1 year ago
21ad715e6a
Merge pull request #3021 from louislam/1.22.X
...
1.22.x -> master
1 year ago
23af66f618
Merge branch 'louislam:master' into ntfy-bearer-authorization
1 year ago
45ef7b2f69
Fix Effective Date Range cannot be removed
1 year ago
38fab198bb
Fix: Fix user count check
1 year ago
8d5679a8ab
Fix: Create database before connect
1 year ago
6b078b83bd
Merge branch 'master' into ntfy-bearer-authorization
1 year ago
1be74e2720
Merge pull request #2870 from chakflying/feat/auto-theme-status-page
...
Feat: Support auto theme in status pages
1 year ago
32f84b5e4e
Merge pull request #2491 from RubenNL/fix-metrics-push
...
Fixed the metrics for the push type.
1 year ago
dbfaddafca
Validate cron before submit
1 year ago
511038b45a
Remove unused code
1 year ago
17ae47d091
Drop database backup logic, because duplicating a relative large database likely causes a disk space issue, users should take backup manually instead.
1 year ago
de0d1edfd4
Merge pull request #2988 from chakflying/fix/socks-rejectUnauthorized
...
Fix: Pass rejectUnauthorized to Socks Proxy
1 year ago
524cf7c607
WIP
1 year ago
227cec86a8
WIP
1 year ago
02291730fe
WIP
1 year ago
8ee4b844fd
Fix: Pass rejectUnauthorized to Socks Proxy
1 year ago
fc4312ca1a
Merge branch 'master' into ntfy-bearer-authorization
1 year ago
fbdeb30ce7
Merge pull request #2973 from chakflying/fix/limit-precision
...
Fix: Apply toPrecision as last step
1 year ago
41bda4e1d7
Merge pull request #2975 from chakflying/fix/badge-no-label
...
Fix: Allow status badge with empty label
1 year ago
4869e6531c
Merge pull request #2980 from Genc/feature/twilio-notification-provider
...
Add Twilio Sms Notification Provider
1 year ago
302b9cf644
Merge pull request #2956 from wwniclask25/feature/opsgenie-alerts
...
Feat: Add opsgenie notification provider
1 year ago
3c3a192943
Merge pull request #2906 from chakflying/fix/duplicate-expiry-notif
...
Fix: Check for TLS expiry notified days smaller than target
1 year ago
b64c835cee
Add Twilio Sms Notification Provider
1 year ago
4f05912276
Fix: Allow status badge with empty label
1 year ago
bf525371d9
Fix: Apply toPrecision as last step
1 year ago
89bfc3bf33
Merge pull request #2908 from chakflying/chore/encrypted-private-key
...
Chore: Add support for encrypted SSL-key
1 year ago
f4ee5271af
Improve error handling of mysqlQuery and return row count as result
1 year ago
7330db3563
Improve error handling of mysqlQuery and return row count as result
1 year ago
ca52047bf5
Feat: Flush WAL on shutdown
1 year ago
d9558833fc
Fix linting
1 year ago
d2527d7254
Merge branch 'master' into feature/opsgenie-alerts
1 year ago
6dfca0c163
Add Opsgenie notification provider
1 year ago
35a56dd9e0
Added dropdown for authentication methods
1 year ago
442f54de84
Merge branch 'louislam:master' into ntfy-bearer-authorization
1 year ago
dbe73bd6ae
Update monitor.js ( #2929 )
...
Language
1 year ago
491239415e
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
1 year ago
533bc1505b
Prevent generating duplicated timeslots
1 year ago
391692a708
Chore: Add support for encrypted SSL-key
1 year ago
a599f5149b
Merge pull request #2907 from chakflying/fix/disconnect-redis
...
Fix: Disconnect redis after ping
1 year ago
f32fcb204f
Fix: Check for notified days smaller than target
1 year ago
230de63460
Fix: Disconnect redis after ping
1 year ago
e8814e8479
added option for ntfy access tokens
1 year ago
2dedc1cfbd
Fix #2776
1 year ago
ce8eebc838
Fix #2880
1 year ago
7ec09d0118
Fix ipv6 issue for ping
1 year ago
92c9b8bb63
Fix ipv6 issue for ping
1 year ago
010c7d681f
Fix ipv6 issue for ping
1 year ago
8d1847c032
Merge pull request #2744 from bobby-ore/add-lunasea-user-id
...
Add ability to use User ID for LunaSea notifications
1 year ago
bc87abf5c2
Fix: Clear uptime cache on push beat
1 year ago
bb7de6aa88
chore: notification toggle missing when import from backup
1 year ago
150607cc93
Feat: Support auto theme in status pages
1 year ago
cbbd3e20ad
Codestyle: Add trailing comma
1 year ago
71c800b880
Merge remote-tracking branch 'origin/master' into notification-provider-pagertree
...
# Conflicts:
# src/lang/en.json
1 year ago
7b4f90ce92
Improve ntfy notifications
...
- use tags `red_circle` for down and `green_circle` for up
- increase priority for down alert by 1 if not already max
- add monitor name and status to title
- use heartbeat msg as Message
- add monitor url as action
1 year ago
b21c2adcc2
Rework lunasea notification to allow for device id and user id
1 year ago
958354e4db
Minor
1 year ago
38ab5e0f3e
Merge pull request #2558 from Computroniks/feature/1685-prometheus-api-key
...
Added #1685 : Add API keys for API authentication
1 year ago
669f8700b2
Switched to nanoid for key generation
...
To try and prevent any security issues, use an external package to
generate key instead of doing it ourselves. Note: we have to use nanoid
version 3 as nanoid version 4 requires ESM. Currently, nanoid v3 is
still supported.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
1 year ago
06ee68dc0e
Merge branch 'feature/1685-prometheus-api-key' of github.com:Computroniks/uptime-kuma into feature/1685-prometheus-api-key
1 year ago
42a69c16ca
Switched to crypto.randomBytes fpr key generation
...
Keys are now 32 bytes long encoded in a URL safe base64 string
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
1 year ago
ea3b3abe36
Fine tune
1 year ago
7f9332c753
Merge remote-tracking branch 'origin/master' into feature/482-add-description-to-monitor
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# src/icon.js
# src/languages/en.js
# src/languages/es-ES.js
1 year ago
d668812df1
Fix merge issue
1 year ago
f32d3af62c
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
1 year ago
a7b49fcd98
Fix json body after xml body added
1 year ago
ef64077980
Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key
...
# Conflicts:
# src/lang/en.json
1 year ago
e873fea86d
Merge pull request #2736 from blozano824/add-status-to-slack-notification
...
Adds name + status + message to Slack notification
1 year ago
c4a9374671
Merge pull request #2835 from chakflying/fix/game-list-empty
...
Fix: getGameList returns nothing on first run
1 year ago
c65a920050
Chore: Fix code comment
1 year ago
7b8ed01f27
Fix: getGameList returns nothing on first run
1 year ago
cecb0b6425
Merge pull request #2610 from bayramberkay/feature/add-xml-support-to-http-monitors
...
Add xml support to HTTP monitors
1 year ago
2fa233ae7f
Fix prometheus null issues
1 year ago
e9475ed3c0
Merge remote-tracking branch 'origin/master' into telegram_test
...
# Conflicts:
# server/notification-providers/telegram.js
# src/languages/en.js
1 year ago
10228874fa
Merge manually
1 year ago
186ca30508
Improve mattermost notifications
1 year ago
7f88aacbe7
make monitor start() and stop() async
1 year ago
896e33815d
Merge branch 'louislam:master' into fix-metrics-push
1 year ago
7e3734af53
Better handling
1 year ago
5789112f55
Merge remote-tracking branch 'origin/master' into feat-add-message-thread-id-telegram-nonfiction
1 year ago
4dfc1a0221
Merge pull request #2664 from spali/keep_prometheus_instance
...
remember prometheus instance and expose it
1 year ago
5e1489a6ed
PagerTree Notification - Send msg when heartbeatJSON null
1 year ago
9ccaa4d120
Merge pull request #2786 from luckman212/luckman212-tagsort-1
...
sorted tags on dashboard
1 year ago
42033c692f
Merge pull request #2748 from chakflying/feat/improve-err-code
...
Feat: Use error message to detect and set status code
1 year ago
0be8b111e2
chore: better up message
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
1 year ago
72106ba4c4
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
1 year ago
cef0a0faf4
Merge branch 'master' into group-monitors
1 year ago
b8720b46c3
Switched to using Authorization header
...
Prometheus doesn't support using custom headers for exporters, however
it does support using the Authorisation header with basic auth. As
such, we switched from using X-API-Key to Authorization with the basic
scheme and an empty username field.
Also added a rate limit for API endpoints of 60 requests in a minute
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
1 year ago
1d4af39820
Fixed JSDoc for one method
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
1 year ago
dd1d71530f
sorted tags on dashboard
...
see https://github.com/louislam/uptime-kuma/issues/2785
1 year ago
01c71a0242
Fixed logic errors, removed dev leftovers
...
Fixed a logic error where a comma was used instead of an or, also
removed leftover console.logs from testing.
Date picker is now dissabled when don't expire is checked.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
1 year ago
e7feca1cd6
Added API key authentication handler
...
API key authentication is now possible by making use of the X-API-Key
header. API authentication will only be enabled when a user adds their
first API key, up until this point, they can still use their username
and password to authenticate with API endpoints. After the user adds
their first API key, they may only use API keys in future to
authenticate with the API.
In this commit, the prometheus /metrics endpoint has been changed over
to the new authentication system.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
1 year ago
cd796898d0
Added expiry check for frontend
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
1 year ago
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key
1 year ago
ee2eb5109b
Added basic web interface for API keys
...
Web interfaces for manging API keys have been added however translation
keys are still required.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
1 year ago
d1175ff471
Fix #2777
1 year ago
cd18b96f69
Added check to ensure backup exists when restoring ( #2779 )
...
A check to ensure that the backup database exists before deleting the
current database.
Fixes #2778
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
1 year ago
19c8538149
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
1 year ago
f2633a5d01
Finished knex_init_db.js
1 year ago
4056951915
WIP: building database in knex.js
1 year ago
e4183ee2b7
Database Setup Page ( #2738 )
...
* WIP
* WIP: Database setup process
* Add database setup page
1 year ago
db4663d6be
Merge remote-tracking branch 'origin/master' into 2.0.X
1 year ago
c12b06348b
Fix parsing issues of status page's og tags
1 year ago
48b637d4c8
Refactor to not introduce a breaking change
1 year ago
3439074835
Feat: Use message to improve errror status code
1 year ago
3a361d2621
lint fix
1 year ago
8725e5daf9
Add ability to use User ID for LunaSea notifications
1 year ago
d45aee450d
Removes unecessary ternary operator
1 year ago
727acb32bf
Adds name + status + message to slack notification
1 year ago
43941fa2c6
feat: add mtls authen method in http/http keyword
1 year ago
faa78443d6
chore: alter table monitor add column tls_ca, tls_cert, tls_key for certificate data
1 year ago
e1f956879d
Fix: Use .destroy() instead of .end()
1 year ago
ef54d9e3b6
Add PagerTree Notification Provider
1 year ago
68ead3414d
WIP
1 year ago
39c99b0ec4
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# src/lang/en.json
1 year ago
d4752b65de
WIP
1 year ago
dc4d2a77bb
WIP
1 year ago
1bfb290718
feat: add message thread id for telegram nonfiction
1 year ago
0b40c65139
Merge remote-tracking branch 'origin/master' into mariadb
...
# Conflicts:
# docker/alpine-base.dockerfile
# docker/dockerfile-alpine
# package.json
# server/database.js
1 year ago
afadfe32d5
Trim
1 year ago
5f2affb38c
Relocate and fix jsesc issue
1 year ago
10c6f3b688
Merge remote-tracking branch 'origin/master' into feature-google-analytics
1 year ago
666838f334
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
1 year ago
a823ed8ccc
Feature - Google Analytics - Removed unused import.
1 year ago
2a6d98ff01
Feat: Expand and Simplify Badge Functionality ( #2211 )
...
* [expanding badges] added new configs
* [expanding badges] recieve ping in getPreviousHeartbeat()
* [expanding badges] re-added original new badges
* [expanding badges] recreate parity between old and new badges
* [expanding badges] fix linting
1 year ago
913bb611d5
Feature - Google Analytics - Removed regex to validate a Google Analytics tag.
1 year ago
c08d8a5eaf
Google Analytics - Simplified retrieving Tag ID from Status Page.
1 year ago
3ff0cbe311
Feature - Google Analytics - Simplified Module & Escaped the Script to prevent XXS.
1 year ago
fb2999706c
Feature - Google Analytics - Added JSDoc to Google Analytics functions.
1 year ago
Louis Lam
Nelson Chan
Raymond Hackley
小造xu_zh
SGprooo
Tarun Singh
Muhammed Hussein karimi
nthumann
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
Christopher Wilkinson
Josua Frank
Miles Steele
Faruk Genç
niclas.koegl
tombii
Arniwatt Chonkiattipoom
Michael Telgkamp
Bobby Ore
Matthew Nickson
Thomas Spalinger
Ruben van Dijk
Austin Miller
Luke Hamburg
Brayan Lozano
Suriya Soutmun
Haytham Salama
c
Joseph