Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64362 discussions

Check_MK Git: check_mk: Major cleanup of minor cleanup

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 16736cc310fb74d8f549480934f5f51252a9fd31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16736cc310fb74… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 4 12:41:41 2012 +0200 Major cleanup of minor cleanup --- checks/printer_alerts | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/printer_alerts b/checks/printer_alerts index 9f6b760..8fe8424 100644 --- a/checks/printer_alerts +++ b/checks/printer_alerts @@ -116,7 +116,7 @@ def check_printer_alerts(_not_used, _not_used1, info): if state == 2: sum_state = 2 elif state == 3 and sum_state != 2: - sum_state = 3: + sum_state = 3 elif state > sum_state: sum_state = max(state, sum_state)

11 years, 12 months

Check_MK Git: check_mk: Updated bug entries #0066, #0045, #0052, #0056, #0221, #0127

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 70724282fc654f2ee3f1a84a2f71fb51bd77b358 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70724282fc654f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 4 12:40:28 2012 +0200 Updated bug entries #0066, #0045, #0052, #0056, #0221, #0127 --- .bugs/127 | 8 ++++++-- .bugs/221 | 8 ++++++-- .bugs/45 | 8 ++++++-- .bugs/52 | 8 ++++++-- .bugs/56 | 8 ++++++-- .bugs/66 | 8 ++++++-- 6 files changed, 36 insertions(+), 12 deletions(-) diff --git a/.bugs/127 b/.bugs/127 index 554d7f7..d840a40 100644 --- a/.bugs/127 +++ b/.bugs/127 @@ -1,11 +1,15 @@ Title: Reschedule icon for passive Check_MK checks Component: multisite -State: open -Date: 2011-02-10 12:01:27 Class: feature +State: done +Date: 2011-02-10 12:01:27 +Targetversion: future When you are in the problems view, there is no direct way to reschedule a service since the Check_MK service is not visible. We could add a reschedule icon for passive check_MK checks as well and let it reschedule the Check_MK service on that host instead. + +2012-10-04 12:36:14: changed state open -> done +Is already implemented. diff --git a/.bugs/221 b/.bugs/221 index 0b338c0..9265650 100644 --- a/.bugs/221 +++ b/.bugs/221 @@ -1,10 +1,14 @@ Title: Snapins should not show error on Nagios reload Component: multisite -State: open -Date: 2011-03-10 11:06:15 Class: feature +State: done +Date: 2011-03-10 11:06:15 +Targetversion: future When Nagios reloads and there is a Livestatus error, then the Snapins should - on their refresh - not display that error but reject the Ajax response completely and stay in their old state. + +2012-10-04 12:37:33: changed state open -> done +This is done at the moment by clearing the contents instead of displaying an error. diff --git a/.bugs/45 b/.bugs/45 index 24b27cf..23d8d9a 100644 --- a/.bugs/45 +++ b/.bugs/45 @@ -1,11 +1,15 @@ Title: logwatch: Teil der Meldung im Check ausgeben Component: checks -State: open -Date: 2010-12-21 21:27:03 Class: feature +State: done +Date: 2010-12-21 21:27:03 +Targetversion: future Kann man dazu evtl. den long_service_output nehmen? Es wäre auf jeden Fall gut, wenn neue Meldungen zu sehen sind, auch wenn die später wieder verschwinden. Noch besser wäre, wenn der logwatch-Check sogar auch später immer die letzten Fehlermeldungen anzeigt. Diese kann man ja problemlos aus der Datei holen. + +2012-10-04 12:32:13: changed state open -> done +This is already done. The last problematic line is shown. diff --git a/.bugs/52 b/.bugs/52 index 2060d99..75dd92e 100644 --- a/.bugs/52 +++ b/.bugs/52 @@ -1,8 +1,9 @@ Title: Checkboxen zum Auswählen von Einträgen für Kommandos Component: multisite -State: open -Date: 2010-12-21 22:01:48 Class: feature +State: done +Date: 2010-12-21 22:01:48 +Targetversion: future Checkboxen: Bei einer View macht man oben einen kleinen Reiter, der eine Checkbox symbolisiert. Wenn man den anklickt, wir bei jedem Datensatz @@ -58,3 +59,6 @@ und mit der transid nur noch prüfen, ob dieses Formular bereits abgeschickt wurde? Man würde dann pro Benutzer mehrere Transids speichern. + +2012-10-04 12:33:06: changed state open -> done +Das ist schon länger umgesetzt. diff --git a/.bugs/56 b/.bugs/56 index a69fcf7..c801a95 100644 --- a/.bugs/56 +++ b/.bugs/56 @@ -1,8 +1,12 @@ Title: Icon, das anzeigt, dass eine Ansicht gefiltert ist Component: multisite -State: open -Date: 2010-12-21 22:13:43 Class: feature +State: done +Date: 2010-12-21 22:13:43 +Targetversion: future Wenn man bei einer View einen Filter ausfüllt (user), dann soll irgendwo ein Icon anzeigen, dass das Resultat gefiltert ist. + +2012-10-04 12:33:38: changed state open -> done +Ist auch schon lange drin. diff --git a/.bugs/66 b/.bugs/66 index 2bbc689..a2da138 100644 --- a/.bugs/66 +++ b/.bugs/66 @@ -1,8 +1,9 @@ Title: URL-Variable für index.py mit URL von main.py Component: multisite -State: open -Date: 2010-12-21 22:26:06 Class: feature +State: done +Date: 2010-12-21 22:26:06 +Targetversion: future So könnte man einen Link auf das ganze Frameset machen. Wenn man dann mal in der View ein Icon macht, bei der man einen Link auf die Seite @@ -11,3 +12,6 @@ lassen. Man könnte sogar darüber nachdenken, dass die URL auf der rechten Seite persistiert wird... + +2012-10-04 12:34:23: changed state open -> done +Ist schon lange drin.

11 years, 12 months

Check_MK Git: check_mk: Updated bug entries #0744

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2ef509bfecbf80832e7440dd2044b52d794014be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ef509bfecbf80… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Oct 4 12:24:58 2012 +0200 Updated bug entries #0744 --- .bugs/744 | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/744 b/.bugs/744 index d210025..bbac548 100644 --- a/.bugs/744 +++ b/.bugs/744 @@ -1,10 +1,13 @@ Title: Host- and Service Groups empty if contact not have the right for all members Component: livestatus -State: open +Class: bug +State: closed Date: 2012-10-01 15:54:12 Targetversion: 1.2.0 -Class: bug On the Hostgroups (Summary) and the Servicegroups (Summary) all elements are missing, where a contact is not member for all childrens of element. For example, a hostgroup with ten hosts, is contact not member of all ten, the hostgroup doesent appear + +2012-10-04 12:24:53: changed state open -> closed +See livestatus option group_authorization

11 years, 12 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 769a7befffda4ba132aa0d4571886d587ca3166b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=769a7befffda4b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Oct 4 12:25:07 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 12 months

Check_MK Git: check_mk: WATO "activate changes" - Internal code improvment

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 688c0642f572fce6f1cb75175ff3e3b25f65f0a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=688c0642f572fc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 4 12:21:09 2012 +0200 WATO "activate changes" - Internal code improvment --- web/htdocs/js/wato.js | 4 +++- web/htdocs/wato.py | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 908683b..f96dd1d 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -488,7 +488,9 @@ function update_bulk_moveto(val) { // | | // +----------------------------------------------------------------------+ -function wato_do_activation(siteid, est) { +function wato_do_activation(est) { + var siteid = 'local'; + // Hide the activate changes button var button = document.getElementById('act_changes_button'); if(button) { diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2a0e216..286fa6c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3573,9 +3573,9 @@ def mode_changelog(phase): html.write('<tr class="data odd0"><td class=repprogress><div id="repstate_local"></div></td>') html.write('<td id="repmsg_local"><i>%s</i></td></tr></table>' % _('activating...')) - srs = load_replication_status().get('local', {}) + srs = load_replication_status().get(None, {}) estimated_duration = srs.get("times", {}).get('act', 2.0) - html.javascript("wato_do_activation('local', %d);" % + html.javascript("wato_do_activation(%d);" % (int(estimated_duration * 1000.0))) sitestatus_do_async_replication = None # could survive in global context! @@ -7192,7 +7192,7 @@ def ajax_activation(): start = time.time() check_mk_local_automation(config.wato_activation_method) duration = time.time() - start - update_replication_status('local', {}, { 'act': duration }) + update_replication_status(None, {}, { 'act': duration }) except Exception: import traceback raise MKUserError(None, "Error executing hooks: %s" %

11 years, 12 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 053db409d5989acd197cb7b2d6038cf54eafc23a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=053db409d5989a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 4 12:21:30 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 12 months

Check_MK Git: check_mk: FIX: Speed-o-meter: Fixed calculation of Check_MK passive check invervals

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9b6c8b7b07e6afb15ec6fa002cd6c56678228572 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b6c8b7b07e6af… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 4 12:14:36 2012 +0200 FIX: Speed-o-meter: Fixed calculation of Check_MK passive check invervals --- ChangeLog | 1 + web/htdocs/sidebar.py | 30 +++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e92aa1..415466e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ aggregation compilations * FIX: Fixed releasing of locks and livestatus connections when logging out * FIX: Fixed login/login confusions with index page caching + * FIX: Speed-o-meter: Fixed calculation of Check_MK passive check invervals WATO: * Added progress indicator in single site WATO "Activate Changes" diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 56190c9..e4cb533 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -390,11 +390,39 @@ def ajax_speedometer(): # scheduled checks rate needs to loop over all hosts and services. if last_program_start != program_start: scheduled_rate = 0.0 + + # First get data of all active checks for what in [ "host", "service" ]: data = html.live.query_summed_stats( - "GET %ss\nStats: suminv check_interval" % what) + "GET %ss\nStats: suminv check_interval\n" + "Filter: active_checks_enabled = 1" % what) + scheduled_rate += data[0] / 60.0 + # HACK: + # The Check_MK passive checks are always added to Nagios with + # a check interval of 1 minute. If one chancges the check interval + # of the Check_MK service, the intervals of the passive services + # change in fact. But this change is not added to the nagios config + # of these objects. Workaround here: Get interval of Check_MK service + # and add it as interval to the cmk passive checks + intervals = html.live.query_table( + "GET services\n" + "Columns: host_name check_interval\n" + "Filter: description = Check_MK") + + num_svcs = dict(html.live.query_table( + "GET services\n" + "Columns:host_name\n" + "Stats: check_command ~ ^check_mk-")) + + for line in intervals: + host_name, check_interval = line + num_services = num_svcs.get(host_name, 0) + + file('/tmp/3', 'a').write('%s %d %0.2f\n' % (host_name, num_services, 1.0 / (check_interval / 60.0) * num_services)) + scheduled_rate += 1.0 / ((check_interval / 60.0) * num_services) + percentage = 100.0 * current_rate / scheduled_rate; title = _("Scheduled check rate: %.1f/s, current rate: %.1f/s, that is " "%.0f%% of the scheduled rate" %

11 years, 12 months

Check_MK Git: check_mk: Minor code cleanup

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a202c5aec3b6489063bfade32f88c338dc11c96a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a202c5aec3b648… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 4 11:56:43 2012 +0200 Minor code cleanup --- checks/printer_alerts | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/printer_alerts b/checks/printer_alerts index ae5a11c..9f6b760 100644 --- a/checks/printer_alerts +++ b/checks/printer_alerts @@ -114,9 +114,9 @@ def check_printer_alerts(_not_used, _not_used1, info): group_txt += ' #%s' % group_index if state == 2: - sum_state = max(2, sum_state) + sum_state = 2 elif state == 3 and sum_state != 2: - sum_state = max(3, sum_state) + sum_state = 3: elif state > sum_state: sum_state = max(state, sum_state)

11 years, 12 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: dc19783d7287f1c06c1426f9d13331fd204d6329 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc19783d7287f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 4 11:56:45 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 12 months

Check_MK Git: check_mk: resolved gitbug merge conflict

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b4c51fc00e6c8e56da1f359f489d2eebd6624662 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4c51fc00e6c8e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 4 11:42:35 2012 +0200 resolved gitbug merge conflict ---

11 years, 12 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits