Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65229 discussions

Check_MK Git: check_mk: Intermediate state of inventory refactoring

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 32163ad945b6de542f5ba2f51b413686cff49486 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32163ad945b6de… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 28 09:21:40 2010 +0100 Intermediate state of inventory refactoring --- ChangeLog | 5 ++ LIESMICH.wato | 56 +++++++++++++++- checks/blade_blowers | 2 +- modules/check_mk.py | 168 ++++++++++++++++++++++++++------------------------ 4 files changed, 146 insertions(+), 85 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=32163ad945…

13 years, 11 months

Check_MK Git: check_mk: wato: fix problem with empty extra_service_conf

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: ea2d51ac0c92c5d3b5a98569bce7c22c48a7989a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea2d51ac0c92c5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 29 10:12:13 2010 +0100 wato: fix problem with empty extra_service_conf --- web/htdocs/wato.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0d5b6b3..fefad41 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -551,6 +551,8 @@ def write_configuration_file(): out.write("\n") # all WATO information to Check_MK's inventory checks (needed for link in Multisite) + out.write("\n\nif '_WATO' not in extra_service_conf:\n" + " extra_service_conf['_WATO'] = []\n") out.write("\nextra_service_conf['_WATO'] += [ \n" " ('%s', [ 'wato', '%s' ], ALL_HOSTS, [ 'Check_MK inventory' ] ) ]\n" % (g_filename, g_filename)) @@ -573,6 +575,7 @@ def check_filename(): if fn == filename: title = t break + if not title: raise MKGeneralException("No config file <tt>%s</tt> is declared in <tt>multisite.mk</tt>" % filename)

13 years, 11 months

Check_MK Git: check_mk: wato: fixed typo

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9675318280bfc9ac5ea0a7259cb121992c2649f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9675318280bfc9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 29 10:51:35 2010 +0100 wato: fixed typo --- 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 fefad41..9ffb430 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -357,7 +357,7 @@ def mode_edithost(phase, new): html.write("</td></tr>\n") # alias - html.write("<tr><td class=legend>Alias<br><i>(optional</i></td><td class=content>") + html.write("<tr><td class=legend>Alias<br><i>(optional)</i></td><td class=content>") html.text_input("alias", alias) html.write("</td></tr>\n")

13 years, 11 months

Check_MK Git: check_mk: webconf: make hostnames clickable in log

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7f499d8db3757acedd432fbf21b47eb14efe2168 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f499d8db3757a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 22 16:44:05 2010 +0100 webconf: make hostnames clickable in log --- web/htdocs/check_mk.css | 19 ++++++++------- web/htdocs/webconf.py | 59 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 54 insertions(+), 24 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 4a93917..ad0a4e5 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -662,17 +662,18 @@ table.services th.tablegap { background-repeat: repeat; background-position: center; } -table.services tr.odd0 { background-color: #eee; } -table.services tr.even0 { background-color: #ddd; } -table.services tr.odd1 { background-color: #ffc; } -table.services tr.even1 { background-color: #ffa; } +tr.odd0 { background-color: #eee; } +tr.even0 { background-color: #ddd; } -table.services tr.odd2 { background-color: #fcc; } -table.services tr.even2 { background-color: #faa; } +tr.odd1 { background-color: #ffc; } +tr.even1 { background-color: #ffa; } -table.services tr.odd3 { background-color: #fdc; } -table.services tr.even3 { background-color: #fea; } +tr.odd2 { background-color: #fcc; } +tr.even2 { background-color: #faa; } + +tr.odd3 { background-color: #fdc; } +tr.even3 { background-color: #fea; } /* HACK */ @@ -1705,7 +1706,7 @@ div.webconf { margin-bottom: 1em; width: 100%; } - + .webconf table.pending { background-color: #fff; } diff --git a/web/htdocs/webconf.py b/web/htdocs/webconf.py index e7f0f83..6645891 100644 --- a/web/htdocs/webconf.py +++ b/web/htdocs/webconf.py @@ -179,6 +179,45 @@ def mode_index(phase): html.write("</table>\n") +def parse_host_names(line): + newline = "" + in_hostname = False + hostname = "" + for c in line: + if c == '[': + in_hostname = True + elif c == ']': + in_hostname = False + newline += host_link(hostname) + elif in_hostname: + hostname += c + else: + newline += c + return newline + + +def host_link(hostname): + if hostname in g_hosts: + return '<a href="%s">%s</a>' % (make_link([("mode", "edithost"), ("host", hostname)]), hostname) + else: + return hostname + + +def render_audit_log(log, what): + htmlcode = '<table class="webconf auditlog %s">' + even = "even" + for t, user, action, text in log: + text = parse_host_names(text) + even = even == "even" and "odd" or "even" + htmlcode += '<tr class="%s0"><td>%s</td><td>%s</td><td>%s</td><td width="100%%">%s</td></tr>\n' % ( + even, + time.strftime("%Y-%m-%d", time.localtime(float(t))), + time.strftime("%H:%M:%S", time.localtime(float(t))), + user, + text) + htmlcode += "</table>" + return htmlcode + def mode_changelog(phase): if phase == "buttons": @@ -198,16 +237,6 @@ def mode_changelog(phase): return None, "The new configuration has been successfully activated." else: - def render_audit_log(log, what): - htmlcode = '<table class="webconf auditlog %s">' - for t, user, action, text in log: - htmlcode += '<tr><td>%s</td><td>%s</td><td>%s</td><td width="100%%">%s</td></tr>\n' % ( - time.strftime("%Y-%m-%d", time.localtime(float(t))), - time.strftime("%H:%M:%S", time.localtime(float(t))), - user, - text) - htmlcode += "</table>" - return htmlcode pending = parse_audit_log("pending") if len(pending) > 0: @@ -293,10 +322,10 @@ def mode_edithost(phase, new): g_hosts[hostname] = (alias, ipaddress, tags) write_configuration_file() if new: - message = "Created new host %s" % hostname + message = "Created new host [%s]." % hostname log_pending(hostname, "create-host", message) else: - log_pending(hostname, "edit-host", "Edited properties of host %s" % hostname) + log_pending(hostname, "edit-host", "Edited properties of host [%s]" % hostname) if new: return go_to_services and "firstinventory" or "index" else: @@ -349,9 +378,9 @@ def mode_edithost(phase, new): html.write("</td></tr>\n") html.write('<tr><td class="legend button" colspan=2>') + html.button("save", "Save & Finish", "submit") if not new: html.button("delete", "Delete host!", "submit") - html.button("save", "Save & Finish", "submit") html.button("services", "Save & got to Services", "submit") html.write("</td></tr>\n") html.write("</table>\n") @@ -375,7 +404,7 @@ def mode_inventory(phase, firsttime): active_checks[(ct, item)] = paramstring check_mk_automation("set-autochecks", [hostname], active_checks) - message = "Saved check configuration of host %s with %d checks" % (hostname, len(active_checks)) + message = "Saved check configuration of host [%s] with %d checks" % (hostname, len(active_checks)) log_pending(hostname, "set-autochecks", message) return "index", message return "index" @@ -597,7 +626,7 @@ def delete_host_after_confirm(delname): if c: del g_hosts[delname] write_configuration_file() - log_pending(delname, "delete-host", "Deleted host %s" % delname) + log_pending(delname, "delete-host", "Deleted host [%s]" % delname) check_mk_automation("delete-host", [delname]) return "index" elif c == False: # not yet confirmed

13 years, 11 months

Check_MK Git: check_mk: webconf: Titles

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6dc7291477ecc5252eedabc7666e01da0f149cd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6dc7291477ecc5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 23 06:28:52 2010 +0100 webconf: Titles --- web/htdocs/htmllib.py | 4 +++- web/htdocs/webconf.py | 28 +++++++++++++++++++++------- web/plugins/sidebar/webconf.py | 4 ++-- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 4974597..ddae25f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -117,6 +117,7 @@ class html: self.global_vars = [] self.browser_reload = 0 self.events = set([]) # currently used only for sounds + self.header_sent = False def write(self, text): if type(text) == unicode: @@ -353,7 +354,7 @@ class html: self.req.headers_out.add("refresh", "%d; URL=%s" % (secs, url)) def header(self, title=''): - if not self.req.header_sent: + if not self.header_sent: self.html_head(title) if type(self.req.user) == str: login_text = "<b>%s</b> (%s)" % (config.user, config.role) @@ -364,6 +365,7 @@ class html: "%s     <b class=headertime>%s</b> <img src=\"images/mk_logo_klein.png\"></td></tr></table>" % (title, login_text, time.strftime("%H:%M"))) self.write("<hr class=header>\n") + self.header_sent = True def footer(self): if self.req.header_sent: diff --git a/web/htdocs/webconf.py b/web/htdocs/webconf.py index 6645891..5706128 100644 --- a/web/htdocs/webconf.py +++ b/web/htdocs/webconf.py @@ -61,9 +61,6 @@ def page_index(h): g_filename, title = check_filename() read_configuration_file() - html.header("Check_MK Configuration - " + title) - html.write("<div class=webconf>\n") - modefuncs = { "newhost" : lambda phase: mode_edithost(phase, True), "edithost" : lambda phase: mode_edithost(phase, False), @@ -98,6 +95,11 @@ def page_index(h): action_message = e.message html.add_user_error(e.varname, e.message) + # Title + html.header("Check_MK WATO - %s - %s" % (title, modefunc("title"))) + html.write("<div class=webconf>\n") + + # Show contexts buttons html.begin_context_buttons() modefunc("buttons") @@ -126,7 +128,10 @@ def page_index(h): # ----------------------------------------------------------------- def mode_index(phase): - if phase == "buttons": + if phase == "title": + return "Hosts list" + + elif phase == "buttons": html.context_button("Create new host", make_link([("mode", "newhost")])) changelog_button() @@ -220,7 +225,10 @@ def render_audit_log(log, what): def mode_changelog(phase): - if phase == "buttons": + if phase == "title": + return "Change log" + + elif phase == "buttons": html.context_button("Create new host", make_link([("mode", "newhost")])) html.context_button("Host list", make_link([("mode", "index")])) @@ -276,7 +284,10 @@ def mode_edithost(phase, new): alias, ipaddress, tags = None, None, [] mode = "new" - if phase == "buttons": + if phase == "title": + return title + + elif phase == "buttons": html.context_button("Abort", make_link([("mode", "index")])) if not new: html.context_button("Services", make_link([("mode", "inventory"), ("host", hostname)])) @@ -393,7 +404,10 @@ def mode_inventory(phase, firsttime): if hostname not in g_hosts: raise MKGeneralException("You called this page for a non-existing host.") - if phase == "action": + if phase == "title": + return "Services of host %s" % hostname + + elif phase == "action": if html.check_transaction(): table = check_mk_automation("try-inventory", ["tcp", hostname]) table.sort() diff --git a/web/plugins/sidebar/webconf.py b/web/plugins/sidebar/webconf.py index 2e802b3..73dda7a 100644 --- a/web/plugins/sidebar/webconf.py +++ b/web/plugins/sidebar/webconf.py @@ -16,8 +16,8 @@ def render_webconf_files(): bulletlink(title, "webconf.py?filename=%s" % filename) sidebar_snapins["webconf"] = { - "title" : "Check_MK Webconfig", - "description" : "Web configuration GUI for Check_MK - manage hosts to be monitored without access to the command line", + "title" : "Check_MK Web Administration Tool", + "description" : "WATO - the Web Administration Tool of Check_MK - manage hosts to be monitored without access to the command line", "author" : "Mathias Kettner", "render" : render_webconf_files, "allowed" : [ "admin", "user" ],

13 years, 11 months

Check_MK Git: check_mk: webconf: renamed to wato

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: e7a7e0f9784c520fb72211e77dc274ae6e0c9c42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7a7e0f9784c52… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 23 06:30:01 2010 +0100 webconf: renamed to wato --- LIESMICH.webconf => LIESMICH.wato | 0 web/htdocs/.f12 | 2 +- web/htdocs/check_mk.css | 26 +++++++++++++------------- web/htdocs/{webconf.py => wato.py} | 18 +++++++++--------- web/plugins/pages/wato.py | 5 +++++ web/plugins/pages/webconf.py | 5 ----- web/plugins/sidebar/{webconf.py => wato.py} | 10 +++++----- 7 files changed, 33 insertions(+), 33 deletions(-) diff --git a/LIESMICH.webconf b/LIESMICH.wato similarity index 100% rename from LIESMICH.webconf rename to LIESMICH.wato diff --git a/web/htdocs/.f12 b/web/htdocs/.f12 index 41938b8..240a59f 100644 --- a/web/htdocs/.f12 +++ b/web/htdocs/.f12 @@ -2,4 +2,4 @@ set -e sudo cp -rv images *.css *.py /omd/versions/default/share/check_mk/web/htdocs sudo cp -v ../plugins/pages/*.py /omd/versions/default/share/check_mk/web/plugins/pages/ -sudo omd restart webconf apache +sudo omd restart wato apache diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index ad0a4e5..ae7edb9 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1686,19 +1686,19 @@ table.add_snapin i { } /* - __ __ _ __ - \ \ / /__| |__ ___ ___ _ __ / _| - \ \ /\ / / _ \ '_ \ / __/ _ \| '_ \| |_ - \ V V / __/ |_) | (_| (_) | | | | _| - \_/\_/ \___|_.__/ \___\___/|_| |_|_| - + __ ___ _____ ___ + \ \ / / \|_ _/ _ \ + \ \ /\ / / _ \ | || | | | + \ V V / ___ \| || |_| | + \_/\_/_/ \_\_| \___/ + */ -div.webconf { +div.wato { padding: 0px; margin: 0px; } -.webconf table.auditlog { +.wato table.auditlog { background-image: url("images/form_background.png"); background-repeat: repeat; border-collapse: collapse; @@ -1707,24 +1707,24 @@ div.webconf { width: 100%; } -.webconf table.pending { +.wato table.pending { background-color: #fff; } -.webconf table.auditlog td { +.wato table.auditlog td { border: 1px solid white; padding: 2px 6px; } -.webconf .pending td { +.wato .pending td { border: 1px solid #444; padding: 2px 6px; } -.webconf td.dns { +.wato td.dns { color: #666; } -.webconf td.dnserror { +.wato td.dnserror { color: #f00; } diff --git a/web/htdocs/webconf.py b/web/htdocs/wato.py similarity index 98% rename from web/htdocs/webconf.py rename to web/htdocs/wato.py index 5706128..12f01ab 100644 --- a/web/htdocs/webconf.py +++ b/web/htdocs/wato.py @@ -2,7 +2,7 @@ # encoding: utf-8 # TODO: Ein Logfile pro filename anlegen, z.B. mit Unterverzeichnis -# var/web/webconf/windows/audit.log +# var/web/wato/windows/audit.log # ----------------------------------------------------------------- # ___ _ _ @@ -21,15 +21,15 @@ import htmllib # Problem hier: Das ganze funktioniert noch nicht in der local/-Hierarchie # from mod_python import importer -# config = importer.import_module("config", path = ["/omd/sites/webconf/share/check_mk/web/htdocs"]) +# config = importer.import_module("config", path = ["/omd/sites/wato/share/check_mk/web/htdocs"]) # config = importer.import_module("config") -config.declare_permission("use_webconf", +config.declare_permission("use_wato", "Use Webconfiguration", "Only with this permission, users are allowed to use Check_MK web configuration GUI.", [ "admin", ]) -conf_dir = defaults.var_dir + "/webconf/" +conf_dir = defaults.var_dir + "/wato/" # ----------------------------------------------------------------- # __ __ _ @@ -97,7 +97,7 @@ def page_index(h): # Title html.header("Check_MK WATO - %s - %s" % (title, modefunc("title"))) - html.write("<div class=webconf>\n") + html.write("<div class=wato>\n") # Show contexts buttons @@ -209,7 +209,7 @@ def host_link(hostname): def render_audit_log(log, what): - htmlcode = '<table class="webconf auditlog %s">' + htmlcode = '<table class="wato auditlog %s">' even = "even" for t, user, action, text in log: text = parse_host_names(text) @@ -501,7 +501,7 @@ def read_configuration_file(): for h in variables["all_hosts"]: parts = h.split('|') hostname = parts[0] - tags = [ tag for tag in parts[1:] if tag != 'webconf' and not tag.endswith('.mk') ] + tags = [ tag for tag in parts[1:] if tag != 'wato' and not tag.endswith('.mk') ] ipaddress = variables["ipaddresses"].get(hostname) aliases = host_extra_conf(hostname, variables["extra_host_conf"]["alias"]) if len(aliases) > 0: @@ -521,7 +521,7 @@ def write_configuration_file(): alias, ipaddress, tags = g_hosts[hostname] if alias: aliases.append((alias, [hostname])) - all_hosts.append("|".join([hostname] + tags + [ g_filename, 'webconf' ])) + all_hosts.append("|".join([hostname] + tags + [ g_filename, 'wato' ])) if ipaddress: ipaddresses[hostname] = ipaddress @@ -564,7 +564,7 @@ def check_filename(): if not title: raise MKGeneralException("No config file <tt>%s</tt> is declared in <tt>multisite.mk</tt>" % filename) - if not config.may("use_webconf") or config.role not in roles: + if not config.may("use_wato") or config.role not in roles: raise MKAuthException("You are not allowed to edit this configuration file!") return filename, title diff --git a/web/plugins/pages/wato.py b/web/plugins/pages/wato.py new file mode 100644 index 0000000..2183a40 --- /dev/null +++ b/web/plugins/pages/wato.py @@ -0,0 +1,5 @@ +import wato + +pagehandlers.update({ + "wato" : wato.page_index, +}) diff --git a/web/plugins/pages/webconf.py b/web/plugins/pages/webconf.py deleted file mode 100644 index ad7e964..0000000 --- a/web/plugins/pages/webconf.py +++ /dev/null @@ -1,5 +0,0 @@ -import webconf - -pagehandlers.update({ - "webconf" : webconf.page_index, -}) diff --git a/web/plugins/sidebar/webconf.py b/web/plugins/sidebar/wato.py similarity index 77% rename from web/plugins/sidebar/webconf.py rename to web/plugins/sidebar/wato.py index 73dda7a..066cab6 100644 --- a/web/plugins/sidebar/webconf.py +++ b/web/plugins/sidebar/wato.py @@ -2,8 +2,8 @@ import config -def render_webconf_files(): - if not config.may("use_webconf"): +def render_wato_files(): + if not config.may("use_wato"): html.write("You are not allowed to use Check_MK's web configuration GUI.") elif len(config.config_files)== 0: html.write("No configuration files are defined.<br>" @@ -13,13 +13,13 @@ def render_webconf_files(): else: for filename, title, roles in config.config_files: if config.role in roles: - bulletlink(title, "webconf.py?filename=%s" % filename) + bulletlink(title, "wato.py?filename=%s" % filename) -sidebar_snapins["webconf"] = { +sidebar_snapins["wato"] = { "title" : "Check_MK Web Administration Tool", "description" : "WATO - the Web Administration Tool of Check_MK - manage hosts to be monitored without access to the command line", "author" : "Mathias Kettner", - "render" : render_webconf_files, + "render" : render_wato_files, "allowed" : [ "admin", "user" ], }

13 years, 11 months

Check_MK Git: check_mk: Updated internal docu

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6d19b8b042360257f01d6b6a6ecddd1b340957d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d19b8b0423602… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 23 10:59:02 2010 +0100 Updated internal docu --- LIESMICH.wato | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/LIESMICH.wato b/LIESMICH.wato index 8b044b7..c728808 100644 --- a/LIESMICH.wato +++ b/LIESMICH.wato @@ -1,6 +1,21 @@ * Integration mit Multisite: - Bei einem Host muss es einen Kontextknopf zur Konfig-GUI geben, falls - dieser host per webconf erstellt wurde. + dieser host per webconf erstellt wurde. Dabei muss ich den Site-Prefix + benutzen. Problem: in sites muss ich einen neuen Schluessel einführen + "link_base" oder "url_base" oder "url_prefix". Dieser ersetzt dann + nagios_url, etc. und wird einfach vor alles davor gehängt. Dabei muss + ich auch http:// erlauben. + + Der Link erscheint nur, wenn: + * der Host das Tag 'wato' hat. + * der Benutzer das Rech 'use_wato' hat. + + In den Link wird der wato-Filename eingebaut, so dass man auf der + richtigen Seite landet. + + Problem noch: Dafür brauche ich per Livestatus die Host-Tags. + Die kann ich über die custom_attributes holen... + - Link von Webconf auf den Host in Nagios. Dazu muss ich die lokale Site wissen (konfigurieren in multisite.mk) @@ -8,3 +23,10 @@ * Doku +* Multisite: Das Snapin sollte die Dateien von allen WATO-Sites +anzeigen. Dazu kann die Liste der Sites durchgehen und für jede +Site per AJAX einen Webservice abrufen, der die Liste der editierbaren +Dateien anzeigt. + + +

13 years, 11 months

Check_MK Git: check_mk: Multisite: use url_prefix instead of specific paramters

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0d0250870d2a7e3440cdf17eaf14c0238fd0ca4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d0250870d2a7e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 24 21:01:35 2010 +0100 Multisite: use url_prefix instead of specific paramters --- ChangeLog | 6 +++++ multisite.mk | 33 ++++++++++++++++----------- scripts/install_nagios.sh | 2 +- scripts/setup.sh | 46 +++++++++++--------------------------- web/htdocs/.f12 | 6 +++- web/htdocs/config.py | 8 +----- web/htdocs/index.py | 8 +----- web/htdocs/livestatus.py | 4 ++- web/htdocs/sidebar.py | 6 ++-- web/plugins/sidebar/shipped.py | 5 ++- web/plugins/views/painters.py | 11 +++++---- web/plugins/views/perfometer.py | 1 - 12 files changed, 63 insertions(+), 73 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0d0250870d…

13 years, 11 months

Check_MK Git: check_mk: Multisite: improve handling of invalid status hosts

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5f7c234a56f5ff9f78e02da62b3dec451b7c4893 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f7c234a56f5ff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 24 22:30:55 2010 +0100 Multisite: improve handling of invalid status hosts --- web/htdocs/index.py | 2 +- web/htdocs/livestatus.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index bc682b8..c6b0cc8 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -111,7 +111,7 @@ 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", 4:"unknown" }.get(shs) + statename = { 1:"down", 2:"unreach", 3:"waiting", }.get(shs, "unknown") html.site_status[sitename]["state"] = statename else: diff --git a/web/htdocs/livestatus.py b/web/htdocs/livestatus.py index 404e28c..a95ae87 100644 --- a/web/htdocs/livestatus.py +++ b/web/htdocs/livestatus.py @@ -183,7 +183,8 @@ class BaseConnection: # Create new socket self.socket = None - parts = self.socketurl.split(":") + url = self.socketurl + parts = url.split(":") if parts[0] == "unix": if len(parts) != 2: raise MKLivestatusConfigError("Invalid livestatus unix url: %s. "

13 years, 11 months

Check_MK Git: check_mk: Multisite: icon from host to wato, improve wato snapin

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7acfb244a5de1c9fe406b20c6dd17215902b91bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7acfb244a5de1c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 24 22:32:02 2010 +0100 Multisite: icon from host to wato, improve wato snapin --- LIESMICH.wato | 24 ------------------------ web/htdocs/.f12 | 6 +++--- web/htdocs/check_mk.js | 13 +++++++++++++ web/htdocs/images/icon_wato.gif | Bin 0 -> 1506 bytes web/htdocs/sidebar.js | 12 ++++++------ web/plugins/pages/wato.py | 4 +++- web/plugins/sidebar/shipped.py | 4 ++-- web/plugins/sidebar/wato.py | 18 ++++++++++++++++++ web/plugins/views/painters.py | 20 ++++++++++++++++++++ 9 files changed, 65 insertions(+), 36 deletions(-) diff --git a/LIESMICH.wato b/LIESMICH.wato index c728808..1fd6469 100644 --- a/LIESMICH.wato +++ b/LIESMICH.wato @@ -1,21 +1,4 @@ * Integration mit Multisite: - - Bei einem Host muss es einen Kontextknopf zur Konfig-GUI geben, falls - dieser host per webconf erstellt wurde. Dabei muss ich den Site-Prefix - benutzen. Problem: in sites muss ich einen neuen Schluessel einführen - "link_base" oder "url_base" oder "url_prefix". Dieser ersetzt dann - nagios_url, etc. und wird einfach vor alles davor gehängt. Dabei muss - ich auch http:// erlauben. - - Der Link erscheint nur, wenn: - * der Host das Tag 'wato' hat. - * der Benutzer das Rech 'use_wato' hat. - - In den Link wird der wato-Filename eingebaut, so dass man auf der - richtigen Seite landet. - - Problem noch: Dafür brauche ich per Livestatus die Host-Tags. - Die kann ich über die custom_attributes holen... - - Link von Webconf auf den Host in Nagios. Dazu muss ich die lokale Site wissen (konfigurieren in multisite.mk) @@ -23,10 +6,3 @@ * Doku -* Multisite: Das Snapin sollte die Dateien von allen WATO-Sites -anzeigen. Dazu kann die Liste der Sites durchgehen und für jede -Site per AJAX einen Webservice abrufen, der die Liste der editierbaren -Dateien anzeigt. - - - diff --git a/web/htdocs/.f12 b/web/htdocs/.f12 index 717bd0d..d836a21 100644 --- a/web/htdocs/.f12 +++ b/web/htdocs/.f12 @@ -1,7 +1,7 @@ #!/bin/bash set -e -sudo cp -r images *.css *.py /omd/versions/default/share/check_mk/web/htdocs +sudo cp -r images *.css *.py *.js /omd/versions/default/share/check_mk/web/htdocs sudo cp ../plugins/pages/*.py /omd/versions/default/share/check_mk/web/plugins/pages/ -sudo cp -v ../plugins/views/*.py /omd/versions/default/share/check_mk/web/plugins/views/ -sudo cp -v ../plugins/sidebar/*.py /omd/versions/default/share/check_mk/web/plugins/sidebar/ +sudo cp ../plugins/views/*.py /omd/versions/default/share/check_mk/web/plugins/views/ +sudo cp ../plugins/sidebar/*.py /omd/versions/default/share/check_mk/web/plugins/sidebar/ sudo omd restart wato apache diff --git a/web/htdocs/check_mk.js b/web/htdocs/check_mk.js index 99e1dfc..c3ee791 100644 --- a/web/htdocs/check_mk.js +++ b/web/htdocs/check_mk.js @@ -59,6 +59,19 @@ function get_url(url, handler, data, errorHandler) { } } +function get_url_sync(url) { + if (window.XMLHttpRequest) { + var AJAX = new XMLHttpRequest(); + } else { + var AJAX = new ActiveXObject("Microsoft.XMLHTTP"); + } + + AJAX.open("GET", url, false); + AJAX.send(null); + return AJAX.responseText; +} + + // ---------------------------------------------------------------------------- // GUI styling // ---------------------------------------------------------------------------- diff --git a/web/htdocs/images/icon_wato.gif b/web/htdocs/images/icon_wato.gif new file mode 100644 index 0000000..5aae7e8 Binary files /dev/null and b/web/htdocs/images/icon_wato.gif differ diff --git a/web/htdocs/sidebar.js b/web/htdocs/sidebar.js index a7431eb..9231551 100644 --- a/web/htdocs/sidebar.js +++ b/web/htdocs/sidebar.js @@ -623,12 +623,12 @@ function sidebar_scheduler() { get_url(url, updateContents, "snapin_" + name); } } - // Detect page changes and re-register the mousemove event handler - // in the content frame. another bad hack ... narf - if(contentLocation != parent.frames[1].document.location) { - registerEdgeListeners(parent.frames[1]); - contentLocation = parent.frames[1].document.location; - } + // Detect page changes and re-register the mousemove event handler + // in the content frame. another bad hack ... narf + if (contentLocation != parent.frames[1].document.location) { + registerEdgeListeners(parent.frames[1]); + contentLocation = parent.frames[1].document.location; + } setTimeout(function(){sidebar_scheduler();}, 1000); } diff --git a/web/plugins/pages/wato.py b/web/plugins/pages/wato.py index 2183a40..0be87cd 100644 --- a/web/plugins/pages/wato.py +++ b/web/plugins/pages/wato.py @@ -1,5 +1,7 @@ import wato +import sidebar pagehandlers.update({ - "wato" : wato.page_index, + "wato" : wato.page_index, + "ajax_wato_files" : sidebar.ajax_wato_files, }) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index bd7b9c8..a7f1a01 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -434,10 +434,10 @@ sidebar_snapins["sitestatus"] = { .snapin table.sitestate td.online a { background-color: #3c0; color: #fff; border-color: #0f0; } .snapin table.sitestate td.disabled a { background-color: #666; color: #ccc; border-color: #888; } .snapin table.sitestate td.dead a { background-color: #c00; color: #f88; border-color: #f44; } -.snapin table.sitestate td.waiting a { background-color: #26c; color: #fff; border-color: #44f; } +.snapin table.sitestate td.waiting a { background-color: #666; color: #fff; border-color: #ccc; } .snapin table.sitestate td.down a { background-color: #f00; color: #fff; border-color: #800; } .snapin table.sitestate td.unreach a { background-color: #f80; color: #fff; border-color: #840; } -.snapin table.sitestate td.unknown a { background-color: #62d; color: #fff; border-color: #8ff; } +.snapin table.sitestate td.unknown a { background-color: #26c; color: #fff; border-color: #44f; } """ % snapin_width } diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 066cab6..f40a7bb 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -11,10 +11,28 @@ def render_wato_files(): "in <tt>multisite.mk</tt>.") else: + if config.is_multisite(): + sitenames = config.sites.keys() + sitenames.sort() + for sitename in sitenames: + site = config.sites[sitename] + state = html.site_status[sitename]["state"] + if state != "disabled": + html.write("<h3>%s</h3>\n" % site["alias"]) + ajax_url = site["url_prefix"] + "check_mk/ajax_wato_files.py" + html.javascript("document.write(get_url_sync('%s'));" % ajax_url) + else: + ajax_wato_files(html) + +def ajax_wato_files(h): + global html + html = h + if config.may("use_wato"): for filename, title, roles in config.config_files: if config.role in roles: bulletlink(title, "wato.py?filename=%s" % filename) + sidebar_snapins["wato"] = { "title" : "Check_MK Web Administration Tool", "description" : "WATO - the Web Administration Tool of Check_MK - manage hosts to be monitored without access to the command line", diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 4f6c448..7694c6d 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -75,6 +75,10 @@ icon_columns = [ "acknowledged", "scheduled_downtime_depth", "downtimes_with_inf "accept_passive_checks", "action_url_expanded", "notes_url_expanded", "in_notification_period", "custom_variable_names", "custom_variable_values" ] +def wato_link(filename, site, hostname): + prefix = config.site(site)["url_prefix"] + "check_mk/" + return prefix + "wato.py?filename=%s&host=%s&mode=edithost" % (htmllib.urlencode(filename), htmllib.urlencode(hostname)) + def paint_icons(what, row): # what is "host" or "service" output = "" if what == "host": @@ -90,6 +94,12 @@ def paint_icons(what, row): # what is "host" or "service" output += link_to_view("<img class=icon title='Detailed host infos' src='images/icon_detail.gif'>", newrow, 'host') + # Extract host tags + if "TAGS" in custom_vars: + tags = custom_vars["TAGS"].split() + else: + tags = [] + # action_url if row[prefix + "action_url_expanded"]: output += "<a href='%s'><img class=icon src=\"images/icon_action.gif\"></a>" % row[prefix + "action_url_expanded"] @@ -142,6 +152,16 @@ def paint_icons(what, row): # what is "host" or "service" if not row[prefix + "in_notification_period"]: output += '<img class=icon title="Out of notification period" src="images/icon_outofnot.gif">' + # Link to WATO + if "wato" in tags and what == "host": + for tag in tags: + if tag.endswith(".mk"): + wato_filename = tag + output += '<a href="%s"><img class=icon src="images/icon_wato.gif" ' \ + 'title="Open this host in WATO - the Check_MK Web Administration Tool"></a>' % \ + wato_link(wato_filename, row["site"], row["host_name"]) + break + return "icons", output def iconpainter_columns(what):

13 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits