c36d9a4b8b
Fix port data type #1802
2 years ago
7ba717ee55
Fix Lunasea do not handle general message correctly #1790
2 years ago
f1d24782f8
Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page
2 years ago
b97019eea8
Fix cloudflared cannot be stopped in No Auth mode due to password checking
2 years ago
47e82ed83a
Removed blank line
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
e1f766756f
Removed blank line
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
edcdedcaae
Added check for blank password.
2 years ago
945288f0c0
Added postgres monitor
2 years ago
ac27e6e2af
Rename feature to: Resend Notification if Down X times consequently
...
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2 years ago
869a040011
Merge branch 'master' into introduce-resend-interval
2 years ago
fdbdf83a0d
Fix data type of `notification.isDefault` and `notification.active` ( #1765 )
2 years ago
ac449ec1c2
Merge branch 'master' into master
2 years ago
660005b143
cleaned up code
2 years ago
98f3c126e5
passed lint
2 years ago
cf2ca71dee
prevent null workstation #'s from passing..
...
to axios-ntlm
2 years ago
c690d1c3a1
fix timeout bypass for upside down push monitor
2 years ago
6682839ec8
Merge remote-tracking branch 'origin/master' into ntml-auth
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# server/util-server.js
2 years ago
54b9698a05
Update
2 years ago
6424fe77ab
Change successful log from `info` to `debug` in order to avoid large log and less disk usage
2 years ago
6e43ef1dd3
Merge remote-tracking branch 'origin/master' into feat/cert-exp-settings
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
2 years ago
a28ef56553
Merge remote-tracking branch 'gregdev/feature/axios-cached-dns-resolve' into feature/axios-cached-dns-resolve
...
# Conflicts:
# package-lock.json
# package.json
2 years ago
f570d41142
Merge remote-tracking branch 'origin/master' into feature/axios-cached-dns-resolve
...
# Conflicts:
# package-lock.json
# package.json
2 years ago
1c4ddaeddf
Update
2 years ago
55a6e5af42
Update server/notification-providers/bark.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
252709ff49
Update server/notification-providers/bark.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
404923b7c8
bugfix
2 years ago
a41023ca2a
Update
2 years ago
817c941489
Add Bark Notification Parameters
2 years ago
5f6347d277
pull request for adding alertnow notification
2 years ago
fbfa5a33ed
Added Clickable hostname on status page. #1221
...
This should fully implement #1221 by modifying the API and adding two
new properties to the result. The `sendUrl` property denotes if the URL
is sent and `url` is included when required.
Client side checks have been implemented in order to only show a link
when the URL is vaugely correct. I.e not "" or "https://". This prevents
the link from being included if the monitor type is not HTTP without
having to publicly expose the monitor type.
The exposure of the URL is configuarable for each monitor on each
status page by clicking on the link icon.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
2 years ago
aa398948da
Merge branch 'louislam:master' into patch-1
2 years ago
11243a6ca1
Merge pull request #1222 from NETivism/issue-1201
...
Show some pure text body in notification when keyword not found
2 years ago
54548e34ed
Added label to status badge
2 years ago
2c0180f323
Fix: Fix error when status page desc. is null
2 years ago
4fdaa1abb6
[Push API] Response 404 if error, fix #1721
2 years ago
cc258dce14
Merge pull request #1674 from philippdormann/feature/ntfy-support
...
feat: ntfy push support
2 years ago
a707b51053
Page Loading Speed Optimization ( #1711 )
...
* Update Vite.js to 2.9.9 and add Rollup Plugin Visualizer
* Prebuild gzip and brotli for assets
Original: ~1.2MB
Optimized: ~370KB
2 years ago
091158cfe7
[Status Page] Preload data
2 years ago
e4ad8cbfc8
Remove unused variables
2 years ago
a674caa520
[Status Page] Add og meta tags
2 years ago
fa777c5bc0
Update server/server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
6d0683b055
Update server/routers/api-router.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
25262cfb91
Update server/model/monitor.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
c095767f4a
[Status Page] SSR
3 years ago
ffb7ba176c
Merge remote-tracking branch 'origin/master' into status-page-inject-html
3 years ago
ea10d89f51
show correct down message for first tick
3 years ago
7f46223d68
Fix another log.debug call
3 years ago
df4ce811d9
Merge remote-tracking branch 'origin/master' into kaysond_master
...
# Conflicts:
# server/model/monitor.js
3 years ago
e9e78c26e5
Merge branch 'master' into master
3 years ago
ab4edf2092
Fix log.debug calls
3 years ago
5830f1e0b5
[feat] Adding PagerDuty notification
3 years ago
35b8e89457
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
...
Added #1059 : Allow to specify Resolver Port for DNS Monitor
3 years ago
f23baf9c22
Added Push Monitor to Discord Notifications
3 years ago
54184350a4
fix: missing semicolons
3 years ago
14dbe7c334
clean up + default ntfs.sh server url
3 years ago
71f031c14e
add ntfy support
...
ref https://github.com/louislam/uptime-kuma/issues/1622
3 years ago
32cfd411f8
Fixed style & code errors
3 years ago
a9f3142cee
Merge branch 'master' into master
3 years ago
b7ba6330db
Feat: Add cert exp. settings
3 years ago
da99a57560
Merge remote-tracking branch 'fxgh/radius-check' into radius-check
3 years ago
42d68edab0
(style) add trailing comma
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
019d638767
Merge remote-tracking branch 'ghupstream/master' into radius-check
3 years ago
7a46b44d25
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# src/components/HeartbeatBar.vue
3 years ago
8ede6d888f
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
3 years ago
cec0521834
[Discord] Fix ping type should no port, update better naming
3 years ago
73b603dd10
Merge pull request #1627 from karelkryda/wrong-uptime-for-push
...
Fixed incorrect uptime calculation for push monitors
3 years ago
ef73af391f
added option for ntlm authorization
3 years ago
44f6fca945
added finally to close connection pool
3 years ago
c346ea7864
updated name on export
3 years ago
f0ad32a252
merged
3 years ago
5720017fb4
updated name on import
3 years ago
5bba19f866
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
e198f2f1ab
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
87f933df4f
added sqlserver monitor
3 years ago
398ecb7666
add radius check
3 years ago
66971deaf4
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
3 years ago
59be9bb971
working
3 years ago
8077744c60
Merge pull request #1604 from c-w/fix-apprise-zulip
...
Fix apprise integration for Zulip Streams
3 years ago
c5faf709b8
Merge branch 'master' into fix-1448-discord-service-url
3 years ago
7da9f139c1
Bug fix
3 years ago
42f931f6cf
Merge branch 'master' into master
3 years ago
2fe5c090aa
small fixes
3 years ago
b680371746
Make apprise notification title configurable in UI
3 years ago
4e3258579d
Merge branch 'master' into uptime-badges
...
# Conflicts:
# server/util-server.js
3 years ago
cd3fbc80b4
Add first parameter back to logging in api router
3 years ago
bb7d67f717
Apply suggestions from code review
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
9a35386841
Merge branch 'master' into master
3 years ago
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
3 years ago
93050208bb
Merge database changes into single patch file
3 years ago
98ee9caf2c
Add variable for currentTime
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
8e99cbf426
Merge branch 'master' into introduce-resend-interval
3 years ago
cbfecab850
switch to the more-up-to-date esm-wallaby
...
https://github.com/wallabyjs/esm
3 years ago
4b9dc2890d
Convert let to const
3 years ago
f9004bcbed
Add optional title to apprise notification
3 years ago
bc174c3325
Extract child process args into variable
3 years ago
4c2753af46
Remove an unused variable
3 years ago
c6ba5b621c
Remove isPublished, checkPublished which had been removed in upstream.
3 years ago
2b14bdae62
Merge branch 'master' into master
3 years ago
d962ab7a1c
Merge branch 'master' into uptime-badges
...
# Conflicts:
# package-lock.json
# server/routers/api-router.js
3 years ago
53b98ad3e4
Add more comment for aliyun-sms fix
3 years ago
d0546afe71
fix esm require: no ugly warnings
3 years ago
31b90d12a4
Added the ability to choose on which status pages maintenance information should be displayed
3 years ago
b4ffcc5555
Added JSDoc
3 years ago
42ea3fb412
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
9f8b3151d8
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
73e38a13d2
Update server/notification-providers/aliyun-sms.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
f78d01d770
Resolve lint errors
3 years ago
7532acc95d
Resolve conflicts
3 years ago
f4515ad8c5
add axios cached dns resolve to monitor
3 years ago
ed84e56a85
Merge remote-tracking branch 'origin_kuma/master'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/MonitorList.vue
# src/components/PingChart.vue
# src/icon.js
# src/pages/DashboardHome.vue
# src/pages/StatusPage.vue
# src/router.js
# src/util.js
3 years ago
369477b4b9
Update aliyun-sms.js
3 years ago
2347a01f7c
Update aliyun-sms.js
...
Add comments for the changed code.
3 years ago
ae2c49a729
Update aliyun-sms.js
3 years ago
b9e72b9645
Update aliyun-sms.js
...
aliyun-sms.js: escape more characters than encodeURIComponent
see https://help.aliyun.com/document_detail/315526.html
字符A~Z、a~z、0~9以及字符-、_、.、~不编码。对其它ASCII码字符进行编码。
3 years ago
60538036c6
[ #1108 ] Change "true" to "up"
3 years ago
0ba5d031d0
Merge branch 'master' into push-status-param
...
# Conflicts:
# server/routers/api-router.js
3 years ago
023db1450d
Fix #1577
3 years ago
3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
3 years ago
39df4eea92
Ssynchronize push monitor heartbeats to api calls
...
Includes a 1s buffer time to allow the push url to be called before the monitor is checked
3 years ago
1e595eaa76
Update linters
3 years ago
5fbfacf5ce
Fix ESlint warnings
3 years ago
d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
587faecf87
Made value nullable in apicache JSDoc
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
46da5e51be
Fix JSDoc grammar
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
1eecdec2d9
Update JSDoc for better clarity
...
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
64a33d7455
Update server/util-server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
09e61d9d63
Changed Array<T> to type[]
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
9996ba1636
Add JSDoc to server/modules/apicache/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
c2f6c5b42e
Added JSDoc docs for mqttAsync
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
0083485d4c
Updated server/model/* JSDoc to match new methods
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
7ed8ae9f7c
Fix trailing space warning
3 years ago
4ddbf71920
Fixed trailing spaces in database.js
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
068b920553
Add JSDoc to server/socket-handlers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
d6b591a513
Make comment more readable
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
3d04befc1f
Add JSDoc to server/routers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
3 years ago
19933bbd99
Improve backwards compatibility
3 years ago
60f8ab7285
Use new logging mechanism
3 years ago
b7e2489d22
Merge branch 'master' into introduce-resend-interval
3 years ago
03b2d8d521
Add JSDoc to server/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
e103ac8335
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
3 years ago
10f6a3c4f5
Merge pull request #1229 from Computroniks/#1209-Logout-button-in-navbar
...
Add #1209 : logout button in navbar
3 years ago
200fdfb808
Merge code manually since some code moved to another file
3 years ago
29d2d95c71
Merge branch '1.14.X'
...
# Conflicts:
# package.json
# server/server.js
3 years ago
919393cac9
Partially change the server core into a class, remove all require("./server") #1520
3 years ago
17d4003e5c
Add dropdown menu
3 years ago
e2c45f93bf
Merge pull request #1509 from chakflying/feat/mqtt-optional-message
...
Feat: Allow MQTT successMessage to be optional
3 years ago
addf75daa7
Fix MQTT password do not save
3 years ago
359a490ae3
Fix #1510
3 years ago
cd38dd3f68
Feat: Allow MQTT successMessage to be optional
3 years ago
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
3 years ago
e6a8a84278
Include only nessacary data in webhook
3 years ago
47c72192e1
[eslint] Enable yoda and eqeqeq
3 years ago
d71c086447
Standardize array bracket spacing
3 years ago
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
3 years ago
45f44b183d
Add JSDoc to server/model/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
5a209c74e1
Add JSDoc to server/notification-providers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
07c474db0b
Merge remote-tracking branch 'origin/master'
3 years ago
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
3 years ago
e34420368b
Remove try-catch and fix username/password/port not working for mqtt
3 years ago
60c63cc18e
Add JSDoc to server/jobs/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
566133e350
Domain Name Expiry Notification for https monitor only
3 years ago
30e113755e
Add HIDE_LOG and catch error if cannot subscribe topic
3 years ago
083e8355b7
Change debug to log.debug
3 years ago
b1c7915bc1
Merge branch 'master' into mqtt2
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# src/pages/EditMonitor.vue
3 years ago
a680331dd7
Fixes issue with ::1 port 5300 requests
...
Now the address is wrapped in `[]` in order to prevent ::1 port 5300
being interpreted as ::1:5300. Wrapping the IPv4 address in `[]` does
seem to have any effect on correct domain name resolution. In order to
prevent issues if a user inputs an address with brackets, they are
removed from the string if present before being re-added when it is
passed to `setServers`. I have also removed the JSDoc comment as this
will be added in a seperate PR
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
288ed1e3ca
Merge branch 'master' into fix-1448-discord-service-url
3 years ago
fb0064082e
Change Pushdeer to PushDeer
3 years ago
93c51504f9
fixes: formatting and security issues
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
fb059f5e91
Add support for Pushdeer notifications
3 years ago
d0b5f147e2
Fix spelling and merge mistake
3 years ago
ddf8a7a692
Fix camelCase
3 years ago
bd9df09f87
Apply suggestions from code review, fix style
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
4656ab3d57
Add OneBot notification service
3 years ago
0a5db0cecb
Fix #1478
3 years ago
8c8eeaf627
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
b893d50e45
Implement specify Port for DNS Monitor #1059
...
This commit should fully implement #1059 . When the user selects the DNS
monitor option, a new input box has been added below the resolver
address allowing the user to implement the port to access the resolver
on. This uses the same `monitor.port` as the TCP monitor but a monitor
has been added to prefill the port value to the default of `53` if the
value in this field has not already been set. This is then cleared if
the user selects a different monitor type and has not changed the port
value. A translation has also been added explaining what this field
does in order to reduce any confusion. JSDoc documentation has also been
added to the `dnsResolve` function in `util-server.js`.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
649f3106e1
Enforce semicolon, fix format globally
3 years ago
17dcf6d3a2
Merge pull request #910 from andreasbrett/logging
...
introduce consistent logging
3 years ago
e9ce1433cd
Change log_info to log.info by making it into an object
3 years ago
361e44ad6a
Merge branch 'louislam:master' into master
3 years ago
4053b9db1f
Merge remote-tracking branch 'origin/master'
3 years ago
772d009f43
Merge branch 'master' into fluencydoc_master
...
# Conflicts:
# extra/update-version.js
# server/client.js
# server/server.js
3 years ago
6179f6c982
Merge branch 'master' into issue/1138
...
# Conflicts:
# server/server.js
3 years ago
94770cf865
Resolve log message null reference
3 years ago
279e2eb3f6
Merge branch 'master' into logging
...
# Conflicts:
# server/database.js
# server/jobs.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# server/socket-handlers/status-page-socket-handler.js
# server/util-server.js
3 years ago
2638d68c97
Cover dns and steam types in Discord notifs
3 years ago
0961c6d9b3
Check for ping and port type in discord notifs
3 years ago
c9fa183712
Manage domain names
3 years ago
0afa0be5c2
Merge branch 'master' into status-page-domain
...
# Conflicts:
# server/database.js
3 years ago
6a30dbd71a
Fix Mattermost when channel is empty #1468
3 years ago
7bbaeffd3e
Fix reset-password (issue caused by 5027fcd320)
3 years ago
008dc27f52
Reload proxy settings for monitors in the monitorList
3 years ago
5027fcd320
Export server using an object class
3 years ago
d5e68f8453
Export monitor list
3 years ago
082c2dd32d
Remove restartMonitors() and move proxy socket events to a socket handler file
3 years ago
c4e74c9943
Render <StatusPage> if domain matched
3 years ago
fee88b32e3
Set PRAGMA synchronous = FULL
3 years ago
c9deea9fdf
Merge pull request #1456 from Arubinu/alerta
...
Fix "API key parameter 'undefined' is invalid"
3 years ago
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
3 years ago
4b99160b1f
Fix "Check Update" is not checked by default
3 years ago
48d679234a
Stop bree and cloudflared while the server shutting down
3 years ago
d3d1656625
Fix "API key parameter 'undefined' is invalid"
3 years ago
af44b0beab
Merge branch 'master' into master
3 years ago
84a0b24448
Update server/model/monitor.js
...
As per recommendation of @Computroniks
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
a4be651118
Update server/model/monitor.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
04e3394d02
Merge branch 'master' into feature/request-with-http-proxy
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# src/languages/en.js
# src/mixins/socket.js
3 years ago
6674005e8b
Fix storing cloudflared token while start cloudflared
3 years ago
b72a2d350f
Set cloudflared token from env var or arg
3 years ago
82ea896bbc
Improve the workflow of cloudflared
3 years ago
f1f4b3b377
Add reverse proxy setting page for controlling cloudflared
3 years ago
a6b52b7ba6
Merge branch 'master' into cloudflared
3 years ago
b8dea3a823
Merge remote-tracking branch 'origin/master'
3 years ago
0da6e6b1fb
Some improvements
3 years ago
44fb2a88f2
Add cloudflared socket handler
3 years ago
d8013f31e8
Update version after merging new master branch
3 years ago
91366ff565
Merge branch 'master' into introduce-resend-interval
3 years ago
be88351eb3
Merge pull request #1136 from chakflying/fix/prometheus-on-delete
...
Fix: Remove prometheus metrics on delete [Test needed]
3 years ago
28d72fcd08
Fix #1409 , slug cannot be empty
3 years ago
71af08189e
Clear useless code
3 years ago
d32ba7cadd
Fix #1318 , basic auth is completely disabled if the auth is disabled
3 years ago
775d1696fa
Fix pushover device not working #1114
3 years ago
ad2130b7b5
[Status Page] Fix monitors are deleted unexpectedly #1399
3 years ago
3adda48f3a
Load the status page list earlier
3 years ago
d7a839aa52
[Status Page] Fix reset entry page
3 years ago
aef0a66205
[Status Page] Simplify show tags logic
3 years ago
37be7df9b0
[Status Page] Delete status page
3 years ago
8d981c8f0b
[Status Page] Fix migration and unpin incident
3 years ago
27bfae67af
[Status Page] Add a new status page
3 years ago
719a136d1e
[Status Page] Improved entry page
3 years ago
e87cdf4d09
[Status Page] wip, upload logo and status page listing
3 years ago
1033ca5cf4
[Status Page] wip, combine api, add status_page_id into group and incident tables
3 years ago
18ec42b060
[Status Page] wip
3 years ago
7c7dbf68c1
[Status Page] wip, sidebar for editor
3 years ago
50d6e888c2
[new status page] wip
3 years ago
72ce28a541
Migrate status page table
3 years ago
1e2a8453c6
Merge branch 'master' into restructure-status-page
3 years ago
1fa4a16663
Check beta release
3 years ago
8078d0618d
Add socks proxy support to proxy feature
...
- Socks proxy support implemented.
- Monitor proxy agent create flow refactored
and moved under proxy class.
Thanks for suggestion @thomasleveil
3 years ago
78d76512ba
Add http and https proxy feature
...
Added new proxy feature based on http and https proxy agents.
Proxy feature works like notifications, there is many proxy
could be related one proxy entry.
Supported features
- Proxies can activate and disable in bulk
- Proxies auto enabled by default for new monitors
- Proxies could be applied in bulk to current monitors
- Both authenticated and anonymous proxies supported
- Export and import support for proxies
3 years ago
8bbf55777e
Merge pull request #1205 from arjunkomath/master
...
Add notification provider - Push
3 years ago
fa490d0bf1
[Alerta] Handle general message
3 years ago
c52c8a4206
Merge branch 'master' into alerta
...
# Conflicts:
# server/notification.js
# src/components/notifications/index.js
# src/languages/en.js
3 years ago
9789d8cde8
Merge branch 'master' into alerta
3 years ago
ccb3d85a48
Merge pull request #1157 from zackelia/master
...
Implement gorush notifications
3 years ago
b62d94184a
Merge branch 'master' into restructure-status-page
3 years ago
595cd93220
Check invalid interval
3 years ago
258d93be72
Fix mattermost couldn't find channel issue
3 years ago
244a7b3671
Update server/model/monitor.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
8febff9282
fix comments
3 years ago
90f2497548
change data for Alerta
3 years ago
28be32fc68
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
3 years ago
cefe43800f
add alerta service
3 years ago
b49e5d5c39
The SQL query to determine if the monitor is under maintenance is now in its own method.
3 years ago
ee90d2713f
refs issue-1201 in upstream.
...
Add 100 characters from response body to bean.msg after keyword not match.
3 years ago
e7b2832967
The start and end dates of the maintenance are now stored in UTC, which allows it to be converted between time zones
3 years ago
f390a8caf1
Fix missing DB patch and use DATETIME as column format
3 years ago
f931e709e6
Add database patch
3 years ago
5fda1f0f59
minor fixes (missing commas, spaces, translations)
3 years ago
11e9eee09d
Change seconds to minutes
3 years ago
b69a8b8493
Fix formatting
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
1ac904d6d6
Introduce resend interval if down
3 years ago
0d3414c6d6
A complete maintenance planning system has been created
3 years ago
29df70949d
Add ability to connect to daemon via http / tcp for windows compatibility
3 years ago
23796723dd
Address code review
...
Add missing comma
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
51b7a2badb
remove log
3 years ago
74c584f544
Add Push by Techulus
3 years ago
0345719e53
added cleartimeout in case client is already ended
3 years ago
22256dfcd2
added timeout for removing the dead loop state
3 years ago
aba6cb2c52
Merge pull request #1169 from jbenguira/patch-1
...
Fixed #1024
3 years ago
d1a99b0a22
Check Node.js version, better error message
3 years ago
4818bb67d6
Added trailing comma, fixed spelling & translation
3 years ago
3b9fac2942
Update server/prometheus.js
...
removed useless spaces
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
c5cc42272f
Fixing the editing of docker container & adding english translation
3 years ago
b0259b5592
Added docker container monitor
3 years ago
227bbdea2f
[MQTT] Try to improve error handling
3 years ago
6272514820
[MQTT] Use existing fields instead of creating new ones (Server)
3 years ago
32ec4beda0
Merge branch 'master' into mqtt
3 years ago
482b3f9233
Update server/util-server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
3 years ago
13acdd4c65
Fix for issue in logs
...
This fix address the issue described here: https://github.com/louislam/uptime-kuma/issues/1024
3 years ago
ed64853125
Keep FBSD, BSD for ping only
3 years ago
0f822d3b2a
FBSD does not exists anymore
3 years ago
6bda5c6329
update comment
3 years ago
44bc98a453
Merge branch 'louislam:master' into master
3 years ago
f9751d0c01
Fix FBSD to BSD https://github.com/louislam/uptime-kuma/pull/1155#issuecomment-1009544236
3 years ago
53df9a36e3
reintroduce exports.FBSD
3 years ago
ea43422ccf
Implement gorush notifications
3 years ago
8063449f49
ping path is common to all BSDs
3 years ago
0bbe157099
change parsing priority for all passed arguments
...
update all passed args in server.js to prioritize command line, then use
env.UPTIME_KUMA_ environment variables, then use the generic environment
variable versions env.HOST, env.PORT, env.SSL_KEY, env.SSL_CERT and fall
back to default values where applicable
3 years ago
0053a29d10
add validation to port value parsing
...
only port configurations that are valid (not isNaN) after parseInt
are considered to be used in port variable
3 years ago
2c8d5d28e9
simplify host fallback logic
...
move decision logic for freeBSD HOST environment var into temp var
3 years ago
1bbd744d02
Chore: Improve syntax
3 years ago
2e0e35a1ee
Fix: Fix typo
3 years ago
1e92487f30
Chore: Remove onDelete as unused
3 years ago
edd2534a1b
Fix: Clear metrics also on stop and edit
3 years ago
f6ef390c76
Fix: Remove Prom. metrics on delete monitor
3 years ago
46fa6a56fa
fix `TypeError: Cannot read property 'id' of null`
...
when testing a Google Chat notification
see https://github.com/louislam/uptime-kuma/issues/1126#issuecomment-1006343423
3 years ago
81a194d826
Merge remote-tracking branch 'origin/master'
3 years ago
64b3e04d3f
Fix #1129
3 years ago
bcc3cec7d6
extract translation for notification type
3 years ago
f8c5015e3f
fix google chat type mismatch
3 years ago
f00ec4dfef
PR feedback: remove spaces in parenthesis
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
43f8fc701c
PR feedback: remove spaces in parenthesis
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
499042504f
PR feedback: remove spaces in parenthesis
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
faf6719e7c
PR feedback: remove spaces in parenthesis
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
a9d264ccfc
PR feedback: remove spaces in comments
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
df8f93f0c2
clean uptime percentage display
3 years ago
28c0e16a0c
PR feedback
3 years ago
6acc9546a0
PR feedback + remove redundant code + add a test
3 years ago
f455e3a454
add shields.io 'style' parameter
3 years ago
7abbf421d0
PR feedback
3 years ago
3625915a85
add ping, status badge
3 years ago
d74404e106
minor fixes
3 years ago
1c5bce8afa
a little documentation
3 years ago
35360e2069
add badges
3 years ago
590859a95b
Merge branch 'master' into add-wecom-notification
3 years ago
e18d4b6ad0
Merge pull request #1045 from bilipp/google-chat-notifications
...
Add support for Google Chat Notifications
3 years ago
72a59ce7a4
add status page table
3 years ago
40b70277c7
feat(*): support WeCom notification
3 years ago
3d002b3ce9
add status boolean parameter to push monitor
3 years ago
4118de6d53
fix protocol not defined bug
3 years ago
624cd862a5
Feat: Expose SMTP DKIM settings
3 years ago
d3c90df8a8
fixed edit monitor fields empty issues
3 years ago
a42932a43e
Simulate Chrome's request Accept header. Better handling of #1067
3 years ago
a6072a0e30
google chat: only show offline message in notification when service went down
3 years ago
934d633d4d
Add description to monitor
...
* Add description to monitor model
* Add description field to database
* Add english and spanish translation for description
* Closes : #482
3 years ago
a71569379e
add missing import
3 years ago
8050cb8e99
implement google chat notification type
3 years ago
38f8a8ac2f
Merge branch 'louislam:master' into logging
3 years ago
d4bfe57b79
minor: improve formatting
3 years ago
dcc91d6c72
Fix #922
3 years ago
e684712a77
Merge branch 'louislam:master' into logging
3 years ago
67849a9e84
add support for stackfield notifications
3 years ago
a13bdaac84
Merge branch 'master' into logging
3 years ago
40cb22e671
Merge pull request #963 from kffl/feat/serwersms-provider
...
Add SerwerSMS.pl notification provider
3 years ago
a864b72e03
fix pushover for general message
3 years ago
186c11540f
style(serwersms): add missing trailing commas
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
c1267e9b3b
feat: add SerwerSMS notification provider
3 years ago
37e6ca8d77
Merge pull request #950 from dingdayu/master
...
Update dingding notification title
3 years ago
e3745da986
Merge branch 'master' into master
3 years ago
92a5f18bf5
Merge pull request #864 from ivanbratovic/http-basicauth
...
Implement explicit HTTP "basic" authentication support
3 years ago
dce908a07b
Update dingding notification title
...
Add the status to the title, you can see the message title on the friend list page.
3 years ago
3d222ac5f5
fix btoa is not define
3 years ago
c811c1ccde
Merge pull request #753 from chakflying/settings-redesign
...
UI: Redesign/organize settings page
3 years ago
35da8c78f4
added connection timeout and refactored code
3 years ago
ed96757b24
Merge branch 'louislam:master' into logging
3 years ago
3306f4a8e0
removed extra logging
3 years ago
5d3bf68123
add remove-2fa command
3 years ago
7f4d5a0f76
Test: fix tests
...
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Investigate error message
Test: Attempt to fix tests
Chore: Cleanup code
Test: Attempt to fix tests
Test: Attempt to fix tests
3 years ago
07742799ed
Test: Fix tests
...
Test: Add clear stats test
Test: Attempt to fix tests
Test: Add test for disable auth
Update README
3 years ago
3f5133d1ba
Added authentication logic
3 years ago
e5913c5abc
separate log functions
3 years ago
bdcdf47e52
introduce consistent logging
3 years ago
f55350bebc
Generated documentation :)
3 years ago
0275d7a42b
minor
3 years ago
41a6d1b701
Fix parseCertificateInfo possibly in dead loop
3 years ago
34d8984e3a
Merge branch 'master' into http-basicauth
3 years ago
c92153c97e
add more debug msg
3 years ago
e4506963d9
Merge branch 'louislam:master' into tags-on-status
3 years ago
d5d07da4ee
update review suggestions
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
2d802585ff
Update review suggestions
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
179ca232bc
Minor refactor - change variable names and add commas to object definitions
3 years ago
0dcb7aed21
Delinting
3 years ago
23736549f9
Implement HTTP basic auth feature
3 years ago
665c263c03
Add db migrations for new basic auth fields
3 years ago
6828e8ef6d
Merge branch 'master' of https://github.com/tarun7singh/uptime-kuma
3 years ago
670754b697
added MQTT monitor type
3 years ago
82cde7c847
Merge pull request #854 from 634750802/patch-1
...
Add a status prefix for feishu notification's title
3 years ago
e5d6410caf
Apply formatting suggestions from code review
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
c094dc0c5b
speed up redirect by using 302 redirect instead of vue redirect
3 years ago
f3651a1219
Add a status prefix for feishu notification
3 years ago
12ef9f39c5
Merged buttons, cleaned up SS tag retrieval and made tagsVisible a bool.
...
Also to note: due to the transition of tagsVisible this breaks compatibility with the previous commits, delete the tagsVisible setting in the database to fix.
3 years ago
e7104737e7
prevent to show "New Update" when the Docker image is not ready yet
3 years ago
74688e69aa
Remove debug statement in server/routers/api-router.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
b32bfb3ff1
Added toggle for tag visibility
3 years ago
348c5ec995
Match lint settings
3 years ago
5e6d945095
Most hacked in POC
3 years ago
ba93129b18
Merge branch '1.9.X'
...
# Conflicts:
# server/server.js
3 years ago
caa2a34177
fix 2fa not working #833
3 years ago
d4c9431142
catch createWriteStream error
3 years ago
d7f7dba13f
write some error logs to ./data/error.log
3 years ago
e261a27ebe
fix wrong call of rejectUnauthorized for smtp ( #757 )
3 years ago
eb22ad5ffe
[certificate notification] error handling and better msg
3 years ago
f5f4835b74
[certificate notification] clear sent history if the cert is changed
3 years ago
44c1b336dc
send certificate notifications in 21, 14, 7 days
3 years ago
110ec491ee
Merge branch 'master' into cert-notification
3 years ago
640b6e5b1c
prevent monitor dead for unexpected error
3 years ago
698a38e773
clear status page cache in a better place
3 years ago
a9e319517a
add auto vacuum and shrink database button
3 years ago
77addfebc8
Merge branch 'tarun7singh_master'
...
# Conflicts:
# src/languages/vi.js
3 years ago
d1c4d13903
Merge pull request #782 from Co2333/dev-lakr233-bark_notification
...
Support for Bark (APN) notifications
3 years ago
ba1e025353
added click send to number
3 years ago
fed611d1b9
Merge branch 'master' of https://github.com/louislam/uptime-kuma
3 years ago
bc68088350
Click send sms integration for notifications
3 years ago
2f7b60f5e5
Feat: Use separate storage for custom chart period
...
Fix: Fix import error
3 years ago
b83c59e308
WIP: Add options for chart period
...
Fix: Fix callback, add toast on error
Fix: Improve styling
Fix: Restore default chart behavior
Fix: Replace 1h with 3h
draft only
3 years ago
ce852dfa02
Support for Bark (APN) notifications
...
Update bark.js
3 years ago
957c292307
add certificate-notification job
3 years ago
d578300104
Merge pull request #743 from andreasbrett/patch-4
...
Harden 2FA/TOTP implementation according to rfc6238 (part 2)
3 years ago
b77b33e790
add login rate limiter
3 years ago
56094a43d7
add passwordStrength
3 years ago
cd04ac4557
"dist/index.html" is no longer needed for development environment
3 years ago
e03ee593e2
Merge pull request #716 from NeuralMiner/textchanges
...
Text update
3 years ago
6c1ee70e15
fix
3 years ago
5c3892313e
add env var: UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN
3 years ago
c57c94642c
Merge remote-tracking branch 'origin/master'
3 years ago
62f168a2a5
config response header
3 years ago
acc2995d86
invalidate used token
3 years ago
9ddffc0f7f
Updates
3 years ago
76e7c8b276
Rebase
3 years ago
572a5300aa
Recommended updates.
3 years ago
e1f1d4a959
Merge branch 'louislam:master' into textchanges
3 years ago
23714ab688
genSecret don't need `await`
3 years ago
6e18f39eb4
[steam] code cleanup
3 years ago
68d44dd9b3
[steam] do not request if there is no steam api key
3 years ago
20d59e5a13
fix and move the steam api key to settings page
3 years ago
ae31eb6ba9
Merge branch 'master' into Revyn112_master
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
# src/pages/EditMonitor.vue
3 years ago
1d63dd9ddd
fix(monitor): safely get status of previous beat if first beat
3 years ago
cb43ecb46e
Merge branch 'master' into background-jobs
...
# Conflicts:
# package-lock.json
# package.json
# src/languages/en.js
3 years ago
6ff3cb275e
Merge pull request #642 from andreasbrett/patch-2
...
Harden 2FA/TOTP implementation according to rfc6238 (part 3)
3 years ago
8cb26d2b31
Text update
3 years ago
7276f34d90
fix reset-password
3 years ago
4178983df3
Merge remote-tracking branch 'origin/master'
3 years ago
cd211a6be7
[http options] fine tune
3 years ago
4e71ab7406
Merge branch 'master' into feature/add-support-for-method-body-and-headers
3 years ago
c593a962c2
Merge pull request #627 from NixNotCastey/smtp-subject
...
Add support for custom subject in emails
3 years ago
c9b4d2ae2a
Merge pull request #698 from erktime/master
...
Add monitor name context to Slack fallback text.
3 years ago
3b74b727f2
[Push Type] fix missing important flag and missing up notification
3 years ago
a7d2a34dae
fix ping bug
3 years ago
60acb91fc8
Merge pull request #687 from xjoker/master
...
Add new notification `Aliyun Sms` and `DingDing`
3 years ago
f51156f18e
run eslint for #687
3 years ago
8338881927
[SMTP] change {{HOSTNAME}} to {{HOSTNAME_OR_URL}}, support for http montior type, some UI improvements
3 years ago
674b387c95
Merge branch 'master' into smtp-subject
3 years ago
5ff9a64e5e
[Push Type] Fix missing duration calculation ( #685 )
3 years ago
4bee57ea7f
Merge remote-tracking branch 'giacomo892/patch-1'
...
# Conflicts:
# server/ping-lite.js
3 years ago
f75c9e4f0c
add UPTIME_KUMA_HOST, UPTIME_KUMA_PORT and special handling for FreeBSD
3 years ago
6e04ec436e
Update server/notification-providers/dingding.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
2d471a5e84
Update server/notification-providers/dingding.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
cae194f58f
Update server/notification-providers/dingding.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
655ccc86b9
Add monitor name context to Slack fallback text.
...
The text block of a slack notification payload is used for mobile
devices and plain text previews. This change allows slack users to see
the name of the failing service without having to open up Slack to read
the entire message.
3 years ago
e2dbacb383
Fix encoding problem of ping result for non-English Windows
3 years ago
89b34b5748
Use double curly brackets and sanity check for customSubject
3 years ago
843992c410
Add DingDing notification
3 years ago
57a76e6129
remove `alicloud/pop-core` keep simple
3 years ago
3fe3450533
Prioritize port passed from args
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
330cd6e058
Minor rehabilitanty impedyment
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
a2f2253221
Add aliyun sms notification
3 years ago
30d8aadf12
Slightly refactor
3 years ago
d733ec018e
Prioritize host arg
...
Otherwise launching the program with the --host argument does nothing
3 years ago
03b07730d3
Fix: Increase default kept period
3 years ago
2538bd04ce
notp verification defaults
3 years ago
1bc77a06e5
Update server/notification-providers/feishu.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
69c623ac2b
Update server/notification-providers/feishu.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
ce2df137e6
change text to using variable `msg`
3 years ago
6d9b71c054
Add Feishu notification
3 years ago
e223e826a3
linting
3 years ago
b5b391c73b
avoid default values for token verification
...
override default values: window=1, window size=30 (see https://github.com/louislam/uptime-kuma/issues/640 )
3 years ago
5445c2a2ff
fix(monitor): revert unintentional change to comment
3 years ago
dc08510e72
Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers
3 years ago
2286f78f57
update to 1.8.0
3 years ago
82131f4dd2
merge conflict
3 years ago
5137c80c07
fix(monitor): handle empty headers
3 years ago
792f3c7c5c
Add support for values of Name, Hostname and Status
3 years ago
edb75808d8
Merge branch 'louislam:master' into smtp-subject
3 years ago
56ae6f6117
fix demoMode export
3 years ago
5e3ea3293c
Very basic email subject customization
3 years ago
5c89562650
not allow lower than 20s for demo mode
3 years ago
ac80631bcd
Fix: Run clear data at specific time
3 years ago
8caf47988c
Fix: Allow setting settings type
3 years ago
dca5a59dbc
Feat: Implement data clearing logic & frontend
3 years ago
656a4d6270
WIP: Enable background jobs
...
WIP: Remove better-sqlite3
3 years ago
d71d27220b
fix(edit-monitor): store headers as JSON
3 years ago
fba4f86552
Merge branch 'master' into feature/add-support-for-method-body-and-headers
3 years ago
23a2d33f8c
[backup] restore pushToken
3 years ago
daab2a05f5
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
3 years ago
a15e9077fc
[status page] clear cache if it is an important beat
3 years ago
fc8d1e78b6
[push type] hide upside down mode, apply primary base url
3 years ago
db791c880a
Don't use then with await.
3 years ago
dfd63386ba
Make PromoSMS actually working
...
Make PromoSMS actually working and inform on success only when API return 0
3 years ago
12b5489eb5
PromoSMS as Notification Provider
...
Add PromoSMS (Polish SMS Gateway) as new notification provider
3 years ago
ddad2dcb4a
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/languages/en.js
3 years ago
5b4af550fb
Merge branch 'master' into DeeJayPee_master
3 years ago
3a0143ac46
[matrix] use encodeURIComponent to handle the url encode
3 years ago
2ce5c28ed4
Merge branch 'master' into feature/matrix-notifications
...
# Conflicts:
# src/languages/en.js
3 years ago
ec4b7e4064
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
3 years ago
e5f6d7f047
slack and rocket.chat use the primary base url
...
env var to show time logger
3 years ago
162ef04c41
Merge branch 'master' into feature/add-support-for-method-body-and-headers
3 years ago
6bebc623f9
UI polish
3 years ago
34b86352f2
remove double spaces
3 years ago
99e8a33118
escape room characters
3 years ago
d7cc585101
Update server/notification-providers/matrix.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
5decfb9fad
Matrix Notifications
3 years ago
bc4db6c692
Merge branch 'master' of https://github.com/louislam/uptime-kuma into louislam-master
3 years ago
f14a798b2c
Fix indentation + typo
3 years ago
550825927c
Merge branch 'master' into feature/add-support-for-method-body-and-headers
3 years ago
edad2caf8e
return the correct exit code from jest
3 years ago
49720c709c
improve the test with a single command only "npm test"
3 years ago
865b721b79
Merge pull request #519 from chakflying/improve-certInfo
...
Feat: Improve Certificate Info Display
3 years ago
6b44116245
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
3 years ago
a2a4c70cf5
setup jest-puppeteer
3 years ago
3f0b85e5a8
feat(http-requests): add support for methods, body and headers for http
3 years ago
13bdfefa9d
Feat: Improve Certificaet Info Display
3 years ago
7fa1cb83af
[push type] add ping parameter
3 years ago
8d5eaaf8a7
minor
3 years ago
b246c8e0f2
Fix 2fa for iOS Google authenticator ( #486 )
3 years ago
1ed4ac9494
add Push-based monitoring ( #279 )
3 years ago
6eceb4c744
Merge remote-tracking branch 'origin/master'
3 years ago
3e4154dfb5
Fix retry interval affected bug
3 years ago
fbc8828ddc
Merge pull request #464 from chakflying/fix-delete-monitor
...
Fix: clear important beats after deleteMonitor
3 years ago
b67b4d5afd
add steam gameserver for monitoring
3 years ago
0afa3a2c21
Merge branch '1.6.X'
...
# Conflicts:
# server/database.js
# server/server.js
3 years ago
662c97dcde
Fix: Fix importing tag if tag doesn't exist
3 years ago
7fb55b8875
Fixed issues
3 years ago
4786514e9f
Merge branch 'louislam:master' into import-export
3 years ago
32c9dfbb31
Fix: clear important beats after deleteMonitor
3 years ago
d3d4363031
Used compare-version instead of replace
3 years ago
f6a984b671
start-server-dev. Fixes #460
3 years ago
23a63213aa
Merge branch 'master' into import-export
...
# Conflicts:
# server/server.js
3 years ago
0a5a6e6a4b
[status page] fix monitor order
3 years ago
fe0fc63843
[status page] send uptime
3 years ago
8c7ee94769
add modified apicache library with disabling client cache
3 years ago
15c00d9158
upload logo and expose ./data/upload to url
3 years ago
469e8f6fd6
Merge branch 'master' into public-dashboard
...
# Conflicts:
# package-lock.json
3 years ago
4591adc05e
second attempt: prebuilt node-sqlite3 and update SQLite to 3.36
3 years ago
5f6aa32844
fix store/fetch status page config
3 years ago
a8e170f6a8
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/server.js
3 years ago
34c0fa59a8
fix reset-password ( #448 )
...
(cherry picked from commit b0e9c5bcb4
3 years ago
b0e9c5bcb4
fix reset-password ( #448 )
3 years ago
0b572df3d0
[status page] store config
3 years ago
7ee98d989c
[status page] implement rest api for heartbeat
3 years ago
fd95d41d9f
[status page] many update and save group list
3 years ago
a6fdd272a6
[status page] minor
3 years ago
1b5e723f60
Added descriptions to uploadBackup function
3 years ago
4bdada36a9
Removed if includes version
3 years ago
9b8f01cfc6
since eslint can auto fix semicolon, standardize all end with semicolon
3 years ago
2955abb5d9
[status page] create incident
3 years ago
8b463e70df
Apply suggestions from @Saibamen
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
392f8275b3
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/database.js
3 years ago
54aa68ec58
Added import/export compatibility for version 1.7
3 years ago
72783fd94c
Merge pull request #380 from No0Vad/retry-heartbeat-interval
...
Added support for a retry interval to monitors
3 years ago
80322cbfe7
Merge branch 'import-export'
...
# Conflicts:
# src/languages/it-IT.js
# src/languages/nl-NL.js
3 years ago
7e0272077b
cleanup demo mode code
3 years ago
512ff09cca
set entry page
3 years ago
e8f4fabcd0
[status page] crop and resize logo
3 years ago
2ab06f87b8
Merge branch 'master' into public-dashboard
3 years ago
76db55b657
Merge pull request #395 from WillianRod/feat/add-microsoft-teams-notification
...
Add microsoft teams notification provider
3 years ago
1693873f4a
[Teams] change handleTestNotification to GeneralNotification
3 years ago
db05b506f3
[status page] checkpoint
3 years ago
1300448bed
Adjustments to the retry interval
...
The monitor logic for when to use "retryInterval" is updated. Also removed some texts when they are no longer needed.
3 years ago
1d6670ed9a
Merge branch 'master' into public-dashboard
3 years ago
3234aec5b3
NODE_ENV if not set, change to production
3 years ago
afe91078c4
[status page] checkpoint
3 years ago
9902c181bc
Merge branch 'master' into public-dashboard
...
# Conflicts:
# src/components/MonitorList.vue
# src/icon.js
3 years ago
069c811af8
Merge pull request #278 from chakflying/tags
...
Monitor: Tags with metadata
3 years ago
f9311e4e7f
[status page]
3 years ago
d7a230ac15
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/server.js
# src/main.js
3 years ago
97360dab26
add /.well-known/change-password
3 years ago
ccb8736b3d
fix: send msg if heartbeat message is not set
3 years ago
2c02dad1f9
Merge pull request #393 from Revyn112/master
...
add possibility to have a prefixMessage in discord notification before the embed
3 years ago
29d0db805d
Add legacy octopush (Octopush-DM from 2011 to 2020 accounts) version
3 years ago
a0e4e96160
Fix: Fix tag removal, reuse and validation
3 years ago
6e3a904aaa
WIP: Add tags functionality
...
WIP: add color column, show tags
WIP: Improve TagsManager styling & workflow
WIP: Improve styling & validation, use translation
WIP: Complete TagsManager functionality
WIP: Add tags display in monitorList & Details
Fix: update tags list after edit
Fix: slightly improve tags styling
Fix: Improve mobile UI
Fix: Fix tags not showing on create monitor
Fix: bring existingTags inside tagsManager
Fix: remove unused tags prop
Fix: Fix formatting, bump db version
3 years ago
2617e1f4d8
Update database.js
3 years ago
91ee39ec60
Merge branch 'master' into retry-heartbeat-interval
3 years ago
e205adfd7b
[status page] developing
3 years ago
063d64eec8
feat: add microsoft teams notification provider
3 years ago
f47f7758f9
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/database.js
# server/server.js
# server/util-server.js
3 years ago
d313966d80
Merge branch 'master' into import-export
3 years ago
8352d9abbe
add posibility to have a prefixMessage before the embed
3 years ago
389d247463
Update server/database.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
7fee4a7ea7
Added import options
3 years ago
c4f78d776e
[2fa] "UptimeKuma" to "Uptime Kuma"
3 years ago
f8f9f59464
Added support for a retry interval to monitors
...
If a check fails and retries are used you can now specify a specific value for that. So you can check faster if the site goes back up again.
3 years ago
934685637a
[Status Page] WIP: Checkpoint
3 years ago
295ccba44b
Adjusted for new db patch management
3 years ago
8cd5bad44c
Merge branch 'master' into 2fa
3 years ago
f6d1a82989
Update server/server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
651b525d06
Update server/server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
3e25f0e9d9
[Status Page] WIP: Checkpoint
3 years ago
08de0090dc
add a better approach for patching db, change setting.value from varchar to TEXT, restore Database.close() to 1.2.0
3 years ago
59cccf8c50
Fixed typo
3 years ago
403202d4d4
Added simple TOTP Two Factor Authentication
3 years ago
573c7faddd
switch on the notification, if it is added in EditMonitor.vue
3 years ago
e330875c80
fix restore fail if no isDefault
3 years ago
331ae5ec20
Merge pull request #306 from Ponkhy/import-export
...
Added import and export function
3 years ago
8ee34c7904
also handle the first beat problem in uptime
3 years ago
4f07c2ea9a
uptime calculation fully sum in sql
3 years ago
24facc79d7
sendHeartbeatList use raw data
3 years ago
9f9c1007d7
increase sqlite cache size from 2MB to 12MB
3 years ago
dd283423ab
improve smtp with cc, bbc and ignore tls
3 years ago
6006038689
fix monitor.stop() in some cases
3 years ago
a7b50c3630
Revert "add user-monitor-list"
...
This reverts commit 230a9bfaf9
3 years ago
0ddbac5109
Revert "move userMonitorList out of server.js"
...
This reverts commit a7cf14c663
3 years ago
0f440596c8
Revert "cache last heartbeat list in memory"
...
This reverts commit 87678ea92d
3 years ago
87678ea92d
cache last heartbeat list in memory
3 years ago
a7cf14c663
move userMonitorList out of server.js
3 years ago
230a9bfaf9
add user-monitor-list
3 years ago
1ef4562905
Paused monitors stay paused after import
3 years ago
62712f5cc4
Merge branch 'master' into import-export
3 years ago
0aeaf87f5b
Merge branch 'master' into default-notification
...
# Conflicts:
# server/notification.js
# src/components/NotificationDialog.vue
3 years ago
da74391c3e
convert notifications into modules
3 years ago
242e494cb5
Merge branch 'master' into import-export
3 years ago
4faa409027
Merge branch 'master' into default-notification
3 years ago
da131a5156
Merge branch 'master' into clear-monitor-data
...
# Conflicts:
# src/languages/da-DK.js
# src/languages/en.js
# src/languages/es-ES.js
# src/languages/fr-FR.js
# src/languages/ja.js
# src/languages/ko-KR.js
# src/languages/nl-NL.js
# src/languages/ru-RU.js
# src/languages/sr-latn.js
# src/languages/sr.js
# src/languages/sv-SE.js
# src/languages/zh-CN.js
# src/languages/zh-HK.js
3 years ago
fd8c95d64e
Merge branch 'master' into default-notification
3 years ago
58240aceef
Added the option for default notifications
3 years ago
f9c177b150
Merge pull request #315 from tgxn/patch-1
...
Notifications Content Improvements: SMTP, LunaSea, PushBullet
3 years ago
299506ce45
reset the heartbeat list instead of reload the page after cleared events or heartbeats
3 years ago
41d32bb9dd
Undo parm changes
3 years ago
b0acda52f9
Add time to smtp body content
3 years ago
e9cd9be03a
Use constants for UP/DOWN through notifications class
3 years ago
6ae279c7f3
Move title generation to notification class
3 years ago
9c32adfb55
Update pushbullet down body
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
d346afd33b
Update pushbullet up body
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
3bf380c684
Update lunasea "up" body content
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
dca5c59982
Update lunasea body content
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
8f9a973ede
Merge branch 'master' into import-export
3 years ago
ebf362754c
Merge branch 'master' into clear-monitor-data
3 years ago
e31be8caf5
demo mode
3 years ago
60f2f08cea
add demo db
3 years ago
b1647a310e
add demo db
3 years ago
7d70c4d8cd
Code optimizations
3 years ago
532ad3044c
Add space to pushbullet and lunasea notifications
...
Start changes regarding standardization of notification messages
3 years ago
f23ecef636
add missing cert parameters
3 years ago
51cf2ff6f9
add missing cert parameters
3 years ago
b30b1d3a52
create data dir before copy
3 years ago
582e14098d
create data dir before copy
3 years ago
6e3e2fc85c
fix db path
3 years ago
b604807cfe
create data dir if not exists
3 years ago
3ee13bddd1
dash style for args
3 years ago
c74986647e
allow changing data dir
3 years ago
b88b357b55
add support for https
3 years ago
2dd392e609
Added uptime kuma version to backup file
3 years ago
c13cc62d3d
Update server/server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
b604910bbb
Merge branch 'master' into clear-monitor-data
3 years ago
2f6c5963c5
Added import and export function
3 years ago
e4b76717be
revert back to node-sqlite3
3 years ago
cd1a3a2fb9
revert back to node-sqlite3, as better-sqlite3 causes a lot of installation problems
3 years ago
7b92166d18
Added clear all db statistics function
3 years ago
1341d220ed
Merge branch 'louislam:master' into clear-monitor-data
3 years ago
697fa6bdfd
fix discord notification appended port unexpectedly
3 years ago
527e0c3444
raise the ping timeout from 2s to 10s (avoid #294 )
3 years ago
a41534ca60
no declare vars with comma, one line only one statement
3 years ago
ec731d174d
Merge branch 'MichelBaie_master'
3 years ago
0d65918a6a
change bcrypt to bcryptjs, use my own prebuilt better-sqlite3, supports more prebuilt
3 years ago
bf29f28726
send stats only if there is at least one client in the room
3 years ago
1952e34110
Added the possibility to clear monitor data
3 years ago
ada6606217
move the new sql to patch8.sql
3 years ago
858affa808
Removed useless database query
3 years ago
303adbf9b1
Show latest dns result in Details.vue
3 years ago
7652b4849a
Merge pull request #238 from Ponkhy/dns-monitor
...
Added DNS Monitor Type
3 years ago
d2f0a15076
Merge pull request #264 from antiseptikk/master
...
feat: add rocket.chat notification
3 years ago
44d9967cfb
feat: add rocket.chat notification
3 years ago
46ac753c46
Merge branch 'master' into dns-monitor
3 years ago
72740ba477
Update the styling to better match existing styles
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
5d438ca2b6
Discord notification URL now also represents non http services
3 years ago
d313a06d5c
Optimizations for output handling
3 years ago
23851ef539
added mattermost notification support
3 years ago
397fd12081
remove unused import
3 years ago
682e4d45e2
eslint for notification.js
3 years ago
f96d792fa1
fix patch database using better-sqlite3
3 years ago
44d9fa63f0
Adjusted the output for A and AAAA records
3 years ago
14652c9b5f
Remove unused variables
3 years ago
b2041cb36b
Fixed ESLint Errors
3 years ago
aa2233eb2d
log notification error
3 years ago
e5981b10ce
Replaced var with let and removed re-declaration
3 years ago
46cb955172
afterLogin change to non blocking
3 years ago
50f300dd28
heartbeat interval change to use setTimeout()
3 years ago
2f50fc4c00
plan to switch to better-sqlite3, drop node-sqlite3
3 years ago
c79be19ec3
Added DNS Monitor Type
3 years ago
b892a92fc8
retry if acquire error
3 years ago
ec0dbf3cbe
probably still memory leak over time, not sure what happen, change back to singal pool.
3 years ago
210a0d414c
fix check update interval too short
3 years ago
05680472a7
fix high memory usage
3 years ago
ca3b0a0f19
fix setInterval
3 years ago
4571a9b8c1
check update
3 years ago
209e44c2e1
prevent all monitors making requests at the same moment when start the server
3 years ago
30b8d3d0ab
prevent all monitors making requests at the same moment when start the server
3 years ago
7ffdb2eb80
also backup sqlite shm, val file
3 years ago
64501bf065
Added Line Messenger Notification Service
3 years ago
440c178403
change sqlite to WAL mode
3 years ago
61e758d872
disable pool for sqlite, re-use a connection to improve the performance.
3 years ago
86826fb826
Merge remote-tracking branch 'origin/master'
3 years ago
7a32e5e6ff
catch rejection error globally
3 years ago
01e9c76a6f
Use ping in FreeBSD
3 years ago
eed6d3e847
add more query log for dev env
3 years ago
31d5b4fd3d
do not pass smtp user/pass to nodemailer if both are empty
3 years ago
fc76c2836b
increase the query timeout
3 years ago
efe75bde75
Add Pushbullet notification service
3 years ago
af34e861c5
Merge pull request #200 from proffalken/feature/187_add_cert_checks_to_prometheus
...
Add certificate monitoring to the Prometheus handler
3 years ago
2ae2022e62
Merge pull request #211 from AlexandreGagner/master
...
Add Octopush Notification Service
3 years ago
d39b43dacc
fix require problem
3 years ago
eb34dc6cc2
Update notification.js
...
Fix remove non ascii char from msg
3 years ago
ed93aae1c2
add octopush notification service
3 years ago
6a8ccf627a
add version to user agent
3 years ago
b14f63491d
timeout change to 80% of its interval
3 years ago
d5149f90b4
fix ping
3 years ago
Louis Lam
Matthew Nickson
sur.la.route
OidaTiftla
OidaTiftla
Moritz R
Aram Akhavan
Super Manito
Daeho Ro
Wooferz
Nelson Chan
Karel Krýda
Marc Hagen
DasCanard
Philipp Dormann
c0derMo
Sascha Kruse
Sascha Kruse
Christopher Pickering
Jordan Bertasso
Karel Krýda
Clemens Wolff
Greg Smith
GOGOsu
Adam Stachowicz
Jens Neuber
Jens Neuber
ngc7331
ColdThunder11
ColdThunder11
Alvin Pergens
Jimmy Huang
Uğur Erkan
Ananth Kamath
Alvin Pergens
Jimmy Huang
Arjun Komath
Tarun Singh
Joseph Benguira
Denis
Zack Elia
Marc Harnos
Thomas LÉVEIL
Philipp Bischoff
Leslie Leung
Jakub Blažej
Juan Cruz Vincenti
Andreas Brett
Jonas Liebert
kffl
Fluency
小雨
Andreas Brett
Calum Bird
Ivan Bratović
Jasper Miller-Waugh
Jasper Miller-Waugh
Jagger
Lakr Aream
NeuralMiner
NeuralMiner
Bert Verhelst
xJoker
Aaron Erkenswick
Lukas
wuwenjing
giacomo892
Lukas
Gero Gerke
Gero Gerke
DeeJayPee
Denis Freund
Ponkhy
No0Vad
Willian Rodrigues Barbosa
Ponkhy
Domenic Horner
Thomas Ferney
Thies
Thies Nieborg
Rashad
AverageHumanoid
Chris Taylor
Alexandre Gagner