Checkmk git commits November 2010

checkmk-commits@lists.checkmk.com

2 participants
180 discussions

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, 6 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, 6 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, 6 months

Check_MK Git: check_mk: webconf: context button hot

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9e1712be73e7fc6def79c221f14392c220c19822 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9e1712be73e7fc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 20 13:48:09 2010 +0100 webconf: context button hot --- web/htdocs/.f12 | 2 +- web/htdocs/check_mk.css | 4 ++++ web/htdocs/htmllib.py | 8 ++++---- web/htdocs/images/contextlink_hot.png | Bin 0 -> 625 bytes web/htdocs/images/contextlink_hot_hi.png | Bin 0 -> 629 bytes web/htdocs/webconf.py | 5 ++++- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/web/htdocs/.f12 b/web/htdocs/.f12 index d0db3c2..41938b8 100644 --- a/web/htdocs/.f12 +++ b/web/htdocs/.f12 @@ -1,5 +1,5 @@ #!/bin/bash set -e -sudo cp -v *.css *.py /omd/versions/default/share/check_mk/web/htdocs +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 diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 93a50a5..c0c85a6 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -501,6 +501,10 @@ div.contextlink { left: -4px; } +div.contextlink.hot { + background-image: url("images/contextlink_hot.png"); +} + div.contextlink a { padding-top: 5px; color: white; diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index dbd31e2..7a1beba 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -211,10 +211,10 @@ class html: def end_context_buttons(self): self.write("</td></tr></table>\n") - def context_button(self, title, url): - self.write('<div class="contextlink" ') - self.write(r'''onmouseover='this.style.backgroundImage="url(\"images/contextlink_hi.png\")";' ''') - self.write(r'''onmouseout='this.style.backgroundImage="url(\"images/contextlink.png\")";' ''') + def context_button(self, title, url, hot=False): + self.write('<div class="contextlink%s" ' % (hot and " hot" or "")) + self.write(r'''onmouseover='this.style.backgroundImage="url(\"images/contextlink%s_hi.png\")";' ''' % (hot and "_hot" or "")) + self.write(r'''onmouseout='this.style.backgroundImage="url(\"images/contextlink%s.png\")";' ''' % (hot and "_hot" or "")) self.write('>') self.write('<a href="%s">%s</a></div>' % (url, title)) diff --git a/web/htdocs/images/contextlink_hot.png b/web/htdocs/images/contextlink_hot.png new file mode 100644 index 0000000..60f9f67 Binary files /dev/null and b/web/htdocs/images/contextlink_hot.png differ diff --git a/web/htdocs/images/contextlink_hot_hi.png b/web/htdocs/images/contextlink_hot_hi.png new file mode 100644 index 0000000..61e96ae Binary files /dev/null and b/web/htdocs/images/contextlink_hot_hi.png differ diff --git a/web/htdocs/webconf.py b/web/htdocs/webconf.py index b323f41..1ad3231 100644 --- a/web/htdocs/webconf.py +++ b/web/htdocs/webconf.py @@ -213,7 +213,10 @@ def page_index(h): buttontext = "ChangeLog" if len(pending) > 0: buttontext = "<b>%s (%d)</b>" % (buttontext, len(pending)) - html.context_button(buttontext, make_link([("mode", "changelog")])) + hot = True + else: + hot = False + html.context_button(buttontext, make_link([("mode", "changelog")]), hot) if mode == "changelog": html.context_button("Host list", make_link([("mode", "index")]))

13 years, 6 months

Check_MK Git: check_mk: webconf: beginning to convert to new workflow

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: a8d12734bb5692bc7d5f10f081fc6648c9cb37d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8d12734bb5692… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 20 12:45:38 2010 +0100 webconf: beginning to convert to new workflow --- web/htdocs/check_mk.css | 21 +++- web/htdocs/webconf.py | 306 ++++++++++++++++++++++++++--------------- web/plugins/pages/.f12 | 4 +- web/plugins/pages/webconf.py | 2 - 4 files changed, 214 insertions(+), 119 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a8d12734bb…

13 years, 6 months

Check_MK Git: check_mk: webconf: intermediate state

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 388b5e41dffbd927c0ec1943b020cefda0991f20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=388b5e41dffbd9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 21 13:22:08 2010 +0100 webconf: intermediate state --- modules/check_mk.py | 2 +- modules/check_mk_base.py | 15 +- web/htdocs/htmllib.py | 7 +- web/htdocs/webconf.py | 758 +++++++++++++++++++++++++--------------------- 4 files changed, 437 insertions(+), 345 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=388b5e41df…

13 years, 6 months

Check_MK Git: check_mk: webconf: new workflow system works

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 81b54bd1aa6d3bba50cddd676627f5c9bbb49509 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81b54bd1aa6d3b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 22 08:37:49 2010 +0100 webconf: new workflow system works --- LIESMICH.webconf | 4 -- web/htdocs/webconf.py | 77 ++++++++++++++++-------------------------------- 2 files changed, 26 insertions(+), 55 deletions(-) diff --git a/LIESMICH.webconf b/LIESMICH.webconf index 79097aa..bee51f7 100644 --- a/LIESMICH.webconf +++ b/LIESMICH.webconf @@ -4,10 +4,6 @@ - Link von Webconf auf den Host in Nagios. Dazu muss ich die lokale Site wissen (konfigurieren in multisite.mk) -* Evtl. sollte man den Hosts Tags verpassen: 'webconf' und 'hirni.mk', - also die Datei, aus der der Host kommt. Das würde auch die GUI-Links - leichter machen. - * Es fehlt noch SNMP. Keine Ahnung, wie ich das am besten umsetze * Knopf zum Löschen eines Hosts auch in Detailmaske diff --git a/web/htdocs/webconf.py b/web/htdocs/webconf.py index ccbdfed..8ad900d 100644 --- a/web/htdocs/webconf.py +++ b/web/htdocs/webconf.py @@ -46,11 +46,12 @@ conf_dir = defaults.var_dir + "/webconf/" # # Der Trick: welche Inhalte angezeigt werden, hängt vom Ausgang der Aktion # ab. Wenn man z.B. bei einem Host bei "Create new host" auf [Save] klickt, -# dann kommt bei Erfolg die Inventurseite, bei Misserfolgt bleibt man +# dann kommt bei Erfolg die Inventurseite, bei Misserfolg bleibt man # auf der Neuanlegen-Seite. # # Dummerweise kann ich aber die Kontextbuttons erst dann anzeigen, wenn -# ich den Ausgang der Aktion kenne. +# ich den Ausgang der Aktion kenne. Daher wird zuerst die Aktion ausgeführt, +# welche aber keinen HTML-Code ausgeben darf. def page_index(h): global html @@ -85,7 +86,8 @@ def page_index(h): # if newmode is not None, then the mode has been changed if newmode != None: if newmode == "": # no further information: configuration dialog, etc. - html.message(action_message) + if action_message: + html.message(action_message) html.write("</div>") html.footer() return @@ -114,43 +116,6 @@ def page_index(h): html.footer() -# def hirnstuff(): -# -# # Mögliche Aktionen: -# # Host löschen -# # Host anlegen -# # Host editieren/speichern -# # Servicekonfiguration speichern -# -# # Context buttons -# -# if mode in [ "index", "changelog" ]: -# html.context_button("Create new host", make_link([("mode", "newhost")])) -# -# if mode == "index": -# -# if mode == "changelog": -# html.context_button("Host list", make_link([("mode", "index")])) -# -# if mode in [ "newhost", "edithost", "inventory" ]: -# html.context_button("Abort", make_link([("mode", "index")])) -# -# -# # Actions (regardless of current mode) -# action = html.var("_action") -# if action == "activate" and html.transaction_valid(): -# activate_configuration() -# -# if mode == "index": -# show_hosts_table() -# elif mode == "changelog": -# show_changelog() -# elif mode in [ "edithost", "newhost" ]: -# show_edithost() -# -# html.write("</div>\n") -# html.footer() - # ----------------------------------------------------------------- # ____ # | _ \ __ _ __ _ ___ ___ @@ -169,14 +134,7 @@ def mode_index(phase): # Deletion of hosts delname = html.var("_delete") if delname and delname in g_hosts: - c = html.confirm("Do you really want to delete the host <tt>%s</tt>?" % delname) - if c: - del g_hosts[delname] - write_configuration_file() - log_pending(delname, "delete-host", "Deleted host %s" % delname) - check_mk_automation("delete-host", [delname]) - elif c == False: # not yet confirmed - return "" + return delete_host_after_confirm(delname) else: # Show table of hosts in this file html.write("<table class=services>\n") @@ -208,9 +166,9 @@ def mode_index(phase): html.write("<td>%s</td>" % ", ".join(tags)) html.write("<td>") html.buttonlink(edit_url, "Edit") + html.buttonlink(services_url, "Services") html.buttonlink(clone_url, "Clone") html.buttonlink(delete_url, "Delete") - html.buttonlink(services_url, "Services") html.write("</td>") html.write("</tr>\n") @@ -265,11 +223,11 @@ def mode_edithost(phase, new): if clonename: title = "Create clone of %s" % clonename - alias, ipaddress, tags = hosts[clonename] + alias, ipaddress, tags = g_hosts[clonename] mode = "clone" elif hostname in g_hosts: title = "Edit host " + hostname - alias, ipaddress, tags = g_hosts.get(hostname) + alias, ipaddress, tags = g_hosts[hostname] mode = "edit" else: title = "Create new host" @@ -282,6 +240,9 @@ def mode_edithost(phase, new): html.context_button("Services", make_link([("mode", "inventory"), ("host", hostname)])) elif phase == "action": + if html.var("delete"): # Delete this host + return delete_host_after_confirm(hostname) + alias = html.var("alias") if not alias: alias = None # make sure no alias is set - not an empty one @@ -363,6 +324,7 @@ def mode_edithost(phase, new): html.write("</td></tr>\n") html.write('<tr><td class="legend button" colspan=2>') + 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") @@ -608,3 +570,16 @@ def activate_configuration(): html.message("The new configuration has been successfully activated.") log_commit_pending() # flush logfile with pending actions log_audit(None, "activate-config", "Configuration activated, monitoring server restarted") + +def delete_host_after_confirm(delname): + c = html.confirm("Do you really want to delete the host <tt>%s</tt>?" % delname) + if c: + del g_hosts[delname] + write_configuration_file() + log_pending(delname, "delete-host", "Deleted host %s" % delname) + check_mk_automation("delete-host", [delname]) + return "index" + elif c == False: # not yet confirmed + return "" + else: + return None # browser reload

