From b71aec751deb8e6bf5a08760050c2c9149f53cb5 Mon Sep 17 00:00:00 2001 From: M.Gergő Date: Tue, 7 Apr 2020 00:51:26 +0200 Subject: Munin graphs for Nextcloud --- nextcloud_munin.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nextcloud_munin.php b/nextcloud_munin.php index e813436..b27e35f 100755 --- a/nextcloud_munin.php +++ b/nextcloud_munin.php @@ -96,7 +96,7 @@ $time_req = time()-60*$set['diff_minutes']; $ret['g_info'] = "nextcloud_events"; $ret['g_order'] = "nxt_evt_all nxt_evt_files nxt_evt_share"; // skeleton for returning - foreach(array_merge(array('all', 'files', 'share', 'pub', 'comm', 'cal', 'other'), $set['nxt_plugins']) as $key => $val){ + foreach(array_merge(array('all', 'files', 'share', 'pub', 'comm', 'cal'), $set['nxt_plugins'], array( 'other')) as $key => $val){ // Order -> merge(arr(),arr(), arr( 'other')) $ret['data'][$d_pfx.$val]['value'] = 0; $ret['data'][$d_pfx.$val]['draw'] = "LINE1.2"; $ret['data'][$d_pfx.$val]['type'] = "GAUGE"; @@ -113,14 +113,13 @@ $time_req = time()-60*$set['diff_minutes']; $ret['data'][$d_pfx.'comm']['info'] = "Comments"; $ret['data'][$d_pfx.'cal']['label'] = "Calendar actions"; $ret['data'][$d_pfx.'cal']['info'] = "Calendar actions/operations"; + $ret['data'][$d_pfx.'other']['label'] = "Other actions"; + $ret['data'][$d_pfx.'other']['info'] = "Other actions"; //------------ Applications enabled ------------// $ret['data'][$d_pfx.'talk']['label'] = "Talk events"; $ret['data'][$d_pfx.'talk']['info'] = "Nextcloud Talk events"; $ret['data'][$d_pfx.'antivirus']['label'] = "Virus detect"; $ret['data'][$d_pfx.'antivirus']['info'] = "Virus Detections by files_antivirus"; - //------------------ Others --------------------// - $ret['data'][$d_pfx.'other']['label'] = "Other actions"; - $ret['data'][$d_pfx.'other']['info'] = "Other actions"; mysqli_set_charset($l, "utf8"); $r = mysqli_query($l, " SELECT * FROM ".mysqli_real_escape_string($l, $set['db_db']).".".mysqli_real_escape_string($l, $set['db_prefix'])."activity -- cgit v1.2.3