From 3a6fdce80fa3b56c189a31a52db3337040839102 Mon Sep 17 00:00:00 2001 From: dipohl Date: Fri, 24 Feb 2017 01:35:47 +0100 Subject: [PATCH] Plugin-Gallery: get better 2nd level structure --- plugins/{time => chrony}/chrony | 0 plugins/{time => ntp}/ntp_kernel_pll_prec | 0 plugins/{time => ntp}/ntp_kernel_pll_tol | 0 plugins/{time => ntp}/ntp_packets | 0 plugins/{time => ntp}/ntp_peers | 0 plugins/{time => ntp}/ntp_peers_ipv6 | 0 plugins/{time => ntp}/ntp_pool_score_ | 0 plugins/{time => ntp}/ntp_queries | 0 plugins/{time => ntp}/ntpdate_ | 0 plugins/{network => }/ssh/openssh-denyhosts | 2 +- plugins/{network => }/ssh/sshd_invalid_countries | 2 +- plugins/{network => }/ssh/sshd_invalid_countries_ruby | 2 +- plugins/ssh/sshd_log | 3 +-- 13 files changed, 4 insertions(+), 5 deletions(-) rename plugins/{time => chrony}/chrony (100%) rename plugins/{time => ntp}/ntp_kernel_pll_prec (100%) rename plugins/{time => ntp}/ntp_kernel_pll_tol (100%) rename plugins/{time => ntp}/ntp_packets (100%) rename plugins/{time => ntp}/ntp_peers (100%) rename plugins/{time => ntp}/ntp_peers_ipv6 (100%) rename plugins/{time => ntp}/ntp_pool_score_ (100%) rename plugins/{time => ntp}/ntp_queries (100%) rename plugins/{time => ntp}/ntpdate_ (100%) rename plugins/{network => }/ssh/openssh-denyhosts (97%) rename plugins/{network => }/ssh/sshd_invalid_countries (98%) rename plugins/{network => }/ssh/sshd_invalid_countries_ruby (98%) diff --git a/plugins/time/chrony b/plugins/chrony/chrony similarity index 100% rename from plugins/time/chrony rename to plugins/chrony/chrony diff --git a/plugins/time/ntp_kernel_pll_prec b/plugins/ntp/ntp_kernel_pll_prec similarity index 100% rename from plugins/time/ntp_kernel_pll_prec rename to plugins/ntp/ntp_kernel_pll_prec diff --git a/plugins/time/ntp_kernel_pll_tol b/plugins/ntp/ntp_kernel_pll_tol similarity index 100% rename from plugins/time/ntp_kernel_pll_tol rename to plugins/ntp/ntp_kernel_pll_tol diff --git a/plugins/time/ntp_packets b/plugins/ntp/ntp_packets similarity index 100% rename from plugins/time/ntp_packets rename to plugins/ntp/ntp_packets diff --git a/plugins/time/ntp_peers b/plugins/ntp/ntp_peers similarity index 100% rename from plugins/time/ntp_peers rename to plugins/ntp/ntp_peers diff --git a/plugins/time/ntp_peers_ipv6 b/plugins/ntp/ntp_peers_ipv6 similarity index 100% rename from plugins/time/ntp_peers_ipv6 rename to plugins/ntp/ntp_peers_ipv6 diff --git a/plugins/time/ntp_pool_score_ b/plugins/ntp/ntp_pool_score_ similarity index 100% rename from plugins/time/ntp_pool_score_ rename to plugins/ntp/ntp_pool_score_ diff --git a/plugins/time/ntp_queries b/plugins/ntp/ntp_queries similarity index 100% rename from plugins/time/ntp_queries rename to plugins/ntp/ntp_queries diff --git a/plugins/time/ntpdate_ b/plugins/ntp/ntpdate_ similarity index 100% rename from plugins/time/ntpdate_ rename to plugins/ntp/ntpdate_ diff --git a/plugins/network/ssh/openssh-denyhosts b/plugins/ssh/openssh-denyhosts similarity index 97% rename from plugins/network/ssh/openssh-denyhosts rename to plugins/ssh/openssh-denyhosts index 163ac1a8..15b102f3 100755 --- a/plugins/network/ssh/openssh-denyhosts +++ b/plugins/ssh/openssh-denyhosts @@ -31,7 +31,7 @@ fi if [ "$1" = "config" ]; then echo 'graph_title SSH Statistics' echo 'graph_order refused invalid accepted' - echo 'graph_category ssh' + echo 'graph_category security' echo 'graph_vlabel Count' echo 'graph_scale no' diff --git a/plugins/network/ssh/sshd_invalid_countries b/plugins/ssh/sshd_invalid_countries similarity index 98% rename from plugins/network/ssh/sshd_invalid_countries rename to plugins/ssh/sshd_invalid_countries index 04f8f929..e36b3201 100755 --- a/plugins/network/ssh/sshd_invalid_countries +++ b/plugins/ssh/sshd_invalid_countries @@ -52,7 +52,7 @@ if (isset($argv[1]) && $argv[1] == 'config') { echo 'graph_title SSHD invalid countries from ' . SYSLOG . "\n"; echo 'graph_args --base 1000 -l 0' . "\n"; echo 'graph_vlabel number of invalid access per country' . "\n"; - echo 'graph_category system' . "\n"; + echo 'graph_category security' . "\n"; echo 'graph_info This graph shows the countries of invalid access to sshd.' . "\n"; foreach (get_sshd_invalid_countries() as $country => $cnt) { echo $country . '.label ' . $country . "\n"; diff --git a/plugins/network/ssh/sshd_invalid_countries_ruby b/plugins/ssh/sshd_invalid_countries_ruby similarity index 98% rename from plugins/network/ssh/sshd_invalid_countries_ruby rename to plugins/ssh/sshd_invalid_countries_ruby index ba79454a..9a6c11f4 100755 --- a/plugins/network/ssh/sshd_invalid_countries_ruby +++ b/plugins/ssh/sshd_invalid_countries_ruby @@ -71,7 +71,7 @@ when 'config' puts 'graph_title SSHD invalid countries from ' + SYSLOG puts 'graph_args --base 1000 -l 0' puts 'graph_vlabel number of invalid access per country' - puts 'graph_category system' + puts 'graph_category security' puts 'graph_info This graph shows the countries of invalid access to sshd.' getInvalids.each {|k,v| puts k + '.label ' + k} exit 0 diff --git a/plugins/ssh/sshd_log b/plugins/ssh/sshd_log index ea84ae2c..608f49ec 100755 --- a/plugins/ssh/sshd_log +++ b/plugins/ssh/sshd_log @@ -30,7 +30,6 @@ # LOG=${logfile:-/var/log/secure} -CATEGORY=${category:-system} if [ "$1" = "autoconf" ]; then @@ -48,7 +47,7 @@ if [ "$1" = "config" ]; then echo 'graph_title SSHD login stats from' $LOG echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel logins' - echo 'graph_category' $CATEGORY + echo 'graph_category' security echo 'LogPass.label Successful password logins' echo 'LogPassPAM.label Successful login via PAM'