Checkmk git commits October 2013

checkmk-commits@lists.checkmk.com

6 participants
384 discussions

Check_MK Git: check_mk: FIX: avoid invalid cache of 2nd and up hosts in bulk inventory

by Mathias Kettner

Module: check_mk Branch: master Commit: 6bcc6712aeadcb539cd069455035bdcbad5a28d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6bcc6712aeadcb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 14 19:33:15 2013 +0200 FIX: avoid invalid cache of 2nd and up hosts in bulk inventory --- ChangeLog | 1 + modules/automation.py | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 984e442..332de69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * FIX: avoid exception nodes of cluster have different agent type * FIX: continue inventory, if one check does not support it * FIX: fix configuration of explicit SNMP community, allow unicode + * FIX: avoid invalid cache of 2nd and up hosts in bulk inventory Multisite: * Speed-O-Meter: now measure only service checks. Host checks diff --git a/modules/automation.py b/modules/automation.py index 4ddda88..f9b7034 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -308,6 +308,11 @@ def automation_try_inventory_node(hostname, leave_no_tcp=False): global g_service_description g_service_description = descr infotype = ct.split('.')[0] + + # Sorry. The whole caching stuff is the most horrible hack in + # whole Check_MK. Nobody dares to clean it up, YET. But that + # day is getting nearer... + old_opt_use_cachefile = opt_use_cachefile opt_use_cachefile = True if not leave_no_tcp: opt_no_tcp = True @@ -340,6 +345,8 @@ def automation_try_inventory_node(hostname, leave_no_tcp=False): else: tcp_error = output + opt_use_cachefile = old_opt_use_cachefile + if exitcode == None: check_function = check_info[ct]["check_function"] if state_type != 'manual':

10 years, 11 months

Check_MK Git: check_mk: Fixed some inline comments

by Mathias Kettner

Module: check_mk Branch: master Commit: d55154a3d1bdc99f4bd3dcea2c5fc9b912885a88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d55154a3d1bdc9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 14 19:04:34 2013 +0200 Fixed some inline comments --- modules/check_mk.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index 9c6d5ff..df9dde5 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -610,6 +610,7 @@ def check_interval_of(hostname, checkname): if match is None or match == checkname: return minutes # use first match +#. # +----------------------------------------------------------------------+ # | ____ _ _ __ __ ____ | # | / ___|| \ | | \/ | _ \ | @@ -660,6 +661,7 @@ def is_snmpv2c_host(hostname): def is_usewalk_host(hostname): return in_binary_hostlist(hostname, usewalk_hosts) +#. # .--Classic SNMP--------------------------------------------------------. # | ____ _ _ ____ _ _ __ __ ____ | # | / ___| | __ _ ___ ___(_) ___ / ___|| \ | | \/ | _ \ |

10 years, 11 months

Check_MK Git: check_mk: FIX: fix configuration of explicit SNMP community, allow unicode

by Mathias Kettner

Module: check_mk Branch: master Commit: b3ed2d8e62097cdb6127dc1c824575f6e5926f03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3ed2d8e62097c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 14 19:05:15 2013 +0200 FIX: fix configuration of explicit SNMP community, allow unicode --- ChangeLog | 1 + modules/check_mk.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 11074eb..984e442 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * FIX: inventory check now honors settings for exit code * FIX: avoid exception nodes of cluster have different agent type * FIX: continue inventory, if one check does not support it + * FIX: fix configuration of explicit SNMP community, allow unicode Multisite: * Speed-O-Meter: now measure only service checks. Host checks diff --git a/modules/check_mk.py b/modules/check_mk.py index df9dde5..ff09864 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -714,7 +714,7 @@ def snmp_base_command(what, hostname): command = 'snmpbulkwalk' # Handle V1 and V2C - if type(credentials) == str: + if type(credentials) in [ str, unicode ]: if is_bulkwalk_host(hostname): options = '-v2c' else:

10 years, 11 months

Check_MK Git: check_mk: WATO: New option for full SNMP scan in bulk inventory

by Mathias Kettner

