Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65229 discussions

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

Check_MK Git: check_mk: webconf: complete cycle working for the first time

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 124c1bbe0719c241b47c7aa3ada21d336d675b90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=124c1bbe0719c2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 16 11:48:28 2010 +0100 webconf: complete cycle working for the first time --- modules/check_mk.py | 2 ++ web/htdocs/webconf.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 6d9b0e4..e7b3447 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3572,6 +3572,8 @@ def automation_parse_autochecks_file(hostname): def automation_delete_host(args): hostname = args[0] for path in [ + "%s/%s" % (precompiled_hostchecks_dir, hostname), + "%s/%s.py" % (precompiled_hostchecks_dir, hostname), "%s/%s.mk" % (autochecksdir, hostname), "%s/%s" % (logwatch_dir, hostname), "%s/%s" % (counters_directory, hostname), diff --git a/web/htdocs/webconf.py b/web/htdocs/webconf.py index 63cdd54..d4caa78 100644 --- a/web/htdocs/webconf.py +++ b/web/htdocs/webconf.py @@ -134,7 +134,7 @@ def page_index(h): if delname and delname in hosts and html.confirm("Do you really want to delete the host <tt>%s</tt>?" % delname): del hosts[delname] write_configuration_file(filename, hosts) - check_mk_automation("delete-host", delname) + check_mk_automation("delete-host", [delname]) # Show table of hosts in this file @@ -199,6 +199,8 @@ def page_edithost(h): html.header(title) html.begin_context_buttons() html.context_button("Hostlist", "webconf.py?filename=" + filename) + if hostname == None: + hostname = html.var("name") html.context_button("Services", "webconf_services.py?filename=%s&host=%s&_activate_available=1" % (filename, hostname)) html.end_context_buttons()

13 years, 11 months

Check_MK Git: check_mk: Always add tags "webconf" and filename

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 66782542ab85321fe498a17c9fa29a2a58755a20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66782542ab8532… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 17 08:36:42 2010 +0100 Always add tags "webconf" and filename --- LIESMICH.webconf | 23 +++++++++++++++++++++++ web/htdocs/webconf.py | 7 ++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/LIESMICH.webconf b/LIESMICH.webconf new file mode 100644 index 0000000..cf1e5a0 --- /dev/null +++ b/LIESMICH.webconf @@ -0,0 +1,23 @@ +* Integration mit Multisite: + - Bei einem Host muss es einen Kontextknopf zur Konfig-GUI geben, falls + dieser host per webconf erstellt wurde. + - 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 + +* Arbeitsfluss besser umsetzen. Kann/soll man so eine Art Wizard + machen? + +* 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 diff --git a/web/htdocs/webconf.py b/web/htdocs/webconf.py index d4caa78..33ec323 100644 --- a/web/htdocs/webconf.py +++ b/web/htdocs/webconf.py @@ -41,7 +41,7 @@ def read_configuration_file(filename): for h in variables["all_hosts"]: parts = h.split('|') hostname = parts[0] - tags = parts[1:] + tags = [ tag for tag in parts[1:] if tag != 'webconf' and not tag.endswith('.mk') ] ipaddress = variables["ipaddresses"].get(hostname) aliases = host_extra_conf(hostname, variables["extra_host_conf"]["alias"]) if len(aliases) > 0: @@ -64,7 +64,7 @@ def write_configuration_file(filename, hosts): alias, ipaddress, tags = hosts[hostname] if alias: aliases.append((alias, [hostname])) - all_hosts.append("|".join([hostname] + tags)) + all_hosts.append("|".join([hostname] + tags + [ filename, 'webconf' ])) if ipaddress: ipaddresses[hostname] = ipaddress @@ -75,7 +75,8 @@ def write_configuration_file(filename, hosts): out.write("all_hosts += ") out.write(pprint.pformat(all_hosts)) if len(aliases) > 0: - out.write("\n\nif 'alias' not in extra_host_conf:\n extra_host_conf['alias'] = []\n") + out.write("\n\nif 'alias' not in extra_host_conf:\n" + " extra_host_conf['alias'] = []\n") out.write("\nextra_host_conf['alias'] += ") out.write(pprint.pformat(aliases)) if len(ipaddresses) > 0:

13 years, 11 months

Check_MK Git: check_mk: Audit log and pending changes

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 46281280bd326126fb13eb7021153f9436cac7e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46281280bd3261… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 18 09:42:26 2010 +0100 Audit log and pending changes --- web/htdocs/.f12 | 2 +- web/htdocs/check_mk.css | 27 +++++++++++++++++++ web/htdocs/lib.py | 8 ++++- web/htdocs/webconf.py | 66 ++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 96 insertions(+), 7 deletions(-) diff --git a/web/htdocs/.f12 b/web/htdocs/.f12 index 1df668e..d0db3c2 100644 --- a/web/htdocs/.f12 +++ b/web/htdocs/.f12 @@ -1,5 +1,5 @@ #!/bin/bash set -e -sudo cp -v *.py /omd/versions/default/share/check_mk/web/htdocs +sudo cp -v *.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 9daf326..35f4070 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1154,6 +1154,13 @@ div.really, div.success, div.error, div.message, div.warning { border-style: solid; } +div.really h1, div.success h1, div.error h1, div.message h1, div.warning h1 { + font-size: 12pt; + font-weight: bold; + margin-bottom: 5px; +color: black; +} + div.really { background-color: #f88; border-color: #800; @@ -1673,3 +1680,23 @@ table.add_snapin i { color: white; } +/* + __ __ _ __ + \ \ / /__| |__ ___ ___ _ __ / _| + \ \ /\ / / _ \ '_ \ / __/ _ \| '_ \| |_ + \ V V / __/ |_) | (_| (_) | | | | _| + \_/\_/ \___|_.__/ \___\___/|_| |_|_| + +*/ +table.webconfpending { + background-color: #fff; + border-collapse: collapse; + margin-top: 3px; + margin-bottom: 1em; + width: 100%; +} + +table.webconfpending td { + border: 1px solid #444; + padding: 2px 6px; +} diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index 2818df0..e50e883 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -72,8 +72,8 @@ def make_nagios_directory(path): "<li>Both Nagios and the web server are in the group <tt>%s</tt>.</ul>Reason: %s" % ( path, defaults.www_group, defaults.www_group, e)) -def write_settings_file(path, content): - file(path, "w", 0).write(pprint.pformat(content) + "\n") +def create_user_file(path, mode): + f = file(path, mode, 0) gid = grp.getgrnam(defaults.www_group).gr_gid # Tackle user problem: If the file is owned by nagios, the web # user can write it but cannot chown the group. In that case we @@ -83,3 +83,7 @@ def write_settings_file(path, content): os.chmod(path, 0660) except: pass + return f + +def write_settings_file(path, content): + create_user_file(path, "w").write(pprint.pformat(content) + "\n") diff --git a/web/htdocs/webconf.py b/web/htdocs/webconf.py index 87d4f16..03d078c 100644 --- a/web/htdocs/webconf.py +++ b/web/htdocs/webconf.py @@ -5,19 +5,55 @@ import config #config = importer.import_module("config", path = ["/omd/sites/webconf/share/check_mk/web/htdocs"]) # config = importer.import_module("config") -import sys, pprint, socket, re, subprocess +import sys, pprint, socket, re, subprocess, time from lib import * import htmllib # import config +conf_dir = defaults.var_dir + "/webconf/" + config.declare_permission("use_webconf", "Use Webconfiguration", "Only with this permission, users are allowed to use Check_MK web configuration GUI.", [ "admin", ]) + +def log_entry(hostname, action, message, filename): + make_nagios_directory(conf_dir) + log_file = conf_dir + filename + create_user_file(log_file, "a").write("%d %s %s %s\n" % + (int(time.time()), html.req.user, action, message)) + + +def log_audit(hostname, what, message): + log_entry(hostname, what, message, "audit.log") + + +def log_pending(hostname, what, message): + log_entry(hostname, what, message, "pending.log") + log_entry(hostname, what, message, "audit.log") + + +def log_commit_pending(): + pending = conf_dir + "pending.log" + if os.path.exists(pending): + os.remove(pending) + +def parse_pending(): + pending = conf_dir + "pending.log" + if os.path.exists(pending): + entries = [] + for line in file(pending): + line = line.rstrip() + entries.append(line.split(None, 3)) + return entries + return [] + + def check_mk_automation(command, args, indata=""): - p = subprocess.Popen(["check_mk", "--automation", command ] + args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + p = subprocess.Popen(["check_mk", "--automation", command ] + args, + stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) p.stdin.write(repr(indata)) p.stdin.close() outdata = p.stdout.read() @@ -123,18 +159,33 @@ def page_index(h): # Context buttons html.begin_context_buttons() html.context_button("Create new host", "webconf_edithost.py?filename=" + filename) - html.context_button("Activate Changes!", html.makeuri([("_action", "activate")])) html.end_context_buttons() + # Activate changes action = html.var("_action") - if action == "activate": + if action == "activate" and html.transaction_valid(): activate_configuration() + pending = parse_pending() + if len(pending) > 0: + message = "<h1>Changes which are not yet activated:</h1>" + message += '<table class="webconfpending">' + for t, user, action, text in pending: + message += '<tr><td>%s</td><td>%s</td><td width="100%%">%s</td></tr>\n' % ( + time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(float(t))), + user, + text) + message += "</table>" + message += '<a href="%s" class=button>Activate Changes!</a>' % \ + html.makeuri([("_action", "activate"), ("_transid", html.current_transid(html.req.user))]) + html.show_warning(message) + # Deletion of entries delname = html.var("_delete") if delname and delname in hosts and html.confirm("Do you really want to delete the host <tt>%s</tt>?" % delname): del hosts[delname] write_configuration_file(filename, hosts) + log_pending(delname, "delete-host", "Deleted host %s" % delname) check_mk_automation("delete-host", [delname]) @@ -236,6 +287,10 @@ def page_edithost(h): write_configuration_file(filename, hosts) # html.set_browser_redirect(1, "webconf.py?filename=%s" % htmllib.urlencode(filename)) html.message("Saved changes.") + if not html.var("host"): + log_pending(hostname, "create-host", "Created new host %s" % hostname) + else: + log_pending(hostname, "edit-host", "Edited properties of host %s" % hostname) except MKUserError, e: html.write("<div class=error>%s</div>\n" % e.message) @@ -306,6 +361,8 @@ def activate_configuration(): 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 show_services_table(hostname): # Read current check configuration @@ -322,6 +379,7 @@ def show_services_table(hostname): check_mk_automation("set-autochecks", [hostname], active_checks) html.message("Saved check configuration with %d checks." % len(active_checks)) + log_pending(hostname, "set-autochecks", "Saved check configuration of host %s with %d checks" % (hostname, len(active_checks))) # re-read current check configuration, because it has changed table = check_mk_automation("try-inventory", ["tcp", hostname])

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