Checkmk git commits September 2013

checkmk-commits@lists.checkmk.com

6 participants
227 discussions

Check_MK Git: check_mk: jolokia_metrics.uptime: Added pnp template

by Lars Michelsen

Module: check_mk Branch: master Commit: d1b768fcee679d26c557b9cb5460a209ec0469d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1b768fcee679d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 6 15:41:07 2013 +0200 jolokia_metrics.uptime: Added pnp template --- ChangeLog | 1 + pnp-templates/check_mk-jolokia_metrics.uptime.php | 36 +++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1eb21b9..13b4fdf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -65,6 +65,7 @@ * windows_agent: increased maximum local/plugin script output length to 512kB (output buffer now grows dynamically) * jolokia_metrics: fixed incorrect plugin output for high warn/crit levels + * jolokia_metrics.uptime: Added pnp template * hyperv: Added a check for checking state changes. * df / esx_vsphere_datastore: now able to set absolute levels and levels depending on total disk space of used and free space diff --git a/pnp-templates/check_mk-jolokia_metrics.uptime.php b/pnp-templates/check_mk-jolokia_metrics.uptime.php new file mode 100644 index 0000000..7af9ca2 --- /dev/null +++ b/pnp-templates/check_mk-jolokia_metrics.uptime.php @@ -0,0 +1,36 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +$title = str_replace("_", " ", $servicedesc); +$opt[1] = "--vertical-label 'Uptime (days)' -l0 --title \"$hostname / $title: Time since last reboot\" "; + +$def[1] = "DEF:sec=$RRDFILE[1]:$DS[1]:MAX "; +$def[1] .= "CDEF:uptime=sec,86400,/ "; +$def[1] .= "AREA:uptime#80f000:\"Uptime (days)\"\\n "; +$def[1] .= "LINE:uptime#408000 "; +$def[1] .= "GPRINT:uptime:LAST:\"%7.2lf %s LAST\"\\t "; +$def[1] .= "GPRINT:uptime:MAX:\"%7.2lf %s MAX\" "; +$def[1] .= "GPRINT:uptime:AVERAGE:\"%7.2lf %s AVG\" "; +?>

11 years

Check_MK Git: check_mk: Fixed further POST/ GET problems in rule editor and hosttag editor

by Lars Michelsen

Module: check_mk Branch: master Commit: 279934a4f43dbe57bfcfbe726ced063c3f939f5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=279934a4f43dbe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 10 12:07:36 2013 +0200 Fixed further POST/GET problems in rule editor and hosttag editor --- web/htdocs/wato.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4fa9eb2..cf25d97 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9259,17 +9259,17 @@ def mode_hosttags(phase): topic, title = parse_hosttag_title(title) table.row() edit_url = make_link([("mode", "edit_hosttag"), ("edit", tag_id)]) - delete_url = html.makeactionuri([("_delete", tag_id)]) + delete_url = make_action_link([("mode", "hosttags"), ("_delete", tag_id)]) table.cell(_("Actions"), css="buttons") if nr == 0: html.empty_icon_button() else: - html.icon_button(html.makeactionuri([("_move", str(-nr))]), + html.icon_button(make_action_link([("mode", "hosttags"), ("_move", str(-nr))]), _("Move this tag group one position up"), "up") if nr == len(hosttags) - 1: html.empty_icon_button() else: - html.icon_button(html.makeactionuri([("_move", str(nr))]), + html.icon_button(make_action_link([("mode", "hosttags"), ("_move", str(nr))]), _("Move this tag group one position down"), "down") html.icon_button(edit_url, _("Edit this tag group"), "edit") html.icon_button(delete_url, _("Delete this tag group"), "delete") @@ -9298,7 +9298,7 @@ def mode_hosttags(phase): table.row() topic, title = parse_hosttag_title(title) edit_url = make_link([("mode", "edit_auxtag"), ("edit", nr)]) - delete_url = html.makeactionuri([("_delaux", nr)]) + delete_url = make_action_link([("mode", "hosttags"), ("_delaux", nr)]) table.cell(_("Actions"), css="buttons") html.icon_button(edit_url, _("Edit this auxiliary tag"), "edit") html.icon_button(delete_url, _("Delete this auxiliary tag"), "delete") @@ -10696,18 +10696,20 @@ def create_rule(rulespec, hostname=None, item=NO_ITEM): new_rule.append([""]) return tuple(new_rule) - - def rule_button(action, help=None, folder=None, rulenr=0): if action == None: html.empty_icon_button() else: - vars = [("_folder", folder[".path"]), - ("_rulenr", str(rulenr)), - ("_action", action)] + vars = [ + ("mode", html.var('mode', 'edit_ruleset')), + ("varname", html.var('varname')), + ("_folder", folder[".path"]), + ("_rulenr", str(rulenr)), + ("_action", action) + ] if html.var("host"): vars.append(("host", html.var("host"))) - url = html.makeactionuri(vars) + url = make_action_link(vars) html.icon_button(url, help, action) def parse_rule(ruleset, orig_rule):

11 years

Check_MK Git: check_mk: Fixed bug in keeping current rule folder during delete actions

by Lars Michelsen

Module: check_mk Branch: master Commit: 9e96cd31a6dd12ba6c3dc4838ef7c59ddf22876e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e96cd31a6dd12… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 10 12:13:52 2013 +0200 Fixed bug in keeping current rule folder during delete actions --- web/htdocs/wato.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index cf25d97..4c37207 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10111,7 +10111,8 @@ def mode_ineffective_rules(phase): ("mode", "edit_rule"), ("varname", varname), ("rulenr", rel_rulenr), - ("rule_folder", f[".path"])]) + ("rule_folder", f[".path"]) + ]) html.icon_button(edit_url, _("Edit this rule"), "edit") delete_url = make_action_link([ @@ -10119,7 +10120,9 @@ def mode_ineffective_rules(phase): ("varname", varname), ("_action", "delete"), ("_folder", f[".path"]), - ("_rulenr", rel_rulenr)]) + ("_rulenr", rel_rulenr), + ("rule_folder", f[".path"]) + ]) html.icon_button(delete_url, _("Delete this rule"), "delete") # Rule folder @@ -10707,6 +10710,8 @@ def rule_button(action, help=None, folder=None, rulenr=0): ("_rulenr", str(rulenr)), ("_action", action) ] + if html.var("rule_folder"): + vars.append(("rule_folder", html.var("rule_folder"))) if html.var("host"): vars.append(("host", html.var("host"))) url = make_action_link(vars)

11 years

Check_MK Git: check_mk: automation: snmp scan: adhere rule snmp_without_sys_descr

by Andreas Boesl

Module: check_mk Branch: master Commit: 7953e0cf959fd75abd444c25e45ad671d2beebfd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7953e0cf959fd7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 10 11:57:02 2013 +0200 automation: snmp scan: adhere rule snmp_without_sys_descr --- ChangeLog | 2 ++ modules/automation.py | 15 ++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5cf7d51..9e63238 100644 --- a/ChangeLog +++ b/ChangeLog @@ -172,6 +172,8 @@ inherited values * FIX: Changed several forms from GET to POST to prevent "Request-URI too large" error messages during submitting forms + * FIX: automation snmp scan now adhere rules for shoddy snmp devices + which have no sys description Notifications: * Flexible Notification can now filter service levels diff --git a/modules/automation.py b/modules/automation.py index 99d71f8..00c6674 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -201,13 +201,14 @@ def automation_try_inventory_node(hostname): if cn in existing_checks: found_services += make_inventory(cn, [hostname], True, True) else: - sys_descr = get_single_oid(hostname, ipaddress, ".1.3.6.1.2.1.1.1.0") - if sys_descr != None: - found_services = do_snmp_scan([hostname], True, True) - else: - raise MKSNMPError("Cannot get system description via SNMP. " - "SNMP agent is not responding. Probably wrong " - "community or wrong SNMP version.") + if not in_binary_hostlist(hostname, snmp_without_sys_descr): + sys_descr = get_single_oid(hostname, ipaddress, ".1.3.6.1.2.1.1.1.0") + if sys_descr == None: + raise MKSNMPError("Cannot get system description via SNMP. " + "SNMP agent is not responding. Probably wrong " + "community or wrong SNMP version.") + + found_services = do_snmp_scan([hostname], True, True) except Exception, e: if not dual_host:

