Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64464 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Andreas Boesl

Module: check_mk Branch: master Commit: 083ec51998e27a5c407fc7f35e918887fb3413bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=083ec51998e27a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 25 17:38:40 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: multsite views: rule editor icon for services

by Andreas Boesl

Module: check_mk Branch: master Commit: 09f7eaca27e98f0ba509612906044e30125f1da0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09f7eaca27e98f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jun 25 17:38:38 2013 +0200 multsite views: rule editor icon for services --- ChangeLog | 2 ++ web/htdocs/wato.py | 44 +++++++++++++++++++++------- web/plugins/icons/builtin.py | 21 +++++++++++++ web/plugins/wato/check_mk_configuration.py | 10 +++++++ 4 files changed, 67 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25abe3d..72e62e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,8 @@ * Rules: Renamed "Ignored services" to "Disabled services" Renamed "Ignored checks" to "Disabled checks" * Sorter Host IP address: fixed sorting, no longer uses str compare on ip + * Views: New: Draw rule editor icon in multisite views (default off) + Can be activated in global settings WATO: * Allow to configure check-/retry_interval in second precision diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2220a87..380508c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10052,7 +10052,7 @@ def mode_rulesets(phase): html.write('</div>') -def create_new_rule_form(rulespec, hostname = None, item = None): +def create_new_rule_form(rulespec, hostname = None, item = None, varname = None): html.begin_form("new_rule", add_transid = False) html.write('<table>') @@ -10077,13 +10077,24 @@ def create_new_rule_form(rulespec, hostname = None, item = None): html.select("rule_folder", folder_selection(g_root_folder)) html.write('</td></tr></table>\n') - html.hidden_field("varname", html.var("varname")) + html.hidden_field("varname", varname) html.hidden_field("mode", "new_rule") html.end_form() def mode_edit_ruleset(phase): varname = html.var("varname") - rulespec = g_rulespecs[varname] + + if html.var("check_command"): + check_command = html.var("check_command") + checks = check_mk_local_automation("get-check-information") + if check_command.startswith("check_mk-"): + check_command = check_command[9:] + varname = "checkgroup_parameters:" + checks[check_command].get("group","") + elif check_command.startswith("check_mk_active-"): + check_command = check_command[16:].split(" ")[0][:-1] + varname = "active_checks:" + check_command + + rulespec = g_rulespecs.get(varname) hostname = html.var("host", "") if html.has_var("item"): item = mk_eval(html.var("item")) @@ -10097,6 +10108,9 @@ def mode_edit_ruleset(phase): hostname = None # host not found. Should not happen if phase == "title": + if not rulespec: + text = html.var("service_description") or varname + return _("No available rule for service %s at host %s") % (text, hostname) title = rulespec["title"] if hostname: title += _(" for host %s") % hostname @@ -10106,18 +10120,23 @@ def mode_edit_ruleset(phase): elif phase == "buttons": global_buttons() - group = rulespec["group"].split("/")[0] - groupname = g_rulegroups[group][0] - html.context_button(groupname, - make_link([("mode", "rulesets"), ("group", group), ("host", hostname)]), "back") - html.context_button(_("Used Rulesets"), - make_link([("mode", "rulesets"), ("group", "used"), ("host", hostname)]), "usedrulesets") + if not rulespec: + html.context_button(_("All Rulesets"), make_link([("mode", "ruleeditor")]), "back") + else: + group = rulespec["group"].split("/")[0] + groupname = g_rulegroups[group][0] + html.context_button(groupname, + make_link([("mode", "rulesets"), ("group", group), ("host", hostname)]), "back") + html.context_button(_("Used Rulesets"), + make_link([("mode", "rulesets"), ("group", "used"), ("host", hostname)]), "usedrulesets") if hostname: html.context_button(_("Services"), make_link([("mode", "inventory"), ("host", hostname)]), "back") return elif phase == "action": + if not rulespec: + return # Folder for the rule actions is defined by _folder rule_folder = g_folders[html.var("_folder", html.var("folder"))] check_folder_permissions(rule_folder, "write", True) @@ -10168,6 +10187,11 @@ def mode_edit_ruleset(phase): _("Changed order of rules in ruleset %s") % rulespec["title"]) return + if not rulespec: + text = html.var("service_description") or varname + html.write("<div class=info>" + _("There are no rules availabe for %s.") % text + "</div>") + return + if not hostname: render_folder_path(keepvarnames = ["mode", "varname"]) @@ -10335,7 +10359,7 @@ def mode_edit_ruleset(phase): table.end() - create_new_rule_form(rulespec, hostname, item) + create_new_rule_form(rulespec, hostname, item, varname) def folder_selection(folder, depth=0): diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 8208221..c87343e 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -115,6 +115,27 @@ multisite_icons.append({ 'columns': [ 'active_checks_enabled' ], 'paint': paint_reschedule, }) + + +def paint_rule_editor(what, row, tags, custom_vars): + if config.may("wato.rulesets") and config.multisite_draw_ruleicon: + if what == 'service': + check_command = row["service_check_command"] + if check_command.startswith("check_mk-") or \ + check_command.startswith("check_mk_active-"): + url = html.makeuri_contextless( [("mode", "edit_ruleset"), + ("check_command", row["service_check_command"]), + ("service_description", row["service_description"]), + ("host", row["host_name"])], "wato.py") + title = _("Edit rule for %s") % check_command + return '<a href="%s"><img title="%s" class=icon src="images/icon_rulesets.png"></a>' % \ + (url, title) + +multisite_icons.append({ + 'service_columns': [ 'description', 'check_command', "host_name" ], + 'paint': paint_rule_editor, +}) + # +----------------------------------------------------------------------+ # | _ _ _ _ | # | / \ ___| | ___ __ _____ _| | ___ __| | __ _ ___ | diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 2ae1c3d..96766c6 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -219,6 +219,16 @@ register_configvar(group, domain = "multisite") register_configvar(group, + "multisite_draw_ruleicon", + Checkbox(title = _("Draw WATO rule editor icon for services"), + label = _("Draw rule editor icon"), + help = _("When enabled a rule editor icon is displayed for each " + "service in the multisite views. It is only displayed if the user " + "does have the permission to edit rules"), + default_value = False), + domain = "multisite") + +register_configvar(group, "wato_max_snapshots", Integer(title = _("Number of configuration snapshots to keep"), help = _("Whenever you successfully activate changes a snapshot of the configuration "