Module: check_mk Branch: master Commit: 1c811fc4e3cf80ec8d9ca3955cb2ce50c4bb5926 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c811fc4e3cf80… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 14 20:57:20 2013 +0200 WATO: New option for full SNMP scan in bulk inventory --- ChangeLog | 1 + modules/automation.py | 35 +++++++++++++++++++++++++---------- modules/check_mk_base.py | 4 +++- web/htdocs/wato.py | 10 +++++++--- 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46ba14f..d2f562c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * You can now have site-specific global settings when using distributed WATO (available in the "Distributed Monitoring") * bulk inventory: display percentage in progress bar + * New option for full SNMP scan in bulk inventory * FIX: correct display of number of hosts in bulk inventory 1.2.3i4: diff --git a/modules/automation.py b/modules/automation.py index f9b7034..8a46ee3 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -89,10 +89,20 @@ def do_automation(cmd, args): # "fixall" - find new, remove exceeding # "refresh" - drop all services and reinventorize def automation_inventory(args): - global opt_use_cachefile, inventory_max_cachefile_age - if args[0] == "--cache": + global opt_use_cachefile, inventory_max_cachefile_age, check_max_cachefile_age + + # perform full SNMP scan on SNMP devices? + if args[0] == "@scan": + with_snmp_scan = True + args = args[1:] + else: + with_snmp_scan = False + + # use cache files if present? + if args[0] == "@cache": opt_use_cachefile = True inventory_max_cachefile_age = 1000000000 + check_max_cachefile_age = 1000000000 args = args[1:] else: opt_use_cachefile = False @@ -119,7 +129,7 @@ def automation_inventory(args): for hostname in hostnames: try: # Compute current state of new and existing checks - table = automation_try_inventory([hostname], leave_no_tcp=True) + table = automation_try_inventory([hostname], leave_no_tcp=True, with_snmp_scan=with_snmp_scan) # Create new list of checks new_items = [] @@ -158,13 +168,17 @@ def automation_inventory(args): return (count_added, count_removed, count_kept, count_new), failed_hosts -def automation_try_inventory(args, leave_no_tcp=False): +def automation_try_inventory(args, leave_no_tcp=False, with_snmp_scan=False): global opt_use_cachefile, inventory_max_cachefile_age, check_max_cachefile_age - if args[0] == '--cache': + if args[0] == '@noscan': + args = args[1:] + with_snmp_scan = False opt_use_cachefile = True check_max_cachefile_age = 1000000000 inventory_max_cachefile_age = 1000000000 + elif args[0] == '@scan': args = args[1:] + with_snmp_scan = True hostname = args[0] @@ -174,7 +188,7 @@ def automation_try_inventory(args, leave_no_tcp=False): if is_cluster(hostname): already_added = set([]) for node in nodes_of(hostname): - new_services = automation_try_inventory_node(node, leave_no_tcp=leave_no_tcp) + new_services = automation_try_inventory_node(node, leave_no_tcp=leave_no_tcp, with_snmp_scan=with_snmp_scan) for entry in new_services: if host_of_clustered_service(node, entry[6]) == hostname: # 1: check, 6: Service description @@ -190,7 +204,7 @@ def automation_try_inventory(args, leave_no_tcp=False): already_added.add( (ct, descr) ) # make it unique else: - new_services = automation_try_inventory_node(hostname, leave_no_tcp=leave_no_tcp) + new_services = automation_try_inventory_node(hostname, leave_no_tcp=leave_no_tcp, with_snmp_scan=with_snmp_scan) for entry in new_services: host = host_of_clustered_service(hostname, entry[6]) if host == hostname: @@ -202,7 +216,7 @@ def automation_try_inventory(args, leave_no_tcp=False): -def automation_try_inventory_node(hostname, leave_no_tcp=False): +def automation_try_inventory_node(hostname, leave_no_tcp=False, with_snmp_scan=False): global opt_use_cachefile, opt_no_tcp, opt_dont_submit try: @@ -219,7 +233,7 @@ def automation_try_inventory_node(hostname, leave_no_tcp=False): snmp_error = None if is_snmp_host(hostname): try: - if opt_use_cachefile: + if not with_snmp_scan: existing_checks = set([ cn for (cn, item) in get_check_table(hostname) ]) for cn in inventorable_checktypes("snmp"): if cn in existing_checks: @@ -230,7 +244,8 @@ def automation_try_inventory_node(hostname, leave_no_tcp=False): if sys_descr == None: raise MKSNMPError("Cannot get system description via SNMP. " "SNMP agent is not responding. Probably wrong " - "community or wrong SNMP version.") + "community or wrong SNMP version. IP address is %s" % + ipaddress) found_services = do_snmp_scan([hostname], True, True) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 55a7046..1b37a71 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -548,7 +548,9 @@ def read_cache_file(relpath, max_cache_age): sys.stderr.write("Using data from cachefile %s.\n" % cachefile) return result elif opt_debug: - sys.stderr.write("Skipping cache file %s: Too old\n" % cachefile) + sys.stderr.write("Skipping cache file %s: Too old " + "(age is %d sec, allowed is %d sec)\n" % + (cachefile, cachefile_age(cachefile), max_cache_age)) if simulation_mode and not opt_no_cache: raise MKGeneralException("Simulation mode and no cachefile present.") diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e372316..be5ba4f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2193,7 +2193,7 @@ def mode_inventory(phase, firsttime): config.need_permission("wato.services") check_host_permissions(hostname) if html.check_transaction(): - cache_options = not html.var("_scan") and [ '--cache' ] or [] + cache_options = html.var("_scan") and [ '@scan' ] or [ '@noscan' ] table = check_mk_automation(host[".siteid"], "try-inventory", cache_options + [hostname]) table.sort() active_checks = {} @@ -2229,7 +2229,7 @@ def show_service_table(host, firsttime): hostname = host[".name"] # Read current check configuration - cache_options = not html.var("_scan") and [ '--cache' ] or [] + cache_options = html.var("_scan") and [ '@scan' ] or [ '@noscan' ] # We first try using the Cache (if the user has not pressed Full Scan). # If we do not find any data, we omit the cache and immediately try @@ -2611,7 +2611,9 @@ def mode_bulk_inventory(phase): load_hosts(folder) arguments = [how,] + hostnames if html.var("use_cache"): - arguments = [ "--cache" ] + arguments + arguments = [ "@cache" ] + arguments + if html.var("do_scan"): + arguments = [ "@scan" ] + arguments counts, failed_hosts = check_mk_automation(site_id, "inventory", arguments) #counts = ( 1, 2, 3, 4 ) result = repr([ 'continue', num_hosts, 0 ] + list(counts)) + "\n" @@ -2779,6 +2781,8 @@ def mode_bulk_inventory(phase): forms.section(_("Performance options")) html.checkbox("use_cache", True, label=_("Use cached data if present")) html.write("<br>") + html.checkbox("do_scan", True, label=_("Do full SNMP scan for SNMP devices")) + html.write("<br>") html.write(_("Number of hosts to handle at once:") + " ") html.number_input("bulk_size", 10, size=3)

