diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile index 3477c0999..59374556b 100644 --- a/net/vnstat/Makefile +++ b/net/vnstat/Makefile @@ -1,6 +1,5 @@ PLUGIN_NAME= vnstat -PLUGIN_VERSION= 1.1 -PLUGIN_REVISION= 1 +PLUGIN_VERSION= 1.2 PLUGIN_COMMENT= vnStat is a console-based network traffic monitor PLUGIN_DEPENDS= vnstat PLUGIN_MAINTAINER= m.muenz@gmail.com diff --git a/net/vnstat/pkg-descr b/net/vnstat/pkg-descr index 945e4d573..f4eea85ce 100644 --- a/net/vnstat/pkg-descr +++ b/net/vnstat/pkg-descr @@ -9,6 +9,11 @@ ensures light use of system resources. Plugin Changelog ================ +1.2 + +* Remove Weekly statistics, unsupported since vnStat v2 +* Reset of DB is required due to SQLite migration + 1.1 * Add button to remove database diff --git a/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/Api/ServiceController.php b/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/Api/ServiceController.php index ef94d9605..c72a5d421 100644 --- a/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/Api/ServiceController.php +++ b/net/vnstat/src/opnsense/mvc/app/controllers/OPNsense/Vnstat/Api/ServiceController.php @@ -67,17 +67,6 @@ class ServiceController extends ApiMutableServiceControllerBase return array("response" => $response); } - /** - * list weekly statistics - * @return array - */ - public function weeklyAction() - { - $backend = new Backend(); - $response = $backend->configdRun("vnstat weekly"); - return array("response" => $response); - } - /** * list monthly statistics * @return array diff --git a/net/vnstat/src/opnsense/mvc/app/views/OPNsense/Vnstat/general.volt b/net/vnstat/src/opnsense/mvc/app/views/OPNsense/Vnstat/general.volt index 9f0d606a6..add9b5564 100644 --- a/net/vnstat/src/opnsense/mvc/app/views/OPNsense/Vnstat/general.volt +++ b/net/vnstat/src/opnsense/mvc/app/views/OPNsense/Vnstat/general.volt @@ -30,7 +30,6 @@
  • {{ lang._('General') }}
  • {{ lang._('Hourly Statistics') }}
  • {{ lang._('Daily Statistics') }}
  • -
  • {{ lang._('Weekly Statistics') }}
  • {{ lang._('Monthly Statistics') }}
  • @@ -51,9 +50,6 @@
    
         
    -
    -
    
    -    
    
         
    @@ -72,11 +68,6 @@ function update_daily() { $("#listdaily").text(data['response']); }); } -function update_weekly() { - ajaxCall(url="/api/vnstat/service/weekly", sendData={}, callback=function(data,status) { - $("#listweekly").text(data['response']); - }); -} function update_monthly() { ajaxCall(url="/api/vnstat/service/monthly", sendData={}, callback=function(data,status) { $("#listmonthly").text(data['response']); @@ -95,7 +86,6 @@ $( document ).ready(function() { // Call function update_neighbor with a auto-refresh of 3 seconds setInterval(update_hourly, 3000); setInterval(update_daily, 3000); - setInterval(update_weekly, 3000); setInterval(update_monthly, 3000); $("#saveAct").click(function(){ diff --git a/net/vnstat/src/opnsense/service/conf/actions.d/actions_vnstat.conf b/net/vnstat/src/opnsense/service/conf/actions.d/actions_vnstat.conf index 5579d9663..5c998c805 100644 --- a/net/vnstat/src/opnsense/service/conf/actions.d/actions_vnstat.conf +++ b/net/vnstat/src/opnsense/service/conf/actions.d/actions_vnstat.conf @@ -34,12 +34,6 @@ parameters: type:script_output message:request Vnstat daily status -[weekly] -command:/usr/local/bin/vnstat -w -parameters: -type:script_output -message:request Vnstat weekly status - [monthly] command:/usr/local/bin/vnstat -m parameters: