Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

oracle_asm_diskgroup: Additional fix for required mirror free space used

by Lars Michelsen

Module: check_mk Branch: master Commit: e5631a782aaa1902b8e3a80a8be438ce41821d58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5631a782aaa19… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 16 08:49:59 2016 +0100 oracle_asm_diskgroup: Additional fix for required mirror free space used --- checks/oracle_asm_diskgroup | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/checks/oracle_asm_diskgroup b/checks/oracle_asm_diskgroup index e10d445..deb8595 100644 --- a/checks/oracle_asm_diskgroup +++ b/checks/oracle_asm_diskgroup @@ -61,6 +61,7 @@ def check_oracle_asm_diskgroup(item, params, info): dg_name = name.rstrip('/') if dg_name == item: + add_text = "" if typ in ('NORMAL', 'HIGH'): if typ == 'NORMAL': if voting_files == 'Y': @@ -89,7 +90,7 @@ def check_oracle_asm_diskgroup(item, params, info): free_space_mb = int(req_mir_free_mb) - infotext += ', required mirror free space used' + add_text = ', required mirror free space used' else: # EXTERNAL Redundancy @@ -99,6 +100,7 @@ def check_oracle_asm_diskgroup(item, params, info): free_space_mb, 0, params) infotext += ', %s redundancy' % typ.lower() + infotext += add_text offline_disks = int(offline_disks) if offline_disks > 0:

8 years, 4 months

#3210 FIX oracle_asm_diskgroup: Fixed exception when using required mirror free space parameter

by Lars Michelsen

Module: check_mk Branch: master Commit: cbff228d10992efc0a8bdba51d5bbff4abe5707f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cbff228d10992e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 16 08:47:47 2016 +0100 #3210 FIX oracle_asm_diskgroup: Fixed exception when using required mirror free space parameter --- .werks/3210 | 10 ++++++++++ ChangeLog | 1 + checks/oracle_asm_diskgroup | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3210 b/.werks/3210 new file mode 100644 index 0000000..01963d9 --- /dev/null +++ b/.werks/3210 @@ -0,0 +1,10 @@ +Title: oracle_asm_diskgroup: Fixed exception when using required mirror free space parameter +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455608827 + + diff --git a/ChangeLog b/ChangeLog index eb6f3b9..6111cd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * 3205 FIX: raritan_pdu_inlet: Fixed exception in case phases report a non OK state * 3206 FIX: esx_vsphere_hostsystem.mem_usage_cluster: Fixed broken check * 3209 FIX: esx_vsphere_datastores: Added missing uncommitted and overprovisioned graphs + * 3210 FIX: oracle_asm_diskgroup: Fixed exception when using required mirror free space parameter Multisite: * 3059 FIX: Fixed highlighting of availability timeline time slices diff --git a/checks/oracle_asm_diskgroup b/checks/oracle_asm_diskgroup index 6c57edf..e10d445 100644 --- a/checks/oracle_asm_diskgroup +++ b/checks/oracle_asm_diskgroup @@ -89,7 +89,7 @@ def check_oracle_asm_diskgroup(item, params, info): free_space_mb = int(req_mir_free_mb) - infotext += ', required mirror free space used' % lower() + infotext += ', required mirror free space used' else: # EXTERNAL Redundancy

8 years, 4 months

Removed unused function

by Lars Michelsen

Module: check_mk Branch: master Commit: 8a8a130bd60cf4b4b156b5924444032e9cb8d7d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a8a130bd60cf4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 16 08:43:07 2016 +0100 Removed unused function --- checks/ps | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/checks/ps b/checks/ps index 12d821f..ac8c386 100644 --- a/checks/ps +++ b/checks/ps @@ -125,32 +125,6 @@ def ps_get_current_pids(parsed): return pids -# Makes sure, that no counter with a give prefix is kept longer -# than min_keep_seconds * 2. Counter is kept at least min_keep_seconds. -def clear_counters(counter_name_prefix, min_keep_seconds): - global g_item_state - - counters_to_delete = [] - - for name, state in g_item_state.iteritems(): - if type(name) == tuple: - counter_name = name[0] # never needed, since only called by ps currently - else: - counter_name = name - - if type(state) == tuple: - timestamp, value = state - else: - continue # unable to cleanup values without timestamp info, skip - - if counter_name.startswith(counter_name_prefix): - if timestamp < remove_if_min_keep_seconds: - counters_to_delete.append(name) - - for name in counters_to_delete: - del g_item_state[name] - - # FIXME: Refactor this function for better readability def ps_merge_wmic_info(info): ps_result = []

8 years, 4 months

3209 FIX esx_vsphere_datastores: Added missing uncommitted and overprovisioned graphs

by Lars Michelsen

