From 349edaf8196a9f79a85255936cdc1dc68b8afa85 Mon Sep 17 00:00:00 2001 From: dipohl Date: Fri, 24 Feb 2017 04:26:39 +0100 Subject: [PATCH] Reduce plugin categories --- plugins/{proftpd => ftp}/proftpd | 2 +- plugins/{proftpd => ftp}/proftpd_bytes | 2 +- plugins/{proftpd => ftp}/proftpd_count | 2 +- plugins/{pure-ftpd => ftp}/pure-ftpd | 2 +- plugins/{pure-ftpd => ftp}/pure-ftpd-bw | 2 +- plugins/{pure-ftpd => ftp}/pure-ftpd-logs | 2 +- plugins/{pure-ftpd => ftp}/pureftpd_count | 2 +- plugins/{pure-ftpd => ftp}/pureftpd_traffic | 2 +- plugins/{vsftpd => ftp}/vsftpd | 2 +- plugins/{vsftpd => ftp}/vsftpd-rel | 2 +- plugins/rsync/rsyncd_bytes | 2 +- plugins/rsync/rsyncd_count | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) rename plugins/{proftpd => ftp}/proftpd (93%) rename plugins/{proftpd => ftp}/proftpd_bytes (97%) rename plugins/{proftpd => ftp}/proftpd_count (97%) rename plugins/{pure-ftpd => ftp}/pure-ftpd (98%) rename plugins/{pure-ftpd => ftp}/pure-ftpd-bw (98%) rename plugins/{pure-ftpd => ftp}/pure-ftpd-logs (98%) rename plugins/{pure-ftpd => ftp}/pureftpd_count (96%) rename plugins/{pure-ftpd => ftp}/pureftpd_traffic (98%) rename plugins/{vsftpd => ftp}/vsftpd (98%) rename plugins/{vsftpd => ftp}/vsftpd-rel (98%) diff --git a/plugins/proftpd/proftpd b/plugins/ftp/proftpd similarity index 93% rename from plugins/proftpd/proftpd rename to plugins/ftp/proftpd index 3b70408d..f02c49fd 100755 --- a/plugins/proftpd/proftpd +++ b/plugins/ftp/proftpd @@ -6,7 +6,7 @@ if [ "$1" = 'config' ]; then echo "graph_args --base 1000 -l 0" echo "graph_title Serveur FTP" - echo "graph_category ftp" + echo "graph_category network" echo "graph_vlabel Stats Proftpd" echo "succes.label Login succes" echo "succes.draw AREA" diff --git a/plugins/proftpd/proftpd_bytes b/plugins/ftp/proftpd_bytes similarity index 97% rename from plugins/proftpd/proftpd_bytes rename to plugins/ftp/proftpd_bytes index 57875963..0e538e08 100755 --- a/plugins/proftpd/proftpd_bytes +++ b/plugins/ftp/proftpd_bytes @@ -38,7 +38,7 @@ if [ "$1" = "config" ]; then echo 'graph_title FTP Server Bytes' echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel FTP Server Bytes' - echo 'graph_category ftp' + echo 'graph_category network' echo 'ftp_get.label Bytes GET' echo 'ftp_put.label Bytes PUT' exit 0 diff --git a/plugins/proftpd/proftpd_count b/plugins/ftp/proftpd_count similarity index 97% rename from plugins/proftpd/proftpd_count rename to plugins/ftp/proftpd_count index 2d18f6b7..7409f418 100755 --- a/plugins/proftpd/proftpd_count +++ b/plugins/ftp/proftpd_count @@ -38,7 +38,7 @@ if [ "$1" = "config" ]; then echo 'graph_title FTP Server Transfers' echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel FTP Server Transfers' - echo 'graph_category ftp' + echo 'graph_category network' echo 'ftp_get.label Files GET' echo 'ftp_put.label Files PUT' exit 0 diff --git a/plugins/pure-ftpd/pure-ftpd b/plugins/ftp/pure-ftpd similarity index 98% rename from plugins/pure-ftpd/pure-ftpd rename to plugins/ftp/pure-ftpd index 3a2700ac..2a699778 100755 --- a/plugins/pure-ftpd/pure-ftpd +++ b/plugins/ftp/pure-ftpd @@ -59,7 +59,7 @@ if [ "$1" = "config" ]; then echo "graph_title $GRAPHTITLE" echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel connections' - echo 'graph_category ftp' + echo 'graph_category network' echo 'upload.label Upload' echo 'download.label Download' echo 'idle.label Idle' diff --git a/plugins/pure-ftpd/pure-ftpd-bw b/plugins/ftp/pure-ftpd-bw similarity index 98% rename from plugins/pure-ftpd/pure-ftpd-bw rename to plugins/ftp/pure-ftpd-bw index 49db5ed3..4e2fcf8a 100755 --- a/plugins/pure-ftpd/pure-ftpd-bw +++ b/plugins/ftp/pure-ftpd-bw @@ -54,7 +54,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Pure Ftpd Bandwidth' echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel Datas sent / received' - echo 'graph_category ftp' + echo 'graph_category network' echo 'dl.label Bytes downloaded' echo 'ul.label Bytes uploaded' exit 0 diff --git a/plugins/pure-ftpd/pure-ftpd-logs b/plugins/ftp/pure-ftpd-logs similarity index 98% rename from plugins/pure-ftpd/pure-ftpd-logs rename to plugins/ftp/pure-ftpd-logs index e4d9f881..8fc5fb7e 100755 --- a/plugins/pure-ftpd/pure-ftpd-logs +++ b/plugins/ftp/pure-ftpd-logs @@ -44,7 +44,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Pure Ftpd Logs' echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel Connections number' - echo 'graph_category ftp' + echo 'graph_category network' echo 'nc.label new connection' echo 'al.label anonymous logged' echo 'ul.label auth user logged' diff --git a/plugins/pure-ftpd/pureftpd_count b/plugins/ftp/pureftpd_count similarity index 96% rename from plugins/pure-ftpd/pureftpd_count rename to plugins/ftp/pureftpd_count index b466948a..07f9dc8a 100755 --- a/plugins/pure-ftpd/pureftpd_count +++ b/plugins/ftp/pureftpd_count @@ -30,7 +30,7 @@ if [ "$1" = "config" ]; then echo 'graph_title FTP Server' echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel Daily FTP Operations' - echo 'graph_category ftp' + echo 'graph_category network' echo 'graph_period second' echo 'ftp_put.type GAUGE' echo 'ftp_get.type GAUGE' diff --git a/plugins/pure-ftpd/pureftpd_traffic b/plugins/ftp/pureftpd_traffic similarity index 98% rename from plugins/pure-ftpd/pureftpd_traffic rename to plugins/ftp/pureftpd_traffic index f2eacc09..c9ec4c73 100755 --- a/plugins/pure-ftpd/pureftpd_traffic +++ b/plugins/ftp/pureftpd_traffic @@ -23,7 +23,7 @@ if ($ARGV[0] eq "test") { if ($ARGV[0] eq "config") { $out.="graph_title pureftpd traffic -graph_category ftp +graph_category network graph_info This graph shows pureftpd traffic. graph_vlabel Bytes get.label Get diff --git a/plugins/vsftpd/vsftpd b/plugins/ftp/vsftpd similarity index 98% rename from plugins/vsftpd/vsftpd rename to plugins/ftp/vsftpd index 298c5025..d329552f 100755 --- a/plugins/vsftpd/vsftpd +++ b/plugins/ftp/vsftpd @@ -17,7 +17,7 @@ if [ "$1" = "config" ]; then graph_title vsftpd Server graph_args --base 1000 -l 0 graph_vlabel Requests -graph_category ftp +graph_category network ftp_c.label connections ftp_c.type DERIVE ftp_c.min 0 diff --git a/plugins/vsftpd/vsftpd-rel b/plugins/ftp/vsftpd-rel similarity index 98% rename from plugins/vsftpd/vsftpd-rel rename to plugins/ftp/vsftpd-rel index 689ae60c..4d80d302 100755 --- a/plugins/vsftpd/vsftpd-rel +++ b/plugins/ftp/vsftpd-rel @@ -66,7 +66,7 @@ then echo 'system.type ABSOLUTE' echo 'graph_title Very Secure FTP Server' echo 'graph_vlabel Requests' - echo 'graph_category FTP' + echo 'graph_category network' echo 'ftp_conn.label connections' echo 'ftp_loginok.label successful logins' echo 'ftp_loginfail.label failed logins' diff --git a/plugins/rsync/rsyncd_bytes b/plugins/rsync/rsyncd_bytes index 6613ea24..ea1b3887 100755 --- a/plugins/rsync/rsyncd_bytes +++ b/plugins/rsync/rsyncd_bytes @@ -32,7 +32,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Rsync Server Bytes' echo 'graph_args --base 1000 -l 0' echo 'graph_order send recv' - echo 'graph_category rsync' + echo 'graph_category network' echo 'graph_vlabel Rsync Bytes' echo 'send.label Bytes Send' echo 'recv.label Bytes Recv' diff --git a/plugins/rsync/rsyncd_count b/plugins/rsync/rsyncd_count index e8d98905..62585548 100755 --- a/plugins/rsync/rsyncd_count +++ b/plugins/rsync/rsyncd_count @@ -32,7 +32,7 @@ if [ "$1" = "config" ]; then echo 'graph_title Rsync Server Transfers' echo 'graph_args --base 1000 -l 0' echo 'graph_order send recv' - echo 'graph_category rsync' + echo 'graph_category network' echo 'graph_vlabel Rsync Server Transfers' echo 'send.label Files Send' echo 'recv.label Files Recv'