11 years

Check_MK Git: check_mk: windows agent: fixed bug with plugin output buffer size

by Andreas Boesl

Module: check_mk Branch: master Commit: 0a503a754369cfadf376b3ad7eddae1f3a662bbe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a503a754369cf… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Sep 10 08:45:18 2013 +0200 windows agent: fixed bug with plugin output buffer size --- ChangeLog | 1 + agents/windows/check_mk_agent.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bc26597..5cf7d51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,7 @@ * FIX: cisco_qos: Catch policies without individual bandwidth limits * mk-job: /var/lib/check_mk_agent/job directory is now created with mode 1777 so mk-job can be used by unprivileged users too + * windows_agent: fixed bug on merging plugin output buffers Notifications: * notify.py: Matching service level: Use the hosts service level if a diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index da4be44..e495e2f 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2299,7 +2299,7 @@ int launch_program(script_container* cont) if (bread > 0) { memset(buf, 0, sizeof(buf)); - ReadFile(read_stdout, buf, sizeof(buf), &bread, NULL); + ReadFile(read_stdout, buf, sizeof(buf) - 1, &bread, NULL); out_offset += snprintf(cont->buffer_work + out_offset, current_heap_size - out_offset, buf); } }

11 years

Check_MK Git: check_mk: Updated bug entries #0950

by Mathias Kettner

Module: check_mk Branch: master Commit: f43309b6c92bf6e6ef459d4ce53d45b7263c4253 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f43309b6c92bf6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 9 17:05:12 2013 +0200 Updated bug entries #0950 --- .bugs/950 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.bugs/950 b/.bugs/950 new file mode 100644 index 0000000..278c265 --- /dev/null +++ b/.bugs/950 @@ -0,0 +1,20 @@ +Title: Handle limit-settings sensefully at availability reporting +Component: multisite +State: open +Date: 2013-09-09 16:33:52 +Targetversion: 1.4.0 +Class: nastiness + +The problem is: we cannot simply us Limit: when querying statehist, since this will +create invalid availability data - silently. The Limit: needs to be applied on the +number of result rows, i.e. hosts and services. This cannot be done with Livestatus +but would need to be done in the AV GUI. + +Furthermore: an AV-report with 1000 services could be very harmful when it +comes to performance. + +One solution could be to hide the AV-Button whenever a query produces more +than X results. + +Another solution could be to implement the Limit just as it should be - +i.e. count the number of lines in the AV GUI.

11 years

Check_MK Git: check_mk: Fix: fix AV computation (removed implicit Limit:)

by Mathias Kettner

