From f5b816df9e5bd0914713ab3e3107a71a1694b23e Mon Sep 17 00:00:00 2001 From: dipohl Date: Thu, 23 Feb 2017 19:53:57 +0100 Subject: [PATCH] Plugin-Gallery: get better 2nd level headings --- plugins/{virtualization => libvirt}/kvm_cpu | 0 plugins/{virtualization => libvirt}/kvm_io | 0 plugins/{virtualization => libvirt}/kvm_mem | 0 plugins/{virtualization => libvirt}/kvm_net | 0 plugins/{virtualization => libvirt}/libvirt | 0 plugins/{virtualization => libvirt}/munin-libvirtpy | 0 plugins/{virtualization => virtualbox}/virtualbox_cpu_kernel | 0 plugins/{virtualization => virtualbox}/virtualbox_cpu_user | 0 plugins/{virtualization => virtualbox}/virtualbox_ram_usage | 0 plugins/{virtualization => }/vmware/esx_ | 4 ++++ plugins/{virtualization => }/vmware/esxcli_env_ | 0 plugins/{virtualization => }/vmware/esxi | 4 ++-- plugins/{virtualization => }/vmware/fusion_ | 2 +- plugins/{virtualization => }/vmware/vm_cpu_load | 2 +- plugins/{virtualization => }/vserver/vserver_jiffies | 2 +- plugins/{virtualization => }/vserver/vserver_limit_hits | 2 +- plugins/{virtualization => }/vserver/vserver_limits | 2 +- plugins/{virtualization => xen}/xen | 0 plugins/{virtualization => xen}/xen-cpu | 0 plugins/{virtualization => xen}/xen-multi | 0 plugins/{virtualization => xen}/xen_cpu_v2 | 0 plugins/{virtualization => xen}/xen_memory | 0 plugins/{virtualization => xen}/xen_traffic_ | 0 plugins/{virtualization => xen}/xen_traffic_all | 0 plugins/{virtualization => xen}/xen_vbd | 0 25 files changed, 11 insertions(+), 7 deletions(-) rename plugins/{virtualization => libvirt}/kvm_cpu (100%) rename plugins/{virtualization => libvirt}/kvm_io (100%) rename plugins/{virtualization => libvirt}/kvm_mem (100%) rename plugins/{virtualization => libvirt}/kvm_net (100%) rename plugins/{virtualization => libvirt}/libvirt (100%) rename plugins/{virtualization => libvirt}/munin-libvirtpy (100%) rename plugins/{virtualization => virtualbox}/virtualbox_cpu_kernel (100%) rename plugins/{virtualization => virtualbox}/virtualbox_cpu_user (100%) rename plugins/{virtualization => virtualbox}/virtualbox_ram_usage (100%) rename plugins/{virtualization => }/vmware/esx_ (99%) rename plugins/{virtualization => }/vmware/esxcli_env_ (100%) rename plugins/{virtualization => }/vmware/esxi (98%) rename plugins/{virtualization => }/vmware/fusion_ (98%) rename plugins/{virtualization => }/vmware/vm_cpu_load (94%) rename plugins/{virtualization => }/vserver/vserver_jiffies (98%) rename plugins/{virtualization => }/vserver/vserver_limit_hits (99%) rename plugins/{virtualization => }/vserver/vserver_limits (98%) rename plugins/{virtualization => xen}/xen (100%) rename plugins/{virtualization => xen}/xen-cpu (100%) rename plugins/{virtualization => xen}/xen-multi (100%) rename plugins/{virtualization => xen}/xen_cpu_v2 (100%) rename plugins/{virtualization => xen}/xen_memory (100%) rename plugins/{virtualization => xen}/xen_traffic_ (100%) rename plugins/{virtualization => xen}/xen_traffic_all (100%) rename plugins/{virtualization => xen}/xen_vbd (100%) diff --git a/plugins/virtualization/kvm_cpu b/plugins/libvirt/kvm_cpu similarity index 100% rename from plugins/virtualization/kvm_cpu rename to plugins/libvirt/kvm_cpu diff --git a/plugins/virtualization/kvm_io b/plugins/libvirt/kvm_io similarity index 100% rename from plugins/virtualization/kvm_io rename to plugins/libvirt/kvm_io diff --git a/plugins/virtualization/kvm_mem b/plugins/libvirt/kvm_mem similarity index 100% rename from plugins/virtualization/kvm_mem rename to plugins/libvirt/kvm_mem diff --git a/plugins/virtualization/kvm_net b/plugins/libvirt/kvm_net similarity index 100% rename from plugins/virtualization/kvm_net rename to plugins/libvirt/kvm_net diff --git a/plugins/virtualization/libvirt b/plugins/libvirt/libvirt similarity index 100% rename from plugins/virtualization/libvirt rename to plugins/libvirt/libvirt diff --git a/plugins/virtualization/munin-libvirtpy b/plugins/libvirt/munin-libvirtpy similarity index 100% rename from plugins/virtualization/munin-libvirtpy rename to plugins/libvirt/munin-libvirtpy diff --git a/plugins/virtualization/virtualbox_cpu_kernel b/plugins/virtualbox/virtualbox_cpu_kernel similarity index 100% rename from plugins/virtualization/virtualbox_cpu_kernel rename to plugins/virtualbox/virtualbox_cpu_kernel diff --git a/plugins/virtualization/virtualbox_cpu_user b/plugins/virtualbox/virtualbox_cpu_user similarity index 100% rename from plugins/virtualization/virtualbox_cpu_user rename to plugins/virtualbox/virtualbox_cpu_user diff --git a/plugins/virtualization/virtualbox_ram_usage b/plugins/virtualbox/virtualbox_ram_usage similarity index 100% rename from plugins/virtualization/virtualbox_ram_usage rename to plugins/virtualbox/virtualbox_ram_usage diff --git a/plugins/virtualization/vmware/esx_ b/plugins/vmware/esx_ similarity index 99% rename from plugins/virtualization/vmware/esx_ rename to plugins/vmware/esx_ index 42c32759..4c4ad4b4 100755 --- a/plugins/virtualization/vmware/esx_ +++ b/plugins/vmware/esx_ @@ -710,3 +710,7 @@ sub munin_print { } } } + +# for Munin Plugin Gallery +# graph_category virtualization + diff --git a/plugins/virtualization/vmware/esxcli_env_ b/plugins/vmware/esxcli_env_ similarity index 100% rename from plugins/virtualization/vmware/esxcli_env_ rename to plugins/vmware/esxcli_env_ diff --git a/plugins/virtualization/vmware/esxi b/plugins/vmware/esxi similarity index 98% rename from plugins/virtualization/vmware/esxi rename to plugins/vmware/esxi index 54de7b8f..7aef50a3 100755 --- a/plugins/virtualization/vmware/esxi +++ b/plugins/vmware/esxi @@ -139,7 +139,7 @@ if [ "$1" = "config" ]; then echo 'graph_args -l 0' echo 'graph_scale no' echo 'graph_vlabel CPU usage in MHz' - echo 'graph_category Virtualization' + echo 'graph_category virtualization' echo 'graph_info This graph shows the average CPU MHz used by each domain' name="Domain_0" @@ -176,7 +176,7 @@ EOF echo 'graph_args -l 0' echo 'graph_scale no' echo 'graph_vlabel Memory usage in Megabytes' - echo 'graph_category Virtualization' + echo 'graph_category virtualization' echo 'graph_info This graph shows the average Memory used by each domain' name="Domain_0" diff --git a/plugins/virtualization/vmware/fusion_ b/plugins/vmware/fusion_ similarity index 98% rename from plugins/virtualization/vmware/fusion_ rename to plugins/vmware/fusion_ index ec71d8d6..6ae2eec6 100755 --- a/plugins/virtualization/vmware/fusion_ +++ b/plugins/vmware/fusion_ @@ -62,7 +62,7 @@ my @lines=split(/\n/,$output); if ( exists $ARGV[0] and $ARGV[0] eq "config" ) { my $lcount = 0; - my $base_config = "graph_category Virtualization\n"; + my $base_config = "graph_category virtualization\n"; if( $type eq "pcpu" ) { print $base_config; diff --git a/plugins/virtualization/vmware/vm_cpu_load b/plugins/vmware/vm_cpu_load similarity index 94% rename from plugins/virtualization/vmware/vm_cpu_load rename to plugins/vmware/vm_cpu_load index d8ecbaae..00829d49 100755 --- a/plugins/virtualization/vmware/vm_cpu_load +++ b/plugins/vmware/vm_cpu_load @@ -16,7 +16,7 @@ if [ "$1" = "config" ]; then echo 'graph_title VMware CPU-Load' echo 'graph_args --base 1000 -l 0' echo 'graph_vlabel Load of VMware VMs' - echo 'graph_category Virtualization' + echo 'graph_category cpu' while [ $i -lt ${#VMX[*]} ] do diff --git a/plugins/virtualization/vserver/vserver_jiffies b/plugins/vserver/vserver_jiffies similarity index 98% rename from plugins/virtualization/vserver/vserver_jiffies rename to plugins/vserver/vserver_jiffies index c405d703..caf196c7 100755 --- a/plugins/virtualization/vserver/vserver_jiffies +++ b/plugins/vserver/vserver_jiffies @@ -51,7 +51,7 @@ else fi if [[ "$1" = "config" ]]; then - echo 'graph_category Virtualization' + echo 'graph_category virtualization' echo 'graph_args --base 1000' echo 'graph_title Vserver cpu usage' echo 'graph_vlabel jiffies used per ${graph_period}' diff --git a/plugins/virtualization/vserver/vserver_limit_hits b/plugins/vserver/vserver_limit_hits similarity index 99% rename from plugins/virtualization/vserver/vserver_limit_hits rename to plugins/vserver/vserver_limit_hits index 8fcc7b7d..d4a690cc 100755 --- a/plugins/virtualization/vserver/vserver_limit_hits +++ b/plugins/vserver/vserver_limit_hits @@ -89,7 +89,7 @@ if [ "$1" = "config" ]; then echo "graph_title Vserver $resource limit hits" # echo 'graph_args --base 1024k -l 0' echo "graph_vlabel $resource limit hits" - echo 'graph_category Virtualization' + echo 'graph_category virtualization' echo "graph_info Shows number of hits on $resource limits by each vserver.'" for vserver_xid in $vservers ; do diff --git a/plugins/virtualization/vserver/vserver_limits b/plugins/vserver/vserver_limits similarity index 98% rename from plugins/virtualization/vserver/vserver_limits rename to plugins/vserver/vserver_limits index 3e6ab1b2..ea4317c5 100755 --- a/plugins/virtualization/vserver/vserver_limits +++ b/plugins/vserver/vserver_limits @@ -66,7 +66,7 @@ if [ "$1" = "config" ]; then echo "graph_title Vserver $resource limits" # echo 'graph_args --base 1024k -l 0' echo "graph_vlabel $resource limits" - echo 'graph_category Virtualization' + echo 'graph_category virtualization' echo "graph_info Shows current $resource limits for each vserver.'" for vserver_xid in $vservers ; do diff --git a/plugins/virtualization/xen b/plugins/xen/xen similarity index 100% rename from plugins/virtualization/xen rename to plugins/xen/xen diff --git a/plugins/virtualization/xen-cpu b/plugins/xen/xen-cpu similarity index 100% rename from plugins/virtualization/xen-cpu rename to plugins/xen/xen-cpu diff --git a/plugins/virtualization/xen-multi b/plugins/xen/xen-multi similarity index 100% rename from plugins/virtualization/xen-multi rename to plugins/xen/xen-multi diff --git a/plugins/virtualization/xen_cpu_v2 b/plugins/xen/xen_cpu_v2 similarity index 100% rename from plugins/virtualization/xen_cpu_v2 rename to plugins/xen/xen_cpu_v2 diff --git a/plugins/virtualization/xen_memory b/plugins/xen/xen_memory similarity index 100% rename from plugins/virtualization/xen_memory rename to plugins/xen/xen_memory diff --git a/plugins/virtualization/xen_traffic_ b/plugins/xen/xen_traffic_ similarity index 100% rename from plugins/virtualization/xen_traffic_ rename to plugins/xen/xen_traffic_ diff --git a/plugins/virtualization/xen_traffic_all b/plugins/xen/xen_traffic_all similarity index 100% rename from plugins/virtualization/xen_traffic_all rename to plugins/xen/xen_traffic_all diff --git a/plugins/virtualization/xen_vbd b/plugins/xen/xen_vbd similarity index 100% rename from plugins/virtualization/xen_vbd rename to plugins/xen/xen_vbd