upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

*/*: merge @fraenki plugin modifications minus title removal

Browse source
This commit is contained in:
Franco Fichtner 2017-12-05 14:46:43 +01:00
parent d570503b80
commit 6abffda11b
8 changed files with 30 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net-mgmt/zabbix-agent/Makefile
View file

@ -1,6 +1,5 @@
PLUGIN_NAME= zabbix-agent
PLUGIN_VERSION= 1.1
PLUGIN_REVISION= 1
PLUGIN_VERSION= 1.2
PLUGIN_COMMENT= Enterprise-class open source distributed monitoring agent
PLUGIN_DEPENDS= zabbix34-agent
PLUGIN_MAINTAINER= opnsense@moov.de

2
net-mgmt/zabbix-agent/src/etc/inc/plugins.inc.d/zabbixagent.inc
View file

@ -58,7 +58,7 @@ function zabbixagent_services()
}
$services[] = array(
'description' => gettext('Enterprise-class open source distributed monitoring agent'),
'description' => gettext('Zabbix Agent'),
'pidfile' => '/var/run/zabbix/zabbix_agentd.pid',
'configd' => array(
'restart' => array('zabbix_agentd restart'),

8
net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/Api/ServiceController.php
View file

@ -46,8 +46,10 @@ class ServiceController extends ApiControllerBase
public function startAction()
{
if ($this->request->isPost()) {
// close session for long running action
$this->sessionClose();
$backend = new Backend();
$response = $backend->configdRun("zabbixagent start", true);
$response = $backend->configdRun("zabbixagent start");
return array("response" => $response);
} else {
return array("response" => array());
@ -61,6 +63,8 @@ class ServiceController extends ApiControllerBase
public function stopAction()
{
if ($this->request->isPost()) {
// close session for long running action
$this->sessionClose();
$backend = new Backend();
$response = $backend->configdRun("zabbixagent stop");
return array("response" => $response);
@ -76,6 +80,8 @@ class ServiceController extends ApiControllerBase
public function restartAction()
{
if ($this->request->isPost()) {
// close session for long running action
$this->sessionClose();
$backend = new Backend();
$response = $backend->configdRun("zabbixagent restart");
return array("response" => $response);

9
net-mgmt/zabbix-agent/src/opnsense/mvc/app/views/OPNsense/ZabbixAgent/index.volt
View file

@ -71,12 +71,9 @@ POSSIBILITY OF SUCH DAMAGE.
draggable: true
});
} else {
// request service status after successful save and update status box (wait a few seconds before update)
setTimeout(function(){
ajaxCall(url="/api/zabbixagent/service/status", sendData={}, callback=function(data,status) {
updateServiceStatusUI(data['status']);
});
},3000);
ajaxCall(url="/api/zabbixagent/service/status", sendData={}, callback=function(data,status) {
updateServiceStatusUI(data['status']);
});
}
});
});

2
net-mgmt/zabbix-agent/src/opnsense/service/conf/actions.d/actions_zabbixagent.conf
View file

@ -17,7 +17,7 @@ type:script
message:restarting zabbix_agentd
[status]
command:/usr/local/etc/rc.d/zabbix_agentd status
command:/usr/local/etc/rc.d/zabbix_agentd status; exit 0
parameters:
type:script_output
message:requesting zabbix_agentd status

8
net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/Api/ServiceController.php
View file

@ -46,8 +46,10 @@ class ServiceController extends ApiControllerBase
public function startAction()
{
if ($this->request->isPost()) {
// close session for long running action
$this->sessionClose();
$backend = new Backend();
$response = $backend->configdRun("haproxy start", true);
$response = $backend->configdRun("haproxy start");
return array("response" => $response);
} else {
return array("response" => array());
@ -61,6 +63,8 @@ class ServiceController extends ApiControllerBase
public function stopAction()
{
if ($this->request->isPost()) {
// close session for long running action
$this->sessionClose();
$backend = new Backend();
$response = $backend->configdRun("haproxy stop");
return array("response" => $response);
@ -76,6 +80,8 @@ class ServiceController extends ApiControllerBase
public function restartAction()
{
if ($this->request->isPost()) {
// close session for long running action
$this->sessionClose();
$backend = new Backend();
$response = $backend->configdRun("haproxy restart");
return array("response" => $response);

9
net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt
View file

@ -352,12 +352,9 @@ POSSIBILITY OF SUCH DAMAGE.
draggable: true
});
} else {
// request service status after successful save and update status box (wait a few seconds before update)
setTimeout(function(){
ajaxCall(url="/api/haproxy/service/status", sendData={}, callback=function(data,status) {
updateServiceStatusUI(data['status']);
});
},3000);
ajaxCall(url="/api/haproxy/service/status", sendData={}, callback=function(data,status) {
updateServiceStatusUI(data['status']);
});
}
});
});

8
security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/ServiceController.php
View file

@ -48,8 +48,10 @@ class ServiceController extends ApiControllerBase
public function startAction()
{
if ($this->request->isPost()) {
// close session for long running action
$this->sessionClose();
$backend = new Backend();
$response = $backend->configdRun("acmeclient http-start", true);
$response = $backend->configdRun("acmeclient http-start");
return array("response" => $response);
} else {
return array("response" => array());
@ -63,6 +65,8 @@ class ServiceController extends ApiControllerBase
public function stopAction()
{
if ($this->request->isPost()) {
// close session for long running action
$this->sessionClose();
$backend = new Backend();
$response = $backend->configdRun("acmeclient http-stop");
return array("response" => $response);
@ -78,6 +82,8 @@ class ServiceController extends ApiControllerBase
public function restartAction()
{
if ($this->request->isPost()) {
// close session for long running action
$this->sessionClose();
$backend = new Backend();
$response = $backend->configdRun("acmeclient http-restart");
return array("response" => $response);