Restart button logic added on UI and backend, Some localizations added for japanese log msg #4755
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… into anpr-restart
status page monitor list has restart button
CommanderStorm
requested changes
May 13, 2024
There was a problem hiding this comment.
- Please go through the changes you are trying to add and remove the ones which are made by accident.
As it stands, it is basically impossible to review this change as there are waaay to many accidental/ formatting changes.
+2k -1k lines changed is not reviewable - Please split this PR into two distinct PRs for reviewability:
- one adding a restart button
- one adding the japanese log message you mentioned above
- Please also fill out the description. The checklist exists to prevent wasted effort and churn, please respect this.
github-actions
bot
added
needs:resolve-merge-conflict
| @@ -380,50 +447,70 @@ class Monitor extends BeanModel { | |||
|
|
|||
| try { | |||
| if (await Monitor.isUnderMaintenance(this.id)) { | |||
| bean.msg = "Monitor under maintenance"; | |||
| bean.msg = | |||
| "モニターメンテナンス中 / Monitor under maintenance"; | |||
There was a problem hiding this comment.
Such changes as here lead me to beleave that this PR was opened by accident
Comment on lines
+409
to
+428
| const downSeconds = this.interval * previousBeat?.retries || 0; | ||
| if ( | ||
| this.restartUrl && | ||
| this.restartInterval && | ||
| this.restartUrl.length > 0 && | ||
| downSeconds >= this.restartInterval | ||
| ) { | ||
| log.info("monitor", `[${this.name}] Restarting monitor`); | ||
| axios | ||
| .get(this.restartUrl) | ||
| .then(() => { | ||
| log.info("monitor", `[${this.name}] Restarted monitor`); | ||
| }) | ||
| .catch((error) => { | ||
| log.error( | ||
| "monitor", | ||
| `[${this.name}] Failed to restart monitor: ${error.message}` | ||
| ); | ||
| }); | ||
| } |
There was a problem hiding this comment.
What you are trying to add here is a webhook on downed monitors.
We currently allow sending monitors, but don't allow for filtering them.
The correct issues are:
- Filter which event (
UP/DOWN/CERT-EXPIRY/...) triggers alerts #508 - Notification Escalation / Delay Notifications #1315
Given that such a change was never discussed, nor a setting that we should have, I am going to close this PR.
We are not going to add another timeout to the list of timeouts. I expect that our users already don't get half of what the timeouts do and mostly leave them as is.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md#can-i-create-a-pull-request-for-uptime-kuma
Tick the checkbox if you understand [x]:
Description
Fixes #(issue)
Type of change
Please delete any options that are not relevant.
Checklist
Screenshots (if any)
Please do not use any external image service. Instead, just paste in or drag and drop the image here, and it will be uploaded automatically.