[checkmk-commits] Check_MK Git: check_mk: #1375 vxvm_enclosures, vxvm_multipath,

vxvm_objstatus: joined into one agent plugin called vxvm Message-ID: &lt;53f8b33a.WsTfAQh8TDgFzseU%mk(a)mathias-kettner.de&gt; User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 1d9b1950848dfe99232c43146c906334350964d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d9b1950848dfe… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Sat Aug 23 17:28:51 2014 +0200 #1375 vxvm_enclosures, vxvm_multipath, vxvm_objstatus: joined into one agent plugin called vxvm All of the three agent plugins have been joined into one single plugin. There is no need to update your agent now. --- .werks/1375 | 10 ++++++++++ ChangeLog | 1 + agents/plugins/veritas/vxvm_enclosures | 15 --------------- agents/plugins/veritas/vxvm_multipath | 15 --------------- agents/plugins/veritas/vxvm_objstatus | 30 ------------------------------ agents/plugins/vxvm | 26 ++++++++++++++++++++++++++ checkman/vxvm_enclosures | 2 ++ checkman/vxvm_multipath | 2 ++ checkman/vxvm_objstatus | 1 + 9 files changed, 42 insertions(+), 60 deletions(-) diff --git a/.werks/1375 b/.werks/1375 new file mode 100644 index 0000000..215c439 --- /dev/null +++ b/.werks/1375 @@ -0,0 +1,10 @@ +Title: vxvm_enclosures, vxvm_multipath, vxvm_objstatus: joined into one agent plugin called vxvm +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1408807656 +Class: feature + +All of the three agent plugins have been joined into one single plugin. +There is no need to update your agent now. diff --git a/ChangeLog b/ChangeLog index ce61549..8fdba52 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,7 @@ * 0649 f5_bigip_pool: check now also prints the node names of down nodes * 1374 arc_raid_status: moved plugin into main Linux agent... NOTE: Please refer to the migration notes! + * 1375 vxvm_enclosures, vxvm_multipath, vxvm_objstatus: joined into one agent plugin called vxvm... * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/agents/plugins/veritas/vxvm_enclosures b/agents/plugins/veritas/vxvm_enclosures deleted file mode 100755 index dbef723..0000000 --- a/agents/plugins/veritas/vxvm_enclosures +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# Original Output -#ENCLR_NAME ENCLR_TYPE ENCLR_SNO STATUS ARRAY_TYPE LUN_COUNT -#=================================================================================== -#disk Disk DISKS CONNECTED Disk 2 -#emc1 EMC 0002XXXXXXXX CONNECTED A/A 512 -#emc_clariion0 EMC_CLARiiON CK2000XXXXXXXX CONNECTED CLR-A/P 1 - -# Disk: local disks, or maybe JBOD (then remove the -e ^disk) - -if type vxdmpadm > /dev/null ; then - echo '<<<vxvm_enclosures>>>' - vxdmpadm listenclosure all | grep -v -w -e ^[dD]isk -e ^other_disks -e ^ENCLR_NAME -e \^= -fi diff --git a/agents/plugins/veritas/vxvm_multipath b/agents/plugins/veritas/vxvm_multipath deleted file mode 100755 index 2761c14..0000000 --- a/agents/plugins/veritas/vxvm_multipath +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# DMPNODENAME ENCLR-NAME STATE[A] PATH-TYPE[M] -# disk2057 emc1 ENABLED(A) - -# disk3119 emc_clariion0 ENABLED SECONDARY - - -if type vxdmpadm >/dev/null 2>&1 ; then - echo '<<<vxvm_multipath>>>' - ENCS=$( vxdmpadm listenclosure all | grep -v -w -e ^[dD]isk -e ENCLR_NAME -e \^= | awk '{print $1}') - - echo "$ENCS" | while read enc ; do - vxdmpadm getdmpnode enclosure=$enc | grep -v -e \^= -e NAME - done -fi diff --git a/agents/plugins/veritas/vxvm_objstatus b/agents/plugins/veritas/vxvm_objstatus deleted file mode 100755 index 932adc4..0000000 --- a/agents/plugins/veritas/vxvm_objstatus +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - - -if type vxdg > /dev/null; then - echo '<<<vxvm_objstatus>>>' - # Get a list of the in-use disk groups. - DGS=$(vxdg list | grep enabled | awk '{print $1}') - # Deported or otherwise inactive needs no performance monitoring - if [ "X${DGS}" != "X" ]; then - for DG in $DGS ; do - vxprint -g $DG -v -q -Q -F "%type %dgname %name %admin_state %kstate" - done - fi -fi - - - -# Output examples: -# A stopped volume -#v datadg lalavol CLEAN DISABLED -# An active volume -#v datadg oravol ACTIVE ENABLE -# v2 layered volumes on lower level that we might or might not need. -#v datadg oravol-L01 ACTIVE ENABLED -#v datadg oravol-L02 ACTIVE ENABLED - - -# Man page - -# https://sort.symantec.com/public/documents/sfha/5.1sp1/solaris/manualpages/… diff --git a/agents/plugins/vxvm b/agents/plugins/vxvm new file mode 100755 index 0000000..71b3f7e --- /dev/null +++ b/agents/plugins/vxvm @@ -0,0 +1,26 @@ +#!/bin/sh +# This plugin has been tested on Linux and HPUX. + + +if type vxdmpadm >/dev/null 2>&1; then + echo '<<<vxvm_enclosures>>>' + vxdmpadm listenclosure all | grep -v -w -e ^[dD]isk -e ^other_disks -e ^ENCLR_NAME -e \^= + echo '<<<vxvm_multipath>>>' + ENCS=$( vxdmpadm listenclosure all | grep -v -w -e ^[dD]isk -e ENCLR_NAME -e \^= | awk '{print $1}') + + echo "$ENCS" | while read enc ; do + vxdmpadm getdmpnode enclosure=$enc | grep -v -e \^= -e NAME + done +fi + +if type vxdg >/dev/null 2>&1; then + echo '<<<vxvm_objstatus>>>' + # Get a list of the in-use disk groups. + DGS=$(vxdg list | grep enabled | awk '{print $1}') + # Deported or otherwise inactive needs no performance monitoring + if [ "X${DGS}" != "X" ]; then + for DG in $DGS ; do + vxprint -g $DG -v -q -Q -F "%type %dgname %name %admin_state %kstate" + done + fi +fi diff --git a/checkman/vxvm_enclosures b/checkman/vxvm_enclosures index c845044..77d0e07 100644 --- a/checkman/vxvm_enclosures +++ b/checkman/vxvm_enclosures @@ -15,6 +15,8 @@ description: the local disks under Veritas control, you can add these to {ignored_services}. + You need to install the agent plugin {vxvm}. + inventory: One item is generated per VxVM disk enclosure, the naming is inherited from VxVM. See the man page for {vxdmpadm} about diff --git a/checkman/vxvm_multipath b/checkman/vxvm_multipath index 02f05c4..af9ab4f 100644 --- a/checkman/vxvm_multipath +++ b/checkman/vxvm_multipath @@ -12,6 +12,8 @@ description: {WARN} status, or a {CRIT} if less than 50% - or none - paths are still working. + You need to install the agent plugin {vxvm}. + inventory: One item is generated per multipathed LUN. It is named after the diff --git a/checkman/vxvm_objstatus b/checkman/vxvm_objstatus index 6763760..1def0bb 100644 --- a/checkman/vxvm_objstatus +++ b/checkman/vxvm_objstatus @@ -16,6 +16,7 @@ description: The check should be extensible for tracking status in multiple layers. + You need to install the agent plugin {vxvm}. inventory: One item is generated per volume in the volume manager.