13 years, 6 months

Check_MK Git: check_mk: webconf: fixed several inconsistencies

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: f554460e63c0edbc1238cb67b1a393ab6e0939e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f554460e63c0ed… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 22 08:51:08 2010 +0100 webconf: fixed several inconsistencies --- LIESMICH.webconf | 5 +---- web/htdocs/check_mk.css | 8 ++++++++ web/htdocs/webconf.py | 35 +++++++++++++++++++++-------------- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/LIESMICH.webconf b/LIESMICH.webconf index bee51f7..422d79c 100644 --- a/LIESMICH.webconf +++ b/LIESMICH.webconf @@ -6,10 +6,7 @@ * Es fehlt noch SNMP. Keine Ahnung, wie ich das am besten umsetze -* Knopf zum Löschen eines Hosts auch in Detailmaske - -* Arbeitsfluss besser umsetzen. Kann/soll man so eine Art Wizard - machen? +* Reload bei ChangeLog aktivieren wird nicht abgefangen. * Eine Flagdatei, welche klarmacht, dass Änderungen gemacht, aber Nagios nicht neugestartet wurde. Evtl. kann man diese als Art diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index c0c85a6..4a93917 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1719,3 +1719,11 @@ div.webconf { border: 1px solid #444; padding: 2px 6px; } + +.webconf td.dns { + color: #666; +} + +.webconf td.dnserror { + color: #f00; +} diff --git a/web/htdocs/webconf.py b/web/htdocs/webconf.py index 8ad900d..64c7cff 100644 --- a/web/htdocs/webconf.py +++ b/web/htdocs/webconf.py @@ -156,13 +156,16 @@ def mode_index(phase): html.write('<tr class="data %s0"><td><a href="%s">%s</a></td>' % (odd, edit_url, hostname)) html.write("<td>%s</td>" % (alias and alias or "")) + tdclass = "" if not ipaddress: try: ip = socket.gethostbyname(hostname) ipaddress = "(DNS: %s)" % ip + tdclass = ' class="dns"' except: ipaddress = "(hostname not resolvable!)" - html.write("<td>%s</td>" % ipaddress) + tdclass = ' class="dnserror"' + html.write("<td%s>%s</td>" % (tdclass, ipaddress)) html.write("<td>%s</td>" % ", ".join(tags)) html.write("<td>") html.buttonlink(edit_url, "Edit") @@ -182,7 +185,15 @@ def mode_changelog(phase): html.context_button("Host list", make_link([("mode", "index")])) elif phase == "action": - activate_configuration() + f = os.popen("check_mk -R 2>&1 >/dev/null") + errors = f.read() + exitcode = f.close() + if exitcode: + raise MKUserError(None, errors) + else: + log_commit_pending() # flush logfile with pending actions + log_audit(None, "activate-config", "Configuration activated, monitoring server restarted") + return None, "The new configuration has been successfully activated." else: def render_audit_log(log, what): @@ -240,7 +251,7 @@ def mode_edithost(phase, new): html.context_button("Services", make_link([("mode", "inventory"), ("host", hostname)])) elif phase == "action": - if html.var("delete"): # Delete this host + if not new and html.var("delete"): # Delete this host return delete_host_after_confirm(hostname) alias = html.var("alias") @@ -250,6 +261,11 @@ def mode_edithost(phase, new): ipaddress = html.var("ipaddress") if not ipaddress: ipaddress = None # make sure no IP address is set + try: + ip = socket.gethostbyname(hostname) + except: + raise MKUserError("ipaddress", "Hostname <b><tt>%s</tt></b> cannot be resolved into an IP address. " + "Please check hostname or specify an explicit IP address." % hostname) tags = [] for tagno, (tagname, taglist) in enumerate(config.host_tags): @@ -324,7 +340,8 @@ def mode_edithost(phase, new): html.write("</td></tr>\n") html.write('<tr><td class="legend button" colspan=2>') - html.button("delete", "Delete host!", "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") @@ -560,16 +577,6 @@ def show_service_table(hostname, firsttime): html.write("</table>\n") html.end_form() -def activate_configuration(): - f = os.popen("check_mk -R 2>&1 >/dev/null") - errors = f.read() - exitcode = f.close() - if exitcode: - html.show_error(errors) - else: - html.message("The new configuration has been successfully activated.") - log_commit_pending() # flush logfile with pending actions - log_audit(None, "activate-config", "Configuration activated, monitoring server restarted") def delete_host_after_confirm(delname): c = html.confirm("Do you really want to delete the host <tt>%s</tt>?" % delname)

13 years, 6 months

Check_MK Git: check_mk: webconf: transid and reload now works in all cases

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9ca3b877559b9d04d5f1d581843fae9947161c23 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ca3b877559b9d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 22 16:32:26 2010 +0100 webconf: transid and reload now works in all cases --- LIESMICH.webconf | 18 ------------- web/htdocs/webconf.py | 68 +++++++++++++++++++++++++++++------------------- 2 files changed, 41 insertions(+), 45 deletions(-) diff --git a/LIESMICH.webconf b/LIESMICH.webconf index 422d79c..8b044b7 100644 --- a/LIESMICH.webconf +++ b/LIESMICH.webconf @@ -6,23 +6,5 @@ * Es fehlt noch SNMP. Keine Ahnung, wie ich das am besten umsetze -* Reload bei ChangeLog aktivieren wird nicht abgefangen. - -* Eine Flagdatei, welche klarmacht, dass Änderungen gemacht, aber -Nagios nicht neugestartet wurde. Evtl. kann man diese als Art -Logdatei aufbauen - ein Audit-log. Falls ja, sollte es beim Neustarten -umgeschoben werden in ein generelles Log. - * Doku - -Fluss beim Anlegen eines neues Hosts: - -1. Es erscheint das leere Formular. -2. Benutzer füllt aus und drück speichern - -> Fehler (eins rot) -> wiederholen - -> Cancel -> einfach zurück zur Hauptseite - -> OK: Weiter - -3. Jetzt kommt die Tabelle der Services -4. Speichern -> Hauptliste aller Hosts. diff --git a/web/htdocs/webconf.py b/web/htdocs/webconf.py index 64c7cff..e7f0f83 100644 --- a/web/htdocs/webconf.py +++ b/web/htdocs/webconf.py @@ -75,7 +75,7 @@ def page_index(h): # Do actions (might switch mode) action_message = None - if html.transaction_valid(): + if html.has_var("_transid"): try: result = modefunc("action") if type(result) == tuple: @@ -135,6 +135,7 @@ def mode_index(phase): delname = html.var("_delete") if delname and delname in g_hosts: return delete_host_after_confirm(delname) + else: # Show table of hosts in this file html.write("<table class=services>\n") @@ -185,15 +186,16 @@ def mode_changelog(phase): html.context_button("Host list", make_link([("mode", "index")])) elif phase == "action": - f = os.popen("check_mk -R 2>&1 >/dev/null") - errors = f.read() - exitcode = f.close() - if exitcode: - raise MKUserError(None, errors) - else: - log_commit_pending() # flush logfile with pending actions - log_audit(None, "activate-config", "Configuration activated, monitoring server restarted") - return None, "The new configuration has been successfully activated." + if html.check_transaction(): + f = os.popen("check_mk -R 2>&1 >/dev/null") + errors = f.read() + exitcode = f.close() + if exitcode: + raise MKUserError(None, errors) + else: + log_commit_pending() # flush logfile with pending actions + log_audit(None, "activate-config", "Configuration activated, monitoring server restarted") + return None, "The new configuration has been successfully activated." else: def render_audit_log(log, what): @@ -252,7 +254,10 @@ def mode_edithost(phase, new): elif phase == "action": if not new and html.var("delete"): # Delete this host - return delete_host_after_confirm(hostname) + if not html.transaction_valid(): + return "index" + else: + return delete_host_after_confirm(hostname) alias = html.var("alias") if not alias: @@ -283,17 +288,21 @@ def mode_edithost(phase, new): raise MKUserError("host", "Invalid host name: must contain only characters, digits, dash, underscore and dot.") if hostname: - g_hosts[hostname] = (alias, ipaddress, tags) - write_configuration_file() go_to_services = html.var("services") + if html.check_transaction(): + g_hosts[hostname] = (alias, ipaddress, tags) + write_configuration_file() + if new: + message = "Created new host %s" % hostname + log_pending(hostname, "create-host", message) + else: + log_pending(hostname, "edit-host", "Edited properties of host %s" % hostname) if new: - message = "Created new host %s" % hostname - log_pending(hostname, "create-host", message) return go_to_services and "firstinventory" or "index" else: - log_pending(hostname, "edit-host", "Edited properties of host %s" % hostname) return go_to_services and "inventory" or "index" + else: html.begin_form("edithost") html.write('<table class=form>\n') @@ -356,18 +365,20 @@ def mode_inventory(phase, firsttime): raise MKGeneralException("You called this page for a non-existing host.") if phase == "action": - table = check_mk_automation("try-inventory", ["tcp", hostname]) - table.sort() - active_checks = {} - for st, ct, item, paramstring, params, descr, state, output, perfdata in table: - varname = "_%s_%s" % (ct, item) - if html.var(varname, "") != "": - active_checks[(ct, item)] = paramstring + if html.check_transaction(): + table = check_mk_automation("try-inventory", ["tcp", hostname]) + table.sort() + active_checks = {} + for st, ct, item, paramstring, params, descr, state, output, perfdata in table: + varname = "_%s_%s" % (ct, item) + if html.var(varname, "") != "": + 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)) - log_pending(hostname, "set-autochecks", message) - return "index", message + check_mk_automation("set-autochecks", [hostname], 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" elif phase == "buttons": html.context_button("Host list", make_link([("mode", "index")])) @@ -579,6 +590,9 @@ def show_service_table(hostname, firsttime): def delete_host_after_confirm(delname): + if not html.transaction_valid(): + return None # Browser reload + c = html.confirm("Do you really want to delete the host <tt>%s</tt>?" % delname) if c: del g_hosts[delname]

13 years, 6 months

Check_MK Git: check_mk: services page working for the first time

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: c6fbe6a48a325f5c9b79eb0ced71eddb3a424d48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6fbe6a48a325f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 16 11:34:46 2010 +0100 services page working for the first time --- modules/check_mk.py | 149 +++++++++++++++++++++++++++++++++++++++++++------ web/htdocs/webconf.py | 54 ++++++++++++------ 2 files changed, 168 insertions(+), 35 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c6fbe6a48a…

13 years, 6 months

← Newer
1
2
3
4
5
6
7
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2010