10 years, 11 months

Check_MK Git: check_mk: inventory check of SNMP devices now does scan per default

by Mathias Kettner

Module: check_mk Branch: master Commit: 4219e778b6f17a1eac51b5866ad8f97b539bc183 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4219e778b6f17a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 14 20:02:37 2013 +0200 inventory check of SNMP devices now does scan per default Previously the inventory check for SNMP devices just detected new items for already configured checks. Now it does the usual SNMP scan that is also done during cmk -I. This can be switched off the the old beviour with inventory_check_do_scan = False and also via WATO --- ChangeLog | 1 + modules/check_mk.py | 16 ++++++++++++++-- web/plugins/wato/check_mk_configuration.py | 11 +++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 332de69..46ba14f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * FIX: continue inventory, if one check does not support it * FIX: fix configuration of explicit SNMP community, allow unicode * FIX: avoid invalid cache of 2nd and up hosts in bulk inventory + * inventory check of SNMP devices now does scan per default (configurable) Multisite: * Speed-O-Meter: now measure only service checks. Host checks diff --git a/modules/check_mk.py b/modules/check_mk.py index ff09864..8211c1c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -243,6 +243,7 @@ explicit_snmp_communities = {} # override the rule based configuration # Inventory and inventory checks inventory_check_interval = None # Nagios intervals (4h = 240) inventory_check_severity = 1 # warning +inventory_check_do_scan = True # include SNMP scan for SNMP devices inventory_max_cachefile_age = 120 # secs. always_cleanup_autochecks = True @@ -2713,13 +2714,24 @@ def check_inventory(hostname): is_snmp = is_snmp_host(hostname) is_tcp = is_tcp_host(hostname) check_table = get_check_table(hostname) + if is_snmp and inventory_check_do_scan: + try: + ipaddress = lookup_ipaddress(hostname) + snmp_checktypes = snmp_scan(hostname, ipaddress) + except: + if opt_debug: + raise + pass + else: + snmp_checktypes = [] + hosts_checktypes = set([ ct for (ct, item), params in check_table.items() ]) try: for ct in inventorable_checktypes("all"): if check_uses_snmp(ct) and not is_snmp: continue # Skip SNMP checks on non-SNMP hosts - elif check_uses_snmp(ct) and ct not in hosts_checktypes: - continue # Do not look for new SNMP services (maybe change in future) + elif check_uses_snmp(ct) and ct not in hosts_checktypes and ct not in snmp_checktypes: + continue # Only try positive scans and existing types elif not check_uses_snmp(ct) and not is_tcp: continue # Skip TCP checks on non-TCP hosts diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 88b360a..057f89e 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1013,6 +1013,17 @@ register_configvar(group, (3, _("Unknown") ), ])) +register_configvar(group, + "inventory_check_do_scan", + DropdownChoice( + title = _("Inventory check for SNMP devices"), + choices = [ + ( True, _("Perform full SNMP scan always, detect new check types") ), + ( False, _("Just rely on existing check files, detect new items only") ) + ] + )) + + _if_portstate_choices = [ ( '1', 'up(1)'), ( '2', 'down(2)'),

