Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: check_mk.example.ini: added some examples regarding plugin timeout, execution, cache and retry_count

by Andreas Boesl

Module: check_mk Branch: master Commit: fe91596bd801eac9db9ef68d7cb4c7332c674c37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe91596bd801ea… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 16 13:46:53 2014 +0200 check_mk.example.ini: added some examples regarding plugin timeout, execution, cache and retry_count --- agents/windows/check_mk.example.ini | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/agents/windows/check_mk.example.ini b/agents/windows/check_mk.example.ini index 9b99ec6..ef54773 100644 --- a/agents/windows/check_mk.example.ini +++ b/agents/windows/check_mk.example.ini @@ -82,8 +82,17 @@ # timeout * = 30 [plugins] + # example: the windows_updates.vbs + # plugin is executed asynchronous + # and is only updated every 3600 seconds + # it may fail (timeout / error) up to 3 times before the last known data is discarded + # execution windows_updates.vbs = async + # timeout windows_updates.vbs = 120 + # cache_age windows_updates.vbs = 3600 + # retry_count windows_udpates.vbs = 3 + # define timeouts for plugin scripts matching # specific patterns - first match wins - # timeout windows_updates.vbs = 20 - # timeout *.vbs = 10 + # timeout ps_perf.ps1 = 20 + # timeout *.ps1 = 10 # timeout * = 30

9 years, 11 months

Check_MK Git: check_mk: #1412 Speed up of displaying and sorting after WATO folder path

by Mathias Kettner

Module: check_mk Branch: master Commit: 232c15cda529d238727b159729838c432833fae4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=232c15cda529d2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 16 13:06:26 2014 +0200 #1412 Speed up of displaying and sorting after WATO folder path --- .werks/1412 | 9 +++++++++ ChangeLog | 1 + web/htdocs/views.py | 10 ++++++++++ web/htdocs/wato.py | 14 +++++++++++--- web/plugins/views/painters.py | 8 -------- 5 files changed, 31 insertions(+), 11 deletions(-) diff --git a/.werks/1412 b/.werks/1412 new file mode 100644 index 0000000..2dec5dd --- /dev/null +++ b/.werks/1412 @@ -0,0 +1,9 @@ +Title: Speed up of displaying and sorting after WATO folder path +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.5i6 +Date: 1413457569 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 472e764..dd7a354 100644 --- a/ChangeLog +++ b/ChangeLog @@ -120,6 +120,7 @@ * 1410 Output log text of scheduled downtime log entries... * 1411 New builting views for the history of scheduled downtimes * 1185 mobile ui: Added a new view to see events from the Event Console + * 1412 Speed up of displaying and sorting after WATO folder path * 1067 FIX: Fixed login problem in LDAP connector when no user filter specified... * 1094 FIX: sidebar snaping 'Tree of folders': fixed exception * 1154 FIX: Availability: Fixed unwanted redirect to edit annotation page after editing availability options... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index b174883..f24ff72 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -2214,6 +2214,16 @@ def get_host_tags(row): return val return "" +# Get the definition of a tag group +g_taggroups_by_id = {} +def get_tag_group(tgid): + # Build a cache + if not g_taggroups_by_id: + for entry in config.wato_host_tags: + g_taggroups_by_id[entry[0]] = (entry[1], entry[2]) + + return g_taggroups_by_id.get(tgid) + def get_custom_var(row, key): for name, val in zip(row["custom_variable_names"], row["custom_variable_values"]): diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3f90051..8e55bea 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16861,9 +16861,17 @@ def get_folder_title(path): # Return a list with all the titles of the paths' # components, e.g. "muc/north" -> [ "Main Directory", "Munich", "North" ] -def get_folder_title_path(path, withlinks=False): - load_all_folders() # TODO: speed up! - return folder_title_path(path, withlinks) +def get_folder_title_path(path, with_links=False): + # In order to speed this up, we work with a per HTML-request cache + cache_name = "wato_folder_titles" + (with_links and "_linked" or "") + cache = html.get_cached(cache_name) + if cache == None: + load_all_folders() + cache = {} + html.set_cache(cache_name, cache) + if path not in cache: + cache[path] = folder_title_path(path, with_links) + return cache[path] def sort_by_title(folders): def folder_cmp(f1, f2): diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 6033075..0cf409b 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1926,14 +1926,6 @@ multisite_painters["host_tags_with_titles"] = { "sorter" : 'host', } -g_tags_by_id = {} -def get_tag_group(tgid): - # Build a cache - if not g_tags_by_id: - for entry in config.wato_host_tags: - g_tags_by_id[entry[0]] = (entry[1], entry[2]) - - return g_tags_by_id.get(tgid) def paint_host_tag(row, tgid): tags_of_host = get_host_tags(row).split()

