Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

3091 FIX fixed failure to rename hosts in raw edition

by Sebastian Herbord

Module: check_mk Branch: master Commit: 8bb12c8b71c53f882306f1b9351865ea7e3f3ba4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8bb12c8b71c53f… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Mar 8 11:13:26 2016 +0100 3091 FIX fixed failure to rename hosts in raw edition renaming of hosts would cancel with the error "No such file or directory: '/omd/sites/sitename/var/check_mk/agents/'" --- .werks/3091 | 11 +++++++++++ ChangeLog | 1 + modules/automation.py | 7 ++++--- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.werks/3091 b/.werks/3091 new file mode 100644 index 0000000..ec418f8 --- /dev/null +++ b/.werks/3091 @@ -0,0 +1,11 @@ +Title: fixed failure to rename hosts in raw edition +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457431906 + +renaming of hosts would cancel with the error "No such file or directory: +'/omd/sites/sitename/var/check_mk/agents/'" diff --git a/ChangeLog b/ChangeLog index acb9444..36a51e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ * 3000 FIX: Host check command: "Use a custom check plugin" was not working with CMC... * 3231 FIX: Not showing network scan properties in host search form anymore * 3086 FIX: fixed incorrect host list when one wato folder was a substring of another... + * 3091 FIX: fixed failure to rename hosts in raw edition... Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/modules/automation.py b/modules/automation.py index adaedb0..c54604e 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -873,9 +873,10 @@ def rename_host_files(oldname, newname): # Baked agents agents_dir = var_dir + "/agents/" have_renamed_agent = False - for opsys in os.listdir(agents_dir): - if rename_host_file(agents_dir + opsys, oldname, newname): - have_renamed_agent = True + if os.path.exists(agents_dir): + for opsys in os.listdir(agents_dir): + if rename_host_file(agents_dir + opsys, oldname, newname): + have_renamed_agent = True if have_renamed_agent: actions.append("agent")

8 years, 6 months

3278 FIX fritz_wan_if: Fixed incorrect unit Bit used in check

by Lars Michelsen

Module: check_mk Branch: master Commit: b1da0545a1559e479d415c26ab8eee0b0d602f00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1da0545a1559e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 8 11:08:02 2016 +0100 3278 FIX fritz_wan_if: Fixed incorrect unit Bit used in check --- .werks/3278 | 10 ++++++++++ ChangeLog | 1 + checks/fritz | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3278 b/.werks/3278 new file mode 100644 index 0000000..72e748b --- /dev/null +++ b/.werks/3278 @@ -0,0 +1,10 @@ +Title: fritz_wan_if: Fixed incorrect unit Bit used in check +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457431633 + + diff --git a/ChangeLog b/ChangeLog index a4ace3b..acb9444 100644 --- a/ChangeLog +++ b/ChangeLog @@ -65,6 +65,7 @@ * 3089 FIX: cmciii.temp: added handling for more device states * 3276 FIX: esx_vsphere_vm.snapshot: Graphs now scale the age of the scnapshots correctly * 3277 FIX: veeam_jobs: Handling missing state "Postprocessing" now + * 3278 FIX: fritz_wan_if: Fixed incorrect unit Bit used in check Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/fritz b/checks/fritz index 225d5d7..c63db39 100644 --- a/checks/fritz +++ b/checks/fritz @@ -157,7 +157,7 @@ def check_fritz_wan_if(item, params, info): if 'assumed_speed_out' not in params: params['assumed_speed_out'] = int(data['NewLayer1UpstreamMaxBitRate']) if 'unit' not in params: - params['unit'] = 'Bit' + params['unit'] = 'bit' return check_if_common(item, params, fritz_wan_if_to_if64(data)) check_info["fritz.wan_if"] = {

8 years, 6 months

mk_inventory.solaris: fix detection of global zone

by Mathias Kettner

Module: check_mk Branch: master Commit: cf3717518ec74b8555e2efc279d010f9e9029d02 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf3717518ec74b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 8 11:06:20 2016 +0100 mk_inventory.solaris: fix detection of global zone Option -q on grep was missing --- agents/plugins/mk_inventory.solaris | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/mk_inventory.solaris b/agents/plugins/mk_inventory.solaris index 1674674..fcfe2d3 100755 --- a/agents/plugins/mk_inventory.solaris +++ b/agents/plugins/mk_inventory.solaris @@ -50,7 +50,7 @@ then echo "<<<solaris_uname:sep(61):persist($UNTIL)>>>" uname -X - if zoneadm list | grep -q global + if zoneadm list | grep global >/dev/null 2>&1 then if type prtdiag > /dev/null; then echo "<<<solaris_prtdiag:sep(10):persist($UNTIL)>>>"

8 years, 6 months

3277 FIX veeam_jobs: Handling missing state "Postprocessing" now

by Lars Michelsen

Module: check_mk Branch: master Commit: ae37bb8656af391af58f465d9a4360ab6baa1a5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae37bb8656af39… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 8 10:39:03 2016 +0100 3277 FIX veeam_jobs: Handling missing state "Postprocessing" now --- .werks/3277 | 10 ++++++++++ ChangeLog | 1 + checks/veeam_jobs | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/3277 b/.werks/3277 new file mode 100644 index 0000000..9a5ff30 --- /dev/null +++ b/.werks/3277 @@ -0,0 +1,10 @@ +Title: veeam_jobs: Handling missing state "Postprocessing" now +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457429930 + + diff --git a/ChangeLog b/ChangeLog index a763e0a..a4ace3b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ * 3274 FIX: ibm_svc_disks: Fixed wrong listing of man page * 3089 FIX: cmciii.temp: added handling for more device states * 3276 FIX: esx_vsphere_vm.snapshot: Graphs now scale the age of the scnapshots correctly + * 3277 FIX: veeam_jobs: Handling missing state "Postprocessing" now Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/veeam_jobs b/checks/veeam_jobs index da1eb8c..0ef18c8 100644 --- a/checks/veeam_jobs +++ b/checks/veeam_jobs @@ -51,7 +51,7 @@ def check_veeam_jobs(item, _no_params, info): elif backup_current == 'Idle' and backup_type == "BackupSync": # A sync job is always idle state = 0 - elif backup_current == "Working": + elif backup_current in [ "Working", "Postprocessing" ]: state = 0 line = line[:6] elif backup_status == "Failed":

8 years, 6 months

3090 FIX fixed perf-o-meter link leading to old graph page even when new graphs are being used

by Sebastian Herbord

Module: check_mk Branch: master Commit: f558ed18cb05c028a14e28793774a5a5e4a14818 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f558ed18cb05c0… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Mar 8 10:35:06 2016 +0100 3090 FIX fixed perf-o-meter link leading to old graph page even when new graphs are being used --- .werks/3090 | 10 ++++++++++ ChangeLog | 1 + web/plugins/views/perfometer.py | 8 ++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/3090 b/.werks/3090 new file mode 100644 index 0000000..39d46ae --- /dev/null +++ b/.werks/3090 @@ -0,0 +1,10 @@ +Title: fixed perf-o-meter link leading to old graph page even when new graphs are being used +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457429645 + + diff --git a/ChangeLog b/ChangeLog index eec95b0..a763e0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ * 3230 FIX: Slightly improved popup menu positioning... * 3264 FIX: Fix display of values in graphs that are < 1.0 * 3273 FIX: Dashboard: The dashboard is now preserving edit/view state during page reloads + * 3090 FIX: fixed perf-o-meter link leading to old graph page even when new graphs are being used WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 4d01cb9..7e1390a 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -168,8 +168,12 @@ def paint_perfometer(row): # pnpgraph_present: -1 means unknown (path not configured), 0: no, 1: yes if 'X' in html.display_options and \ - row["service_pnpgraph_present"] != 0: - return "perfometer" + stale_css, ('<a href="%s">%s</a>' % (pnp_url(row, "service"), content)) + row["service_pnpgraph_present"] != 0: + if metrics.cmk_graphs_possible(): + url = new_graphing_url(row, "service") + else: + url = pnp_url(row, "service") + return "perfometer" + stale_css, ('<a href="%s">%s</a>' % (url, content)) else: return "perfometer" + stale_css, content

8 years, 6 months

3276 FIX esx_vsphere_vm.snapshot: Graphs now scale the age of the scnapshots correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: 6fcf764eca4a4d33e0ffae55fea6f3efed042c15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fcf764eca4a4d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 8 10:31:26 2016 +0100 3276 FIX esx_vsphere_vm.snapshot: Graphs now scale the age of the scnapshots correctly --- .werks/3276 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 15 ++++++++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.werks/3276 b/.werks/3276 new file mode 100644 index 0000000..3572738 --- /dev/null +++ b/.werks/3276 @@ -0,0 +1,10 @@ +Title: esx_vsphere_vm.snapshot: Graphs now scale the age of the scnapshots correctly +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457429460 + + diff --git a/ChangeLog b/ChangeLog index 06d3f7d..eec95b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ * 3266 FIX: check_smtp: when set to IPv6 it used the IPv4 address nevertheless * 3274 FIX: ibm_svc_disks: Fixed wrong listing of man page * 3089 FIX: cmciii.temp: added handling for more device states + * 3276 FIX: esx_vsphere_vm.snapshot: Graphs now scale the age of the scnapshots correctly Multisite: * 3187 notification view: new filter for log command via regex diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index f9aae56..7433be8 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -328,6 +328,12 @@ metric_info["uptime"] = { "color" : "#80f000", } +metric_info["age"] = { + "title" : _("Age"), + "unit" : "s", + "color" : "#80f000", +} + metric_info["runtime"] = { "title" : _("Process Runtime"), "unit" : "s", @@ -3428,7 +3434,7 @@ check_metrics["check_mk-apc_symmetra"] = { "runtime" : { "name" : "lifetime_remaining", "scale" : 60 }, } -check_metrics["check_mk-kernel.util"] = { +check_metrics["check_mk-kernel.util"] = { "wait" : { "name" : "io_wait" }, "guest" : { "name" : "cpu_util_guest" }, "steal" : { "name" : "cpu_util_steal" }, @@ -3878,6 +3884,13 @@ perfometer_info.append({ perfometer_info.append({ "type" : "logarithmic", + "metric" : "age", + "half_value" : 2592000.0, + "exponent" : 2, +}) + +perfometer_info.append({ + "type" : "logarithmic", "metric" : "runtime", "half_value" : 864000.0, "exponent" : 2,

8 years, 6 months

3275 FIX Piggyback based services were skipped on "No agent hosts"

by Lars Michelsen

Module: check_mk Branch: master Commit: 0a95c9705d4f8499d971b411266a8bad8531fb0c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a95c9705d4f84… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 8 10:27:17 2016 +0100 3275 FIX Piggyback based services were skipped on "No agent hosts" This issue was introduced with werk #3214. --- .werks/3275 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 6 ++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/3275 b/.werks/3275 new file mode 100644 index 0000000..999620b --- /dev/null +++ b/.werks/3275 @@ -0,0 +1,10 @@ +Title: Piggyback based services were skipped on "No agent hosts" +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457429199 + +This issue was introduced with werk #3214. diff --git a/ChangeLog b/ChangeLog index 88b705a..06d3f7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * 3220 FIX: Check_MK HW/SW Inventory is now always disabled for "No Agent" hosts * 3221 FIX: Fixed broken nagios config because of missing contact group check-mk-notify with rule based notifications enabled... * 3234 FIX: Make unixcat more robust... + * 3275 FIX: Piggyback based services were skipped on "No agent hosts"... Checks & Agents: * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller diff --git a/modules/check_mk.py b/modules/check_mk.py index 4a2ac8e..4e21946 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1835,13 +1835,15 @@ def get_check_table(hostname, remove_duplicates=False, use_cache=True, world='co elif type(hostlist[0]) == str: pass # regular case: list of hostnames elif hostlist != []: - raise MKGeneralException("Invalid entry '%r' in check table. Must be single hostname or list of hostnames" % hostlist) + raise MKGeneralException("Invalid entry '%r' in check table. Must be single hostname " + "or list of hostnames" % hostlist) # Skip SNMP checks for non SNMP hosts (might have been discovered before with other # agent setting. Remove them without rediscovery). Same for agent based checks. if not is_snmp_host(hostname) and is_snmp_check(checkname): return - if not is_tcp_host(hostname) and is_tcp_check(checkname): + if not is_tcp_host(hostname) and not has_piggyback_info(hostname) \ + and is_tcp_check(checkname): return if hosttags_match_taglist(hosttags, tags) and \

8 years, 6 months

3089 FIX cmciii.temp: added handling for more device states

by Sebastian Herbord

Module: check_mk Branch: master Commit: 026b88daffd9f2d00d6091e673dee7391e4075b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=026b88daffd9f2… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Mar 8 10:03:56 2016 +0100 3089 FIX cmciii.temp: added handling for more device states --- .werks/3089 | 10 ++++++++++ ChangeLog | 1 + checks/cmciii | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/.werks/3089 b/.werks/3089 new file mode 100644 index 0000000..c05b623 --- /dev/null +++ b/.werks/3089 @@ -0,0 +1,10 @@ +Title: cmciii.temp: added handling for more device states +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457427809 + + diff --git a/ChangeLog b/ChangeLog index bcc3df4..88b705a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,6 +61,7 @@ * 3087 FIX: fixed very rare crash in active checks... * 3266 FIX: check_smtp: when set to IPv6 it used the IPv4 address nevertheless * 3274 FIX: ibm_svc_disks: Fixed wrong listing of man page + * 3089 FIX: cmciii.temp: added handling for more device states Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/cmciii b/checks/cmciii index ca0e2d1..860b261 100644 --- a/checks/cmciii +++ b/checks/cmciii @@ -533,6 +533,10 @@ def translate_cmciii_temp_status(status_name): return { "ok" : 0, "warning" : 1, + "low warn" : 1, + "high warn": 1, + "too low" : 2, + "too high" : 2, }[status_name.lower()]

8 years, 6 months

3274 FIX ibm_svc_disks: Fixed wrong listing of man page

by Lars Michelsen

Module: check_mk Branch: master Commit: 557eebd477b891d1b184949ef3dc41c011ea236b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=557eebd477b891… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 8 09:46:58 2016 +0100 3274 FIX ibm_svc_disks: Fixed wrong listing of man page --- .werks/3274 | 10 ++++++++++ ChangeLog | 1 + checkman/ibm_svc_disks | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/3274 b/.werks/3274 new file mode 100644 index 0000000..ce70d7e --- /dev/null +++ b/.werks/3274 @@ -0,0 +1,10 @@ +Title: ibm_svc_disks: Fixed wrong listing of man page +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457426790 + + diff --git a/ChangeLog b/ChangeLog index 68956b1..bcc3df4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ * 3258 FIX: dell_idrac_disks: fixed disk and component status handling * 3087 FIX: fixed very rare crash in active checks... * 3266 FIX: check_smtp: when set to IPv6 it used the IPv4 address nevertheless + * 3274 FIX: ibm_svc_disks: Fixed wrong listing of man page Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checkman/ibm_svc_disks b/checkman/ibm_svc_disks index 4e748e9..6f43d02 100644 --- a/checkman/ibm_svc_disks +++ b/checkman/ibm_svc_disks @@ -1,6 +1,6 @@ title: IBM SVC / Storwize V3700 / V7000: Summary of Disks -agents: netapp -catalog: hw/storagehw/netapp +agents: ibm_svc +catalog: hw/storagehw/ibm license: GPL distribution: check_mk description:

8 years, 6 months

Added missing referenced overridable methods and attributes

by Lars Michelsen

Module: check_mk Branch: master Commit: c4e12e93134ae02f4dd8725d3a6a93d900799c64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4e12e93134ae0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 8 09:08:40 2016 +0100 Added missing referenced overridable methods and attributes --- web/htdocs/crash_reporting.py | 1 + web/htdocs/htmllib.py | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/web/htdocs/crash_reporting.py b/web/htdocs/crash_reporting.py index 5239c2f..7f9b9ce 100644 --- a/web/htdocs/crash_reporting.py +++ b/web/htdocs/crash_reporting.py @@ -430,6 +430,7 @@ def format_var_for_export(val, maxdepth=4): # reporting it is totally ok to have some string representations of the objects. class RobustJSONEncoder(json.JSONEncoder): # Are there cases where no __str__ is available? if so, we should do something like %r + # pylint: disable=method-hidden def default(self, o): return "%s" % o diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a24fa4f..de12809 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -81,6 +81,7 @@ __builtin__.HTML = HTML class html(GUITester): def __init__(self): GUITester.__init__(self) + self.cookies = {} self.user = None self.user_errors = {} self.focus_object = None @@ -190,6 +191,7 @@ class html(GUITester): self.lowlevel_write(text) + def plug(self): self.plugged = True self.plugged_text = '' @@ -1705,3 +1707,34 @@ class html(GUITester): self.times[name] += elapsed self.last_measurement = now + + # + # To be overridden by subclasses + # + + def lowlevel_write(self, text): + raise NotImplementedError() + + + def get_button_counts(self): + raise NotImplementedError() + + + def add_custom_style_sheet(self): + raise NotImplementedError() + + + def top_heading(self, title): + raise NotImplementedError() + + + def load_transids(self, lock=False): + raise NotImplementedError() + + + def save_transids(self, used_ids, unlock=False): + raise NotImplementedError() + + + def load_tree_states(self): + raise NotImplementedError()

8 years, 6 months

← Newer
1
...
18
19
20
21
22
23
24
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016