Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5a4954d57798b6c511b20a8148888dced40f4e5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a4954d57798b6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 17 22:34:38 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Converted layout of global settings to new forms

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d125c2e6ae47be1a928f05363be6d96a934d92fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d125c2e6ae47be… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 17 22:34:35 2012 +0200 Converted layout of global settings to new forms --- web/htdocs/forms.py | 5 +++-- web/htdocs/wato.css | 48 +++++++++++++++++++----------------------------- web/htdocs/wato.py | 17 ++++++----------- 3 files changed, 28 insertions(+), 42 deletions(-) diff --git a/web/htdocs/forms.py b/web/htdocs/forms.py index 3674208..7dde43d 100644 --- a/web/htdocs/forms.py +++ b/web/htdocs/forms.py @@ -116,8 +116,9 @@ def header(title, isopen = True, table_id = ""): table_id = '' html.write('<table %s class=nform>' % table_id) fold_id = strip_bad_chars(title) - g_section_isopen = html.begin_foldable_container(html.form_name, fold_id, isopen, title, indent="nform") - html.write('<tr class=top style="display: %s"><td colspan=2></td></tr>' % (not isopen and "none" or "")) + g_section_isopen = html.begin_foldable_container( + html.form_name and html.form_name or "nform", fold_id, isopen, title, indent="nform") + html.write('<tr class=top style="display: %s"><td colspan=2></td></tr>' % (not g_section_isopen and "none" or "")) g_header_open = True g_section_open = False diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index ec67656..4ce7e26 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -751,45 +751,35 @@ div.varname { } /* page "global settings*/ -.wato .globalvars { - background-color: #eeeeee; - padding: 3px 5px; - width: 100%; -} - -.wato .globalvars a { - color: black; +.wato div.globalvars a { text-decoration: none; + color: black; } -.wato .globalvars a:hover { + +.wato div.globalvars a:hover { text-decoration: underline; } -.wato .globalvars div.text { - width: 335px; - padding-right: 3px; - overflow: hidden; -} -.wato .globalvars td.left { - width: 339px; - overflow: hidden; - white-space: nowrap; -} -.wato .globalvars td.right { - text-align: left; -} -.wato .globalvars div.text .dots { - color: #888; - overflow: hidden; +.wato div.globalvars td.content img.iconbutton { + width: 60px; + height: 16px; } -.wato .globalvars td.right img.iconbutton { - width: auto; - height: auto; - margin-left: -3px; + +.wato div.globalvars td.legend { + padding-top: 0px; } +.wato div.globalvars td.legend { + width: 350px; +} +.wato div.globalvars td.legend div.title { + max-width: 350px; +} +.wato div.globalvars td { + height: 20px; +} /* Table in page "Global variables" */ .wato table.data.globalvars { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 762065d..e087343 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5161,13 +5161,11 @@ def mode_globalvars(phase): groupnames = g_configvar_groups.keys() groupnames.sort() + html.write('<div class=globalvars>') for groupname in groupnames: - # html.begin_foldable_container("globalvars", groupname, False, groupname, indent=False) - html.write("<h3>%s</h3>" % groupname) - html.write('<table class=globalvars>') + forms.header(groupname, isopen=False) for domain, varname, valuespec in g_configvar_groups[groupname]: - html.write('<tr>') if domain == "check_mk" and varname not in default_values: if config.debug: raise MKGeneralException("The configuration variable <tt>%s</tt> is unknown to " @@ -5178,13 +5176,11 @@ def mode_globalvars(phase): defaultvalue = default_values.get(varname, valuespec.default_value()) edit_url = make_link([("mode", "edit_configvar"), ("varname", varname)]) + title = '<a href="%s">%s</a>' % (edit_url, valuespec.title()) + forms.section(title) - html.write('<td class=left><div class=text>' - '<a href="%s">%s</a><span class=dots>%s</span></div></td>' % (edit_url, valuespec.title(), - '.' * 100)) toggle_url = make_action_link([("mode", "globalvars"), ("_action", "toggle"), ("_varname", varname)]) - html.write('<td class=right>') if varname in current_settings: if isinstance(valuespec, Checkbox): html.icon_button(toggle_url, _("Immediately toggle this setting"), @@ -5199,9 +5195,8 @@ def mode_globalvars(phase): else: html.write('<a href="%s">%s</a>' % (edit_url, valuespec.value_to_text(defaultvalue))) - html.write("</td>") - html.write('</tr>') - html.write("</table>") + forms.end() + html.write('</div>') def mode_edit_configvar(phase):

12 years, 3 months

Check_MK Git: check_mk: cleanup documentation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 839483bf89c0889a2c54da18460044a726f661b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=839483bf89c088… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu May 17 14:27:21 2012 +0200 cleanup documentation --- checks/vmware_state | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/checks/vmware_state b/checks/vmware_state index 04878a9..57cb9d2 100644 --- a/checks/vmware_state +++ b/checks/vmware_state @@ -29,19 +29,19 @@ # [2009-11-12 10:40:30.086 'App' 3076453184 info] Current working directory: /usr/lib/check_mk_agent/plugins # Found VM: # moref:32 -# name:ras-uss -# uuid:501e8429-18ed-3097-a521-93932203e5db -# ipaddr:193.18.239.33 +# name:name_of_vm +# uuid:xxxxxxxxxxxx +# ipaddr:192.168.1.5 # Found VM: # moref:48 -# name:zmucgw4 -# uuid:564d7c29-a5ed-8dd5-4bae-3e9177d8628d -# ipaddr:172.19.15.52 +# name:abcdef +# uuid:xxxxxxxxx +# ipaddr:12.34.56.78 # [2009-11-12 10:40:30.215 'vcbVmName' 3076453184 warning] IP address not set. # Found VM: # moref:80 -# name:zmucfi01 -# uuid:501e70b5-6aa3-25fa-1550-c1cf5f8a2025 +# name:name_of_vm +# uuid:xxxxxxxxx # ipaddr: def inventory_vmware_state(info):

12 years, 3 months

Check_MK Git: check_mk: Veritas Agent Plugins: Cleanup

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c7a75e2f4feb537df33476e5f2e2764a839ac88b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7a75e2f4feb53… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu May 17 12:59:17 2012 +0200 Veritas Agent Plugins: Cleanup --- agents/plugins/veritas/vxvm_multipath | 2 +- agents/plugins/veritas/vxvm_volumes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/plugins/veritas/vxvm_multipath b/agents/plugins/veritas/vxvm_multipath index e76658d..281747d 100755 --- a/agents/plugins/veritas/vxvm_multipath +++ b/agents/plugins/veritas/vxvm_multipath @@ -9,7 +9,7 @@ -if type vxdmpadm ; then +if type vxdmpadm >/dev/null; then echo '<<<vxvm_multipath>>>' # dmpnode storagedevice state attribute vxdmpadm getsubpaths | grep -vw DMPNODENAME | awk '{print $4" "$5" "$2" "$3}' diff --git a/agents/plugins/veritas/vxvm_volumes b/agents/plugins/veritas/vxvm_volumes index 573c1a8..46c46fe 100755 --- a/agents/plugins/veritas/vxvm_volumes +++ b/agents/plugins/veritas/vxvm_volumes @@ -2,11 +2,11 @@ if type vxdg > /dev/null; then + echo '<<<vxvm_volumes>>>' # Get a list of the in-use disk groups. # Deported or otherwise inactive needs no performance monitoring DGS=$(vxdg list | grep enabled | awk '{print $1}') if [ "X${DGS}" != "X" ]; then - echo '<<<vxvm_volumes>>>' for DG in $DGS ; do vxprint -g $DG -v -F"%dgname %name %state" # Options: Kilobytes, per Volume

12 years, 3 months

Check_MK Git: check_mk: Agent plugins for Veritas Volume Manager (VxVM). Should run on any non-Windows OS.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fbb3b99b68b5b68a35e67ea04c85fe5259efe9d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbb3b99b68b5b6… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu May 17 12:11:54 2012 +0200 Agent plugins for Veritas Volume Manager (VxVM). Should run on any non-Windows OS. --- agents/plugins/veritas/vxvm_enclosures | 15 +++++++++++++++ agents/plugins/veritas/vxvm_multipath | 17 +++++++++++++++++ agents/plugins/veritas/vxvm_volumes | 23 +++++++++++++++++++++++ 3 files changed, 55 insertions(+), 0 deletions(-) diff --git a/agents/plugins/veritas/vxvm_enclosures b/agents/plugins/veritas/vxvm_enclosures new file mode 100755 index 0000000..18cf6f7 --- /dev/null +++ b/agents/plugins/veritas/vxvm_enclosures @@ -0,0 +1,15 @@ +#!/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 | grep -v -w -e ^disk -e ^ENCLR_NAME -e \^= +fi diff --git a/agents/plugins/veritas/vxvm_multipath b/agents/plugins/veritas/vxvm_multipath new file mode 100755 index 0000000..e76658d --- /dev/null +++ b/agents/plugins/veritas/vxvm_multipath @@ -0,0 +1,17 @@ +#!/bin/sh +# Original output +# c42t4d7 ENABLED(A) - disk2046 emc1 c27 - + +# DMPNODENAME ENCLR-NAME STATE[A] PATH-TYPE[M] +# disk2057 emc1 ENABLED(A) - +# disk3119 emc_clariion0 ENABLED SECONDARY + + + + +if type vxdmpadm ; then + echo '<<<vxvm_multipath>>>' + # dmpnode storagedevice state attribute + vxdmpadm getsubpaths | grep -vw DMPNODENAME | awk '{print $4" "$5" "$2" "$3}' + +fi diff --git a/agents/plugins/veritas/vxvm_volumes b/agents/plugins/veritas/vxvm_volumes new file mode 100755 index 0000000..573c1a8 --- /dev/null +++ b/agents/plugins/veritas/vxvm_volumes @@ -0,0 +1,23 @@ +#!/bin/sh + + +if type vxdg > /dev/null; then + # Get a list of the in-use disk groups. + # Deported or otherwise inactive needs no performance monitoring + DGS=$(vxdg list | grep enabled | awk '{print $1}') + if [ "X${DGS}" != "X" ]; then + echo '<<<vxvm_volumes>>>' + for DG in $DGS ; do + vxprint -g $DG -v -F"%dgname %name %state" + # Options: Kilobytes, per Volume + vxstat -u k -v -g $DG | egrep -v '(OPERATIONS|TYP)' | sed "s/^vol/$DG/" + done + fi +fi + + +# BASIC Output from vxstat +# OPERATIONS BLOCKS AVG TIME(ms) +# TYP NAME READ WRITE READ WRITE READ WRITE +# vol homevol 28987 56780 30873k 28516k 0.78 30.22 +# (for vxprint... see manual)

12 years, 3 months

Check_MK Git: check_mk: HP-UX Agent: plugin for checking HBA states

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 491e3aef67746d6d3282d09c7d1a6fd802bd24ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=491e3aef67746d… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu May 17 12:10:54 2012 +0200 HP-UX Agent: plugin for checking HBA states --- agents/hpux/hpux_hbahealth | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/agents/hpux/hpux_hbahealth b/agents/hpux/hpux_hbahealth new file mode 100755 index 0000000..b6edd33 --- /dev/null +++ b/agents/hpux/hpux_hbahealth @@ -0,0 +1,35 @@ +#!/usr/bin/ksh + +# removed all non relevant output + + +# Warning on +# Driver-Firmware Dump Available = NO + + +# CRIT on +# Driver state = ONLINE +# Topology = PTTOPT_FABRIC + + +# Just Print +# ISP Code version = 5.4.4 +# N_Port Node World Wide Name = 0x50014380120baf51 +# Hardware Path is = 0/0/0/5/0/0/0 + +# There might be different hbas in the system. +# add your code if you need that. remember to use the right "util" for the type. + +hbas=$( ls /dev/fcd* ) +if [ $? = 0 ]; then + echo '<<<hpux_hbahealth>>>' +else + exit 0 +fi + +for hba in /dev/fcd* ; do + util=/opt/fcms/bin/fcdutil + echo "$hba" + $util $hba | grep -e "Driver state" -e "Topology" -e "Dump Available"\ + -e "Code version" -e "Hardware Path" -e "Port World" +done

12 years, 3 months

Check_MK Git: check_mk: remove double documentation

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4508b2cc577906a43c726c0d9e6b6150aa9e73de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4508b2cc577906… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu May 17 09:39:03 2012 +0200 remove double documentation --- agents/hpux/hpux_statgrab | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/agents/hpux/hpux_statgrab b/agents/hpux/hpux_statgrab index 7e02b1b..f87c9a8 100644 --- a/agents/hpux/hpux_statgrab +++ b/agents/hpux/hpux_statgrab @@ -7,8 +7,6 @@ if which statgrab > /dev/null ; then - # You need statgrab to be installed. You'll find it - # here: http://www.i-scream.org/libstatgrab/ if statgrab const. cpu. general. load. mem. net. page. proc. swap. user. > /tmp/statgrab.$$ 2>/dev/null then for s in proc cpu net load page

12 years, 3 months

Check_MK Git: check_mk: AIX Agent Readme: Restart inetd after configuring. Thanks to Ionel :)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9fff28a5e30c6473175f333dc899cc43a8bd9c50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9fff28a5e30c64… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu May 17 08:17:39 2012 +0200 AIX Agent Readme: Restart inetd after configuring. Thanks to Ionel :) --- doc/agents/README.AIX | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/doc/agents/README.AIX b/doc/agents/README.AIX index c956598..7b90941 100644 --- a/doc/agents/README.AIX +++ b/doc/agents/README.AIX @@ -34,6 +34,10 @@ and add an allow entry in /etc/hosts.allow: check_mk: nagioshost, ip_of_nagios_host, 127.0.0.1 +# Restart inetd +refresh -s inetd + + # Extra FEATURES If you wish to have more stats,

12 years, 3 months

Check_MK Git: check_mk: update doc and delete leftover file:

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c36aa62361900ed107d42a27e2a61472b1907ce5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c36aa62361900e… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed May 16 17:34:45 2012 +0200 update doc and delete leftover file: --- agents/hpux/hpux_lunstats | 2 ++ agents/hpux/mk-statgrab | 25 ------------------------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/agents/hpux/hpux_lunstats b/agents/hpux/hpux_lunstats index 8e19c7b..e7e5cbb 100644 --- a/agents/hpux/hpux_lunstats +++ b/agents/hpux/hpux_lunstats @@ -2,6 +2,8 @@ # Put this file into /usr/lib/check_mk_agent/plugins. Then # reinventorize your host. +# Actually querying these stats is quite slow since they freshly update +# on each call. If you have a few 1000 luns then this will not work. get_stats() { diff --git a/agents/hpux/mk-statgrab b/agents/hpux/mk-statgrab deleted file mode 100644 index 68311b9..0000000 --- a/agents/hpux/mk-statgrab +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# this is for users who compiled statgrab on hp-ux. -# note you'll need a 0.18+ version, from their github page at -# https://github.com/i-scream/libstatgrab -# flags used for compiling - disable documentation, examples and set*id - - -if which statgrab > /dev/null ; then - # You need statgrab to be installed. You'll find it - # here: http://www.i-scream.org/libstatgrab/ - if statgrab const. cpu. disk. general. load. mem. net. page. proc. swap. user. > /tmp/statgrab.$$ 2>/dev/null - then - for s in proc cpu net load disk page - do - echo "<<<statgrab_$s>>>" - cat /tmp/statgrab.$$ | grep "^$s\." | cut -d. -f2-99 | sed 's/ *= */ /' - done - - echo '<<<statgrab_mem>>>' - cat /tmp/statgrab.$$ | egrep "^(swap|mem)\." | sed 's/ *= */ /' - - fi - [ -f /tmp/statgrab.$$ ] && rm -f /tmp/statgrab.$$ -fi

12 years, 3 months

Check_MK Git: check_mk: HP-UX rename statgrab 2nd time. do not query disks with statgrab

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7b365f6579fb82cfca731cabaa406d5be0fa16bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b365f6579fb82… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed May 16 15:59:20 2012 +0200 HP-UX rename statgrab 2nd time. do not query disks with statgrab --- agents/hpux/hpux_statgrab | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/agents/hpux/hpux_statgrab b/agents/hpux/hpux_statgrab new file mode 100644 index 0000000..7e02b1b --- /dev/null +++ b/agents/hpux/hpux_statgrab @@ -0,0 +1,25 @@ +#!/bin/sh + +# this is for users who compiled statgrab on hp-ux. +# note you'll need a 0.18+ version, from their github page at +# https://github.com/i-scream/libstatgrab +# flags used for compiling - disable documentation, examples and set*id + + +if which statgrab > /dev/null ; then + # You need statgrab to be installed. You'll find it + # here: http://www.i-scream.org/libstatgrab/ + if statgrab const. cpu. general. load. mem. net. page. proc. swap. user. > /tmp/statgrab.$$ 2>/dev/null + then + for s in proc cpu net load page + do + echo "<<<statgrab_$s>>>" + cat /tmp/statgrab.$$ | grep "^$s\." | cut -d. -f2-99 | sed 's/ *= */ /' + done + + echo '<<<statgrab_mem>>>' + cat /tmp/statgrab.$$ | egrep "^(swap|mem)\." | sed 's/ *= */ /' + + fi + [ -f /tmp/statgrab.$$ ] && rm -f /tmp/statgrab.$$ +fi

12 years, 3 months

← Newer
1
...
23
24
25
26
27
28
29
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012