Module: check_mk Branch: master Commit: 5682201956fac7e5ca62a2f425ed14a6865643af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5682201956fac7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 9 17:08:44 2013 +0200 Fix: fix AV computation (removed implicit Limit:) --- web/plugins/views/availability.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index d546309..41bbb27 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -485,7 +485,7 @@ def get_availability_data(datasource, filterheaders, range, only_sites, limit, t columns.append("log_output") add_columns = datasource.get("add_columns", []) - rows = do_query_data(query, columns, add_columns, None, filterheaders, only_sites, limit) + rows = do_query_data(query, columns, add_columns, None, filterheaders, only_sites, limit = None) return rows

11 years

Check_MK Git: check_mk: Improved wato_imprt

by Bastian Kuhn

Module: check_mk Branch: master Commit: 2e471ff2941aa739628e206d5679e8a522c72c5a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e471ff2941aa7… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Sep 9 16:52:47 2013 +0200 Improved wato_imprt --- doc/treasures/wato_import.py | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/doc/treasures/wato_import.py b/doc/treasures/wato_import.py index c45995d..2a97aa1 100755 --- a/doc/treasures/wato_import.py +++ b/doc/treasures/wato_import.py @@ -37,28 +37,36 @@ except: print """Run this script inside a OMD site Usage: ./wato_import.py csvfile.csv CSV Example: - wato_foldername;hostname;host_alias""" + wato_foldername;hostname;host_alias;ipaddress|None""" sys.exit() folders = {} for line in datei: - ordner, name, alias = line.split(';')[:3] + ordner, name, alias, ipaddress = line.split(';')[:4] if ordner: try: os.makedirs(pathlokal+ordner) except os.error: pass folders.setdefault(ordner,[]) - - folders[ordner].append((name,alias)) + ipaddress = ipaddress.strip() + if ipaddress == "None": + ipaddress = False + folders[ordner].append((name,alias,ipaddress)) datei.close() for folder in folders: all_hosts = "" host_attributes = "" - for name, alias in folders[folder]: + ips = "" + for name, alias, ipaddress in folders[folder]: all_hosts += "'%s',\n" % (name) - host_attributes += "'%s' : {'alias' : u'%s' },\n" % (name, alias) + if ipaddress: + host_attributes += "'%s' : {'alias' : u'%s', 'ipaddress' : '%s' },\n" % (name, alias, ipaddress) + ips += "'%s' : '%s'," % ( name, ipaddress ) + else: + host_attributes += "'%s' : {'alias' : u'%s' },\n" % (name, alias) + ziel = open(pathlokal + folder + '/hosts.mk','w') ziel.write('all_hosts += [') @@ -66,5 +74,9 @@ for folder in folders: ziel.write(']\n\n') ziel.write('host_attributes.update({') ziel.write(host_attributes) - ziel.write('})') + ziel.write('})\n\n') + if len(ips) > 0: + ziel.write('ipaddresses.update({') + ziel.write(ips) + ziel.write('})\n\n') ziel.close()

11 years

Check_MK Git: check_mk: Do not hide Livestatus debug message when hovering

by Mathias Kettner

Module: check_mk Branch: master Commit: 8656f9dadd8e07645d8e78987bfbda489dd22705 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8656f9dadd8e07… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 9 16:08:35 2013 +0200 Do not hide Livestatus debug message when hovering --- web/htdocs/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 262411a..1a70694 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1939,7 +1939,7 @@ def do_query_data(query, columns, add_columns, merge_column, html.live.set_limit(limit + 1) # + 1: We need to know, if limit is exceeded if config.debug_livestatus_queries \ and html.output_format == "html" and 'W' in html.display_options: - html.write('<div class="livestatus message" onmouseover="this.style.display=\'none\';">' + html.write('<div class="livestatus message">' '<tt>%s</tt></div>\n' % (query.replace('\n', '<br>\n'))) if only_sites:

11 years

Check_MK Git: check_mk: LogEntry.cc: fixed query of LOGCLASS_INFO objects

by Andreas Boesl

Module: check_mk Branch: master Commit: 32a9cf514b62f93ccf4c63741ef1169cfd537cf7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32a9cf514b62f9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sat Sep 7 09:25:09 2013 +0200 LogEntry.cc: fixed query of LOGCLASS_INFO objects --- livestatus/src/LogEntry.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 098fb32..5138fd2 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -67,6 +67,9 @@ LogEntry::LogEntry(unsigned lineno, char *line, unsigned logclasses = LOGCLASS_A _time = atoi(_msg+1); _text = _msg + 13; // also skip space after timestamp + // If LOGCLASS_INFO is in logclasses we can't thin out the function calls + logclasses = 1 << LOGCLASS_INFO & logclasses ? LOGCLASS_ALL : logclasses; + // now classify the log message. Some messages // refer to other table, some do not. if (((1 << LOGCLASS_ALERT & logclasses) && handleStatusEntry()) ||

11 years

← Newer
1
...
16
17
18
19
20
21
22
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2013