11 years, 3 months

Check_MK Git: check_mk: Finished categorization of checks

by Mathias Kettner

11 years, 3 months

Check_MK Git: check_mk: Further step in check catalog

by Mathias Kettner

11 years, 3 months

Check_MK Git: check_mk: Added manpage catalog

by Mathias Kettner

Module: check_mk Branch: master Commit: cfa110dcef85c3ab803c8a03b379105e752a96d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfa110dcef85c3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 25 16:06:04 2013 +0200 Added manpage catalog --- modules/catalog.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/catalog.py b/modules/catalog.py new file mode 100644 index 0000000..5b5d103 --- /dev/null +++ b/modules/catalog.py @@ -0,0 +1,7 @@ +manpage_catalog_titles = { + "hw" : "Appliances, other dedicated Hardware", + "os" : "Operating Systems", + "app" : "Applications", + "generic" : "Generic check plugins", + "unsorted" : "Uncategorized", +}

11 years, 3 months

Check_MK Git: check_mk: New man page browser for console (cmk -m)

by Mathias Kettner

Module: check_mk Branch: master Commit: 2be18b8ae61e5cdebc7cade433b17dd257c5b1c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2be18b8ae61e5c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 25 16:04:21 2013 +0200 New man page browser for console (cmk -m) --- ChangeLog | 1 + modules/check_mk.py | 218 ++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 183 insertions(+), 36 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2be18b8ae6…

11 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 67f71f47220c74b01e43e61d404c5e8ff6d1f257 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67f71f47220c74… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 25 16:04:22 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: Further step in cagegorization of checks

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 915879647d88305b904667e1c58c8a345d349441 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=915879647d8830… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Jun 25 15:37:29 2013 +0200 Further step in cagegorization of checks --- checkman/lgp_pdu_info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/lgp_pdu_info b/checkman/lgp_pdu_info index 4fcbc94..bbc22f1 100644 --- a/checkman/lgp_pdu_info +++ b/checkman/lgp_pdu_info @@ -1,6 +1,6 @@ title: Power Distribution information from Liebert MPH/MPX devices agents: snmp -catalog: +catalog: hw/power author: Lars Michelsen <lm(a)mathias-kettner.de> license: GPL distribution: check_mk

11 years, 3 months

Check_MK Git: check_mk: Further step in cagegorization of checks

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 060f72adf399d2c28e7cff6f29ba1a3c97f7fd54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=060f72adf399d2… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Jun 25 15:33:27 2013 +0200 Further step in cagegorization of checks --- checkman/postfix_mailq | 2 +- checkman/win_dhcp_pools.stats | 2 +- checkman/windows_broadcom_bonding | 2 +- checkman/windows_intel_bonding | 2 +- checkman/windows_multipath | 2 +- checkman/windows_updates | 4 ++-- checkman/winperf.cpuusage | 4 ++-- checkman/winperf.diskstat | 4 ++-- checkman/winperf_msx_queues | 4 ++-- checkman/winperf_phydisk | 4 ++-- checkman/winperf_processor.util | 4 ++-- checkman/winperf_tcp_conn | 4 ++-- checkman/wmic_process | 4 ++-- checkman/wut_webio_io | 2 +- checkman/wut_webtherm | 4 ++-- checkman/zfsget | 4 ++-- checkman/zpool_status | 4 ++-- checkman/zypper | 2 +- doc/drafts/LIESMICH.Katalog | 12 +++++++----- 19 files changed, 36 insertions(+), 34 deletions(-) diff --git a/checkman/postfix_mailq b/checkman/postfix_mailq index 6f59ebf..ba2a6da 100644 --- a/checkman/postfix_mailq +++ b/checkman/postfix_mailq @@ -1,6 +1,6 @@ title: Length of the postfix mailqueue agents: linux -catalog: +catalog: app/postfix author: Lars Michelsen <lm(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/win_dhcp_pools.stats b/checkman/win_dhcp_pools.stats index 2456476..ef58c29 100644 --- a/checkman/win_dhcp_pools.stats +++ b/checkman/win_dhcp_pools.stats @@ -1,4 +1,4 @@ -title: Monitors the number of transactions since startup of the Windows DHCP +title: Number of transactions since startup of the Windows DHCP agents: linux catalog: author: Lars Michelsen <lm(a)mathias-kettner.de> diff --git a/checkman/windows_broadcom_bonding b/checkman/windows_broadcom_bonding index 78dbb77..b363e95 100644 --- a/checkman/windows_broadcom_bonding +++ b/checkman/windows_broadcom_bonding @@ -1,4 +1,4 @@ -title: Check state of broadcom Bonding network interface on windows +title: Broadcom Bonding network interface on windows agents: linux catalog: author: Andreas Boesl <ab(a)mathias-kettner.de> diff --git a/checkman/windows_intel_bonding b/checkman/windows_intel_bonding index b8a39bc..8f0de63 100644 --- a/checkman/windows_intel_bonding +++ b/checkman/windows_intel_bonding @@ -1,4 +1,4 @@ -title: Check state of intel Bonding network interface on windows +title: Intel Bonding network interface on windows agents: linux catalog: author: Andreas Boesl <ab(a)mathias-kettner.de> diff --git a/checkman/windows_multipath b/checkman/windows_multipath index 62225aa..f1dbe81 100644 --- a/checkman/windows_multipath +++ b/checkman/windows_multipath @@ -1,6 +1,6 @@ title: Check Multipathing on Windows agents: windows -catalog: +catalog: os/storage author: Florian Heigl <fh(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/windows_updates b/checkman/windows_updates index 1740df4..8aca20b 100644 --- a/checkman/windows_updates +++ b/checkman/windows_updates @@ -1,6 +1,6 @@ -title: Checks number of pending windows updates and needed reboot state +title: Number of pending windows updates and needed reboot state agents: windows -catalog: +catalog: os/misc author: Lars Michelsen <lm(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/winperf.cpuusage b/checkman/winperf.cpuusage index 14357d0..f7203cf 100644 --- a/checkman/winperf.cpuusage +++ b/checkman/winperf.cpuusage @@ -1,6 +1,6 @@ -title: Measure CPU usage on Windows systems +title: CPU usage on Windows systems agents: windows -catalog: +catalog: os/kernel author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/winperf.diskstat b/checkman/winperf.diskstat index a3b4d71..8132cb9 100644 --- a/checkman/winperf.diskstat +++ b/checkman/winperf.diskstat @@ -1,6 +1,6 @@ -title: Measure Disk IO on Windows systems +title: Disk IO on Windows systems agents: windows -catalog: +catalog: os/storage author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/winperf_msx_queues b/checkman/winperf_msx_queues index bb11b1c..e69a6c6 100644 --- a/checkman/winperf_msx_queues +++ b/checkman/winperf_msx_queues @@ -1,6 +1,6 @@ -title: Check length of MS Exchange queues +title: Length of MS Exchange queues agents: windows -catalog: +catalog: app/exchange author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/winperf_phydisk b/checkman/winperf_phydisk index ac68696..7c96099 100644 --- a/checkman/winperf_phydisk +++ b/checkman/winperf_phydisk @@ -1,6 +1,6 @@ -title: Monitor disk throughput on Windows +title: Disk throughput on Windows agents: windows -catalog: +catalog: os/storage author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/winperf_processor.util b/checkman/winperf_processor.util index 8e105e8..7b01495 100644 --- a/checkman/winperf_processor.util +++ b/checkman/winperf_processor.util @@ -1,6 +1,6 @@ -title: Measure CPU utilization on Windows systems +title: CPU utilization on Windows systems agents: windows -catalog: +catalog: os/kernel author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/winperf_tcp_conn b/checkman/winperf_tcp_conn index 3721df1..1bc80cd 100644 --- a/checkman/winperf_tcp_conn +++ b/checkman/winperf_tcp_conn @@ -1,6 +1,6 @@ -title: Monitor number of TCP connections per state +title: Number of TCP connections per state agents: windows -catalog: +catalog: os/network author: Andreas Boesl (ab(a)mathias-kettner.de) license: GPL distribution: check_mk diff --git a/checkman/wmic_process b/checkman/wmic_process index b04f56e..6dbb248 100644 --- a/checkman/wmic_process +++ b/checkman/wmic_process @@ -1,6 +1,6 @@ -title: Check ressource consumption of windows processes +title: Ressource consumption of windows processes agents: windows -catalog: +catalog: os/ps author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/wut_webio_io b/checkman/wut_webio_io index 78d6a14..d62dbd9 100644 --- a/checkman/wut_webio_io +++ b/checkman/wut_webio_io @@ -1,4 +1,4 @@ -title: Check WuT Web-IO +title: WuT Web-IO agents: snmp catalog: author: Mathias Kettner <mk(a)mathias-kettner.de> diff --git a/checkman/wut_webtherm b/checkman/wut_webtherm index 4634515..4acd2ba 100644 --- a/checkman/wut_webtherm +++ b/checkman/wut_webtherm @@ -1,6 +1,6 @@ -title: Check WuT Web-Thermograph +title: WuT Web-Thermograph agents: snmp -catalog: +catalog: hw/environment author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/zfsget b/checkman/zfsget index 4db80ad..5b543c4 100644 --- a/checkman/zfsget +++ b/checkman/zfsget @@ -1,6 +1,6 @@ -title: Check used space in ZFS pools and filesystems +title: Used space in ZFS pools and filesystems agents: linux, solaris, freebsd -catalog: +catalog: os/storage author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/checkman/zpool_status b/checkman/zpool_status index 6fdb452..b051f83 100644 --- a/checkman/zpool_status +++ b/checkman/zpool_status @@ -1,6 +1,6 @@ -title: Check ZFS Storage Pool status +title: ZFS Storage Pool status agents: solaris -catalog: +catalog: os/storage author: Darin Perusich <darin(a)darins.net> license: GPL distribution: check_mk diff --git a/checkman/zypper b/checkman/zypper index 674bd18..70c6b03 100644 --- a/checkman/zypper +++ b/checkman/zypper @@ -1,6 +1,6 @@ title: Check for (security) updates via Zypper agents: linux -catalog: +catalog: os/misc author: Mathias Kettner <mk(a)mathias-kettner.de> license: GPL distribution: check_mk diff --git a/doc/drafts/LIESMICH.Katalog b/doc/drafts/LIESMICH.Katalog index 5297709..86a6816 100644 --- a/doc/drafts/LIESMICH.Katalog +++ b/doc/drafts/LIESMICH.Katalog @@ -13,18 +13,20 @@ os "Betriebsysstem" app "Applications" omd "OMD / Check_MK" "livestatu_status, omd" - ORACLE: - tablespace,e.tg... (pro Check die OS auflisten) apache "Apache" java "Java application server, etc." mailman weblogic + sap + exchange + postfix +ggf. db "Databases" + db2 + ORACLE: + tablespace,e.tg... (pro Check die OS auflisten) mssql mysql postgresql - sap - -db "Databases" ?? hw network "Networking"

11 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: cba85b15649a9b7a06185eb7788a509306d951ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cba85b15649a9b… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Jun 25 15:16:01 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits