Checkmk git commits December 2011

checkmk-commits@lists.checkmk.com

3 participants
336 discussions

Check_MK Git: check_mk: Bulk inventory: Remove leading pipe signs in progress bar on main folder inventory

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e7da4008b4fc5c60923bef33a93338aad770acf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7da4008b4fc5c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 12:05:00 2011 +0100 Bulk inventory: Remove leading pipe signs in progress bar on main folder inventory --- ChangeLog | 2 ++ web/htdocs/js/wato.js | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f15fe7..bc60218 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ WATO: * Optimized wraps in host lists tag column + * Bulk inventory: Remove leading pipe signs in progress bar on main + folder inventory 1.1.13i1: Multisite: diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 614fb56..b3045b9 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -387,7 +387,8 @@ function progress_scheduler(mode, url_prefix, timeout, items, end_url, success_s if (progress_items.length > 0) { // Progressing progress_running = true; - update_progress_title(progress_items[0]); + // Remove leading pipe signs (when having no folder set) + update_progress_title(progress_items[0].replace(/^\|*/g, '')); get_url(url_prefix + '&_transid=-1&_item=' + escape(progress_items[0]), progress_handle_response, [ mode, progress_items[0] ]); } else {

12 years, 6 months

Check_MK Git: check_mk: Bugfix: Calling activate_changes hook also in distributed WATO setups

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7a19b469c225a1104ca33de2b4adc69d70a0552d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a19b469c225a1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 12:55:51 2011 +0100 Bugfix: Calling activate_changes hook also in distributed WATO setups --- ChangeLog | 1 + web/htdocs/wato.py | 7 +++++-- web/plugins/wato/nagvis_auth.py | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc60218..c3a3e6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * Optimized wraps in host lists tag column * Bulk inventory: Remove leading pipe signs in progress bar on main folder inventory + * Bugfix: Calling activate_changes hook also in distributed WATO setups 1.1.13i1: Multisite: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f2c7740..ea83557 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2580,7 +2580,6 @@ def mode_changelog(phase): else: try: check_mk_local_automation("restart") - call_hook_activate_changes() except Exception, e: if config.debug: raise @@ -3141,6 +3140,11 @@ def check_mk_local_automation(command, args=[], indata=""): log_audit(None, "automation", "Automation command %s failed with exit code %d: %s" % (" ".join(cmd), exitcode, outdata)) raise MKGeneralException("Error running <tt>%s</tt> (exit code %d): <pre>%s</pre>%s" % (" ".join(cmd), exitcode, hilite_errors(outdata), sudo_msg)) + + # On successful "restart" command execute the activate changes hook + if command == 'restart': + call_hook_activate_changes() + try: if config.debug: log_audit(None, "automation", "Result from automation: %s" % outdata) @@ -7010,7 +7014,6 @@ def automation_push_snapshot(): log_audit(None, "replication", _("Synchronized with master (my site id is %s.)") % site_id) if html.var("restart", "no") == "yes": check_mk_local_automation("restart") - call_hook_activate_changes() return True except Exception, e: if config.debug: diff --git a/web/plugins/wato/nagvis_auth.py b/web/plugins/wato/nagvis_auth.py index aab63fb..d33fdbd 100644 --- a/web/plugins/wato/nagvis_auth.py +++ b/web/plugins/wato/nagvis_auth.py @@ -178,5 +178,6 @@ if config.wato_write_nagvis_auth and defaults.omd_root: [] ) - api.register_hook('users-saved', generate_auth_file) - api.register_hook('roles-saved', lambda x: generate_auth_file(load_users())) + api.register_hook('users-saved', generate_auth_file) + api.register_hook('roles-saved', lambda x: generate_auth_file(load_users())) + api.register_hook('activate-changes', lambda x: generate_auth_file(load_users()))

12 years, 6 months

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d92be5707dcd798e49847d6d40cb3f49329827ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d92be5707dcd79… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 12:56:17 2011 +0100 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c3a3e6f..72c2b7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * Bulk inventory: Remove leading pipe signs in progress bar on main folder inventory * Bugfix: Calling activate_changes hook also in distributed WATO setups + * NagVis auhtorization file generation is also executed on activate_changes 1.1.13i1: Multisite:

12 years, 6 months

Check_MK Git: check_mk: Bugfix: Fixed javascript error when doing replication in distributed

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f1c9082bf0d81120acfd9d94ff36c8191514f5d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1c9082bf0d811… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 14:01:43 2011 +0100 Bugfix: Fixed javascript error when doing replication in distributed wato environments when not having the sidebar open --- ChangeLog | 4 +++- web/htdocs/js/wato.js | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72c2b7b..484706a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,8 +11,10 @@ * Optimized wraps in host lists tag column * Bulk inventory: Remove leading pipe signs in progress bar on main folder inventory - * Bugfix: Calling activate_changes hook also in distributed WATO setups * NagVis auhtorization file generation is also executed on activate_changes + * Bugfix: Calling activate_changes hook also in distributed WATO setups + * Bugfix: Fixed javascript error when doing replication in distributed + wato environments when not having the sidebar open 1.1.13i1: Multisite: diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index b3045b9..98adf36 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -456,7 +456,8 @@ function wato_replication_result(siteid, code) { } function wato_replication_finish() { - parent.frames[1].location.reload(); // reload sidebar + if(parent && parent.frames[1]) + parent.frames[1].location.reload(); // reload sidebar oDiv = document.getElementById("act_changes_button"); oDiv.style.display = "none"; }

12 years, 6 months

Check_MK Git: check_mk: Bugfix: Fixed javascript error when doing replication in distributed

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6f4631a4c3fe81b99b196c76df399af13942c4bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f4631a4c3fe81… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 14:03:43 2011 +0100 Bugfix: Fixed javascript error when doing replication in distributed wato environments when not having the sidebar open --- ChangeLog | 2 +- web/htdocs/htmllib.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 484706a..d5a9901 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,7 +13,7 @@ folder inventory * NagVis auhtorization file generation is also executed on activate_changes * Bugfix: Calling activate_changes hook also in distributed WATO setups - * Bugfix: Fixed javascript error when doing replication in distributed + * Bugfix: Fixed javascript errors when doing replication in distributed wato environments when not having the sidebar open 1.1.13i1: diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index b0db912..9ef5b01 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -822,7 +822,7 @@ class html: def reload_sidebar(self): if not self.has_var("_ajaxid"): - self.javascript("parent.frames[0].location.reload();"); + self.javascript("if(parent && parent.frames[0]) parent.frames[0].location.reload();"); # Get next transaction id for that user def current_transid(self):

12 years, 6 months

Check_MK Git: check_mk: Fix syntax error in ChangeLog

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: d902d9cad38e37d1f9ab0bd7359ede0c7b818210 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d902d9cad38e37… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 21 15:04:20 2011 +0100 Fix syntax error in ChangeLog --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index d55f6bf..b873606 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -1.1.13i2 +1.1.13i2: Core, Setup, etc.: * cmk -I: accept host tags and cluster names

12 years, 6 months

Check_MK Git: check_mk: FIX: fixed man pages of h3c_lanswitch_sensors and statgrab_cpu

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8ea6d41ffd542f89b56376731c6a9109762beab8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ea6d41ffd542f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 21 14:57:26 2011 +0100 FIX: fixed man pages of h3c_lanswitch_sensors and statgrab_cpu --- ChangeLog | 4 ++++ checkman/h3c_lanswitch_sensors | 13 +++++++++---- checkman/statgrab_cpu | 6 ------ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f15fe7..d55f6bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -110,6 +110,10 @@ * printer_alerts: added further state codes (thanks to Matthew Stew) * Solaris agent: changed shell to /usr/bin/bash (fixes problems with LC_ALL=C) +1.1.12p7: + Checks & Agents: + * FIX: fixed man pages of h3c_lanswitch_sensors and statgrab_cpu + 1.1.12p6: Checks & Agents: * FIX: lnx_if: remove debug output (left over from 1.1.12p5) diff --git a/checkman/h3c_lanswitch_sensors b/checkman/h3c_lanswitch_sensors index 2a741f6..54095d0 100644 --- a/checkman/h3c_lanswitch_sensors +++ b/checkman/h3c_lanswitch_sensors @@ -4,11 +4,16 @@ author: Florian Heigl <fh(a)mathias-kettner.de> license: GPL distribution: check_mk description: - This Check queries the CPU utilization for various switches made by 3Com and H3C, either standalone or that of the CPUs of all units in the stack. By default it will handle 3com Superstack 4 switches, but it should work with all devices defined in the "Lsw" lanswitch Mibs. -Note some of these switches don't handle snmp well and might generate up to 90% cpu load while queried. -To accomodate for this you should lower the frequency of SNMP based checks with them. -The CPU usage ratio returned by the check is the average load of the last 60 seconds. + This Check queries the CPU utilization for various switches made by 3Com + and H3C, either standalone or that of the CPUs of all units in the stack. By + default it will handle 3com Superstack 4 switches, but it should work with + all devices defined in the "Lsw" lanswitch Mibs. + + Please note: some of these switches don't handle SNMP well and might generate + up to 90% CPU load while queried. To accomodate for this you should lower + the frequency of SNMP based checks with them. The CPU usage ratio returned + by the check is the average load of the last 60 seconds. inventory: The check will add one service per Unit/CPU in a stack. diff --git a/checkman/statgrab_cpu b/checkman/statgrab_cpu index 9c24221..faf075d 100644 --- a/checkman/statgrab_cpu +++ b/checkman/statgrab_cpu @@ -15,9 +15,3 @@ perfdata: inventory: One check per host is created if the agent contains a {statgrab_cpu} section containing cpu information. - -[parameters] - The check has no parameters. - -[configuration] - The check is not configurable.

12 years, 6 months

Check_MK Git: check_mk: Optimized wraps in host lists tag column

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: eebc8edb99a856957d6427955d2f8777910755bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eebc8edb99a856… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 21 11:55:08 2011 +0100 Optimized wraps in host lists tag column --- ChangeLog | 3 +++ web/htdocs/wato.py | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac58691..7f15fe7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,9 @@ * dell_powerconnect_cpu: renamed service from CPU to "CPU utilization", in order to be consistent with other checks + WATO: + * Optimized wraps in host lists tag column + 1.1.13i1: Multisite: * New nifty sidebar snapin "Speed-O-Meter" diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 86e8364..f2c7740 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1119,7 +1119,12 @@ def show_hosts(folder): html.write('<td><img class=icon src="images/icon_%s.png" title="%s"></td>' % (icon, title)) # Raw tags - html.write("<td>%s</td>" % "|".join(host[".tags"])) + # + # Optimize wraps: + # 1. add round the single tags to prevent wrap within tags + # 2. add "zero width space" () + html.write("<td>%s</td>" % "|".join( + [ '%s' % t for t in host[".tags"] ])) # Show attributes for attr, topic in host_attributes:

12 years, 6 months

Check_MK Git: check_mk: Removed executable flag from mobile.py

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: ca659eb34a7b4b7ff99f7d9235ec332251a33c54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca659eb34a7b4b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 20 14:15:40 2011 +0100 Removed executable flag from mobile.py --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/mobile.py b/web/htdocs/mobile.py old mode 100755 new mode 100644

12 years, 6 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 02b8cf8d90278f33f3169bc7841d72afc4d748aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02b8cf8d90278f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 20 18:42:18 2011 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 6 months

← Newer
1
...
6
7
8
9
10
11
12
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2011