Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: 1e57ab5dccbeffc9018ad94d2c4e5a5da6501ccb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e57ab5dccbeff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 30 15:17:53 2015 +0100 #2779 FIX Fix moving of folders This fixes the error message <i>Cannot move folder: A folder with this name already exists in the target folder.</i> --- .werks/2779 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/2779 b/.werks/2779 new file mode 100644 index 0000000..ab425bd --- /dev/null +++ b/.werks/2779 @@ -0,0 +1,10 @@ +Title: Fix moving of folders +Level: 2 +Component: wato +Compatible: compat +Version: 1.2.7i4 +Date: 1448893037 +Class: fix + +This fixes the error message <i>Cannot move folder: A folder with this name +already exists in the target folder.</i> diff --git a/ChangeLog b/ChangeLog index e321c90..6492316 100644 --- a/ChangeLog +++ b/ChangeLog @@ -156,6 +156,7 @@ * 2791 FIX: Service parameter overview: Fixed problem displaying incorrect rule for classical checks... * 2793 FIX: Parameter Overview: Prevent python unicode warnings for services with umlauts... * 2845 FIX: LDAP: Fixed exception in connection test on complain issue during connection creation + * 2779 FIX: Fix moving of folders... Notifications: * 2728 FIX: Removed debug notification script (was not executable)... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c8e6644..79062d6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1727,7 +1727,8 @@ def move_folder(what_folder, target_folder): raise MKUserError(None, _("Cannot move folder: Target folder is locked.")) new_dir = folder_dir(target_folder) - if os.path.exists(new_dir): + new_folder_dir = new_dir + "/" + what_folder[".name"] + if os.path.exists(new_folder_dir): raise MKUserError(None, _("Cannot move folder: A folder with this name already exists in the target folder.")) old_parent = what_folder[".parent"]

8 years, 9 months

ps: Refactored most parsing code to parse function

by Lars Michelsen

Module: check_mk Branch: master Commit: a6bcdf917d39067c96e6d5c0765cc86be38d83b5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6bcdf917d3906… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 27 15:02:52 2015 +0100 ps: Refactored most parsing code to parse function --- checks/ps | 106 +++++++++++++------- checks/ps.include | 289 +++++++++++++++++++++++++++-------------------------- 2 files changed, 218 insertions(+), 177 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a6bcdf917d…

8 years, 9 months

ps: minor variable name consolidation

by Lars Michelsen

Module: check_mk Branch: master Commit: 85a4aa5569d085286e794f14d6070fb4db8ee600 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85a4aa5569d085… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 27 15:04:47 2015 +0100 ps: minor variable name consolidation --- checks/ps.include | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/ps.include b/checks/ps.include index aa91d03..5ebc422 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -81,16 +81,16 @@ def ps_get_inventory_specs(invdata, invrules): return inventory_specs -def inventory_ps_common(invdata, invrules, info): +def inventory_ps_common(invdata, invrules, parsed): inventory_specs = ps_get_inventory_specs(invdata, invrules) inventory = [] for servicedesc, pattern, userspec, icon, default_params in inventory_specs: num_perc_s = servicedesc.count("%s") - for line in info: + for line in parsed: # First entry in line is the node name or None for non-clusters - ps = line[1:] - matches, grabbed_user = process_matches_for_discovery(ps, pattern, userspec) + process_line = line[1:] + matches, grabbed_user = process_matches_for_discovery(process_line, pattern, userspec) if matches == False: continue # skip not matched lines

8 years, 9 months

check_http: Fixed link of globe icon when "clickable" is configured in the check

by Lars Michelsen

Module: check_mk Branch: master Commit: 323b4a43baad98941c2a3ca2fa876855e38ee704 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=323b4a43baad98… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 30 09:50:49 2015 +0100 check_http: Fixed link of globe icon when "clickable" is configured in the check --- web/htdocs/lib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 433be23..439f204 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -290,9 +290,9 @@ def format_plugin_output(output, row = None): if config.escape_plugin_output: # (?:<A HREF="), (?: target="_blank">)? and endswith(" </A>") is a special # handling for the HTML code produced by check_http when "clickable URL" option is active. - output = re.sub("(?:<A HREF=")?http[s]?://[^\"'>\t\s\n,]+(?: target="_blank">)?", + output = re.sub("(?:<A HREF=")?(http[s]?://[^\"'>\t\s\n,]+)(?: target="_blank">)?", lambda p: '<a href="%s"><img class=pluginurl align=absmiddle title="%s" src="images/pluginurl.png"></a>' % - (p.group(0).replace('"', ''), p.group(0).replace('"', '')), output) + (p.group(1).replace('"', ''), p.group(1).replace('"', '')), output) if output.endswith(" </A>"): output = output[:-11]

8 years, 9 months

cmk manpage improved

by Mathias Kettner

Module: check_mk Branch: master Commit: 858f0e8347ad2c0d196cfcfa30faf3dfa6cc6ebe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=858f0e8347ad2c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 30 08:07:05 2015 +0100 cmk manpage improved --- doc/.f12 | 3 +++ doc/check_mk.1 | 38 ++++++++++++++++++++++++-------------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/doc/.f12 b/doc/.f12 index fb80d93..30ade72 100644 --- a/doc/.f12 +++ b/doc/.f12 @@ -1,4 +1,7 @@ #!/bin/bash +# man -l check_mk.1 >/dev/tty </dev/tty +# exit + SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} echo "TARGET: /omd/sites/$SITE/share/check_mk/checks" diff --git a/doc/check_mk.1 b/doc/check_mk.1 index 724ce37..a9b9795 100644 --- a/doc/check_mk.1 +++ b/doc/check_mk.1 @@ -8,11 +8,13 @@ check_mk \- command line utility for managing Check_MK .SH DESCRIPTION \fBcheck_mk\fR (or its alias \fBcmk\fR) is a command line utility for managing -certain aspect of the Check_MK Monitoring System. It can be used for diagnosis, -for automating things in scripts and for doing some tasks more efficient than -using the web based WATO. +some aspects of the Check_MK Monitoring System. It can be used for diagnosis, +for automating things in scripts and for doing some tasks more efficiently than +with the web based WATO. -.SH GLOBAL OPTIONS +.SH GENERIC OPTIONS + +The following options work in all modes and all situations. .TP .B -v @@ -27,21 +29,29 @@ options is used. .TP .B --debug -Disables the intern exception handling in Check_MK and let all Python exceptions -through. That way you can exactly see at which location of the code where the actual problem is. -This help finding problems in self written check plugins. +Disables the intern exception handling in Check_MK and let all Python +exceptions through. That way you can see the exact location in the code +where the actual problem is. This helps finding problems in self written +check plugins. + .SH SERVICE DISCOVERY .B cmk [--checks=CHECK_TYPE1,CHECK_TYPE2,...] -I|-II [HOSTS...] -These modes do service discovery. Check_MK will analyse the agent output of the specified -hosts (or all hosts if none are specified) and automatically create monitored services -where it does make sense. While \fB-I\fR only creates new services keeps all the existing ones -\fB-II\fR will first removes all services before staring the discovery. +The options \fB-I\fR and \fB-II\fR do service discovery. Check_MK will analyse +the agent output of the specified hosts (or all hosts if none are specified) +and automatically create monitored services where it does make sense. While +\fB-I\fR only creates new services and keeps the existing ones untouched, \fB-II\fR +first removes all existing services before staring the discovery. + +The option \fB--checks=\fR restricts the option to a list of check types +(e.g. \fB--checks=Bdf,diskstat\fR). When combined with the mode \fB-II\fR +only checks of the specified types are be removed and rediscovered. -The option \fB--checks=\fR restricts the option to a list of check types (e.g. \fB--checks=Bdf,diskstat\fR). -When combined with the mode \fB-II\fR only checks of the specified types will be removed -and rediscovered. +When no hosts are specified then Check_MK will do a discovery for \fBall\fR hosts +that are defined in your configuration. In order to speed this operation up +no actual data is being fetched from the hosts but cached agent data will +be used. When you specify host names then fresh data is fetched from these. .SH AD HOC CHECKING .B cmk [-n] [-p] [--checks=CHECK_TYPE1,CHECK_TYPE2,...] -v HOST

8 years, 9 months

#2842 FIX jolokia_metrics.perm_gen: fixed wrong calculation of perf variables warn and crit

by Simon Betz

Module: check_mk Branch: master Commit: 2a4cd96c60e69bbfd0d3205242a9c1d3630bed15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a4cd96c60e69b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Nov 27 12:28:27 2015 +0100 #2842 FIX jolokia_metrics.perm_gen: fixed wrong calculation of perf variables warn and crit --- .werks/2842 | 9 +++++++++ ChangeLog | 1 + checks/jolokia_metrics | 4 ++-- web/plugins/metrics/check_mk.py | 3 +-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.werks/2842 b/.werks/2842 new file mode 100644 index 0000000..b0d236b --- /dev/null +++ b/.werks/2842 @@ -0,0 +1,9 @@ +Title: jolokia_metrics.perm_gen: fixed wrong calculation of perf variables warn and crit +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1448623631 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 33cb10a..e321c90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -110,6 +110,7 @@ * 2777 FIX: check_mk_agent.linux: avoid execution of .deb temporary files as plugins * 2800 FIX: mk_mysql: fixed some issues with incorrect assembled command line... * 2744 FIX: waitmax now kills the whole process group and is a bit more robust. + * 2842 FIX: jolokia_metrics.perm_gen: fixed wrong calculation of perf variables warn and crit Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 50605e0..d6cc5f4 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -840,8 +840,8 @@ def check_jolokia_metrics_perm_gen(item, params, info): usage_bytes = int(values['PermGenUsage']) size_bytes = int(values['PermGenMax']) usage_perc = 100.0 / size_bytes * usage_bytes - warn_bytes = usage_bytes / 100.0 * warn - crit_bytes = usage_bytes / 100.0 * crit + warn_bytes = size_bytes / 100.0 * warn + crit_bytes = size_bytes / 100.0 * crit perfdata = [("mem_perm_used", usage_bytes, warn_bytes, crit_bytes, 0, size_bytes)] state = 0 if usage_perc >= crit: diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 7b09118..5b8fef6 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -465,7 +465,7 @@ metric_info["mem_used_percent"] = { metric_info["mem_perm_used"] = { "color": "#80ff40", - "title" : _("Perm used"), + "title" : _("Permanent Generation Memory"), "unit" : "bytes", } @@ -5659,4 +5659,3 @@ graph_info.append({ ], "range" : (0, "mem_perm_used:max") }) -

8 years, 9 months

rename hosts also covers agent deployment status now

by Mathias Kettner

Module: check_mk Branch: master Commit: 1f0555037ae4ad44f9b128d51ca3b3c5c038baf5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f0555037ae4ad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 27 11:54:13 2015 +0100 rename hosts also covers agent deployment status now --- modules/automation.py | 5 +++++ web/htdocs/wato.py | 53 +++++++++++++++++++++++++------------------------ 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index ba5d386..b11b83c 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -782,6 +782,11 @@ def rename_host_files(oldname, newname): if have_renamed_agent: actions.append("agent") + # Agent deployment + deployment_dir = var_dir + "/agent_deployment/" + if rename_host_file(deployment_dir, oldname, newname): + actions.append("agent_deployment") + # OMD-Stuff. Note: The question really is whether this should be # included in Check_MK. The point is - however - that all these # actions need to take place while the core is stopped. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7d578e3..c8e6644 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2866,32 +2866,33 @@ def rename_hosts(renamings): def render_renaming_actions(action_counts): action_titles = { - "folder" : _("WATO folder"), - "notify_user" : _("Users' notification rule"), - "notify_global" : _("Global notification rule"), - "notify_flexible" : _("Flexible notification rule"), - "wato_rules" : _("Host and service configuration rule"), - "alert_rules" : _("Alert handler rule"), - "parents" : _("Parent definition"), - "cluster_nodes" : _("Cluster node definition"), - "bi" : _("BI rule or aggregation"), - "favorites" : _("Favorite entry of user"), - "cache" : _("Cached output of monitoring agent"), - "counters" : _("File with performance counter"), - "agent" : _("Baked host specific agent"), - "piggyback-load" : _("Piggyback information from other host"), - "piggyback-pig" : _("Piggyback information for other hosts"), - "autochecks" : _("Auto-disovered services of the host"), - "logwatch" : _("Logfile information of logwatch plugin"), - "snmpwalk" : _("A stored SNMP walk"), - "rrd" : _("RRD databases with performance data"), - "rrdcached" : _("RRD updates in journal of RRD Cache"), - "pnpspool" : _("Spool files of PNP4Nagios"), - "nagvis" : _("NagVis map"), - "history" : _("Monitoring history entries (events and availability)"), - "retention" : _("The current monitoring state (including acknowledgements and downtimes)"), - "inv" : _("Recent hardware/software inventory"), - "invarch" : _("History of hardware/software inventory"), + "folder" : _("WATO folder"), + "notify_user" : _("Users' notification rule"), + "notify_global" : _("Global notification rule"), + "notify_flexible" : _("Flexible notification rule"), + "wato_rules" : _("Host and service configuration rule"), + "alert_rules" : _("Alert handler rule"), + "parents" : _("Parent definition"), + "cluster_nodes" : _("Cluster node definition"), + "bi" : _("BI rule or aggregation"), + "favorites" : _("Favorite entry of user"), + "cache" : _("Cached output of monitoring agent"), + "counters" : _("File with performance counter"), + "agent" : _("Baked host specific agent"), + "agent_deployment" : _("Agent deployment status"), + "piggyback-load" : _("Piggyback information from other host"), + "piggyback-pig" : _("Piggyback information for other hosts"), + "autochecks" : _("Auto-disovered services of the host"), + "logwatch" : _("Logfile information of logwatch plugin"), + "snmpwalk" : _("A stored SNMP walk"), + "rrd" : _("RRD databases with performance data"), + "rrdcached" : _("RRD updates in journal of RRD Cache"), + "pnpspool" : _("Spool files of PNP4Nagios"), + "nagvis" : _("NagVis map"), + "history" : _("Monitoring history entries (events and availability)"), + "retention" : _("The current monitoring state (including acknowledgements and downtimes)"), + "inv" : _("Recent hardware/software inventory"), + "invarch" : _("History of hardware/software inventory"), } texts = []

8 years, 9 months

Agent deployment: delete-host also cleans up deployment state

by Mathias Kettner

Module: check_mk Branch: master Commit: fbbd28fd4ffad2701f7326791be8d4d6f9ce1ce4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbbd28fd4ffad2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 27 11:47:21 2015 +0100 Agent deployment: delete-host also cleans up deployment state --- modules/automation.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index 23d5bc6..ba5d386 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -362,15 +362,17 @@ def automation_delete_host(args): # single files for path in [ - "%s/%s" % (precompiled_hostchecks_dir, hostname), - "%s/%s.py" % (precompiled_hostchecks_dir, hostname), - "%s/%s.mk" % (autochecksdir, hostname), - "%s/%s" % (counters_directory, hostname), - "%s/%s" % (tcp_cache_dir, hostname), - "%s/persisted/%s" % (var_dir, hostname), - "%s/piggyback/%s" % (tmp_dir, hostname), - "%s/inventory/%s" % (var_dir, hostname), - "%s/inventory/%s.gz" % (var_dir, hostname)]: + "%s/%s" % (precompiled_hostchecks_dir, hostname), + "%s/%s.py" % (precompiled_hostchecks_dir, hostname), + "%s/%s.mk" % (autochecksdir, hostname), + "%s/%s" % (counters_directory, hostname), + "%s/%s" % (tcp_cache_dir, hostname), + "%s/persisted/%s" % (var_dir, hostname), + "%s/piggyback/%s" % (tmp_dir, hostname), + "%s/inventory/%s" % (var_dir, hostname), + "%s/inventory/%s.gz" % (var_dir, hostname), + "%s/agent_deployment/%s" % (var_dir, hostname), + ]: if os.path.exists(path): os.unlink(path) @@ -384,6 +386,7 @@ def automation_delete_host(args): if os.path.exists("%s/%s" % (folder, hostname)): os.unlink("%s/%s" % (folder, hostname)) + # logwatch folders if os.path.exists("%s/%s" % (logwatch_dir, hostname)): import shutil

8 years, 9 months

Wato: move creation of backup_domains into wato.py, fix order dependency

by Mathias Kettner

Module: check_mk Branch: master Commit: 7b995b1852a1f7b885167f5e423c7d00521e2b36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b995b1852a1f7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 27 11:20:06 2015 +0100 Wato: move creation of backup_domains into wato.py, fix order dependency --- web/htdocs/wato.py | 3 ++- web/plugins/wato/backup_domains.py | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2e3a405..7d578e3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -20418,7 +20418,7 @@ def load_plugins(): g_rulespec_groups = [] # Directories and files to synchronize during replication - global replication_paths, backup_paths + global replication_paths, backup_paths, backup_domains replication_paths = [ ( "dir", "check_mk", root_dir ), ( "dir", "multisite", multisite_dir ), @@ -20439,6 +20439,7 @@ def load_plugins(): # this? # ( "dir", "autochecks", defaults.autochecksdir ), ] + backup_domains = {} register_builtin_host_tags() diff --git a/web/plugins/wato/backup_domains.py b/web/plugins/wato/backup_domains.py index a1c9c3a..bbaeb2e 100644 --- a/web/plugins/wato/backup_domains.py +++ b/web/plugins/wato/backup_domains.py @@ -24,8 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -backup_domains = {} - # Temporary variable which stores settings during the backup process backup_perfdata_enabled = True def performancedata_restore(pre_restore = True):

8 years, 9 months

edited graph definitions for jolokia_metrics: mem_perm_used

by Simon Betz

Module: check_mk Branch: master Commit: 583bb571693aedf621d20a63380bde44e88a71b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=583bb571693aed… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Nov 27 10:53:27 2015 +0100 edited graph definitions for jolokia_metrics: mem_perm_used --- web/plugins/metrics/check_mk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 953a362..7b09118 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -5655,6 +5655,7 @@ graph_info.append({ "scalars" : [ "mem_perm_used:warn", "mem_perm_used:crit", + ("mem_perm_used:max#000000", _("Max Perm used")), ], "range" : (0, "mem_perm_used:max") })

8 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015