cb4e512dc6
Merge pull request #2316 from Dafnik/patch-fix-link-preview-description
...
Fix 'undefined' in link preview generation
2 years ago
4042c26390
Fix 'undefined' in link preview generation
2 years ago
b459408b10
fix: resolve conflict
2 years ago
134b3b8ac1
Fix 'dayjs' is never used warning
2 years ago
4339ca7eb5
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
24cb212a37
Fix recurring
2 years ago
d8a676abb6
Implement recurring day of month and day of week
2 years ago
268cbdbf8d
Merge remote-tracking branch 'origin/master' into maintenance
...
# Conflicts:
# server/server.js
# src/components/settings/General.vue
2 years ago
f459ea845c
Added #2182 Add support for custom radius ports ( #2197 )
...
This commit adds support for the port to be specified when using the
radius monitor type. A check has been implemented to ensure that a null
value is not passed to the radius check function as could occur with
monitors that were created before this change was introduced. The
default port of 1812 is displayed when the user selects the radius
monitor in much the same way as the DNS port is handled. The port was
not included in the hostname in the form hostname:port in order to avoid
issues with IPv6 addresses and monitors that had been created before
this change was implemented.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
edacff123b
Add UTC in the serverTimezone dropdown
2 years ago
2faf866e9e
Implement generateTimeslot() for recurring interval type
2 years ago
39b6725163
Update maintenance tables
2 years ago
dfb75c8afb
Update status page's maintenance message
2 years ago
e07aa982c3
WIP
2 years ago
c84de4d259
WIP: Add maintenance status
2 years ago
c1ccaa7a9f
WIP
2 years ago
539683f8e9
Merge remote-tracking branch 'origin/master' into maintenance
2 years ago
71af23cf00
Fix #2207
2 years ago
a577fba848
Change DateTime Range using serverTimezone
2 years ago
b007681e67
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# server/model/monitor.js
# server/model/status_page.js
# src/languages/en.js
2 years ago
6e07ed2081
Fix #2186
2 years ago
0686757160
[Docker Monitor] Change `tcp://` to `http://`
2 years ago
f9be918246
Add support for MySQL/MariaDB databases #1817
...
This commit adds support for monitoring MySQL and MariaDB database
servers. The mysql2 package was choosen over mysql as it provides a
promise wrapper and is reportedly faster than the original mysql package
whilst still maintaining the same API.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
204339fbed
Make two functions to convert ISO 8601 <=> YYYY-MM-DD hh:mm:ss
2 years ago
b1465c0282
- Maintenance standardize datetime format to YYYY-MM-DD hh:mm:ss
...
- Import dayjs extensions one time only
- Maintenance activeCondition centralize
2 years ago
4002b9f577
[WIP] Checking maintenance time using maintenance_timeslot table
2 years ago
6537f4fe74
content-type change
2 years ago
5809088f27
Don't override a user-defined content-type header
2 years ago
3f63cb246b
[WIP] Handle timezone offset for timeRange
2 years ago
f11dfc8f43
[WIP] Add/Edit Maintenance with new UI and recurring
2 years ago
9d99c39f30
Update Maintenance UI for recurring
2 years ago
2f67d26702
Merge manually, as this part had been moved
2 years ago
90761cf831
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/HeartbeatBar.vue
# src/components/MonitorList.vue
# src/icon.js
# src/layouts/Layout.vue
# src/mixins/datetime.js
# src/mixins/socket.js
# src/router.js
# src/util.js
2 years ago
6ec6410808
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
c3d655afb4
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
6bb79597e8
fix: resolve merge conflict
2 years ago
de6e1e7ddd
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# server/database.js
2 years ago
31cc328839
fix lint
2 years ago
0d58526f25
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
2b9bf095a6
Add non-json support for http body
2 years ago
3b3763351b
Merge remote-tracking branch 'origin/master' into radius-check
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# server/server.js
# server/util-server.js
# src/pages/EditMonitor.vue
2 years ago
34ab6142db
fix: remove new space line
2 years ago
d0d1e0de28
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# src/pages/EditMonitor.vue
2 years ago
2232236a7a
[empty commit] pull request for add gRPC protocol
2 years ago
dcecd10c88
Feat/add gRPC protocol ( #1 )
...
* feat: added monitor with gRPC
Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
2 years ago
8ced61697a
Fix save docker host issue
2 years ago
60e7824ff0
Merge branch 'master' into master
2 years ago
88afd662db
Merge remote-tracking branch 'origin/master' into postgres
...
# Conflicts:
# package-lock.json
# package.json
2 years ago
e356d5f623
Fixing linting & adding documentation
2 years ago
0d098b0958
Docker Hosts are now a table & have their own dialog
2 years ago
9a8b484ee8
Merge pull request #1853 from louislam/dns
...
Add cacheable-lookup
2 years ago
1999541802
Merge remote-tracking branch 'origin/master' into dns
2 years ago
2073f0c284
Bind cacheable-lookup to custom http agent
2 years ago
a54e58b4d6
Added Ping packet size #1891
...
This should fully implement #1891 by adding an extra field to the edit
monitor page and an extra column to the database. The user can now
set the size of the packet to send, it defaults to 56. A maximum limit
of 65500 was chosen to ensure that the total size of the packet does
not exceed the IPv4 maximum packet size and to comply with the limit
imposed by Windows.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
d29955f3ba
Merge pull request #1741 from Computroniks/feature/#1221-clickable-hostaname-on-status-page
...
Added #1221 clickable hostname in status page
2 years ago
27dbc021b4
Add standalone manifest.json for each status page. Close #1668
2 years ago
baa592bce3
Merge remote-tracking branch 'origin/master' into feature/#1221-clickable-hostaname-on-status-page
2 years ago
1f5466a3e8
Revert #1598
2 years ago
f1d24782f8
Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page
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
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
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
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
11243a6ca1
Merge pull request #1222 from NETivism/issue-1201
...
Show some pure text body in notification when keyword not found
2 years ago
2c0180f323
Fix: Fix error when status page desc. is null
2 years ago
091158cfe7
[Status Page] Preload data
2 years ago
a674caa520
[Status Page] Add og meta tags
2 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
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
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
ef73af391f
added option for ntlm authorization
3 years ago
c346ea7864
updated name on export
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
59be9bb971
working
3 years ago
7da9f139c1
Bug fix
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
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
d0546afe71
fix esm require: no ugly warnings
3 years ago
b4ffcc5555
Added JSDoc
3 years ago
f78d01d770
Resolve lint errors
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
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
5fbfacf5ce
Fix ESlint warnings
3 years ago
d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port
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
09e61d9d63
Changed Array<T> to type[]
...
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
d6b591a513
Make comment more readable
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
3 years ago
60f8ab7285
Use new logging mechanism
3 years ago
b7e2489d22
Merge branch 'master' into introduce-resend-interval
3 years ago
359a490ae3
Fix #1510
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
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
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
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
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
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
c9fa183712
Manage domain names
3 years ago
c4e74c9943
Render <StatusPage> if domain matched
3 years ago
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
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
91366ff565
Merge branch 'master' into introduce-resend-interval
3 years ago
Louis Lam
Dafnik
minhhn3
Adam Stachowicz
Matthew Nickson
Justin Tisdale
Minh Hoàng
Moritz R
c0derMo
Christopher Pickering
OidaTiftla
OidaTiftla
Aram Akhavan
Nelson Chan
Karel Krýda
Sascha Kruse
Sascha Kruse
Christopher Pickering
Karel Krýda
Greg Smith
Jimmy Huang