Module: check_mk Branch: master Commit: efea53ed739d7d85bce4efdfe73a0c88fd1aef7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=efea53ed739d7d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 16 08:34:50 2016 +0100 3209 FIX esx_vsphere_datastores: Added missing uncommitted and overprovisioned graphs --- .werks/3209 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3209 b/.werks/3209 new file mode 100644 index 0000000..dc95788 --- /dev/null +++ b/.werks/3209 @@ -0,0 +1,10 @@ +Title: esx_vsphere_datastores: Added missing uncommitted and overprovisioned graphs +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455607996 + + diff --git a/ChangeLog b/ChangeLog index 55aabc1..eb6f3b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * 3075 FIX: windows agent: fixed data encryption of realtime updates were incompatible... * 3205 FIX: raritan_pdu_inlet: Fixed exception in case phases report a non OK state * 3206 FIX: esx_vsphere_hostsystem.mem_usage_cluster: Fixed broken check + * 3209 FIX: esx_vsphere_datastores: Added missing uncommitted and overprovisioned graphs Multisite: * 3059 FIX: Fixed highlighting of availability timeline time slices diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 18c050d..8ac2c8c 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -3060,7 +3060,8 @@ check_metrics["check_mk_active-disk_smb"] = { } df_translation = { - "~(?!inodes_used|fs_size|growth|trend|fs_provisioning).*" : { "name" : "fs_used", "scale" : MB }, + "~(?!inodes_used|fs_size|growth|trend|fs_provisioning|" + "uncommitted|overprovisioned).*$" : { "name" : "fs_used", "scale" : MB }, "fs_size" : { "scale" : MB }, "growth" : { "name" : "fs_growth", "scale" : MB / 86400.0 }, "trend" : { "name" : "fs_trend", "scale" : MB / 86400.0 },

8 years, 4 months

#3205 FIX raritan_pdu_inlet: Fixed exception in case phases report a non OK state

by Lars Michelsen

Module: check_mk Branch: master Commit: 8cb627adc022fca4981ba433c0b6b8c7a401587a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cb627adc022fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 15 16:47:59 2016 +0100 #3205 FIX raritan_pdu_inlet: Fixed exception in case phases report a non OK state --- .werks/3205 | 10 ++++++++++ ChangeLog | 1 + checks/raritan_pdu_inlet | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3205 b/.werks/3205 new file mode 100644 index 0000000..3a2960c --- /dev/null +++ b/.werks/3205 @@ -0,0 +1,10 @@ +Title: raritan_pdu_inlet: Fixed exception in case phases report a non OK state +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455551228 + + diff --git a/ChangeLog b/ChangeLog index 8388acb..757b72f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters * 3075 FIX: windows agent: fixed data encryption of realtime updates were incompatible... + * 3205 FIX: raritan_pdu_inlet: Fixed exception in case phases report a non OK state Multisite: * 3059 FIX: Fixed highlighting of availability timeline time slices diff --git a/checks/raritan_pdu_inlet b/checks/raritan_pdu_inlet index af6a4f2..8980f7a 100644 --- a/checks/raritan_pdu_inlet +++ b/checks/raritan_pdu_inlet @@ -38,7 +38,7 @@ def parse_raritan_pdu_inlet(info): state, state_info = raritan_map_state[sensor_state] if state > 0: - parsed[phase][key] = (value, (state, raritan_pdu_sensor_states[sensor_state])) + parsed[phase][key] = (value, (state, state_info)) else: parsed[phase][key] = (value, None) return parsed

8 years, 4 months

Fixed duplicate definition of function fix_if_64_highspeed()

by Lars Michelsen

Module: check_mk Branch: master Commit: 51ef7175ae504484253ba3e9012867e50e7e9cd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51ef7175ae5044… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 15 16:50:22 2016 +0100 Fixed duplicate definition of function fix_if_64_highspeed() --- checks/if.include | 7 +++++++ checks/if_brocade | 5 ----- checks/if_lancom | 5 ----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/checks/if.include b/checks/if.include index 26c19d4..89d8a26 100644 --- a/checks/if.include +++ b/checks/if.include @@ -59,6 +59,13 @@ if_disable_if64_hosts = [] # Binary host list for disabling if64 on some broken def if64_disabled(hostname): return in_binary_hostlist(hostname, if_disable_if64_hosts) + +def fix_if_64_highspeed(info): + for line in info: + if type(line[3]) in [ str, unicode ]: # not yet converted + line[3] = saveint(line[3]) * 1000000 + + # Remove 0 bytes from strings. They lead to problems e.g. here: # On windows hosts the labels of network interfaces in oid # iso.3.6.1.2.1.2.2.1.2.1 are given as hex strings with tailing diff --git a/checks/if_brocade b/checks/if_brocade index 37b50e2..c6cc193 100644 --- a/checks/if_brocade +++ b/checks/if_brocade @@ -24,11 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def fix_if_64_highspeed(info): - for line in info: - if type(line[3]) in [ str, unicode ]: # not yet converted - line[3] = saveint(line[3]) * 1000000 - def if_brocade_convert(info): iftab, ssidtab = info ssid_dict = dict(ssidtab) diff --git a/checks/if_lancom b/checks/if_lancom index 9c9b035..15f3c4b 100644 --- a/checks/if_lancom +++ b/checks/if_lancom @@ -24,11 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def fix_if_64_highspeed(info): - for line in info: - if type(line[3]) in [ str, unicode ]: # not yet converted - line[3] = saveint(line[3]) * 1000000 - def if_lancom_convert(info): iftab, ssidtab = info ssid_dict = dict(ssidtab)

8 years, 4 months

#3206 FIX esx_vsphere_hostsystem.mem_usage_cluster: Fixed broken check

by Lars Michelsen

Module: check_mk Branch: master Commit: c42a925e9742d7b308e9905737b2694722680f86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c42a925e9742d7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 15 16:52:16 2016 +0100 #3206 FIX esx_vsphere_hostsystem.mem_usage_cluster: Fixed broken check --- .werks/3206 | 10 ++++++++++ ChangeLog | 1 + checks/esx_vsphere_hostsystem | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3206 b/.werks/3206 new file mode 100644 index 0000000..b78e6ee --- /dev/null +++ b/.werks/3206 @@ -0,0 +1,10 @@ +Title: esx_vsphere_hostsystem.mem_usage_cluster: Fixed broken check +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455551517 + + diff --git a/ChangeLog b/ChangeLog index 757b72f..55aabc1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters * 3075 FIX: windows agent: fixed data encryption of realtime updates were incompatible... * 3205 FIX: raritan_pdu_inlet: Fixed exception in case phases report a non OK state + * 3206 FIX: esx_vsphere_hostsystem.mem_usage_cluster: Fixed broken check Multisite: * 3059 FIX: Fixed highlighting of availability timeline time slices diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index 4077a85..284f443 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -127,7 +127,7 @@ def check_esx_vsphere_hostsystem_mem_cluster(item, params, info): if nodes_count >= count: warn, crit = levels warn_perf = warn * total_memory_size / 100 - crit_perf = cirt * total_memory_size / 100 + crit_perf = crit * total_memory_size / 100 if level > crit: state = 2

8 years, 4 months

Check man pages: Fixed exception handling in case of broken man pages

by Lars Michelsen

Module: check_mk Branch: master Commit: 1653901caa4a18e163fed4eeb6e0e921ad5f688f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1653901caa4a18… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 15 16:19:35 2016 +0100 Check man pages: Fixed exception handling in case of broken man pages --- defaults | 1 + modules/check_mk.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/defaults b/defaults index f6e7c06..65d91a4 100644 --- a/defaults +++ b/defaults @@ -29,3 +29,4 @@ livestatus_unix_socket = 'nagios/live' web_dir = 'web' pnp_templates_dir = 'pnp-templates' doc_dir = 'checkman' +tmp_dir = 'var/tmp' diff --git a/modules/check_mk.py b/modules/check_mk.py index 23247f2..447e697 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2888,7 +2888,7 @@ def show_check_manual(checkname): output.flush() output.close() except Exception, e: - print "Invalid check manpage %s: missing %s" % (filename, e) + sys.stdout.write("Invalid check manpage %s: %s\n" % (checkname, e)) #.

8 years, 4 months

#3076 FIX fixed broken views in check_mk raw edition

by Sebastian Herbord

Module: check_mk Branch: master Commit: 9f759c6f0fb2191a3657c5bbd0ee588b0054cfd8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f759c6f0fb219… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 15 15:53:37 2016 +0100 #3076 FIX fixed broken views in check_mk raw edition --- .werks/3076 | 8 ++++++++ ChangeLog | 1 + web/plugins/views/commands.py | 2 ++ 3 files changed, 11 insertions(+) diff --git a/.werks/3076 b/.werks/3076 new file mode 100644 index 0000000..e7245c9 --- /dev/null +++ b/.werks/3076 @@ -0,0 +1,8 @@ +Title: fixed broken views in check_mk raw edition +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.9i1 +Date: 1455547912 +Class: fix + diff --git a/ChangeLog b/ChangeLog index 39197c4..8388acb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ Multisite: * 3059 FIX: Fixed highlighting of availability timeline time slices * 3175 FIX: Fix timeranges of graphs that are embedded in a dashboard... + * 3076 FIX: fixed broken views in check_mk raw edition WATO: * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 0c19723..af56bff 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -717,6 +717,8 @@ def has_recurring_downtimes(): try: wato.recurring_downtimes_types # Check if this exists return True + except AttributeError: + return False except NameError: return False

8 years, 4 months

windows agent: updated binaries

by Sebastian Herbord

Module: check_mk Branch: master Commit: a032563db370fe098112168d3e1e03ff0b2cb424 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a032563db370fe… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 15 15:32:07 2016 +0100 windows agent: updated binaries --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 909824 -> 909824 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 909824 -> 909824 bytes agents/windows/check_mk_agent.exe | Bin 835584 -> 835584 bytes agents/windows/check_mk_agent.msi | Bin 2006016 -> 2006016 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 835584 -> 835584 bytes agents/windows/install_agent-64.exe | Bin 418320 -> 418320 bytes agents/windows/install_agent.exe | Bin 408684 -> 408685 bytes 8 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 6f2c618..a369ea6 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1335 +1337 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 4a7a922..f4ac56c 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index cab6ca2..c894aaf 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index ff5ab48..c2e1df2 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index b152115..209cb8f 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index bf7c2e2..c9ce522 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index a30ce28..b98cd9c 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index b86b2c7..4e25713 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 4 months

← Newer
1
...
10
11
12
13
14
15
16
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016