Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64160 discussions

Check_MK Git: check_mk: Multisite: correctly show dead Livestatus connections

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2a6e691379ace0507377e217d39ac00bed5cddd7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a6e691379ace0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 3 14:07:38 2011 +0100 Multisite: correctly show dead Livestatus connections in case the connect fails and there is no status host. --- web/htdocs/index.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 8146d3a..095a8fa 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -128,7 +128,10 @@ def connect_to_livestatus(html): html.site_status[sitename]["exception"] = deadinfo["exception"] shs = deadinfo.get("status_host_state") html.site_status[sitename]["status_host_state"] = shs - statename = { 1:"down", 2:"unreach", 3:"waiting", }.get(shs, "unknown") + if shs == None: + statename = "dead" + else: + statename = { 1:"down", 2:"unreach", 3:"waiting", }.get(shs, "unknown") html.site_status[sitename]["state"] = statename else:

12 years, 10 months

Check_MK Git: New commits on branch master

by git＠mathias-kettner.de

URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd63b69cdcf3aa… Merge: 11940ee3f2fffa071b275ed275feede4734bd29e f99a85a63229673f966297af714c23a16b5ff79b Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 3 07:55:07 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11940ee3f2fffa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 3 07:55:03 2011 +0100 Updated Changelog URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd1cc9254e2181… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 3 07:47:54 2011 +0100 WATO: no reload after replication URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2652e2cf7f969a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 3 00:18:47 2011 +0100 WATO: nice animation for replication progress URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1da19f160bda03… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 2 20:55:45 2011 +0100 WATO: deal with peer redirection Should be complete now, but I am sure that this is not the last word in that case. URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cd12f3168f9d7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 2 19:27:39 2011 +0100 WATO: detect preferred peer URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f426c37e2bb2c8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 2 18:50:44 2011 +0100 WATO: disabled renaming of sites URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b304764ccd96e7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 2 18:46:58 2011 +0100 WATO: inhibit deletion of used site URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=081dd806ab3985… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 2 18:30:10 2011 +0100 WATO: allow abort during site login URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b11af27e638a07… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 2 18:23:19 2011 +0100 WATO: dirty handling of rule editor finer URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37d998cafa0aa0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 2 18:04:19 2011 +0100 WATO: fixed restart/sync after inventory URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0d325328c878a… Merge: 454886fc4c5b1afa4e4ca4bff243c26c0e6bb9d3 e22761b75fce5ebb3be351015c79c2270ea6106b Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 2 16:23:48 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk into repl URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=454886fc4c5b1a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 2 16:23:46 2011 +0100 Multisite: renamed filled_in with _filled_in URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c39dd25413a531… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 2 16:23:07 2011 +0100 WATO: fix several place with sync/restart URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35d03eb6d71f70… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 2 13:38:19 2011 +0100 Small face lift in figheaders URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=015b6ce9d5029c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 2 13:38:05 2011 +0100 WATO: handle dirty information more intelligently URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b3d65e0748e49… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 1 23:14:53 2011 +0100 WATO: Clean up code comments This makes VIM folding more easy URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=284bb58fce6ec4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 1 22:21:02 2011 +0100 WATO: add some peer replication checks URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08b3d9017bb1dd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 1 17:27:17 2011 +0100 WATO: optimize creation of sync snapshot URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a72bb00ca1ebd4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 1 16:53:43 2011 +0100 WATO: synchronize site before inventory URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd863c5681281d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 1 12:13:21 2011 +0100 WATO: update repstate on site edits URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a839cae3033ef… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 1 11:53:15 2011 +0100 WATO: handle disabled and logged out sites URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20d4e07984b583… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 1 10:41:43 2011 +0100 WATO: put audit log into own pgae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=008f74886028e2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 1 10:16:29 2011 +0100 WATO: fix bulk inventory URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e13eb920836f94… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 22:45:50 2011 +0100 WATO: reload icon during replication URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41f64fe10f6c4b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 20:48:46 2011 +0100 WATO: honor status host in replication URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38499dbeb94bbe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 20:28:53 2011 +0100 WATO: reload page after complete bulk replication URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ca6280ae8c6d9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 20:12:32 2011 +0100 WATO: update_repstatus now atomic URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25cd2b2f2dc559… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 17:58:33 2011 +0100 WATO: fixed code syntax error URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=843bfb90a449fc… Merge: b444181699dacfb2c9a81e3fcd758af406f2f73a 83f997615a0c00f21353f285045ca7b6d156ed18 Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 17:22:46 2011 +0100 Merge branch 'master' into repl URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b444181699dacf… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 17:17:09 2011 +0100 WATO: Asynchronous replication seems to work URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec4fb6f81bb5d8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 16:07:14 2011 +0100 WATO: show num_hosts/services in site status URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45838d964acd80… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 16:06:56 2011 +0100 Livestatus: new columns num_hosts/services URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f246963153e6f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 15:34:48 2011 +0100 WATO: Improve site status table URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54162746443ce0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 15:05:28 2011 +0100 WATO: other icon for no changes pending URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e36227eaf0afa… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 15:02:41 2011 +0100 WATO: finish restart/sync of single sites URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bccca1053ab7e4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 14:34:55 2011 +0100 WATO: fixed remote inventory URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf56dc58279861… Merge: fd5c8261a007ddc745ae10c0ca6caed91a514c2e 3a116b8a31f3843ad0ca08903fc7d9e03482c8e3 Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 14:30:54 2011 +0100 Merge branch 'master' into repl Conflicts: web/htdocs/wato.py URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd5c8261a007dd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 14:29:33 2011 +0100 WATO: create only_hosts also for local site URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd8886575b8b9f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 08:54:39 2011 +0100 WATO: setting of site: host tags URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4a56bacf1d8f9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 30 17:07:01 2011 +0100 WATO: handle sites.mk in replication correctly URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b93cc5e1374e40… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 30 16:27:34 2011 +0100 WATO: snapshots now also cover multiste.d and htpasswd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc9eb39c320bc0… Merge: c2b59229345a002a72d47085ff2abafbc69809cd aa6658f160f7c7f2ea69757fa7becb0df5df118e Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 30 10:47:07 2011 +0100 Merge branch 'master' into repl URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2b59229345a00… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 29 11:02:02 2011 +0200 WATO: intermediate state of replication URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53a7a8f60a5c39… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 29 11:00:55 2011 +0200 WATO: move multisite config files to multisite.d/wato/ URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1dd642b87abc9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 28 13:22:03 2011 +0200 Updated bug entries #0408, #0409, #0410, #0407 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e556269aba798b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 28 09:23:22 2011 +0200 Updated bug entries #0406 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ed77b6037bb8b… Merge: be0118e0a149200381830820f7ca74b4521df422 9b702d332fcacffe12c23e50be3d6b004adddd3a Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 27 18:58:09 2011 +0200 Merge branch 'master' into repl URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be0118e0a14920… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 27 18:49:45 2011 +0200 WATO: Intermediate state in replication URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1795fc16201e24… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 26 21:10:33 2011 +0200 WATO: remote automation partly working URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=def3b8a276ed8f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 26 19:44:13 2011 +0200 WATO: new attribute for monitoring site URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dbfd0772c3ed5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 26 19:12:15 2011 +0200 WATO: automation login is complete URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d072c0138362b4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 26 18:35:56 2011 +0200 WATO: replication login partially working URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72f8e0f38d868a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 26 11:01:20 2011 +0200 WATO: begin implementation of replication

12 years, 10 months

Check_MK Git: check_mk: FIX: Fixed styling of view header in older IE browsers

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0354fbc29010dfa0cbf9c208ead97ad6b9c27d95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0354fbc29010df… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 2 13:00:02 2011 +0100 FIX: Fixed styling of view header in older IE browsers --- web/htdocs/check_mk.css | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index da8e1c1..43ce4c5 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -107,8 +107,7 @@ div.main { /* The content page header containing the title, user, date */ body.main table.header { width: 100%; - margin-bottom: 10px; - margin-left: 0px; + margin: 0 0 10px 0; padding: 0px 0px 10px 0px; border-spacing: 0px; color: #fff; @@ -116,12 +115,16 @@ body.main table.header { body.main hr.header { background-color: #fff; - border-style: none; height: 1px; position: absolute; width: 100%; left: 0px; - top: 35px; + padding: 0; + margin: 0; + border: 0; + top: 42px; + /* Needed for older IE versions */ + color: #fff; } body.main table.header td.left {

12 years, 10 months

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f99a85a63229673f966297af714c23a16b5ff79b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f99a85a6322967… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 2 13:00:18 2011 +0100 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 61ce5d2..60ca76c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ Multisite: * FIX: Fixed encoding problem when opening dashboard + * FIX: Fixed styling of view header in older IE browsers 1.1.12p1:

12 years, 10 months

Check_MK Git: check_mk: FIX: printer_supply: handle output of Brother printers

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e22761b75fce5ebb3be351015c79c2270ea6106b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e22761b75fce5e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 2 09:11:35 2011 +0100 FIX: printer_supply: handle output of Brother printers --- ChangeLog | 1 + checks/printer_alerts | 28 +++++++++++++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc5c0db..61ce5d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * FIX: Added id parameter to render_statistics() method to allow more than one pie dashlet for host/service stats * FIX: drbd: fixed inventory functions + * FIX: printer_supply: handle output of Brother printers Multisite: * FIX: finally fixed long-wanted "NagStaMon create hundreds diff --git a/checks/printer_alerts b/checks/printer_alerts index 824001c..fa9572e 100644 --- a/checks/printer_alerts +++ b/checks/printer_alerts @@ -62,35 +62,45 @@ printer_alerts_group_map = { printer_alerts_state_map = { 2: [ 8, 1101, 1102, 1112, 1114, 1115 ], - 1: [ ], - 0: [ 4, 6, 7, 19, 20, 23, 24, 25, 27, 35, 36, 37, 38, 502, 503, 504, 505, 506, 507, 802, 803, 804, 805, 806, 807, 808, 809, 810, 1001, 1002, 1005, 1106, 1107, 1108, 1111, 1113, 1302, 1304, 1501, 1502, 1503, 1504, 1505, 1506, 1509 ], + 1: [ 1104 ], + 0: [ 4, 6, 7, 19, 20, 23, 24, 25, 27, 35, 36, 37, 38, + 502, 503, 504, 505, 506, 507, 802, 803, 804, 805, + 806, 807, 808, 809, 810, 1001, 1002, 1005, 1106, + 1107, 1108, 1111, 1113, 1302, 1304, 1501, 1502, + 1503, 1504, 1505, 1506, 1509 ], } def inventory_printer_alerts(info): return [ (None, None) ] def check_printer_alerts(_not_used, _not_used1, info): - # Filter out empty status lines (e.g. sent by Brother printers) - info = [ i for i in info if i != [ "1", "0", "0", "0", "" ] ] + # Filter out empty status lines (e.g. sent by Brother) + info = [ i for i in info if i[1:5] != [ "0", "0", "0", "" ] ] if not info: return (0, 'OK - No alerts present') sum_state = 0 sum_txt = [] - for alert in info: - sev, group, group_index, code, desc = alert + for sev, group, group_index, code, desc in info: - state = 3 + state = 3 # UNKNOWN for s in [ 2, 1, 0 ]: - if saveint(sev) in printer_alerts_state_map[s]: + if saveint(code) in printer_alerts_state_map[s]: state = s break + # Code not found -> take into account severity + if state == 3 and sev == '1': + state = 0 group_txt = printer_alerts_group_map.get(group, 'UNKNOWN') if group_index != '-1': group_txt += ' #%s' % group_index - if state > sum_state: + if state == 2: + sum_state = 2 + elif state == 3 and sum_state != 2: + sum_state = 3 + elif state > sum_state: sum_state = state sum_txt.append('%s - %s - %s (%s)' % (nagios_state_names[state],

12 years, 10 months

Check_MK Git: check_mk: Livestatus: indentation cleanup

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0956801fa9670750961d571f97c9877900dce304 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0956801fa96707… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 2 09:08:52 2011 +0100 Livestatus: indentation cleanup --- livestatus/src/Store.cc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index e1605a1..dc3823e 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -38,7 +38,7 @@ extern int g_debug_level; extern unsigned long g_max_cached_messages; - Store::Store() +Store::Store() :_table_hosts(false) , _table_hostsbygroup(true) , _table_services(false, false) @@ -46,7 +46,7 @@ extern unsigned long g_max_cached_messages; , _table_servicesbyhostgroup(false, true) , _table_downtimes(true) , _table_comments(false) - , _table_log(g_max_cached_messages) + , _table_log(g_max_cached_messages) { _tables.insert(make_pair("hosts", &_table_hosts)); _tables.insert(make_pair("hostsbygroup", &_table_hostsbygroup));

12 years, 10 months

Check_MK Git: check_mk: WATO: fix problem with define_hostgroups

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b6ab0ec8d6c9e604acf38bdb9371f1b3a51fe624 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b6ab0ec8d6c9e6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 2 08:43:56 2011 +0100 WATO: fix problem with define_hostgroups --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5935911..ee37d06 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4792,7 +4792,7 @@ def save_group_information(groups): out.write("# Written by WATO\n# encoding: utf-8\n\n") for what in [ "host", "service", "contact" ]: if what in groups and len(groups[what]) > 0: - out.write("if not define_%sgroups:\n define_%sgroups = {}\n" % (what, what)) + out.write("if type(define_%sgroups) != dict:\n define_%sgroups = {}\n" % (what, what)) out.write("define_%sgroups.update(%s)\n\n" % (what, pprint.pformat(groups[what])))

12 years, 10 months

Check_MK Git: check_mk: WATO: prohbit group rule if no groups defined

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 83f997615a0c00f21353f285045ca7b6d156ed18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83f997615a0c00… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 17:22:34 2011 +0100 WATO: prohbit group rule if no groups defined --- web/htdocs/wato.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ea364ff..5935911 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4283,7 +4283,8 @@ class ElementSelection(ValueSpec): if len(self._elements) > 0: return self._elements.keys()[0] else: - return "" + raise MKUserError(None, + _("There are not defined any elements for this selection yet.")) def render_input(self, varprefix, value): self.load_elements()

12 years, 10 months

Check_MK Git: check_mk: WATO: make plugins i18n-able

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3a116b8a31f3843ad0ca08903fc7d9e03482c8e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a116b8a31f384… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Oct 31 09:08:13 2011 +0100 WATO: make plugins i18n-able --- modules/.f12 | 2 +- web/htdocs/index.py | 2 +- web/htdocs/wato.py | 272 ++++++++++++++++++++++++++------------------------- 3 files changed, 142 insertions(+), 134 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3a116b8a31…

12 years, 10 months

Check_MK Git: check_mk: WATO: make global variables also foldable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: aa6658f160f7c7f2ea69757fa7becb0df5df118e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa6658f160f7c7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 30 09:57:48 2011 +0100 WATO: make global variables also foldable --- web/htdocs/check_mk.css | 11 +++++++++++ web/htdocs/wato.py | 12 ++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 4a0bf53..da8e1c1 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -2303,6 +2303,17 @@ table.add_snapin i { width: 300px; } +/* Table in page "Global variables" */ +.wato table.data.globalvars { + width: 100%; +} +.wato table.data.globalvars td.title { + width: 430px; +} +.wato table.data.globalvars td.varname { + width: 300px; +} + /* ____ | _ \ _ __ ___ __ _ _ __ ___ ___ ___ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 379f3f6..a0aa49c 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4563,9 +4563,9 @@ def mode_globalvars(phase): groupnames = g_configvar_groups.keys() groupnames.sort() - html.write("<table class=data>") for groupname in groupnames: - html.write("<tr><td colspan=5><h3>%s</h3></td></tr>\n" % groupname) + html.begin_foldable_container("globalvars", groupname, False, groupname, indent=False) + html.write('<table class="data globalvars">') html.write("<tr><th>" + _("Configuration variable") + "</th><th>" +_("Check_MK variable") + "</th><th>" + _("Default") + "</th><th>" + _("Your setting") + "</th><th></th></tr>\n") @@ -4585,8 +4585,8 @@ def mode_globalvars(phase): edit_url = make_link([("mode", "edit_configvar"), ("varname", varname)]) - html.write('<td><a href="%s">%s</a></td>' % (edit_url, valuespec.title())) - html.write('<td><tt>%s</tt></td>' % varname) + html.write('<td class=title><a href="%s">%s</a></td>' % (edit_url, valuespec.title())) + html.write('<td class=varname><tt>%s</tt></td>' % varname) if varname in current_settings: html.write('<td class=inherited>%s</td>' % valuespec.value_to_text(defaultvalue)) html.write('<td><b>%s</b></td>' % valuespec.value_to_text(current_settings[varname])) @@ -4602,7 +4602,8 @@ def mode_globalvars(phase): html.write("</td>") html.write('</tr>') - html.write("</table>") + html.write("</table>") + html.end_foldable_container() def mode_edit_configvar(phase): @@ -7157,7 +7158,6 @@ def mode_rulesets(phase): if something_shown: html.write("</table>") html.end_foldable_container() - html.write("<br>") html.begin_foldable_container("rulesets", groupname, False, groupname, indent=False) html.write('<table class="data rulesets">') html.write("<tr><th>" + _("Rule set") + "</th>"

12 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits