diff --git a/plugins/network/dhcp-pool b/plugins/dhcp/dhcp-pool similarity index 100% rename from plugins/network/dhcp-pool rename to plugins/dhcp/dhcp-pool diff --git a/plugins/network/dhcpd-pools b/plugins/dhcp/dhcpd-pools similarity index 100% rename from plugins/network/dhcpd-pools rename to plugins/dhcp/dhcpd-pools diff --git a/plugins/network/ip6_ b/plugins/ip6/ip6_ similarity index 100% rename from plugins/network/ip6_ rename to plugins/ip6/ip6_ diff --git a/plugins/network/ip6t_accounting b/plugins/ip6/ip6t_accounting similarity index 100% rename from plugins/network/ip6t_accounting rename to plugins/ip6/ip6t_accounting diff --git a/plugins/network/fping_ b/plugins/ping/fping_ similarity index 100% rename from plugins/network/fping_ rename to plugins/ping/fping_ diff --git a/plugins/network/multi_tcp_ping b/plugins/ping/multi_tcp_ping similarity index 100% rename from plugins/network/multi_tcp_ping rename to plugins/ping/multi_tcp_ping diff --git a/plugins/network/multiping b/plugins/ping/multiping similarity index 100% rename from plugins/network/multiping rename to plugins/ping/multiping diff --git a/plugins/network/ping/ping b/plugins/ping/ping similarity index 100% rename from plugins/network/ping/ping rename to plugins/ping/ping diff --git a/plugins/network/ping/ping-day.png b/plugins/ping/ping-day.png similarity index 100% rename from plugins/network/ping/ping-day.png rename to plugins/ping/ping-day.png diff --git a/plugins/network/ping-with-ceil b/plugins/ping/ping-with-ceil similarity index 100% rename from plugins/network/ping-with-ceil rename to plugins/ping/ping-with-ceil diff --git a/plugins/network/ping_host b/plugins/ping/ping_host similarity index 100% rename from plugins/network/ping_host rename to plugins/ping/ping_host diff --git a/plugins/network/pinger b/plugins/ping/pinger similarity index 100% rename from plugins/network/pinger rename to plugins/ping/pinger diff --git a/plugins/network/arris-tm502g_ b/plugins/router/arris-tm502g_ similarity index 100% rename from plugins/network/arris-tm502g_ rename to plugins/router/arris-tm502g_ diff --git a/plugins/cisco/cisco_bgp_ b/plugins/router/cisco_bgp_ similarity index 100% rename from plugins/cisco/cisco_bgp_ rename to plugins/router/cisco_bgp_ diff --git a/plugins/network/d-link-dir-655-router-statistics-plugin b/plugins/router/d-link-dir-655-router-statistics-plugin similarity index 100% rename from plugins/network/d-link-dir-655-router-statistics-plugin rename to plugins/router/d-link-dir-655-router-statistics-plugin diff --git a/plugins/network/dartybox b/plugins/router/dartybox similarity index 95% rename from plugins/network/dartybox rename to plugins/router/dartybox index 33ecb279..eeb77622 100755 --- a/plugins/network/dartybox +++ b/plugins/router/dartybox @@ -21,22 +21,22 @@ if [ "$1" = "config" ] then echo multigraph dbox_adsl_bw echo graph_title DartyBox Adsl Bandwidth - echo graph_category other + echo graph_category network echo up.label UpStream echo down.label DownStream echo multigraph dbox_adsl_att echo graph_title DartyBox Adsl Attenuation - echo graph_category other + echo graph_category network echo up.label UpStream echo down.label DownStream echo multigraph dbox_adsl_snr echo graph_title DartyBox Adsl SignalNoise Ratio - echo graph_category other + echo graph_category network echo up.label UpStream echo down.label DownStream echo multigraph dbox_adsl_pkt echo graph_title DartyBox Adsl Packets - echo graph_category other + echo graph_category network echo up.label UpStream echo down.label DownStream echo up_c.label UpStream "(Correctable)" @@ -57,7 +57,7 @@ then echo down_u.min 0 echo multigraph dbox_adsl_uptime echo graph_title DartyBox Adsl Uptime - echo graph_category other + echo graph_category network echo graph_vlabel days echo uptime.label Uptime diff --git a/plugins/network/modem-nvg510 b/plugins/router/modem-nvg510 similarity index 100% rename from plugins/network/modem-nvg510 rename to plugins/router/modem-nvg510 diff --git a/plugins/network/motorola_sb6141 b/plugins/router/motorola_sb6141 similarity index 100% rename from plugins/network/motorola_sb6141 rename to plugins/router/motorola_sb6141 diff --git a/plugins/network/tg585v7__ b/plugins/router/tg585v7__ similarity index 100% rename from plugins/network/tg585v7__ rename to plugins/router/tg585v7__ diff --git a/plugins/network/tcp-retransmissions b/plugins/tcp/tcp-retransmissions similarity index 100% rename from plugins/network/tcp-retransmissions rename to plugins/tcp/tcp-retransmissions diff --git a/plugins/network/tcp-states b/plugins/tcp/tcp-states similarity index 100% rename from plugins/network/tcp-states rename to plugins/tcp/tcp-states diff --git a/plugins/network/udp-statistics b/plugins/udp/udp-statistics similarity index 100% rename from plugins/network/udp-statistics rename to plugins/udp/udp-statistics diff --git a/plugins/network/wifi_signal b/plugins/wifi/wifi_signal similarity index 100% rename from plugins/network/wifi_signal rename to plugins/wifi/wifi_signal diff --git a/plugins/network/wifi_signal_noise_ b/plugins/wifi/wifi_signal_noise_ similarity index 100% rename from plugins/network/wifi_signal_noise_ rename to plugins/wifi/wifi_signal_noise_