10 years, 11 months

Check_MK Git: check_mk: a few grammar fixes in help texts

by Götz Golla

Module: check_mk Branch: master Commit: fb37535aeaf0ad7fa063b47d1db902e6f174183f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb37535aeaf0ad… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Oct 14 17:19:21 2013 +0200 a few grammar fixes in help texts --- web/htdocs/wato.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e7fad09..b341690 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12822,7 +12822,7 @@ def declare_bi_valuespecs(aggregation_rules): CascadingDropdown( title = _("Nodes to create:"), help = _("When calling a rule you can use the place holder <tt>$1$</tt> " - "in the rule arguments. This will be replaced by the actual host " + "in the rule arguments. It will be replaced by the actual host " "names found by the search - one host name for each rule call."), choices = subnode_choices, ), @@ -12852,7 +12852,7 @@ def declare_bi_valuespecs(aggregation_rules): CascadingDropdown( title = _("Nodes to create:"), help = _("When calling a rule you can use the place holder <tt>$1$</tt> " - "in the rule arguments. This will be replaced by the actual host " + "in the rule arguments. It will be replaced by the actual host " "names found by the search - one host name for each rule call. If you " "have regular expression subgroups in the service pattern, then " "the place holders <tt>$2$</tt> will represent the first group match, " @@ -12986,7 +12986,7 @@ def mode_bi_edit_rule(phase): ( "title", TextUnicode( title = _("Rule Title"), - help = _("The title of the BI nodes that are created from that rule. This will be " + help = _("The title of the BI nodes which are created from this rule. This will be " "displayed as the name of the node in the BI view. For " "top level nodes this title must be unique. You can insert " "rule parameters like <tt>$FOO$</tt> or <tt>$BAR$</tt> here."), @@ -13009,8 +13009,8 @@ def mode_bi_edit_rule(phase): "be named like variables in programming languages. For example you can " "make your rule have the two parameters <tt>HOST</tt> and <tt>INST</tt>. " "When calling the rule - from an aggergation or a higher level rule - " - "you will then specify two arbitrary values for that parameters. In the " - "title of the rule, the host and service names you can then insert the " + "you can then specify two arbitrary values for these parameters. In the " + "title of the rule as well as the host and service names, you can insert the " "actual value of the parameters by <tt>$HOST$</tt> and <tt>$INST$</tt> " "(enclosed in dollar signs)."), orientation = "horizontal",

10 years, 11 months

Check_MK Git: check_mk: man page for new active http check testing forms submission

by Götz Golla

Module: check_mk Branch: master Commit: 74e5dee03cb3606bc57714819c658c38d2dd55fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74e5dee03cb360… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Oct 1 18:29:19 2013 +0200 man page for new active http check testing forms submission --- checkman/check_form_submit | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/checkman/check_form_submit b/checkman/check_form_submit new file mode 100644 index 0000000..84ed9a0 --- /dev/null +++ b/checkman/check_form_submit @@ -0,0 +1,36 @@ +title: HTTP Form Check +agents: active +catalog: agentless +license: GPL +distribution: check_mk +description: + This check performs HTTP requests with some advanced features like + a) Detecting, populating and submitting HTML forms + b) Accepts and uses cookies + c) Follos HTTP redirects + d) Extends HTTP headers + + Several hosts may be specified at once. For this case warning an critical levels may + be given and are applied to the number of successful responses. + + This check can be configured by WATO. + + See the {usage} page of the check for details about the invocation on the command line. + +Examples: + Call the page test.php, find the single form on that page and + submit it with default values: + + ./check_form_submit -I localhost -u /test.php + + Same as above, but expect the string "Hello" in the response + of the form: + + ./check_form_submit -I localhost -u /test.php -e "Hello" + + Login as omdadmin with password omd, in the OMD site named /event, + let the login redirect to the wato.py and expect the string WATO + in this response: + + ./check_form_submit -I localhost -u /event -q '_origtarget=wato.py&_username=omdadmin&_password=omd' -e 'WATO' +

10 years, 11 months

Check_MK Git: check_mk: no more kilomilliseconds in ntp performance graph

by Götz Golla

