Checkmk git commits February 2012

checkmk-commits@lists.checkmk.com

3 participants
223 discussions

Check_MK Git: check_mk: WATO: yet some more checks configurable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 52b24b54564df85d68025385a3f7db904499e4c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52b24b54564df8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 12:24:47 2012 +0100 WATO: yet some more checks configurable --- checks/hpux_multipath | 1 + checks/hpux_serviceguard | 2 +- checks/ironport_misc | 2 ++ web/plugins/wato/check_parameters.py | 16 ++++++++++++++++ 4 files changed, 20 insertions(+), 1 deletions(-) diff --git a/checks/hpux_multipath b/checks/hpux_multipath index 72913e3..23c46ad 100644 --- a/checks/hpux_multipath +++ b/checks/hpux_multipath @@ -110,3 +110,4 @@ def check_hpux_multipath(item, params, info): check_info['hpux_multipath'] = (check_hpux_multipath, "Multipath %s", 0, inventory_hpux_multipath ) +checkgroup_of['hpux_multipath'] = "hpux_multipath" diff --git a/checks/hpux_serviceguard b/checks/hpux_serviceguard index 2eb4734..0236060 100644 --- a/checks/hpux_serviceguard +++ b/checks/hpux_serviceguard @@ -51,7 +51,7 @@ def inventory_hpux_serviceguard(info): inventory.append((item, None)) return inventory -def check_hpux_serviceguard(item, params, info): +def check_hpux_serviceguard(item, _no_params, info): for line in info: if (item == "Total Status" and len(line) == 1) or \ (item == line[0] and len(line) == 2): diff --git a/checks/ironport_misc b/checks/ironport_misc index 284ee76..dad22dd 100644 --- a/checks/ironport_misc +++ b/checks/ironport_misc @@ -33,3 +33,5 @@ check_info['ironport_misc'] = ( "%s", 0, no_inventory_possible) + +checkgroup_of['ironport_misc'] = "obsolete" diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index d7c6337..3681933 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -883,6 +883,22 @@ checkgroups.append(( "first")) checkgroups.append(( + "hpux_multipath", + _("Multipathing on HPUX - state of paths of a LUN"), + Tuple( + title = _("Expected path situation"), + elements = [ + Integer(title = _("Number of active paths")), + Integer(title = _("Number of standby paths")), + Integer(title = _("Number of failed paths")), + Integer(title = _("Number of unopen paths")), + ]), + TextAscii( + title = _("WWID of the LUN")), + "first")) + + +checkgroups.append(( "services", _("Windows services"), None,

12 years, 4 months

Check_MK Git: check_mk: WATO: formalized yet further checks ( 200 still to go)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 89e9a1a7cdf484c003cc4b9299f62c2ae80294c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89e9a1a7cdf484… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 12:07:01 2012 +0100 WATO: formalized yet further checks (200 still to go) --- ChangeLog | 4 +- checkman/fjdarye100_disks | 2 +- checkman/fjdarye60_disks | 2 +- checks/3ware_disks | 3 +- checks/3ware_units | 3 +- checks/fjdarye.include | 5 +-- checks/fjdarye100_disks | 1 + checks/fjdarye60_disks | 1 + checks/lsi | 5 +++- checks/md | 5 ++- checks/megaraid_pdisks | 1 + checks/mounts | 1 + web/plugins/wato/check_parameters.py | 42 ++++++++++++++++++++++++++++++++++ 13 files changed, 63 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index af32aea..d2be19b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,8 +11,8 @@ * FIX: fix problem with check includes in subchecks WATO: - * More checks are configurable via WATO now - * Distributed WATO: Made all url calls using curl now + * Much more checks are configurable via WATO now + * Distributed WATO: Made all URL calls using curl now * FIX: fix bug in inventory in validate_datatype() * Better output in case of inventory error * FIX: fix bug in host_icon rule on non OMD diff --git a/checkman/fjdarye100_disks b/checkman/fjdarye100_disks index 61f3a1f..7bb7d94 100644 --- a/checkman/fjdarye100_disks +++ b/checkman/fjdarye100_disks @@ -1,4 +1,4 @@ -title: Monitor status of disks in Fujitsu ETERNUS DX80 S2 storage systems +title: Monitor status of disk in Fujitsu ETERNUS DX80 S2 storage systems agents: SNMP author: Philipp Hoefflin <hoefflin+cmk(a)fuh-e.de> license: GPLv2 diff --git a/checkman/fjdarye60_disks b/checkman/fjdarye60_disks index 211919e..0af70f0 100644 --- a/checkman/fjdarye60_disks +++ b/checkman/fjdarye60_disks @@ -1,4 +1,4 @@ -title: Monitor status of disks in Fujitsu ETERNUS DX storage systems +title: Monitor status of disk in Fujitsu ETERNUS DX storage systems agents: SNMP author: Lars Michelsen <lm(a)mathias-kettner.de> license: GPL diff --git a/checks/3ware_disks b/checks/3ware_disks index 89e2681..b9a4c41 100644 --- a/checks/3ware_disks +++ b/checks/3ware_disks @@ -61,7 +61,7 @@ def inventory_3ware_disks(info): inventory.append( (disk, None) ) return inventory -def check_3ware_disks(item, params, info): +def check_3ware_disks(item, _no_params, info): for line in info: if line[0] == item: status = line[1] @@ -81,3 +81,4 @@ def check_3ware_disks(item, params, info): # declare the check to Check_MK check_info['3ware_disks'] = \ (check_3ware_disks, "RAID 3ware disk %s", 0, inventory_3ware_disks) +checkgroup_of['3ware_disks'] = "raid_disk" diff --git a/checks/3ware_units b/checks/3ware_units index 00859a5..8284343 100644 --- a/checks/3ware_units +++ b/checks/3ware_units @@ -47,7 +47,7 @@ def inventory_3ware_units(info): return inventory # check -def check_3ware_units(item, param, info): +def check_3ware_units(item, _no_params, info): for line in info: if line[0] == item: unit_type = line[1] @@ -77,3 +77,4 @@ def check_3ware_units(item, param, info): # declare the check to Check_MK check_info['3ware_units'] = \ (check_3ware_units, "RAID 3ware unit %s", 0, inventory_3ware_units) +checkgroup_of['3ware_units'] = "raid" diff --git a/checks/fjdarye.include b/checks/fjdarye.include index 6eed9b7..877de9d 100644 --- a/checks/fjdarye.include +++ b/checks/fjdarye.include @@ -78,7 +78,7 @@ def fjdarye_disks_summary(info): def inventory_fjdarye_disks_summary(info): current_state = fjdarye_disks_summary(info) if len(current_state) > 0: - return [ (None, '', current_state) ] + return [ (None, current_state) ] def fjdarye_disks_printstates(state): return ", ".join(["%s: %s" % (s,c) for (s,c) in state.items()]) @@ -101,7 +101,7 @@ def check_fjdarye_disks_summary(index, expected_status, info): # -------------------------------------------------------------------------------- # 2. Single disk version of check -> one check for each disk def inventory_fjdarye_disks(info): - return [ (int(index), '', repr(fjdarye_disks_status[int(status)])) for index, status in info if int(status) != 3 ] + return [ (int(index), repr(fjdarye_disks_status[int(status)])) for index, status in info if int(status) != 3 ] def check_fjdarye_disks(index, expected_status, info): for line in info: @@ -115,4 +115,3 @@ def check_fjdarye_disks(index, expected_status, info): return (3, "UNKNOWN - No status for disk number %d present" % index) -# vim: tabstop=4 shiftwidth=4 expandtab diff --git a/checks/fjdarye100_disks b/checks/fjdarye100_disks index 65b1092..f50cd20 100644 --- a/checks/fjdarye100_disks +++ b/checks/fjdarye100_disks @@ -74,6 +74,7 @@ snmp_scan_functions['fjdarye100_disks.summary'] \ check_info['fjdarye100_disks'] = (check_fjdarye_disks, "Disk %s", 0, inventory_fjdarye_disks) check_includes['fjdarye100_disks'] = ["fjdarye.include"] +checkgroup_of['fjdarye100_disks'] = "raid_disk" # 1: fjdaryDiskIndex, 3: fjdaryDiskStatus snmp_info['fjdarye100_disks'] = (".1.3.6.1.4.1.211.1.21.1.100.2.19.2.1", [ 1, 3 ]) diff --git a/checks/fjdarye60_disks b/checks/fjdarye60_disks index 57d7a89..9a61bff 100644 --- a/checks/fjdarye60_disks +++ b/checks/fjdarye60_disks @@ -38,6 +38,7 @@ snmp_scan_functions['fjdarye60_disks.summary'] \ check_info['fjdarye60_disks'] = (check_fjdarye_disks, "Disk %s", 0, inventory_fjdarye_disks) check_includes['fjdarye60_disks'] = ["fjdarye.include"] snmp_info['fjdarye60_disks'] = (".1.3.6.1.4.1.211.1.21.1.60.2.12.2.1", [ 1, 3 ]) +checkgroup_of['fjdarye60_disks'] = "raid_disk" snmp_scan_functions['fjdarye60_disks'] \ = lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.211.1.21.1.60" diff --git a/checks/lsi b/checks/lsi index bf2c2b7..f9966ba 100644 --- a/checks/lsi +++ b/checks/lsi @@ -46,7 +46,7 @@ def inventory_lsi(check_type, info): else: return [(id, '"%s"' % state) for (id, state) in disks] -def check_lsi_array(item, params, info): +def check_lsi_array(item, _no_params, info): volumeid = -1 for line in info: if line[0] == 'VolumeID': @@ -75,4 +75,7 @@ def check_lsi_disk(item, target_state, info): check_info['lsi.array'] = (check_lsi_array, "RAID array %s", 0, lambda info: inventory_lsi('lsi.array', info)) +checkgroup_of['lsi.array'] = "raid" + check_info['lsi.disk'] = (check_lsi_disk, "RAID disk %s", 0, lambda info: inventory_lsi('lsi.disk', info)) +checkgroup_of['lsi.disk'] = "raid_disk" diff --git a/checks/md b/checks/md index ce769fe..b211fcf 100644 --- a/checks/md +++ b/checks/md @@ -74,10 +74,10 @@ def inventory_md(info): elif line[1] == 'blocks': if line[-1] != "chunks": # ignore RAID 0 devices disk_state = line[-1][1:-1] - inventory.append( (device, '%s / %s' % (raid_state, disk_state), None) ) + inventory.append( (device, None) ) return inventory -def check_md(item, params, info): +def check_md(item, _no_params, info): raid_state = '' its_next = False for line in info: @@ -104,3 +104,4 @@ def check_md(item, params, info): check_info['md'] = (check_md, "MD Softraid %s", 0, inventory_md) +checkgroup_of['md'] = "raid" diff --git a/checks/megaraid_pdisks b/checks/megaraid_pdisks index 91ecd77..0cdf8c7 100644 --- a/checks/megaraid_pdisks +++ b/checks/megaraid_pdisks @@ -98,3 +98,4 @@ def check_megaraid_pdisks(item, target_state, info): return (3, "UNKNOWN - No disk in encl/slot %s found" % item) check_info['megaraid_pdisks'] = (check_megaraid_pdisks, "RAID PDisk Adapt/Enc/Sl %s", 1, inventory_megaraid_pdisks) +checkgroup_of['megaraid_pdisks'] = "raid_disk" diff --git a/checks/mounts b/checks/mounts index 54a7f4f..521023b 100644 --- a/checks/mounts +++ b/checks/mounts @@ -70,3 +70,4 @@ def check_mounts(item, targetopts, info): check_info['mounts'] = ( check_mounts, "Mount options of %s", 0, inventory_mounts) +checkgroup_of['mounts'] = "fs_mount_options" diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 64085c7..d7c6337 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -242,6 +242,22 @@ checkgroups.append(( )) checkgroups.append(( + "fs_mount_options", + _("Filesystem mount options (Linux/UNIX)"), + ListOfStrings( + title = _("Expected mount options"), + help = _("Specify all expected mount options here. If the list of " + "actually found options differs from this list, the check will go " + "warning or critical. Just the option <tt>commit</tt> is being " + "ignored since it is modified by the power saving algorithms.")), + TextAscii( + title = _("Mount point"), + allow_empty = False), + "first")) + + + +checkgroups.append(( "systemtime", _("System time offset"), Tuple( @@ -882,6 +898,32 @@ checkgroups.append(( "first")) checkgroups.append(( + "raid", + _("RAID: overal state"), + None, + TextAscii( + title = _("Name of the device"), + help = _("For Linux MD specify the device name without the " + "<tt>/dev/</tt>, e.g. <tt>md0</tt>, for hardware raids " + "please refer to the manual of the actual check being used.")), + "first")) + +checkgroups.append(( + "raid_disk", + _("RAID: state of a single disk"), + TextAscii( + title = _("Target state"), + help = _("State the disk is expected to be in. Typical good states " + "are online, host spare, OK and the like. The exact way of how " + "to specify a state depends on the check and hard type being used. " + "Please take examples from inventorized checks for reference.")), + TextAscii( + title = _("Number or ID of the disk"), + help = _("How the disks are named depends on the type of hardware being " + "used. Please look at already inventorized checks for examples.")), + "first")) + +checkgroups.append(( "room_temperature", _("Room temperature (e.g. external thermal sensors in datacenters)"), Tuple(

12 years, 4 months

Check_MK Git: check_mk: Fix some layout problems in WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 59864ec002eb55b22d3675ab4be5fcd82535f20a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59864ec002eb55… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 10:44:39 2012 +0100 Fix some layout problems in WATO --- web/htdocs/check_mk.css | 6 +++--- web/htdocs/valuespec.py | 4 ++-- web/htdocs/wato.css | 6 ++++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 52f5bef..5f3572e 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -283,12 +283,12 @@ div.dictelement { float: none; } -td.content table.valuespec_tuple td.left { +table.valuespec_tuple td.tuple_left { padding-right: 10px; } -td.content table.valuespec_tuple td.right, -td.content table.valuespec_tuple td.left { +table.valuespec_tuple td.tuple_right, +table.valuespec_tuple td.tuple_left { vertical-align: top; padding-bottom: 10px; } diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 83c370c..565b2f2 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1173,8 +1173,8 @@ class Tuple(ValueSpec): html.write("<tr>") if self._show_titles: title = element.title()[0].upper() + element.title()[1:] - html.write("<td class=left>%s:%s</td>" % (title, help)) - html.write("<td class=right>") + html.write("<td class=tuple_left>%s:%s</td>" % (title, help)) + html.write("<td class=tuple_right>") element.render_input(vp, val) html.write("</td></tr>") html.write("</table>") diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 296c666..71862de 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -377,10 +377,12 @@ table.validationerror img { padding: 0; } -.wato table.form td.content td { +/* This style destroys many other td styles since + it is too specific or too unspecific */ +/* .wato table.form td.content td { padding: 0; vertical-align: middle; -} +}*/ .wato table.data.ruleset td { /* vertical-align: top; */

12 years, 4 months

Check_MK Git: check_mk: WATO: formalized further checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1dd2260ea5de83c548c65ec9293c7786309bb5ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1dd2260ea5de83… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 21 11:24:19 2012 +0100 WATO: formalized further checks --- checks/multipath | 2 + checks/nfsmounts | 5 ++- checks/nvidia | 3 +- checks/omd_status | 2 + checks/oracle_asm_disk | 6 +++- checks/services | 3 +- checks/smbios_sel | 3 +- checks/snia_sml | 2 + checks/vbox_guest | 3 +- checks/vmware_state | 5 ++- doc/helpers/validate_checks | 3 ++ web/htdocs/wato.py | 1 + web/plugins/wato/check_parameters.py | 62 ++++++++++++++++++++++++++++++++- 13 files changed, 89 insertions(+), 11 deletions(-) diff --git a/checks/multipath b/checks/multipath index c0e9031..2eb1a40 100644 --- a/checks/multipath +++ b/checks/multipath @@ -273,3 +273,5 @@ check_info['multipath'] = ( "Multipath %s", 0, inventory_multipath) + +checkgroup_of['multipath'] = 'multipath' diff --git a/checks/nfsmounts b/checks/nfsmounts index c3c0bd8..03720c3 100644 --- a/checks/nfsmounts +++ b/checks/nfsmounts @@ -26,9 +26,9 @@ def inventory_nfsmounts(info): - return [ (line[0], None, None) for line in info ] + return [ (line[0], None) for line in info ] -def check_nfsmounts(item, params, info): +def check_nfsmounts(item, _no_params, info): for line in info: mountpoint = line[0] if mountpoint == item: @@ -54,3 +54,4 @@ def check_nfsmounts(item, params, info): return (3, "UNKNOWN - not mounted") check_info['nfsmounts'] = (check_nfsmounts, "NFS mount %s", 0, inventory_nfsmounts) +checkgroup_of['nfsmounts'] = 'network_fs' diff --git a/checks/nvidia b/checks/nvidia index 3ce3caa..9b8c787 100644 --- a/checks/nvidia +++ b/checks/nvidia @@ -58,7 +58,7 @@ def inventory_nvidia_errors(info): if line[0] == 'GPUErrors:': return [(None, None)] -def check_nvidia_errors(item, params, info): +def check_nvidia_errors(_no_item, _no_params, info): for line in info: if line[0] == "GPUErrors:": errors = int(line[1]) @@ -70,3 +70,4 @@ def check_nvidia_errors(item, params, info): check_info['nvidia.errors'] = ( check_nvidia_errors, "NVIDIA GPU Errors", 0, inventory_nvidia_errors ) +checkgroup_of['nvidia.errors'] = 'hw_errors' diff --git a/checks/omd_status b/checks/omd_status index ada746f..98229dd 100644 --- a/checks/omd_status +++ b/checks/omd_status @@ -63,3 +63,5 @@ def check_omd_status(item, _no_params, info): check_info['omd_status'] = \ (check_omd_status, "OMD %s status", 0, inventory_omd_status) + +checkgroup_of["omd_status"] = "omd_status" diff --git a/checks/oracle_asm_disk b/checks/oracle_asm_disk index 9712471..e77a616 100644 --- a/checks/oracle_asm_disk +++ b/checks/oracle_asm_disk @@ -24,9 +24,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Note: this check only works with a customer specific agent +# plugin that is not portable and not shipped with Check_MK. +# It will be removed in a future version. def inventory_oracle_asm_disk(info): - return [ (line[0], "", '""') for line in info if line[1] != "0" ] + return [ (line[0], '""') for line in info if line[1] != "0" ] def check_oracle_asm_disk(diskname, params, info): for line in info: @@ -47,3 +50,4 @@ check_info['oracle_asm_disk'] = ( "ASM disk %s", 0, inventory_oracle_asm_disk) +checkgroup_of['oracle_asm_disk'] = "obsolete" diff --git a/checks/services b/checks/services index fcd0e3c..1b7ecc6 100644 --- a/checks/services +++ b/checks/services @@ -110,7 +110,7 @@ def inventory_windows_services(info): return inventory -def check_windows_services(item, params, info): +def check_windows_services(item, _no_params, info): # make sure, that thing also works for clusters: # here a service can be listed more than once. # It is sufficient of at least one "running" is @@ -139,3 +139,4 @@ def check_windows_services(item, params, info): check_info['services'] = (check_windows_services, "service_%s", 0, inventory_windows_services) +checkgroup_of['services'] = 'services' diff --git a/checks/smbios_sel b/checks/smbios_sel index 556ee88..5914556 100644 --- a/checks/smbios_sel +++ b/checks/smbios_sel @@ -98,7 +98,7 @@ smbios_sel_msg_types = { def inventory_smbios_sel(info): if len(info) > 0: - return [(None, "", "None")] + return [(None, "None")] def check_smbios_sel(_no_item, _no_params, info): if len(info) == 0: @@ -164,3 +164,4 @@ def check_smbios_sel(_no_item, _no_params, info): return (sum_status, "%s: %s" % (nagios_state_names[sum_status], sum_output)) check_info['smbios_sel'] = (check_smbios_sel, "SMBIOS Event Log", 0, inventory_smbios_sel) +checkgroup_of['smbios_sel'] = 'hw_errors' diff --git a/checks/snia_sml b/checks/snia_sml index 1736be4..72ad923 100644 --- a/checks/snia_sml +++ b/checks/snia_sml @@ -33,3 +33,5 @@ check_info['snia_sml'] = ( "%s", 0, no_inventory_possible) + +checkgroup_of["snia_sml"] = "obsolete" diff --git a/checks/vbox_guest b/checks/vbox_guest index 7821c6b..adf1d14 100644 --- a/checks/vbox_guest +++ b/checks/vbox_guest @@ -27,7 +27,7 @@ def vbox_guest_make_dict(info): return dict([(l[1].split('/',2)[2].rstrip(','), l[3]) for l in info]) -def check_vbox_guest(item, _no_params, info): +def check_vbox_guest(_no_item, _no_params, info): if len(info) == 1 and info[0][0] == "ERROR": return (3, "UNKNOWN - Error running VBoxControl guestproperty enumerate") try: @@ -56,3 +56,4 @@ def inventory_vbox_guest(info): return [(None, None)] check_info["vbox_guest"] = ( check_vbox_guest, "VBox Guest Additions", 0, inventory_vbox_guest) +checkgroup_of["vbox_guest"] = "vm_state" diff --git a/checks/vmware_state b/checks/vmware_state index ce59058..04878a9 100644 --- a/checks/vmware_state +++ b/checks/vmware_state @@ -54,7 +54,7 @@ def inventory_vmware_state(info): vm_ipaddr = line[0][7:] # add machine to inventory (if IP address is not empty) if vm_ipaddr != '': - inventory.append((vm_name, vm_ipaddr, None)) + inventory.append((vm_name, None)) return inventory # 1. Variant: loop over all machines and @@ -86,7 +86,7 @@ def inventory_vmware_state(info): # we do the check and return immediately. # If we go through the loop without finding # the machine, we return an UNKNOWN state. -def check_vmware_state(item, params, info): +def check_vmware_state(item, _no_params, info): # item is the name of the machine. for line in info: if line[0].startswith("name:"): @@ -101,3 +101,4 @@ def check_vmware_state(item, params, info): return (3, "UNKNOWN - no such machine") check_info['vmware_state'] = (check_vmware_state, "VM %s", 0, inventory_vmware_state) +checkgroup_of['vmware_state'] = 'vm_state' diff --git a/doc/helpers/validate_checks b/doc/helpers/validate_checks index 752606f..1a101f2 100755 --- a/doc/helpers/validate_checks +++ b/doc/helpers/validate_checks @@ -316,6 +316,9 @@ def is_valid_wato(check): def verify_wato(check): group = check_info[check]["group"] + if group == "obsolete": + return True + now = False for line in file("web/plugins/wato/check_parameters.py"): line = line.strip() diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index aea6e16..5f90ed2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8148,6 +8148,7 @@ def mode_rulesets(phase): for groupname in groupnames: # Show information about a ruleset title_shown = False + g_rulespec_groups[groupname].sort() for rulespec in g_rulespec_groups[groupname]: varname = rulespec["varname"] diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 134f4cf..64085c7 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -820,11 +820,68 @@ checkgroups.append(( checkgroups.append(( "zpool_status", - _("Check ZFS Storage Pool status"), + _("ZFS storage pool status"), None, None, None)) checkgroups.append(( + "vm_state", + _("Overall state of a virtual machine"), + None, + None, None)) + +checkgroups.append(( + "hw_errors", + _("Simple checks for BIOS/Hardware errors without parameters"), + None, + None, None)) + +checkgroups.append(( + "omd_status", + _("OMD site status"), + None, + TextAscii( + title = _("Name of the OMD site"), + help = _("The name of the OMD site to check the status for")), + "first")) + +checkgroups.append(( + "network_fs", + _("Network filesystem - overall status (e.g. NFS)"), + None, + TextAscii( + title = _("Name of the mount point"), + help = _("For NFS enter the name of the mount point.")), + "first")) + +checkgroups.append(( + "multipath", + _("Multipathing - health of a multipath LUN"), + Integer( + title = _("Expected number of active paths")), + TextAscii( + title = _("Name of the MP LUN"), + help = _("For Linux multipathing this is either the UUID (e.g. " + "60a9800043346937686f456f59386741), or the configured " + "alias.")), + "first")) + +checkgroups.append(( + "services", + _("Windows services"), + None, + TextAscii( + title = _("Name of the service"), + help = _("Pleae Please note, that the agent replaces spaces in " + "the service names with underscores. If you are unsure about the " + "correct spelling of the name then please look at the output of " + "the agent (cmk -d HOSTNAME). The service names are in the first " + "column of the section <<<services>>>. Please " + "do not mix up the service name with the display name of the service." + "The latter one is just being displayed as a further information.")), + "first")) + +checkgroups.append(( "room_temperature", _("Room temperature (e.g. external thermal sensors in datacenters)"), Tuple( @@ -920,7 +977,8 @@ for checkgroup, title, valuespec, itemspec, matchtype in checkgroups: FixedValue(None, help = _("This check has no parameters."), totext = "") - valuespec._title = _("Parameters") + if not valuespec.title(): + valuespec._title = _("Parameters") elements.append(valuespec) register_rule(

12 years, 4 months

Check_MK Git: check_mk: Merge branch 'tobi' of ssh://git.mathias-kettner.de /var/www/80/git.mathias-kettner.de/check_mk

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: a87bef101171a8b5720d18db854c0cd856e8dbbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a87bef101171a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 20 16:30:18 2012 +0100 Merge branch 'tobi' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Updated layout of login screen

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3c02665679ef3adecdae6f4275cd917a25e4c8ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c02665679ef3a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 20 14:46:25 2012 +0100 Updated layout of login screen --- web/htdocs/images/image_button.png | Bin 0 -> 5010 bytes web/htdocs/images/login_dark_bg.png | Bin 4670 -> 3494 bytes web/htdocs/images/login_spotlight.png | Bin 334182 -> 575079 bytes web/htdocs/images/login_window.png | Bin 10934 -> 29560 bytes web/htdocs/login.css | 42 ++++++++++++++++++-------------- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/web/htdocs/images/image_button.png b/web/htdocs/images/image_button.png new file mode 100644 index 0000000..5727f80 Binary files /dev/null and b/web/htdocs/images/image_button.png differ diff --git a/web/htdocs/images/login_dark_bg.png b/web/htdocs/images/login_dark_bg.png index d02f332..1977293 100644 Binary files a/web/htdocs/images/login_dark_bg.png and b/web/htdocs/images/login_dark_bg.png differ diff --git a/web/htdocs/images/login_spotlight.png b/web/htdocs/images/login_spotlight.png index ab3abf6..3858218 100644 Binary files a/web/htdocs/images/login_spotlight.png and b/web/htdocs/images/login_spotlight.png differ diff --git a/web/htdocs/images/login_window.png b/web/htdocs/images/login_window.png index 931dab3..87449ba 100644 Binary files a/web/htdocs/images/login_window.png and b/web/htdocs/images/login_window.png differ diff --git a/web/htdocs/login.css b/web/htdocs/login.css index 73ffd6b..f8f9c20 100644 --- a/web/htdocs/login.css +++ b/web/htdocs/login.css @@ -46,12 +46,13 @@ body.main { div#login { background-image: url("images/login_spotlight.png"); - width: 605px; - height: 410px; + background-repeat: no-repeat; + width: 770px; + height: 605px; position: absolute; top: 50%; left: 50%; - margin: -205px 0px 0px -302px; + margin: -276px 0px 0px -386px; /* border: 1px solid yellow; */ } @@ -60,7 +61,7 @@ img#login_window { height: 230px; position: relative; left: 10px; - top: 10px; + top: 160px; float: none; } @@ -70,35 +71,38 @@ label { #version { position: absolute; - top: 25px; - left: 420px; + text-align: right; + width: 150px; + top: 173px; + left: 415px; color: white; + font-size: 8pt; } #label_user, #label_pass { - left: 174px; + left: 264px; } #input_user, #input_pass { - left: 250px; + left: 330px; } #label_user { position: absolute; - top: 132px; + top: 275px; } #input_user { position: absolute; - top: 128px; + top: 270px; } #label_pass { position: absolute; - top: 168px; + top: 315px; } #input_pass { position: absolute; - top: 164px; + top: 310px; } #input_user, #input_pass { @@ -108,8 +112,8 @@ label { #button_login { position: absolute; - top: 190px; - left: 415px; + top: 345px; + left: 505px; } #button_login img { @@ -119,12 +123,14 @@ label { #button_text { position: absolute; - top: 198px; - left: 415px; + top: 355px; + left: 505px; text-align: center; width: 61px; color: white; z-index: 100; + font-size: 10px; + text-transform: uppercase; } #login_error { @@ -139,8 +145,8 @@ label { #foot { position: absolute; text-align: center; - top: 250px; - left: 135px; + top: 400px; + left: 220px; width: 350px; color: white; font-size: 8pt;

12 years, 4 months

Check_MK Git: check_mk: Redesign of login screen

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 33fb22b87297bd496d915cb3d60251efc8155306 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=33fb22b87297bd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Feb 16 12:25:06 2012 +0100 Redesign of login screen --- web/htdocs/htmllib.py | 10 ++- web/htdocs/images/button_login_hi.png | Bin 0 -> 1068 bytes web/htdocs/images/button_login_lo.png | Bin 0 -> 1104 bytes web/htdocs/images/login_dark_bg.png | Bin 0 -> 4670 bytes web/htdocs/images/login_spotlight.png | Bin 0 -> 334182 bytes web/htdocs/images/login_window.png | Bin 0 -> 10934 bytes web/htdocs/images/snapin_closed.png | Bin 844 -> 832 bytes web/htdocs/login.css | 145 +++++++++++++++++++++++---------- web/htdocs/login.py | 41 +++++----- 9 files changed, 129 insertions(+), 67 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 9d4ff21..f37ca06 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -330,12 +330,16 @@ class html: def empty_icon(self): self.write('<img class=icon src="images/trans.png">') - def icon_button(self, url, help, icon): - self.write('<a href="%s">' + def icon_button(self, url, help, icon, id=None): + if id: + idtxt = "id='%s' " % id + else: + idtxt = "" + self.write('<a %sonfocus="if (this.blur) this.blur();" href="%s">' '<img align=absmiddle class=iconbutton title="%s" src="images/button_%s_lo.png" ' 'onmouseover=\"hilite_icon(this, 1)\" ' 'onmouseout=\"hilite_icon(this, 0)\">' - '</a>\n' % (url, help, icon)) + '</a>\n' % (idtxt, url, help, icon)) def empty_icon_button(self): self.write('<img class="iconbutton trans" src="images/trans.png">\n') diff --git a/web/htdocs/images/button_login_hi.png b/web/htdocs/images/button_login_hi.png new file mode 100644 index 0000000..f07d282 Binary files /dev/null and b/web/htdocs/images/button_login_hi.png differ diff --git a/web/htdocs/images/button_login_lo.png b/web/htdocs/images/button_login_lo.png new file mode 100644 index 0000000..eeeef84 Binary files /dev/null and b/web/htdocs/images/button_login_lo.png differ diff --git a/web/htdocs/images/login_dark_bg.png b/web/htdocs/images/login_dark_bg.png new file mode 100644 index 0000000..d02f332 Binary files /dev/null and b/web/htdocs/images/login_dark_bg.png differ diff --git a/web/htdocs/images/login_spotlight.png b/web/htdocs/images/login_spotlight.png new file mode 100644 index 0000000..ab3abf6 Binary files /dev/null and b/web/htdocs/images/login_spotlight.png differ diff --git a/web/htdocs/images/login_window.png b/web/htdocs/images/login_window.png new file mode 100644 index 0000000..931dab3 Binary files /dev/null and b/web/htdocs/images/login_window.png differ diff --git a/web/htdocs/images/snapin_closed.png b/web/htdocs/images/snapin_closed.png index 86a669e..0151a0c 100644 Binary files a/web/htdocs/images/snapin_closed.png and b/web/htdocs/images/snapin_closed.png differ diff --git a/web/htdocs/login.css b/web/htdocs/login.css index d6792f4..73ffd6b 100644 --- a/web/htdocs/login.css +++ b/web/htdocs/login.css @@ -36,61 +36,118 @@ Boston, MA 02110-1301 USA. | Styling of the login page (when not HTTP Basic Auth is used) | '-------------------------------------------------------------------------*/ -#login { - margin: 0; - height: 100%; - width: 100%; - text-align:center; +body.main { + background-image: url("images/login_dark_bg.png"); + background-position: center; + text-align: center; + vertical-align: middle; } -#login #logo { - width: 126px; - margin: 5em auto 0 auto; - height: 72px; - background-repeat: no-repeat; - background-image: url("images/mk_logo_126x72.gif"); + + +div#login { + background-image: url("images/login_spotlight.png"); + width: 605px; + height: 410px; + position: absolute; + top: 50%; + left: 50%; + margin: -205px 0px 0px -302px; + /* border: 1px solid yellow; */ +} + +img#login_window { + width: 370px; + height: 230px; + position: relative; + left: 10px; + top: 10px; + float: none; } -#login h1 { - width: 300px; - margin: 0.2em auto 1em auto; + +label { + color: white; } -#login a { - color: #ffffff; + +#version { + position: absolute; + top: 25px; + left: 420px; + color: white; } -#login a:hover { - text-decoration: none; + +#label_user, #label_pass { + left: 174px; } -#login #form { - width: 320px; - margin: 0 auto 10px auto; - padding: 8px 20px 8px 20px; - background-image: url("images/form_background.png"); - border-radius: 15px; + +#input_user, #input_pass { + left: 250px; } -#login p { - text-align: left; + +#label_user { + position: absolute; + top: 132px; } -#login label { - font-size: 1.4em; - padding-top: 0; - margin: 0; +#input_user { + position: absolute; + top: 128px; } -#login p input { - width: 312px; - font-size: 1.5em; - margin-top: 2px; + +#label_pass { + position: absolute; + top: 168px; } -#login #table td.submit { - padding-top: 5px; +#input_pass { + position: absolute; + top: 164px; } -#login p.submit { - text-align: right; + +#input_user, #input_pass { + width: 130px; + height: 16px; } -#login p.submit input { - width: auto; + +#button_login { + position: absolute; + top: 190px; + left: 415px; } -#login #foot { - font-size: 0.8em; - font-style: italic; - color: #ffffff; +#button_login img { + width: 63px; + height: 32px; } + +#button_text { + position: absolute; + top: 198px; + left: 415px; + text-align: center; + width: 61px; + color: white; + z-index: 100; +} + +#login_error { + position: absolute; + top: -60px; + left: 135px; + width: 360px; + z-index: 100; +} + + +#foot { + position: absolute; + text-align: center; + top: 250px; + left: 135px; + width: 350px; + color: white; + font-size: 8pt; +} + + +#foot a, #foot a:hover { + color: white; +} + diff --git a/web/htdocs/login.py b/web/htdocs/login.py index a1a3f8c..1e2afab 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -220,34 +220,35 @@ def normal_login_page(): origtarget = html.req.uri html.write("<div id=login>") - html.write("<div id=logo></div>") - html.write("<h1>%s</h2>" % _("Check_MK Multisite")) - html.write('<div id=form>') - if html.has_user_errors(): + html.write('<div id=login_error>') html.show_user_errors() + html.write('</div>') + + html.write("<img id=login_window src=\"images/login_window.png\">") + html.write("<div id=version>%s</div>" % defaults.check_mk_version) html.begin_form("login", method = 'POST', add_transid = False) + html.hidden_field('_login', '1') html.hidden_field('_origtarget', htmllib.attrencode(origtarget)) - html.write('<p>') - html.write("<label class=legend for=_username>%s</label><br />" % _('Username')) - html.text_input("_username", size = 50) - html.write('</p>') - - html.write('<p>') - html.write("<label class=legend for=_password>%s</label><br />" % _('Password')) - html.password_input("_password", size = 50) - html.write('</p>') - - html.write('<p class=submit>') - html.button("_login", _('Login')) - html.write('</p>') - html.write('</div>') - + html.write("<label id=label_user class=legend for=_username>%s:</label><br />" % _('Username')) + html.text_input("_username", size = 50, id="input_user") + html.write("<label id=label_pass class=legend for=_password>%s:</label><br />" % _('Password')) + html.password_input("_password", size = 50, id="input_pass") + html.write("<div id=button_text>%s</div>" % _("Login")) + html.icon_button("javascript:document.getElementById('form_login').submit();", _("Login"), "login", id="button_login") + html.write('<input type=submit style="display: none;">') + + # Footer with copyright and stuff html.write("<div id=foot>Version: %s - © " - "<a href=\"http://mathias-kettner.de\">Mathias Kettner</a></div>" % defaults.check_mk_version) + "<a href=\"http://mathias-kettner.de\">Mathias Kettner</a><br><br>" % defaults.check_mk_version) + html.write(_("You can use, modify and distribute Check_MK under the terms of the <a href='%s'>" + "GNU GPL Version 2</a>." % "http://mathias-kettner.de/gpl.html")) + html.write("</div>") + html.write("</div>") html.set_focus('_username') + html.hidden_fields() html.end_form() html.footer()

12 years, 4 months

Check_MK Git: check_mk: Fixed font size of sidebar headers

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0af6f922a7ff77f162344d602960856b171ca59f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0af6f922a7ff77… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 6 15:59:57 2012 +0100 Fixed font size of sidebar headers --- web/htdocs/dashboard.css | 4 +--- web/htdocs/sidebar.css | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/web/htdocs/dashboard.css b/web/htdocs/dashboard.css index e90e8b2..05f5aef 100644 --- a/web/htdocs/dashboard.css +++ b/web/htdocs/dashboard.css @@ -66,13 +66,11 @@ div.dashlet div.title { color: #fff; padding: 0px; margin: 0px; - padding-top: 3px; - font-size: 10pt; + padding-top: 4px; font-weight: normal; } div.dashlet div.title a { text-decoration: none; - border-bottom: 1px dotted white; color: white; } div.dashlet div.title a:hover { diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 34d2d5a..1dc3090 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -191,10 +191,11 @@ div.snapin div.head { padding-top: 9px; } -div.snapin b.header { +div.snapin div.head b { font-weight: normal; } + div.snapin div.head.open { background-image: url("images/snapin_header.png"); height: 17px;

12 years, 4 months

Check_MK Git: check_mk: Change style of snapins

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 41fc482fc9b1cd11d3533cfdd5a0d555a4e1943e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41fc482fc9b1cd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 6 15:57:35 2012 +0100 Change style of snapins --- web/htdocs/sidebar.css | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 22234b0..34d2d5a 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -191,6 +191,10 @@ div.snapin div.head { padding-top: 9px; } +div.snapin b.header { + font-weight: normal; +} + div.snapin div.head.open { background-image: url("images/snapin_header.png"); height: 17px;

12 years, 4 months

Check_MK Git: check_mk: Switched font to Arial

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: dce562ec26a3e39907f6f145b15e507ed9770eb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dce562ec26a3e3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 6 16:00:28 2012 +0100 Switched font to Arial --- web/htdocs/sidebar.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index 1dc3090..dccea0d 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -42,7 +42,7 @@ body.side { width: 280px; height: 100%; overflow:hidden; - font-family: verdana, arial, helvetica, sans-serif; + font-family: arial, helvetica, sans-serif; font-size: 9pt; margin: 0px; }

12 years, 4 months

← Newer
1
...
4
5
6
7
8
9
10
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2012