Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sysutils/monit: bug fixing, status api response #563

Merged
merged 2 commits into from
Feb 15, 2018
Merged

sysutils/monit: bug fixing, status api response #563

merged 2 commits into from
Feb 15, 2018

Conversation

fbrendel
Copy link
Member

  • SettingsController: fix faulty deletion of alerts, cleanup code, new function notificationAction to import system notification settings
  • ServiceController: is a ApiMutableServiceControllerBase now
  • StatusController: retruns the Monit status as JSON, old behaviour via 'html' parameter
  • UI: accept FQDN as mailserver, 'Apply' doesn't restart Monit

@@ -1,7 +1,7 @@
<?php

/**
* Copyright (C) 2017 EURO-LOG AG
* Copyright (C) 2017, 2018 EURO-LOG AG
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2017-2018

@fichtner fichtner self-assigned this Feb 15, 2018
@fichtner
Copy link
Member

Looks good, but we should get the post-install hook out with a native config migration eventually.

How much do you plan to edit this in the next 1-2 months? If you say not a lot we should merge it to core in March as discussed previously.

@fbrendel
Copy link
Member Author

Not much. Small bug fixes eventually.

@fichtner fichtner merged commit fb77f88 into opnsense:master Feb 15, 2018
@fichtner
Copy link
Member

Merged, thanks!

Ok, then it's a plan... :)

@fbrendel fbrendel deleted the monit_next branch February 15, 2018 12:26
* can't do it via base_dialog
*/
$('<button class="btn btn-primary" id="btn_ImportSystemNotification" type="button" style="margin-left: 3px;">' +
'<b> Import System Notification </b>' +
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this line is missing translation

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants