Checkmk git commits December 2013

checkmk-commits@lists.checkmk.com

6 participants
316 discussions

Check_MK Git: check_mk: FIX smart.stats: Remove duplicate disks

by Mathias Kettner

Module: check_mk Branch: master Commit: 2a352c7298c6609c03604d0ca4fef01ead3cf157 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a352c7298c660… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 17 12:26:42 2013 +0100 FIX smart.stats: Remove duplicate disks In same cases a disk has two physical paths and thus is seen two times by the <tt>smart</tt> plugin for Linux. This plugin has now been fixed and no longer outputs duplicate entries. --- .werks/347 | 12 ++++++++++++ ChangeLog | 1 + agents/plugins/smart | 7 +++++++ 3 files changed, 20 insertions(+) diff --git a/.werks/347 b/.werks/347 new file mode 100644 index 0000000..72ef9c1 --- /dev/null +++ b/.werks/347 @@ -0,0 +1,12 @@ +Title: smart.stats: Remove duplicate disks +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387279511 +Targetversion: future + +In same cases a disk has two physical paths and thus is seen +two times by the <tt>smart</tt> plugin for Linux. This plugin +has now been fixed and no longer outputs duplicate entries. diff --git a/ChangeLog b/ChangeLog index 06fc932..a2b23fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,7 @@ * 0245 FIX: Inline SNMP now longer throws an exception when using SNMPv3 credentials... * 0380 FIX: jolokia_metrics.mem: PNP-Template now handles non existant max values... * 0381 FIX: win_printers: Fixed creation of duplicate services... + * 0347 FIX: smart.stats: Remove duplicate disks... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/plugins/smart b/agents/plugins/smart index a1727f4..a995367 100755 --- a/agents/plugins/smart +++ b/agents/plugins/smart @@ -23,6 +23,7 @@ if which smartctl > /dev/null 2>&1 ; then fi echo '<<<smart>>>' + SEEN= for D in /dev/disk/by-id/{scsi,ata}-*; do [ "$D" != "${D%scsi-\*}" ] && continue [ "$D" != "${D%ata-\*}" ] && continue @@ -45,6 +46,12 @@ if which smartctl > /dev/null 2>&1 ; then continue fi + # Avoid duplicate entries for same device + if [ "${SEEN//.$N./}" != "$SEEN" ] ; then + continue + fi + SEEN="$SEEN.$N." + # strip device name for final output DNAME=${D#/dev/disk/by-id/scsi-} DNAME=${DNAME#/dev/disk/by-id/ata-}

10 years, 6 months

Check_MK Git: check_mk: FIX jolokia_metrics.mem: PNP-Template now handles non existant max values

by Lars Michelsen

Module: check_mk Branch: master Commit: 1beeafa48f089f9c033d9a6487390c05422ed121 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1beeafa48f089f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 11:57:44 2013 +0100 FIX jolokia_metrics.mem: PNP-Template now handles non existant max values With some application servers the maximum values for memory are not provided by the agent. The checks did already handle this, but the PNP graph could not be displayed in this case. --- .werks/380 | 12 ++++++++++++ ChangeLog | 1 + pnp-templates/check_mk-jolokia_metrics.mem.php | 12 ++++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.werks/380 b/.werks/380 new file mode 100644 index 0000000..3a487f0 --- /dev/null +++ b/.werks/380 @@ -0,0 +1,12 @@ +Title: jolokia_metrics.mem: PNP-Template now handles non existant max values +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387277786 +Targetversion: future + +With some application servers the maximum values for memory are not provided +by the agent. The checks did already handle this, but the PNP graph could +not be displayed in this case. diff --git a/ChangeLog b/ChangeLog index b167301..1e3b68a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ * 0345 FIX: Linux agent: fix detaching of background plugins... * 0378 FIX: agent_vsphere.pysphere: Trying to deal with permissions only on some guests/hosts * 0245 FIX: Inline SNMP now longer throws an exception when using SNMPv3 credentials... + * 0380 FIX: jolokia_metrics.mem: PNP-Template now handles non existant max values... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/pnp-templates/check_mk-jolokia_metrics.mem.php b/pnp-templates/check_mk-jolokia_metrics.mem.php index 9454309..2f79096 100644 --- a/pnp-templates/check_mk-jolokia_metrics.mem.php +++ b/pnp-templates/check_mk-jolokia_metrics.mem.php @@ -31,16 +31,20 @@ $def[1] = "" . "CDEF:min_nonheap=0,nonheap,- " . "CDEF:total=heap,nonheap,+ " - . "AREA:heap#00c0ff:\"Heap\" " - . "LINE1:$MAX[1]#003077:\"Heap MAX\" "; + . "AREA:heap#00c0ff:\"Heap\" "; +if ($MAX[1]) { + $def[1] .= "LINE1:$MAX[1]#003077:\"Heap MAX\" "; +} if ($CRIT[1]) { $def[1] .= "LINE1:$WARN[1]#a0ad00:\"Heap WARN\" " . "LINE1:$CRIT[1]#ad0000:\"Heap CRIT\" "; } -$def[1] .= "AREA:min_nonheap#3430bf:\"Nonheap\" " - . "LINE1:-$MAX[2]#003233:\"Nonheap MAX \" "; +$def[1] .= "AREA:min_nonheap#3430bf:\"Nonheap\" "; +if ($MAX[2]) { + $def[1] .= "LINE1:-$MAX[2]#003233:\"Nonheap MAX \" "; +} if ($CRIT[2]) { $def[1] .= "LINE1:-$WARN[2]#adfd30:\"Nonheap WARN\" " . "LINE1:-$CRIT[2]#ff0080:\"Nonheap CRIT\" ";

10 years, 6 months

Check_MK Git: check_mk: FIX win_printers: Fixed creation of duplicate services

by Lars Michelsen

Module: check_mk Branch: master Commit: a68a18cd44e5dbb59680264b9dae1ef5405bc411 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a68a18cd44e5db… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 12:09:36 2013 +0100 FIX win_printers: Fixed creation of duplicate services Longer printer names were stripped and could result in duplicate services found. This patch extends the terminal width of the agent plugin and prevents stripping of chars. Thanks to Andreas DÃ¶hler for submitting the patch. --- .werks/381 | 14 ++++++++++++++ ChangeLog | 1 + agents/windows/plugins/win_printers.ps1 | 13 +++++++++++++ 3 files changed, 28 insertions(+) diff --git a/.werks/381 b/.werks/381 new file mode 100644 index 0000000..80f4d66 --- /dev/null +++ b/.werks/381 @@ -0,0 +1,14 @@ +Title: win_printers: Fixed creation of duplicate services +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387278488 +Targetversion: future + +Longer printer names were stripped and could result in duplicate services +found. This patch extends the terminal width of the agent plugin and prevents +stripping of chars. + +Thanks to Andreas DÃ¶hler for submitting the patch. diff --git a/ChangeLog b/ChangeLog index 1e3b68a..06fc932 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ * 0378 FIX: agent_vsphere.pysphere: Trying to deal with permissions only on some guests/hosts * 0245 FIX: Inline SNMP now longer throws an exception when using SNMPv3 credentials... * 0380 FIX: jolokia_metrics.mem: PNP-Template now handles non existant max values... + * 0381 FIX: win_printers: Fixed creation of duplicate services... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/windows/plugins/win_printers.ps1 b/agents/windows/plugins/win_printers.ps1 index dd35b63..f5489e7 100644 --- a/agents/windows/plugins/win_printers.ps1 +++ b/agents/windows/plugins/win_printers.ps1 @@ -4,6 +4,19 @@ # #### +### +## http://blogs.technet.com/b/heyscriptingguy/archive/2006/12/04/how-can-i-exp… + +$pshost = get-host +$pswindow = $pshost.ui.rawui + +$newsize = $pswindow.buffersize +$newsize.height = 300 +$newsize.width = 150 +$pswindow.buffersize = $newsize + +### + Write-Host NoNewLine "<<<win_printers>>>" $Data_Set1 = Get-WMIObject Win32_PerfFormattedData_Spooler_PrintQueue | Select Name, @{Expression={$_.jobs};Label="CurrentJobs"} $Data_Set2 = Get-WmiObject win32_printer | select name, printerstatus, detectederrorstate

10 years, 6 months

Check_MK Git: check_mk: Updated help of check_mkevents

by Lars Michelsen

Module: check_mk Branch: master Commit: 87b950f77d4129ed861760cbb0cd4b60d6b66de4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87b950f77d4129… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 11:24:32 2013 +0100 Updated help of check_mkevents --- mkeventd/lib/check_mkevents | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkeventd/lib/check_mkevents b/mkeventd/lib/check_mkevents index 0863273..563b779 100755 --- a/mkeventd/lib/check_mkevents +++ b/mkeventd/lib/check_mkevents @@ -65,8 +65,8 @@ try: else: application = None except: - sys.stdout.write("Usage: check_mkevents [-H REMOTE:PORT] [-a] HOST [APPLICATION]\n") - sys.stdout.write("\n -a do not take into account acknowledged events.\n") + sys.stdout.write("Usage: check_mkevents [-H (REMOTE:PORT|/path/to/unix/socket)] [-a] HOST [APPLICATION]\n") + sys.stdout.write("\n -a do not take into account acknowledged events.\n") sys.stdout.write("\n") sys.exit(3)

10 years, 6 months

Check_MK Git: check_mk: FIX check_mk -c: Now also rewrites the location of conf.d directory

by Lars Michelsen

Module: check_mk Branch: master Commit: 6b35ce653f27d8cc44f1419ab5a8b9b1c0828095 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6b35ce653f27d8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 11:01:42 2013 +0100 FIX check_mk -c: Now also rewrites the location of conf.d directory --- .werks/379 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/.werks/379 b/.werks/379 new file mode 100644 index 0000000..2071d0c --- /dev/null +++ b/.werks/379 @@ -0,0 +1,10 @@ +Title: check_mk -c: Now also rewrites the location of conf.d directory +Level: 1 +Component: core +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387274477 +Targetversion: future + + diff --git a/ChangeLog b/ChangeLog index e5792cf..7dff826 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core & Setup: * 0087 FIX: Fixed possible locking issue when using datasource program with long output... * 0313 FIX: Avoid duplicate reading of configuration file on --create-rrd... + * 0379 FIX: check_mk -c: Now also rewrites the location of conf.d directory Checks & Agents: * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets diff --git a/modules/check_mk.py b/modules/check_mk.py index 6349fd7..5156294 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -170,6 +170,11 @@ if __name__ == "__main__": if not os.path.exists(check_mk_configfile): sys.stderr.write("Missing configuration file %s.\n" % check_mk_configfile) sys.exit(1) + + # Also rewrite the location of the conf.d directory + if os.path.exists(check_mk_basedir + "/conf.d"): + check_mk_configdir = check_mk_basedir + "/conf.d" + else: sys.stderr.write("Missing argument to option -c.\n") sys.exit(1)

10 years, 6 months

Check_MK Git: check_mk: FIX Fix folder visibility in WATO for unpriviledged users

by Mathias Kettner

Module: check_mk Branch: master Commit: 8fe01b8cb4b15d4718d1fde513126e782ca13fd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fe01b8cb4b15d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 17 11:30:25 2013 +0100 FIX Fix folder visibility in WATO for unpriviledged users In WATO if you are an unpriviledged user you might have write access to some lower subfolders but not to the upper folders. This is perfectly common, because that way the monitoring administrator can delegate tasks for certain classes of hosts to his collegues. Previously, however, you couldn't navigate to the lower folders without faking the URL. This has been fixed now. If you are located in a folder without having permissions to it you won't see any hosts of that folder, but still you see the subfolders and also can enter these. Also this fix removes that buttons for actions on a folder if you do not have write permissions to it. --- .werks/346 | 21 +++++++++++++++++++++ ChangeLog | 1 + web/htdocs/wato.css | 8 ++++++++ web/htdocs/wato.py | 46 +++++++++++++++++++++++++++++----------------- 4 files changed, 59 insertions(+), 17 deletions(-) diff --git a/.werks/346 b/.werks/346 new file mode 100644 index 0000000..36cd5de --- /dev/null +++ b/.werks/346 @@ -0,0 +1,21 @@ +Title: Fix folder visibility in WATO for unpriviledged users +Level: 2 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387276017 +Targetversion: future + +In WATO if you are an unpriviledged user you might have write access to some +lower subfolders but not to the upper folders. This is perfectly common, +because that way the monitoring administrator can delegate tasks for certain +classes of hosts to his collegues. + +Previously, however, you couldn't navigate to the lower folders without +faking the URL. This has been fixed now. If you are located in a folder +without having permissions to it you won't see any hosts of that folder, +but still you see the subfolders and also can enter these. + +Also this fix removes that buttons for actions on a folder if you do +not have write permissions to it. diff --git a/ChangeLog b/ChangeLog index e5792cf..9f59b6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,6 +79,7 @@ * 0361 FIX: The page linked by "new rule" can now be bookmarked again * 0341 FIX: Avoid rare exception in WATO when deleting a host... * 0376 FIX: LDAP: Default configuration of attributes is reflected within WATO now + * 0346 FIX: Fix folder visibility in WATO for unpriviledged users... Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index fb0550d..39eb26d 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -362,6 +362,7 @@ table.validationerror img { position: absolute; top: 28px; right: 19px; + z-index: 500; } .wato div.floatfolder div.infos img { @@ -422,6 +423,13 @@ table.validationerror img { top: -2px; } +.wato img.authicon { + width: 28px; + height: 28px; + margin-right: 10px; + vertical-align: middle; +} + .wato div.move_dialog { padding:10px; background-color: #45829D; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 029eac2..4518ff6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -827,6 +827,10 @@ def get_folder_aliaspath(folder, show_main = True): # '----------------------------------------------------------------------' def mode_folder(phase): + auth_message = check_folder_permissions(g_folder, "read", False) + auth_read = auth_message == True + auth_write = check_folder_permissions(g_folder, "write", False) == True + global g_folder if phase == "title": return g_folder["title"] @@ -835,16 +839,17 @@ def mode_folder(phase): global_buttons() if config.may("wato.rulesets") or config.may("wato.seeall"): html.context_button(_("Rulesets"), make_link([("mode", "ruleeditor")]), "rulesets") - html.context_button(_("Folder Properties"), make_link_to([("mode", "editfolder")], g_folder), "edit") - if not g_folder.get(".lock_subfolders") and config.may("wato.manage_folders"): + if auth_read: + html.context_button(_("Folder Properties"), make_link_to([("mode", "editfolder")], g_folder), "edit") + if not g_folder.get(".lock_subfolders") and config.may("wato.manage_folders") and auth_write: html.context_button(_("New folder"), make_link([("mode", "newfolder")]), "newfolder") - if not g_folder.get(".lock_hosts") and config.may("wato.manage_hosts"): + if not g_folder.get(".lock_hosts") and config.may("wato.manage_hosts") and auth_write: html.context_button(_("New host"), make_link([("mode", "newhost")]), "new") html.context_button(_("New cluster"), make_link([("mode", "newcluster")]), "new_cluster") if config.may("wato.services"): html.context_button(_("Bulk Inventory"), make_link([("mode", "bulkinventory"), ("all", "1")]), "inventory") - if not g_folder.get(".lock_hosts") and config.may("wato.parentscan"): + if not g_folder.get(".lock_hosts") and config.may("wato.parentscan") and auth_write: html.context_button(_("Parent scan"), make_link([("mode", "parentscan"), ("all", "1")]), "parentscan") search_button() @@ -955,6 +960,9 @@ def mode_folder(phase): else: render_folder_path() + if not auth_read: + html.message('<img class=authicon src="images/icon_autherr.png"> %s' % auth_message) + lock_messages = [] if g_folder.get(".lock_hosts"): if g_folder[".lock_hosts"] == True: @@ -982,7 +990,7 @@ def mode_folder(phase): if True == check_folder_permissions(g_folder, "read", False): have_something = show_hosts(g_folder) or have_something - if not have_something: + if not have_something and auth_write: menu_items = [] if not g_folder.get(".lock_hosts"): menu_items.extend([ @@ -1098,7 +1106,7 @@ def check_folder_permissions(folder, how, exception=True, user = None, users = N if c in cgs: return True - reason = _("Sorry, you have no permissions to access the folder <b>%s</b>. ") % folder["title"] + reason = _("Sorry, you have no permissions to the folder <b>%s</b>. ") % folder["title"] if not cgs: reason += _("The folder has no contact groups assigned to.") else: @@ -1107,6 +1115,7 @@ def check_folder_permissions(folder, how, exception=True, user = None, users = N reason += _("Your contact groups are <b>%s</b>.") % ", ".join(user_cgs) else: reason += _("But you are not a member of any contact group.") + reason += _("You may enter the folder as you might have permission on a subfolders, though.") if exception: raise MKAuthException(reason) @@ -1152,18 +1161,24 @@ def show_subfolders(folder): html.write('<div class="floatfolder%s" id="folder_%s"' % ( auth_read and " unlocked" or " locked", entry['.name'])) - if auth_write: - html.write(' onclick="wato_open_folder(event, \'%s\');"' % enter_url) + html.write(' onclick="wato_open_folder(event, \'%s\');"' % enter_url) html.write('>') # Only make folder openable when permitted to edit - if auth_read: - html.write( - '<div class=hoverarea onmouseover="wato_toggle_folder(event, this, true);" ' - 'onmouseout="wato_toggle_folder(event, this, false)">' - ) + if not auth_read: + html.write('<img class="icon autherr" src="images/icon_autherr.png" title="%s">' % \ + (html.strip_tags(auth_message))) + + if True: # auth_read: + if not auth_read: + html.write('<div class=hoverarea>') + + else: + html.write( + '<div class=hoverarea onmouseover="wato_toggle_folder(event, this, true);" ' + 'onmouseout="wato_toggle_folder(event, this, false)">' + ) - if auth_read: html.icon_button( edit_url, _("Edit the properties of this folder"), @@ -1200,9 +1215,6 @@ def show_subfolders(folder): ) html.write('</div>') - else: - html.write('<img class="icon autherr" src="images/icon_autherr.png" title="%s">' % \ - (html.strip_tags(auth_message))) html.write('<div class=infos>') # Show contact groups of the folder effective = effective_attributes(None, entry)

10 years, 6 months

Check_MK Git: check_mk: FIX agent_vsphere.pysphere: Trying to deal with permissions only on some guests/hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: 71235bf017dc5a0425a9394264c135643501ac9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71235bf017dc5a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 10:36:24 2013 +0100 FIX agent_vsphere.pysphere: Trying to deal with permissions only on some guests/hosts --- .werks/378 | 10 ++++++++++ ChangeLog | 1 + agents/special/agent_vsphere.pysphere | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/378 b/.werks/378 new file mode 100644 index 0000000..45dc7e9 --- /dev/null +++ b/.werks/378 @@ -0,0 +1,10 @@ +Title: agent_vsphere.pysphere: Trying to deal with permissions only on some guests/hosts +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387272959 +Targetversion: future + + diff --git a/ChangeLog b/ChangeLog index 6796b3d..05c6fd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -45,6 +45,7 @@ * 0370 FIX: brocade_mlx_module*: Improved output of checks * 0372 FIX: megaraid_ldisks: Ignoring adapters without configured logical disks... * 0345 FIX: Linux agent: fix detaching of background plugins... + * 0378 FIX: agent_vsphere.pysphere: Trying to deal with permissions only on some guests/hosts Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/special/agent_vsphere.pysphere b/agents/special/agent_vsphere.pysphere index e09b10d..2e26e18 100755 --- a/agents/special/agent_vsphere.pysphere +++ b/agents/special/agent_vsphere.pysphere @@ -603,7 +603,7 @@ def output_mors(what, properties, direct=False): if type(value) == tuple: sections.append(value) else: - if name == 'runtime.host': + if name == 'runtime.host' and value: running_on = value elif name == 'runtime.powerState': power_state = value

10 years, 6 months

Check_MK Git: check_mk: agent_vsphere.pysphere: More compatibility in case of not enough permissions

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a034c7dc8d95a69c456aeb69d7581b2ad90c26d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a034c7dc8d95a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 10:48:42 2013 +0100 agent_vsphere.pysphere: More compatibility in case of not enough permissions --- agents/special/agent_vsphere.pysphere | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/agents/special/agent_vsphere.pysphere b/agents/special/agent_vsphere.pysphere index 2e26e18..68284f8 100755 --- a/agents/special/agent_vsphere.pysphere +++ b/agents/special/agent_vsphere.pysphere @@ -640,12 +640,15 @@ def output_datastores(): # print inspect.getmembers(MORTypes) print "<<<esx_vsphere_datastores:sep(%d)>>>" % ord('\t') - for mor in host._retrieve_properties_traversal(property_names=property_names, obj_type=MORTypes.Datastore): - for entry in mor.PropSet: - if entry.Name == "name": - print '[%s]' % entry.Val - else: - print '%s\t%s' % (entry.Name.split(".")[1], entry.Val) + rows = host._retrieve_properties_traversal(property_names=property_names, obj_type=MORTypes.Datastore) + # if the user has no permission to host / datastores, rows is None, skip it then + if rows: + for mor in rows: + for entry in mor.PropSet: + if entry.Name == "name": + print '[%s]' % entry.Val + else: + print '%s\t%s' % (entry.Name.split(".")[1], entry.Val) def conv_multipath(value): return " ".join(["%s %s" % (p.Name, p.PathState) for p in value.HostMultipathStateInfoPath])

10 years, 6 months

Check_MK Git: check_mk: check_http: Certificate Age mode now supports SNI

by Lars Michelsen

Module: check_mk Branch: master Commit: aea85429949228334ed9dc221ef340e6dd33c5ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aea85429949228… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 10:23:25 2013 +0100 check_http: Certificate Age mode now supports SNI The WATO configuration dialog did not provide the option to enable SNI for the "Certificate Age" checking mode. This option has been added now. --- .werks/377 | 12 ++++++++++++ ChangeLog | 1 + web/plugins/wato/active_checks.py | 7 +++++++ 3 files changed, 20 insertions(+) diff --git a/.werks/377 b/.werks/377 new file mode 100644 index 0000000..b14e540 --- /dev/null +++ b/.werks/377 @@ -0,0 +1,12 @@ +Title: check_http: Certificate Age mode now supports SNI +Level: 1 +Component: checks +Class: feature +State: unknown +Version: 1.2.5i1 +Date: 1387272159 +Targetversion: future + +The WATO configuration dialog did not provide the option to enable +SNI for the "Certificate Age" checking mode. This option has been +added now. diff --git a/ChangeLog b/ChangeLog index 0d2540e..6796b3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ * 0315 hitachi_hnas_quorumdevice, hitachi_hnas_pnode, hitachi_hnas_vnode: New checks for Hitachi HNAS devices * 0316 hitachi_hnas_cpu: New check for CPU utilization of Hitachi HNAS devices * 0373 wut_webtherm: Supporting several other devices now + * 0377 check_http: Certificate Age mode now supports SNI... * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 9777f0d..5b0e27f 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -733,6 +733,13 @@ register_rule(group, default_value = 443, ) ), + ( "sni", + FixedValue( + value = True, + totext = _("enable SNI"), + title = _("Enable SSL/TLS hostname extension support (SNI)"), + ) + ), ], required_keys = [ "cert_days" ], ),

10 years, 6 months

Check_MK Git: check_mk: FIX Inline SNMP now longer throws an exception when using SNMPv3 credentials

by Andreas Boesl

Module: check_mk Branch: master Commit: 094fc3a54e1dd7923d9c4098113d8fb4cb895c33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=094fc3a54e1dd7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Dec 17 10:51:07 2013 +0100 FIX Inline SNMP now longer throws an exception when using SNMPv3 credentials During the generation of the monitoring configuration an exception was thrown, when the snmp host had SNMPv3 credentials set and the global settings "Use Inline SNMP" was activated. --- .werks/245 | 11 +++++++++++ ChangeLog | 1 + modules/check_mk.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/245 b/.werks/245 new file mode 100644 index 0000000..beabc34 --- /dev/null +++ b/.werks/245 @@ -0,0 +1,11 @@ +Title: Inline SNMP now longer throws an exception when using SNMPv3 credentials +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387273469 +Targetversion: future + +During the generation of the monitoring configuration an exception was thrown, when the +snmp host had SNMPv3 credentials set and the global settings "Use Inline SNMP" was activated. diff --git a/ChangeLog b/ChangeLog index 0d2540e..6fb2362 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ * 0370 FIX: brocade_mlx_module*: Improved output of checks * 0372 FIX: megaraid_ldisks: Ignoring adapters without configured logical disks... * 0345 FIX: Linux agent: fix detaching of background plugins... + * 0245 FIX: Inline SNMP now longer throws an exception when using SNMPv3 credentials... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/modules/check_mk.py b/modules/check_mk.py index aac0506..6349fd7 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3159,7 +3159,7 @@ no_inventory_possible = None output.write("def is_snmpv2c_host(hostname):\n return %r\n\n" % is_snmpv2c_host(hostname)) output.write("def is_bulkwalk_host(hostname):\n return %r\n\n" % is_bulkwalk_host(hostname)) output.write("def snmp_timing_of(hostname):\n return %r\n\n" % snmp_timing_of(hostname)) - output.write("def snmp_credentials_of(hostname):\n return %r\n\n" % snmp_credentials_of(hostname)) + output.write("def snmp_credentials_of(hostname):\n return %s\n\n" % pprint.pformat(snmp_credentials_of(hostname))) output.write("def snmp_port_of(hostname):\n return %r\n\n" % snmp_port_of(hostname)) else: output.write("def snmp_port_spec(hostname):\n return %r\n\n" % snmp_port_spec(hostname))

10 years, 6 months

← Newer
1
...
9
10
11
12
13
14
15
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2013