Louis Lam
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
Minh Hoàng
dcecd10c88
Feat/add gRPC protocol ( #1 )
...
* feat: added monitor with gRPC
Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
2 years ago
Louis Lam
2389b604fe
Use Settings.get
2 years ago
Louis Lam
88afd662db
Merge remote-tracking branch 'origin/master' into postgres
...
# Conflicts:
# package-lock.json
# package.json
2 years ago
tamasmagyar
a382f811f4
added comment to startE2eTests function
2 years ago
tamasmagyar
986c03aecd
test cypress run
2 years ago
Louis Lam
65d71e5db0
Fix mssqlQuery keep adding error listener, which causes memory leak.
...
Also it is not necessary since the error catched in the promise .catch(..).
2 years ago
Louis Lam
25d711e683
Fix jsdoc data type
2 years ago
Matthew Nickson
b5f04573f2
Added formatting to ping options
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
Matthew Nickson
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
Louis Lam
515095ecfb
Move all settings code from `util-server.js` into `settings.js`
2 years ago
sur.la.route
47e82ed83a
Removed blank line
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
sur.la.route
e1f766756f
Removed blank line
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Christopher Pickering
edcdedcaae
Added check for blank password.
3 years ago
Christopher Pickering
945288f0c0
Added postgres monitor
3 years ago
Louis Lam
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
3 years ago
Louis Lam
04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
3 years ago
Louis Lam
091158cfe7
[Status Page] Preload data
3 years ago
Louis Lam
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
Christopher Pickering
ef73af391f
added option for ntlm authorization
3 years ago
Christopher Pickering
44f6fca945
added finally to close connection pool
3 years ago
Christopher Pickering
c346ea7864
updated name on export
3 years ago
Christopher Pickering
f0ad32a252
merged
3 years ago
Christopher Pickering
5720017fb4
updated name on import
3 years ago
sur.la.route
5bba19f866
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Christopher Pickering
87f933df4f
added sqlserver monitor
3 years ago
Sascha Kruse
398ecb7666
add radius check
3 years ago
Louis Lam
4e3258579d
Merge branch 'master' into uptime-badges
...
# Conflicts:
# server/util-server.js
3 years ago
Louis Lam
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
3 years ago
Louis Lam
d962ab7a1c
Merge branch 'master' into uptime-badges
...
# Conflicts:
# package-lock.json
# server/routers/api-router.js
3 years ago
Louis Lam
42ea3fb412
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Louis Lam
9f8b3151d8
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
Louis Lam
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
3 years ago
Adam Stachowicz
1e595eaa76
Update linters
3 years ago
Matthew Nickson
d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
Jens Neuber
64a33d7455
Update server/util-server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Matthew Nickson
09e61d9d63
Changed Array<T> to type[]
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
c2f6c5b42e
Added JSDoc docs for mqttAsync
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
3 years ago
Matthew Nickson
03b2d8d521
Add JSDoc to server/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Jens Neuber
e103ac8335
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
3 years ago
Nelson Chan
cd38dd3f68
Feat: Allow MQTT successMessage to be optional
3 years ago
Louis Lam
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
3 years ago
Louis Lam
47c72192e1
[eslint] Enable yoda and eqeqeq
3 years ago
Louis Lam
d71c086447
Standardize array bracket spacing
3 years ago
Louis Lam
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
3 years ago
Louis Lam
e34420368b
Remove try-catch and fix username/password/port not working for mqtt
3 years ago
Louis Lam
566133e350
Domain Name Expiry Notification for https monitor only
3 years ago
Louis Lam
30e113755e
Add HIDE_LOG and catch error if cannot subscribe topic
3 years ago
Louis Lam
083e8355b7
Change debug to log.debug
3 years ago
Louis Lam
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
Matthew Nickson
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
Matthew Nickson
8c8eeaf627
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
Matthew Nickson
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
Louis Lam
649f3106e1
Enforce semicolon, fix format globally
3 years ago
Louis Lam
e9ce1433cd
Change log_info to log.info by making it into an object
3 years ago
Louis Lam
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
Louis Lam
0da6e6b1fb
Some improvements
3 years ago
Jens Neuber
28be32fc68
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
3 years ago
Tarun Singh
0345719e53
added cleartimeout in case client is already ended
3 years ago
Tarun Singh
22256dfcd2
added timeout for removing the dead loop state
3 years ago
Louis Lam
227bbdea2f
[MQTT] Try to improve error handling
3 years ago
Louis Lam
32ec4beda0
Merge branch 'master' into mqtt
3 years ago
Louis Lam
482b3f9233
Update server/util-server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Louis Lam
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
3 years ago
Louis
ed64853125
Keep FBSD, BSD for ping only
3 years ago
Denis
6bda5c6329
update comment
3 years ago
Denis
53df9a36e3
reintroduce exports.FBSD
3 years ago
Denis
8063449f49
ping path is common to all BSDs
3 years ago
Jens Neuber
6acc9546a0
PR feedback + remove redundant code + add a test
3 years ago
Jens Neuber
3625915a85
add ping, status badge
3 years ago
Jens Neuber
d74404e106
minor fixes
3 years ago
Jens Neuber
1c5bce8afa
a little documentation
3 years ago
Jens Neuber
35360e2069
add badges
3 years ago
Tarun Singh
4118de6d53
fix protocol not defined bug
3 years ago
Tarun Singh
35da8c78f4
added connection timeout and refactored code
3 years ago
Tarun Singh
3306f4a8e0
removed extra logging
3 years ago
Tarun Singh
3f5133d1ba
Added authentication logic
3 years ago
Andreas Brett
e5913c5abc
separate log functions
3 years ago
Andreas Brett
bdcdf47e52
introduce consistent logging
3 years ago
Louis Lam
0275d7a42b
minor
3 years ago
Louis Lam
41a6d1b701
Fix parseCertificateInfo possibly in dead loop
3 years ago
Tarun Singh
d5d07da4ee
update review suggestions
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Tarun Singh
670754b697
added MQTT monitor type
3 years ago
Louis
d4c9431142
catch createWriteStream error
3 years ago
Louis
d7f7dba13f
write some error logs to ./data/error.log
3 years ago
Louis Lam
cb43ecb46e
Merge branch 'master' into background-jobs
...
# Conflicts:
# package-lock.json
# package.json
# src/languages/en.js
3 years ago
Louis Lam
cd211a6be7
[http options] fine tune
3 years ago
Louis Lam
4bee57ea7f
Merge remote-tracking branch 'giacomo892/patch-1'
...
# Conflicts:
# server/ping-lite.js
3 years ago
Louis Lam
f75c9e4f0c
add UPTIME_KUMA_HOST, UPTIME_KUMA_PORT and special handling for FreeBSD
3 years ago
Louis Lam
e2dbacb383
Fix encoding problem of ping result for non-English Windows
3 years ago
Nelson Chan
8caf47988c
Fix: Allow setting settings type
3 years ago
LouisLam
edad2caf8e
return the correct exit code from jest
3 years ago
LouisLam
49720c709c
improve the test with a single command only "npm test"
3 years ago
Nelson Chan
13bdfefa9d
Feat: Improve Certificaet Info Display
3 years ago
LouisLam
1ed4ac9494
add Push-based monitoring ( #279 )
3 years ago
LouisLam
0b572df3d0
[status page] store config
3 years ago
LouisLam
2955abb5d9
[status page] create incident
3 years ago
LouisLam
f47f7758f9
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/database.js
# server/server.js
# server/util-server.js
3 years ago
LouisLam
3e25f0e9d9
[Status Page] WIP: Checkpoint
3 years ago
Ponkhy
403202d4d4
Added simple TOTP Two Factor Authentication
3 years ago
LouisLam
bf29f28726
send stats only if there is at least one client in the room
3 years ago
Ponkhy
b2041cb36b
Fixed ESLint Errors
3 years ago
Ponkhy
c79be19ec3
Added DNS Monitor Type
3 years ago
LouisLam
d5149f90b4
fix ping
3 years ago
LouisLam
4d4d504d6e
retry ping domain with ipv6, if domain is not found
3 years ago
LouisLam
d0aad3400c
add reset password in cli
3 years ago
Nelson Chan
8f7885e58a
Feat: Implement MaxRedirects & StatusCodes
3 years ago
LouisLam
44c8ca9da8
requires empty username/password if set disableAuth for basic auth
3 years ago
LouisLam
33d7f8645a
json format for setting value
3 years ago
LouisLam
c6a66fad79
add setting for disable auth
3 years ago
Adam Stachowicz
9648d700d7
Autofix on save
3 years ago
Nelson Chan
6b72d5033a
Fix: Fix incorrect error handling
3 years ago
Nelson Chan
ccda6f05f5
Feat: Add Barebones certificate info display
3 years ago
LouisLam
e02eb72863
add db migration
3 years ago
LouisLam
5a6e83b777
remove debug msg
3 years ago
LouisLam
3bdf174e90
add telegram notification
3 years ago
LouisLam
a6b5986dd6
add ping and fix uptime
4 years ago
LouisLam
9c653c3d05
implement tcping
4 years ago