Module: check_mk Branch: master Commit: ac019bc4bc520baba1be22d60543d058c5732f6d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac019bc4bc520b… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Oct 14 17:17:26 2013 +0200 no more kilomilliseconds in ntp performance graph --- pnp-templates/check_mk-ntp.time.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pnp-templates/check_mk-ntp.time.php b/pnp-templates/check_mk-ntp.time.php index d6c5991..ce05514 100644 --- a/pnp-templates/check_mk-ntp.time.php +++ b/pnp-templates/check_mk-ntp.time.php @@ -25,7 +25,7 @@ $range = $CRIT[1]; -$opt[1] = "--vertical-label 'offset (ms)' -l -$range -u $range --title '$hostname: NTP time offset to preferred peer' "; +$opt[1] = "--vertical-label 'offset (ms)' -X 0 -l -$range -u $range --title '$hostname: NTP time offset to preferred peer' "; $def[1] = "DEF:offset=$RRDFILE[1]:$DS[1]:MAX "; $def[1] .= "DEF:jitter=$RRDFILE[2]:$DS[2]:MAX ";

10 years, 11 months

Check_MK Git: check_mk: man page for new active sql check

by Götz Golla

Module: check_mk Branch: master Commit: 4c00c754845c2d46003ca016c8cdccad655fb543 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c00c754845c2d… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Oct 1 18:29:01 2013 +0200 man page for new active sql check --- checkman/check_sql | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/checkman/check_sql b/checkman/check_sql index a84def1..e157607 100644 --- a/checkman/check_sql +++ b/checkman/check_sql @@ -7,12 +7,12 @@ description: This is an active check that connects to a database server, sends an SQL statement to that server, and checks for the following result: - The query must return three columns, a number, a text, and + The query must return three columns, a number, a text, and optional performance data in the third column. If upper and lower levels are given, the number is being checked against these levels and the according state is being computed. Otherwise the number ist treated as a Nagios state (0,1,2,3). - State, text and the performance data are being returned + State, text and the performance data are being returned. The check works with MySQL, Postgresql and Oracle databases using the python drivers MySQLdb, psycopg2 and cx_Oracle. For cx_Oracle the @@ -20,5 +20,9 @@ description: LD_LIBRARY_PATH needs to be modified to point to the libclntsh.so of that package. + This check can be configured by WATO. + + See the {usage} page of the check for details about the invocation on the command line. + perfdata: - One value: the third field of the database response. + Optionally, one value: the third field of the database response.

10 years, 11 months

Check_MK Git: check_mk: FIX: Fix output format python for several numeric columns

by Mathias Kettner

Module: check_mk Branch: master Commit: abc6d25f17533d91e0f72278d93e97b7d65c9243 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abc6d25f17533d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 14 16:34:52 2013 +0200 FIX: Fix output format python for several numeric columns If you had the column "Service Notification Number", e.g., then run had run into an exception --- ChangeLog | 1 + web/plugins/views/painters.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 989b60c..11074eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ are omitted, since they do not really matter and make the results less useful when using CMC. * FIX: Fixed encoding problem in webservice column output + * FIX: Fix output format python for several numeric columns Checks & Agents: * diskstat: removed (ever incorrect) latency computation for Linux diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 142532d..67c20e2 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -531,7 +531,7 @@ multisite_painters['svc_notification_number'] = { "title" : _("Service notification number"), "short" : _("N#"), "columns" : [ "service_current_notification_number" ], - "paint" : lambda row: ("", row["service_current_notification_number"]), + "paint" : lambda row: ("", str(row["service_current_notification_number"])), } @@ -959,7 +959,7 @@ multisite_painters['host_notification_number'] = { "title" : _("Host notification number"), "short" : _("N#"), "columns" : [ "host_current_notification_number" ], - "paint" : lambda row: ("", saveint(row["host_current_notification_number"])), + "paint" : lambda row: ("", str(row["host_current_notification_number"])), } multisite_painters["host_flapping"] = { @@ -1446,7 +1446,7 @@ multisite_painters["comment_id"] = { "title" : _("Comment id"), "short" : _("ID"), "columns" : ["comment_id"], - "paint" : lambda row: (None, row["comment_id"]), + "paint" : lambda row: (None, str(row["comment_id"])), } multisite_painters["comment_author"] = { "title" : _("Comment author"), @@ -1643,7 +1643,7 @@ multisite_painters["log_attempt"] = { "title" : _("Log: number of check attempt"), "short" : _("Att."), "columns" : ["log_attempt"], - "paint" : lambda row: ("", row["log_attempt"]), + "paint" : lambda row: ("", str(row["log_attempt"])), } multisite_painters["log_state_type"] = { "title" : _("Log: type of state (hard/soft/stopped/started)"),

10 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2013