9 years, 11 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 82872b1effa9c7b122e8bb4abd64af75abef609e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82872b1effa9c7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 16 13:06:08 2014 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 5b23536..ecaa8c8 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -1412 +1422

9 years, 11 months

Check_MK Git: check_mk: Added missing i18n in WATO rules

by Mathias Kettner

Module: check_mk Branch: master Commit: 7ef45fba45ec2b7f4d0e1f3de9fe851d8c1c68eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ef45fba45ec2b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 16 12:32:05 2014 +0200 Added missing i18n in WATO rules --- web/plugins/wato/check_parameters.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 03eb8bd..00f3de0 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4760,9 +4760,9 @@ register_check_parameters( "be independent of the hardware manufacturer."), title = _("Required plug state"), choices = [ - ( "on", "Plug is ON" ), - ( "off", "Plug is OFF" ), - ], + ( "on", _("Plug is ON") ), + ( "off", _("Plug is OFF") ), + ], default_value = "on" ), TextAscii(

9 years, 11 months

Check_MK Git: check_mk: Updated bug entries #2187

by Mathias Kettner

Module: check_mk Branch: master Commit: 3b2a1d746214aa066f7082fa1553476da6ccd751 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b2a1d746214aa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 16 10:54:32 2014 +0200 Updated bug entries #2187 --- .bugs/2187 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/2187 b/.bugs/2187 new file mode 100644 index 0000000..1ca48cf --- /dev/null +++ b/.bugs/2187 @@ -0,0 +1,12 @@ +Title: Host tag painters missing after new tags have been created +Component: multisite +State: open +Date: 2014-10-16 10:53:29 +Targetversion: 1.2.5i1 +Class: bug + +If you create a new host tag group in WATO then the according +Multisite painter for that tag is not present. It needs an +Apache reload. Seems that the automatic creation of painters for +the host tag groups is just done once one the module is being +loaded.

9 years, 11 months

Check_MK Git: check_mk: FIX: add pending changes after creating random hosts

by Mathias Kettner

Module: check_mk Branch: master Commit: 7a4118f8902ebf6f5d666c14e5f276d7b9f40fcd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a4118f8902ebf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 16 11:19:22 2014 +0200 FIX: add pending changes after creating random hosts --- web/htdocs/wato.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0b44b8c..3f90051 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4539,6 +4539,8 @@ def mode_random_hosts(phase): folders = int(html.var("folders")) levels = int(html.var("levels")) created = create_random_hosts(g_folder, count, folders, levels) + log_pending(AFFECTED, g_folder, "create-random-hosts", + _("Created %d random hosts in %d folders") % (created, folders)) return "folder", _("Created %d random hosts.") % created else: return "folder" @@ -4569,6 +4571,7 @@ def create_random_hosts(folder, count, folders, levels): created += 1 folder["num_hosts"] += count save_folder_and_hosts(folder) + mark_affected_sites_dirty(folder) reload_hosts() return count else:

9 years, 11 months

Check_MK Git: check_mk: Updated bug entries #2186

by Mathias Kettner

Module: check_mk Branch: master Commit: 7ed64f7b46f1f7f1cb87f284b93e5a93a242c9d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ed64f7b46f1f7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 16 10:48:02 2014 +0200 Updated bug entries #2186 --- .bugs/2186 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2186 b/.bugs/2186 new file mode 100644 index 0000000..f03ab4e --- /dev/null +++ b/.bugs/2186 @@ -0,0 +1,8 @@ +Title: agent_vsphere not running on RedHat 5 +Component: checks +State: open +Date: 2014-10-16 10:43:36 +Targetversion: 1.2.5i1 +Class: bug + +Reason is the Python version. Shouldn't be too hard to fix.

9 years, 11 months

Check_MK Git: check_mk: #0661 hw/sw-inventory: install date of software packages no longer in unix timestamps but date format

by Goetz Golla

Module: check_mk Branch: master Commit: 8d293483a9b0b640f455c3927e8664f466cf6350 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d293483a9b0b6… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Oct 16 09:01:35 2014 +0200 #0661 hw/sw-inventory: install date of software packages no longer in unix timestamps but date format Please redo an inventory --- .werks/661 | 9 +++++++++ ChangeLog | 2 ++ inventory/win_exefiles | 8 +++++++- inventory/win_reg_uninstall | 9 ++++++--- web/plugins/views/inventory.py | 11 +++++++++-- 5 files changed, 33 insertions(+), 6 deletions(-) diff --git a/.werks/661 b/.werks/661 new file mode 100644 index 0000000..1cec5c2 --- /dev/null +++ b/.werks/661 @@ -0,0 +1,9 @@ +Title: hw/sw-inventory: install date of software packages no longer in unix timestamps but date format +Level: 1 +Component: inv +Compatible: incomp +Version: 1.2.5i6 +Date: 1413442748 +Class: feature + +Please redo an inventory diff --git a/ChangeLog b/ChangeLog index 284746f..753e9c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -173,6 +173,8 @@ NOTE: Please refer to the migration notes! * 0653 script to extract hw/sw inventory data in csv format... * 0660 mk_inventory-ps1: new uses the Install Location as path for win_reg_uninstall + * 0661 hw/sw-inventory: install date of software packages no longer in unix timestamps but date format... + NOTE: Please refer to the migration notes! * 0655 FIX: win_cpuinfo and mk_inventory.ps1 agent: unit of CPU speed fixed, fixes for long output lines in agent * 1379 FIX: Fixed filter "Host has inventory data"... diff --git a/inventory/win_exefiles b/inventory/win_exefiles index c9935a0..5a67862 100644 --- a/inventory/win_exefiles +++ b/inventory/win_exefiles @@ -35,11 +35,17 @@ def inv_win_exefiles(info): paclist = inv_tree("software.packages:") for full_name, write_time, size, description, product_version, product_name in info: parts = full_name.split('\\') + # 14.02.2014 23:12:04 + if re.match("^\d{2}\.\d{2}\.20\d{2} \d{2}:\d{2}:\d{2}", write_time): + install_date = int(time.mktime(time.strptime(write_time, "%d.%m.%Y %H:%M:%S"))) + else: + install_date = write_time + entry = { "name" : parts[-1], "path" : "\\".join(parts[:-1]), "package_type" : "exe", - "install_date" : write_time, + "install_date" : install_date, "size" : int(size), "version" : product_version, "summary" : description, diff --git a/inventory/win_reg_uninstall b/inventory/win_reg_uninstall index ecf87f4..ed21209 100644 --- a/inventory/win_reg_uninstall +++ b/inventory/win_reg_uninstall @@ -33,8 +33,11 @@ def inv_win_reg_uninstall(info): for line in info: display_name, publisher, path, pacname, version, estimated_size, date = line install_date = "" - if len(date) == 8 and re.match("^20", date): + if re.match("^20\d{6}", date): install_date = int(time.mktime(time.strptime(date, "%Y%m%d"))) + size = saveint(estimated_size) + if size == 0: + size = None entry = { "name" : pacname, @@ -42,9 +45,9 @@ def inv_win_reg_uninstall(info): "vendor" : publisher, "summary" : display_name, "install_date" : install_date, - "size" : estimated_size, + "size" : size, "path" : path, - "package_type" : "reg_uninstall", + "package_type" : "registry", } paclist.append(entry) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 411e30c..bd6c5b6 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -375,6 +375,13 @@ def inv_paint_timestamp(stamp): else: return "", "" +def inv_paint_date(stamp): + if stamp: + date_painted = time.strftime("%Y-%m-%d", time.localtime(stamp)) + return "Date", "%s" % date_painted + else: + return "", "" + inventory_displayhints.update({ "." : { "title" : _("Inventory") }, ".hardware." : { "title" : _("Hardware"), "icon" : "hardware", }, @@ -433,7 +440,7 @@ inventory_displayhints.update({ ".software.os.version" : { "title" : _("Version"), }, ".software.os.vendor" : { "title" : _("Vendor"), }, ".software.os.type" : { "title" : _("Type"), }, # e.g. "linux" - ".software.os,install_date" : { "title" : _("Install Date"), "paint" : "timestamp" }, + ".software.os.install_date" : { "title" : _("Install Date"), "paint" : "date" }, ".software.os.kernel_version" : { "title" : _("Kernel Version"), "short" : _("Kernel") }, ".software.os.arch" : { "title" : _("Kernel Architecture"), "short" : _("Architecture") }, ".software.os.service_pack" : { "title" : _("Service Pack"), "short" : _("Service Pack") }, @@ -448,7 +455,7 @@ inventory_displayhints.update({ ".software.packages:*.version" : { "title" : _("Version"), }, ".software.packages:*.vendor" : { "title" : _("Publisher"), }, ".software.packages:*.package_version" : { "title" : _("Package Version"), }, - ".software.packages:*.install_date" : { "title" : _("Install Date"), }, + ".software.packages:*.install_date" : { "title" : _("Install Date"), "paint" : "date"}, ".software.packages:*.size" : { "title" : _("Size"), "paint" : "count" }, ".software.packages:*.path" : { "title" : _("Path"), }, })

9 years, 11 months

Check_MK Git: check_mk: Fixed wrong wording

by Lars Michelsen

Module: check_mk Branch: master Commit: e5a00838a06a3e918ecbaa5b6f33919b884042df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5a00838a06a3e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 15 10:28:00 2014 +0200 Fixed wrong wording --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index b0fea5a..3065f36 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2412,7 +2412,7 @@ def rename_host(host, newname): elif what == "snmpwalk": actions.append(_("A stored SNMP walk")) elif what == "rrd": - actions.append(_("RR databases with performance data")) + actions.append(_("RRD databases with performance data")) elif what == "rrdcached": actions.append(_("RRD updates in journal of RRD Cache")) elif what == "pnpspool":

9 years, 11 months

Check_MK Git: check_mk: #1159 Remote BI Aggregations can now be configured to be checked as single services

by Lars Michelsen

Module: check_mk Branch: master Commit: 197737ae877427c812513b56b463fe66b3c2a642 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=197737ae877427… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 15 16:24:00 2014 +0200 #1159 Remote BI Aggregations can now be configured to be checked as single services It is now possible to create services out of the total state of local BI aggregations or BI aggregations of other sites. This can be configured via WATO (Host & Service Parameters > Active Checks > Check State of BI Aggregation). --- .werks/1159 | 11 +++ ChangeLog | 1 + checks/check_bi_aggr | 52 +++++++++++ doc/treasures/active_checks/check_bi_aggr | 140 +++++++++++++++++++++++++++++ web/plugins/icons/builtin.py | 25 ++++++ web/plugins/wato/active_checks.py | 58 ++++++++++++ 6 files changed, 287 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=197737ae87…

9 years, 11 months

← Newer
1
...
12
13
14
15
16
17
18
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014