Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: Fixed different things in visual editing code for reporting

by Lars Michelsen

Module: check_mk Branch: master Commit: 4cc9656485e1a6958027f41e484ebd7076772a29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4cc9656485e1a6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 6 15:56:59 2015 +0100 Fixed different things in visual editing code for reporting --- web/htdocs/dashboard.py | 6 +----- web/htdocs/visuals.py | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 1047389..3a99796 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -941,11 +941,7 @@ def page_edit_dashlet(): totext = dashlet_type['title'], title = _('Dashlet Type'), )), - ('single_infos', FixedValue(single_infos, - title = _('Show information of single'), - totext = single_infos and ', '.join(single_infos) \ - or _('Not restricted to showing a specific object.'), - )), + visuals.single_infos_spec(single_infos), ('background', Checkbox( title = _('Colored Background'), label = _('Render background'), diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 8fca96b..e58c2ef 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -601,11 +601,7 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, render = 'form', optional_keys = None, elements = [ - ('single_infos', FixedValue(single_infos, - title = _('Specific objects'), - totext = single_infos and ', '.join(single_infos) \ - or _('Showing information of multiple objects.'), - )), + single_infos_spec(single_infos), ('name', TextAscii( title = _('Unique ID'), help = _("The ID will be used in URLs that point to a view, e.g. " @@ -1089,14 +1085,15 @@ def SingleInfoSelection(info_keys, **args): # Converts a context from the form { filtername : { ... } } into # the for { infoname : { filtername : { } } for editing. -def pack_context_for_editing(context): +def pack_context_for_editing(visual, info_handler): # We need to pack all variables into dicts with the name of the # info. Since we have no mapping from info the the filter variable, # we pack into every info every filter. The dict valuespec will # pick out what it needs. Yurks. packed_context = {} - for info_name in infos.keys(): - packed_context[info_name] = context + info_keys = info_handler and info_handler(visual) or infos.keys() + for info_name in info_keys: + packed_context[info_name] = visual.get('context', {}) return packed_context def unpack_context_after_editing(packed_context): @@ -1119,6 +1116,13 @@ def unpack_context_after_editing(packed_context): # | | # '----------------------------------------------------------------------' +def single_infos_spec(single_infos): + return ('single_infos', FixedValue(single_infos, + title = _('Show information of single'), + totext = single_infos and ', '.join(single_infos) \ + or _('Not restricted to showing a specific object.'), + )) + def verify_single_contexts(what, visual): for k, v in get_singlecontext_html_vars(visual).items(): if v == None:

9 years, 4 months

Check_MK Git: check_mk: fixed broken default.php template

by Andreas Boesl

Module: check_mk Branch: master Commit: abb5096a5e2e57f09242cbcc43da9839eccce793 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abb5096a5e2e57… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 6 14:57:02 2015 +0100 fixed broken default.php template --- pnp-templates/default.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pnp-templates/default.php b/pnp-templates/default.php index 09cb5d8..cf99bcf 100644 --- a/pnp-templates/default.php +++ b/pnp-templates/default.php @@ -28,15 +28,18 @@ $fd = @fopen($url . "pnp_template.py" . "&service=" . urlencode($servicedesc) . "&perfdata=" . urlencode($NAGIOS_PERFDATA) . "&check_command=" . urlencode($NAGIOS_CHECK_COMMAND), "r"); + +$use_legacy_template = True; if ($fd) { while (!feof($fd)) { + $use_legacy_template = False; $opt[] = trim(fgets($fd)); $def[] = trim(fgets($fd)); } } -else -{ +if ($use_legacy_template) +{ $_WARNRULE = '#FFFF00'; $_CRITRULE = '#FF0000'; $_AREA = '#256aef'; @@ -93,7 +96,7 @@ else $vlabel = $VAL['UNIT']; } - $opt[$KEY] = '--vertical-label "' . $titel . $vlabel . '" --title "' . $this->MACRO['DISP_HOSTNAME'] . ' / ' . $this->MACRO['DISP_SERVICEDESC'] . '"' . $upper . $lower; + $opt[$KEY] = '--vertical-label "' . $vlabel . '" --title "' . $this->MACRO['DISP_HOSTNAME'] . ' / ' . $this->MACRO['DISP_SERVICEDESC'] . '"' . $upper . $lower; $ds_name[$KEY] = $VAL['LABEL']; $def[$KEY] = rrd::def ("var1", $VAL['RRDFILE'], $VAL['DS'], "AVERAGE"); $def[$KEY] .= rrd::gradient("var1", "3152A5", "BDC6DE", rrd::cut($VAL['NAME'],16), 20);

9 years, 4 months

Check_MK Git: check_mk: #1937 cpu.loads: performance graph now displays number of CPUs

by Andreas Boesl

Module: check_mk Branch: master Commit: 7a83b2d8d136ed5d708a219c9cdf62f105193f4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a83b2d8d136ed… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 6 14:09:14 2015 +0100 #1937 cpu.loads: performance graph now displays number of CPUs --- .werks/1937 | 9 +++++++++ ChangeLog | 1 + pnp-templates/check_mk-cpu.loads.php | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/.werks/1937 b/.werks/1937 new file mode 100644 index 0000000..99cea39 --- /dev/null +++ b/.werks/1937 @@ -0,0 +1,9 @@ +Title: cpu.loads: performance graph now displays number of CPUs +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i1 +Date: 1423228119 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index fcfb4cb..15c1368 100644 --- a/ChangeLog +++ b/ChangeLog @@ -159,6 +159,7 @@ * 1815 Dashboard: Sidebar snapins can now be added as dashlets to dashboards... * 1973 Added intelligent host and service type icons to default views... * 1979 Relative timestamps display warnings when they should be in future but are in past + * 1937 cpu.loads: performance graph now displays number of CPUs * 1781 FIX: Fix broken grouping by host/service group in availability * 1783 FIX: Finish the view "History of Scheduled Downtimes"... * 1206 FIX: Hostname not longer shown as column in host views diff --git a/pnp-templates/check_mk-cpu.loads.php b/pnp-templates/check_mk-cpu.loads.php index 659724d..a52ba70 100644 --- a/pnp-templates/check_mk-cpu.loads.php +++ b/pnp-templates/check_mk-cpu.loads.php @@ -58,6 +58,10 @@ if ($WARN[1]) { . ""; } +if ($MAX[1]) { + $def[1] .= "COMMENT:\" Number of CPUs $MAX[1]\" "; +} + if (isset($RRD["predict_load15"])) { $def[1] .= "" . "DEF:predict=$RRD[predict_load15] "

9 years, 4 months

Check_MK Git: check_mk: #1980 FIX logwatch: Fixed exception when acknowledging errors of a single logfile on a single host

by Lars Michelsen

Module: check_mk Branch: master Commit: 06a13b9003f045d054e9657761651f29354c81f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06a13b9003f045… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 6 13:57:19 2015 +0100 #1980 FIX logwatch: Fixed exception when acknowledging errors of a single logfile on a single host --- .werks/1980 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/logwatch.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1980 b/.werks/1980 new file mode 100644 index 0000000..a63e909 --- /dev/null +++ b/.werks/1980 @@ -0,0 +1,10 @@ +Title: logwatch: Fixed exception when acknowledging errors of a single logfile on a single host +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1423227422 + + diff --git a/ChangeLog b/ChangeLog index ee0a13a..fcfb4cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -184,6 +184,7 @@ * 1221 FIX: veeam_client: Multisite perfometer is now more robust * 1989 FIX: Fix sorting of services in availability views * 1978 FIX: Fixed linking to other views using "joined columns"... + * 1980 FIX: logwatch: Fixed exception when acknowledging errors of a single logfile on a single host WATO: * 1760 Added search form to manual checks page diff --git a/web/htdocs/logwatch.py b/web/htdocs/logwatch.py index 49a20be..bd451ed 100644 --- a/web/htdocs/logwatch.py +++ b/web/htdocs/logwatch.py @@ -281,7 +281,7 @@ def do_log_ack(host, filename): os.remove(defaults.logwatch_dir + '/' + this_host + '/' + int_filename) except Exception, e: html.show_error(_('The log file <tt>%s</tt> of host <tt>%s</tt> could not be deleted: %s.') % \ - (html.attrencode(file_display), html.attrencode(this_host), e)) + (html.attrencode(display_name), html.attrencode(this_host), e)) html.message('%s%s' % ( _('Acknowledged %s') % ack_msg,

9 years, 4 months

Check_MK Git: check_mk: Added comment

by Bastian Kuhn

Module: check_mk Branch: master Commit: 58c67e3a9e9963921997adda9bad7a77df14b999 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58c67e3a9e9963… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Feb 6 12:47:30 2015 +0100 Added comment --- checks/ibm_svc_portsas | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks/ibm_svc_portsas b/checks/ibm_svc_portsas index e3fe838..276617c 100644 --- a/checks/ibm_svc_portsas +++ b/checks/ibm_svc_portsas @@ -31,6 +31,8 @@ def inventory_ibm_svc_portsas(info): yield line[0], {'current_state' : line[6]} def check_ibm_svc_portsas(item, params, info): + # This can be removed soon, because the age of the check + # was only about 7 days: if not params: params = { 'current_state' : 'offline' } for line in info:

9 years, 4 months

Check_MK Git: check_mk: ibm_svc_portsas: Check checks agains the portstate on discovery

by Bastian Kuhn

Module: check_mk Branch: master Commit: bd618100b69fa6e0f8fff04d020bc59755c17f2b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd618100b69fa6… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Feb 6 12:46:41 2015 +0100 ibm_svc_portsas: Check checks agains the portstate on discovery --- checkman/ibm_svc_portsas | 2 +- checks/ibm_svc_portsas | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/checkman/ibm_svc_portsas b/checkman/ibm_svc_portsas index ffca097..ff4e1d8 100644 --- a/checkman/ibm_svc_portsas +++ b/checkman/ibm_svc_portsas @@ -7,7 +7,7 @@ description: Checks the status of SAS Ports in an IBM SVC / Storwize V3700 / V7000 device. - Status {online} is {OK}, every other status is {CRIT}. + Every Status Change after Discovery results in a {CRIT} state. Please note: You need the Special Agent agent_ibmsvc to retrieve the monitoring data from the device. Your monitoring user must be able to SSH to the device diff --git a/checks/ibm_svc_portsas b/checks/ibm_svc_portsas index b4b1b70..e3fe838 100644 --- a/checks/ibm_svc_portsas +++ b/checks/ibm_svc_portsas @@ -28,9 +28,11 @@ def inventory_ibm_svc_portsas(info): for line in info: if len(line) in (10, 12) and line[6] != "offline_unconfigured": - yield line[0], None + yield line[0], {'current_state' : line[6]} -def check_ibm_svc_portsas(item, _no_params, info): +def check_ibm_svc_portsas(item, params, info): + if not params: + params = { 'current_state' : 'offline' } for line in info: if len(line) in (10, 12) and line[0] == item: sasport_status = line[6] @@ -38,7 +40,7 @@ def check_ibm_svc_portsas(item, _no_params, info): sasport_type = line[9] infotext = "Status: %s" % sasport_status - if sasport_status == "online": + if sasport_status == params['current_state']: state = 0 else: state = 2

9 years, 4 months

Check_MK Git: check_mk: #1990 FIX Fix two exceptions in PDF exports of host group views

by Mathias Kettner

Module: check_mk Branch: master Commit: e4ded1cb71913fce2d7a684b41530134b3a395aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4ded1cb71913f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 6 12:38:09 2015 +0100 #1990 FIX Fix two exceptions in PDF exports of host group views --- .werks/1990 | 10 ++++++++++ ChangeLog | 3 +++ web/plugins/visuals/filters.py | 12 +++++------- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.werks/1990 b/.werks/1990 new file mode 100644 index 0000000..206b940 --- /dev/null +++ b/.werks/1990 @@ -0,0 +1,10 @@ +Title: Fix two exceptions in PDF exports of host group views +Level: 2 +Component: reporting +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1423222676 + + diff --git a/ChangeLog b/ChangeLog index e19afe6..ee0a13a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -222,6 +222,9 @@ BI: * 1784 FIX: Fix exception in BI Boxes when parents are being used + Reporting & Availability: + * 1990 FIX: Fix two exceptions in PDF exports of host group views + Event Console: * 1845 Keep record of original source IP address of a syslog message or SNMP trap... * 1873 SEC: Escaping event text of event console messages correctly in views... diff --git a/web/plugins/visuals/filters.py b/web/plugins/visuals/filters.py index 4ec065a..2438b67 100644 --- a/web/plugins/visuals/filters.py +++ b/web/plugins/visuals/filters.py @@ -270,12 +270,10 @@ class FilterGroupSelection(Filter): def filter(self, infoname): current_value = self.current_value() - if not current_value: - raise MKGeneralException(_("This view needs a host/service group to be specified. " - "We are missing the URL variable <tt>%s</tt>." % - self.htmlvars[0])) - - return "Filter: %s_name = %s\n" % (self.what, lqencode(current_value)) + if current_value: + return "Filter: %s_name = %s\n" % (self.what, lqencode(current_value)) + else: + return "" def variable_settings(self, row): group_name = row[self.what + "_name"] @@ -296,7 +294,7 @@ class FilterHostgroupVisibility(Filter): if html.var("hostgroupshowempty"): return "" else: - return "Filter: num_hosts > 0\n" + return "Filter: hostgroup_num_hosts > 0\n" declare_filter(101, FilterText("hostgroupnameregex", _("Hostgroup (Regex)"), "hostgroup", "hostgroup_name", "hostgroup_regex", "~~"), _("Search field allowing regular expressions and partial matches on the names of hostgroups"))

9 years, 4 months

Check_MK Git: check_mk: fixed syntax error

by Lutz Helwing

Module: check_mk Branch: master Commit: d50a9fb3b016ea383703d923ca018c9d4bad3663 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d50a9fb3b016ea… Author: Lutz Helwing <lh(a)mathias-kettner.de> Date: Fri Feb 6 12:12:31 2015 +0100 fixed syntax error --- web/plugins/views/painters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 9bc6537..d1c3581 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -154,7 +154,7 @@ def paint_icons(what, row): # b) single string - the icon name (without .png) # c) tuple - icon, link # d) triple - icon, link, title - result = icon['paint'](what, row, tags, custom_vars)a + result = icon['paint'](what, row, tags, custom_vars) if result == None: continue

9 years, 4 months

Check_MK Git: check_mk: check_ftp: Now it' s possible to specify a port in wato configuration

by Bastian Kuhn

Module: check_mk Branch: master Commit: 21dc05eb26223b2cc79716ef59732542bd9f070a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21dc05eb26223b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Feb 6 10:56:12 2015 +0100 check_ftp: Now it's possible to specify a port in wato configuration --- checks/check_ftp | 3 +++ web/plugins/wato/active_checks.py | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/checks/check_ftp b/checks/check_ftp index bc47fae..c9b177d 100644 --- a/checks/check_ftp +++ b/checks/check_ftp @@ -33,6 +33,9 @@ def check_ftp_arguments(params): args = ' -H %s' % quote_shell_string(host) + if "port" in settings: + args += ' -p %d' % settings['port'] + if "response_time" in settings: args += ' -w %f -c %f' % ( settings["response_time"][0]/1000.0, diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 52f63fe..6c7bf48 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -232,6 +232,12 @@ register_rule(group, Transform( Dictionary( elements = [ + ("port", + Integer( + title = _("Portnumber"), + default_value = 21, + ) + ), ( "response_time", Tuple( title = _("Expected response time"),

9 years, 4 months

Check_MK Git: check_mk: Fixed bug in last change

by Lars Michelsen

Module: check_mk Branch: master Commit: 89a7e4676b40a0b0a1a51048b16109d9d2a227df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89a7e4676b40a0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 6 09:53:37 2015 +0100 Fixed bug in last change --- web/plugins/views/painters.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 5165a2d..9bc6537 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -335,6 +335,12 @@ def paint_age(timestamp, has_been_checked, bold_if_younger_than, mode=None, what (mode == "mixed" and age >= 48 * 3600 or age < -48 * 3600): return "age", time.strftime(dateformat + " %H:%M:%S", time.localtime(timestamp)) + warn_txt = '' + if what == 'future' and age > 0: + warn_txt = ' %s' % _('in the past!') + elif what == 'past' and age < 0: + warn_txt = ' %s' % _('in the future!') + # Time delta less than two days => make relative time if age < 0: age = -age @@ -346,12 +352,6 @@ def paint_age(timestamp, has_been_checked, bold_if_younger_than, mode=None, what else: age_class = "age" - warn_txt = '' - if what == 'future' and age > 0: - warn_txt = ' %s' % _('in the past!') - elif what == 'past' and age < 0: - warn_txt = ' %s' % _('in the future!') - return age_class, prefix + html.age_text(age) + warn_txt

9 years, 4 months

← Newer
1
...
20
21
22
23
24
25
26
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2015