Checkmk git commits November 2010

checkmk-commits@lists.checkmk.com

2 participants
180 discussions

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

Check_MK Git: check_mk: webconf: Intermediate state

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: f8772891d0441c823add1c9cd9073fc1f29d8b4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8772891d0441c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 17 12:20:46 2010 +0100 webconf: Intermediate state --- LIESMICH.webconf | 12 ++++++++++++ web/htdocs/webconf.py | 49 ++++++++++++++++++++++++++++--------------------- 2 files changed, 40 insertions(+), 21 deletions(-) diff --git a/LIESMICH.webconf b/LIESMICH.webconf index cf1e5a0..79097aa 100644 --- a/LIESMICH.webconf +++ b/LIESMICH.webconf @@ -21,3 +21,15 @@ 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 33ec323..87d4f16 100644 --- a/web/htdocs/webconf.py +++ b/web/htdocs/webconf.py @@ -200,9 +200,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)) + if hostname: + html.context_button("Services", "webconf_services.py?filename=%s&host=%s&_activate_available=1" % (filename, hostname)) html.end_context_buttons() # Form submitted @@ -232,11 +231,11 @@ def page_edithost(h): elif not re.match("^[a-zA-Z0-9-_.]+$", hostname): raise MKUserError("name", "Invalid host name: must contain only characters, digits, dash, underscore and dot.") - hosts[hostname] = (alias, ipaddress, tags) - write_configuration_file(filename, hosts) + if hostname: + hosts[hostname] = (alias, ipaddress, tags) + write_configuration_file(filename, hosts) # html.set_browser_redirect(1, "webconf.py?filename=%s" % htmllib.urlencode(filename)) - html.message("Saved changes.") - html.footer() + html.message("Saved changes.") except MKUserError, e: html.write("<div class=error>%s</div>\n" % e.message) @@ -293,6 +292,10 @@ def page_edithost(h): html.write("</table>\n") html.hidden_fields() html.end_form() + + if hostname: + show_services_table(hostname) + html.footer() def activate_configuration(): @@ -304,20 +307,7 @@ def activate_configuration(): else: html.message("The new configuration has been successfully activated.") -def page_services(h): - global html - html = h - - filename, title = check_filename() - hosts = read_configuration_file(filename) - - hostname = html.var("host") - html.header("Services of " + hostname) - html.begin_context_buttons() - html.context_button("Hostlist", "webconf.py?filename=" + filename) - html.context_button("Edit host", "webconf_edithost.py?filename=%s&host=%s" % (filename, hostname)) - html.end_context_buttons() - +def show_services_table(hostname): # Read current check configuration table = check_mk_automation("try-inventory", ["tcp", hostname]) table.sort() @@ -376,5 +366,22 @@ def page_services(h): html.write("</td></tr>\n") html.write("</table>\n") html.end_form() + +def page_services(h): + global html + html = h + + filename, title = check_filename() + hosts = read_configuration_file(filename) + + hostname = html.var("host") + html.header("Services of " + hostname) + html.begin_context_buttons() + html.context_button("Hostlist", "webconf.py?filename=" + filename) + html.context_button("Edit host", "webconf_edithost.py?filename=%s&host=%s" % (filename, hostname)) + html.end_context_buttons() + + show_services_table(hostname) + html.footer()

13 years, 7 months

Check_MK Git: check_mk: Editing of host with new/clone/edit/ delete now works

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6da3acd5b06c6f8435dbbc0f68ec974535c98f06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6da3acd5b06c6f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 12 16:45:06 2010 +0100 Editing of host with new/clone/edit/delete now works --- web/htdocs/webconf.py | 86 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 65 insertions(+), 21 deletions(-) diff --git a/web/htdocs/webconf.py b/web/htdocs/webconf.py index 22eef1a..6ab4db6 100644 --- a/web/htdocs/webconf.py +++ b/web/htdocs/webconf.py @@ -5,7 +5,7 @@ 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 +import sys, pprint, socket, re from lib import * import htmllib # import config @@ -49,7 +49,13 @@ 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) + + # Form for creating a new host + html.begin_context_buttons() + html.context_button("Create new host", "webconf_edithost.py?filename=" + filename) + html.end_context_buttons() + # Show table of hosts in this file html.write("<table class=services>\n") html.write("<tr><th>Hostname</th><th>IP Address</th><th>Tags</th><th>Actions</th></tr>\n") odd = "even" @@ -59,6 +65,7 @@ def page_index(h): for hostname in hostnames: ipaddress, tags = hosts[hostname] edit_url = "webconf_edithost.py?filename=%s&host=%s" % (filename, hostname) + clone_url = "webconf_edithost.py?filename=%s&clone=%s" % (filename, hostname) delete_url = "webconf.py?filename=%s&_delete=%s" % (filename, hostname) odd = odd == "odd" and "even" or "odd" html.write("<tr class=\"data %s0\"><td>%s</td>" % (odd, hostname)) @@ -72,6 +79,7 @@ def page_index(h): html.write("<td>%s</td>" % ", ".join(tags)) html.write("<td>") html.buttonlink(edit_url, "Edit") + html.buttonlink(clone_url, "Clone") html.buttonlink(delete_url, "Delete") html.write("</td>") html.write("</tr>\n") @@ -128,33 +136,69 @@ def page_edithost(h): html = h filename, title = check_filename() hosts = read_configuration_file(filename) - hostname = html.var("host") - if not hostname: - MKGeneralException("Host %s does not exist." % hostname) + + # Handle Edit, Clone and New + clonename = html.var("clone") + if clonename: + title = "Create clone of %s" % clonename + ipaddress, tags = hosts[clonename] + mode = "clone" + elif hostname in hosts: + title = "Edit host " + hostname + ipaddress, tags = hosts.get(hostname) + mode = "edit" + else: + title = "Create new host" + ipaddress, tags = None, [] + mode = "new" + # Form submitted if html.var("save") and html.check_transaction(): - ipaddress = html.var("ipaddress") - if not ipaddress: - ipaddress = None - tags = [] - for tagno, (tagname, taglist) in enumerate(config.host_tags): - value = html.var("tag_%d" % tagno) - if value: - tags.append(value) - hosts[hostname] = (ipaddress, tags) - write_configuration_file(filename, hosts) - html.set_browser_redirect(1, "webconf.py?filename=%s" % htmllib.urlencode(filename)) - html.header("Edit host") - html.message("Saved changes.") - html.footer() + try: + ipaddress = html.var("ipaddress") + if not ipaddress: + ipaddress = None + tags = [] + for tagno, (tagname, taglist) in enumerate(config.host_tags): + value = html.var("tag_%d" % tagno) + if value: + tags.append(value) + + # handle clone & new + if not hostname: + hostname = html.var("name") + if not hostname: + raise MKUserError("name", "Please specify a host name") + elif hostname in hosts: + raise MKUserError("name", "A host with this name already exists.") + elif not re.match("^[a-zA-Z0-9-_.]+$", hostname): + raise MKUserError("name", "Invalid host name: must contain only characters, digits, dash, underscore and dot.") + + hosts[hostname] = (ipaddress, tags) + write_configuration_file(filename, hosts) + html.set_browser_redirect(1, "webconf.py?filename=%s" % htmllib.urlencode(filename)) + html.header(title) + html.message("Saved changes.") + html.footer() + + except MKUserError, e: + html.header(title) + html.write("<div class=error>%s</div>\n" % e.message) + html.add_user_error(e.varname, e.message) + + else: + html.header(title) - html.header("Edit host %s" % hostname) - ipaddress, tags = hosts[hostname] html.begin_form("edithost") html.write("<table class=form>\n") - html.write("<tr><td class=legend>Hostname</td><td class=content>%s</td></tr>" % hostname) + html.write("<tr><td class=legend>Hostname</td><td class=content>") + if hostname and mode == "edit": + html.write(hostname) + else: + html.text_input("name") + html.write("</td></tr>\n") html.write("<tr><td class=legend>IP-Address<br>" "<i>Leave empty for automatic<br>" "IP address lookup via DNS</td><td class=content>")

13 years, 7 months

Check_MK Git: check_mk: Editing hosts and restarting Nagios works

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: cae74dc496842668b600deaa4747714d8a88b024 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cae74dc4968426… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 12 17:12:47 2010 +0100 Editing hosts and restarting Nagios works --- web/htdocs/.f12 | 3 + web/htdocs/webconf.py | 111 +++++++++++++++++++++++++++--------------------- web/plugins/pages/.f12 | 2 + 3 files changed, 68 insertions(+), 48 deletions(-) diff --git a/web/htdocs/.f12 b/web/htdocs/.f12 index 6b5892f..1df668e 100644 --- a/web/htdocs/.f12 +++ b/web/htdocs/.f12 @@ -1,2 +1,5 @@ +#!/bin/bash +set -e sudo cp -v *.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/webconf.py b/web/htdocs/webconf.py index 6ab4db6..4e5974d 100644 --- a/web/htdocs/webconf.py +++ b/web/htdocs/webconf.py @@ -5,7 +5,7 @@ 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 +import sys, pprint, socket, re, subprocess from lib import * import htmllib # import config @@ -17,6 +17,49 @@ config.declare_permission("use_webconf", [ "admin", ]) +def read_configuration_file(filename): + path = defaults.check_mk_configdir + "/" + filename + + if os.path.exists(path): + variables = { + "all_hosts" : [], + "ipaddresses" : {}, + } + execfile(path, variables, variables) + hosts = {} + for h in variables["all_hosts"]: + parts = h.split('|') + hostname = parts[0] + tags = parts[1:] + ipaddress = variables["ipaddresses"].get(hostname) + hosts[hostname] = (ipaddress, tags) + return hosts + else: + return {} + +def write_configuration_file(filename, hosts): + all_hosts = [] + ipaddresses = {} + hostnames = hosts.keys() + hostnames.sort() + for hostname in hostnames: + ipaddress, tags = hosts[hostname] + all_hosts.append("|".join([hostname] + tags)) + if ipaddress: + ipaddresses[hostname] = ipaddress + + path = defaults.check_mk_configdir + "/" + filename + out = file(path, "w") + out.write("# Written by Check_MK Webconf\n\n") + if len(all_hosts) > 0: + out.write("all_hosts += ") + out.write(pprint.pformat(all_hosts)) + if len(ipaddresses) > 0: + out.write("\n\nipaddresses.update(") + out.write(pprint.pformat(ipaddresses)) + out.write(")") + out.write("\n") + def check_filename(): filename = html.var("filename") if not filename: @@ -44,16 +87,22 @@ def page_index(h): html.header("Check_MK Configuration: " + title) hosts = read_configuration_file(filename) + # 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() + + action = html.var("_action") + if action == "activate": + activate_configuration() + # 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) - # Form for creating a new host - html.begin_context_buttons() - html.context_button("Create new host", "webconf_edithost.py?filename=" + filename) - html.end_context_buttons() # Show table of hosts in this file html.write("<table class=services>\n") @@ -88,49 +137,6 @@ def page_index(h): html.footer() -def read_configuration_file(filename): - path = defaults.check_mk_configdir + "/" + filename - - if os.path.exists(path): - variables = { - "all_hosts" : [], - "ipaddresses" : {}, - } - execfile(path, variables, variables) - hosts = {} - for h in variables["all_hosts"]: - parts = h.split('|') - hostname = parts[0] - tags = parts[1:] - ipaddress = variables["ipaddresses"].get(hostname) - hosts[hostname] = (ipaddress, tags) - return hosts - else: - return {} - -def write_configuration_file(filename, hosts): - all_hosts = [] - ipaddresses = {} - hostnames = hosts.keys() - hostnames.sort() - for hostname in hostnames: - ipaddress, tags = hosts[hostname] - all_hosts.append("|".join([hostname] + tags)) - if ipaddress: - ipaddresses[hostname] = ipaddress - - path = defaults.check_mk_configdir + "/" + filename - out = file(path, "w") - out.write("# Written by Check_MK Webconf\n\n") - if len(all_hosts) > 0: - out.write("all_hosts += ") - out.write(pprint.pformat(all_hosts)) - if len(ipaddresses) > 0: - out.write("\n\nipaddresses.update(") - out.write(pprint.pformat(ipaddresses)) - out.write(")") - out.write("\n") - def page_edithost(h): global html html = h @@ -233,3 +239,12 @@ def page_edithost(h): html.hidden_fields() html.end_form() html.footer() + +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.") diff --git a/web/plugins/pages/.f12 b/web/plugins/pages/.f12 new file mode 100644 index 0000000..92ab928 --- /dev/null +++ b/web/plugins/pages/.f12 @@ -0,0 +1,2 @@ +sudo cp -pv *.py /omd/versions/default/share/check_mk/web/plugins/pages +sudo omd restart webconf

13 years, 7 months

Check_MK Git: check_mk: webconf: started with inventory

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4871308544e241d06f67d682ca6ee558844a9b30 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4871308544e241… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 12 22:17:01 2010 +0100 webconf: started with inventory --- modules/check_mk.py | 133 ++++++++++++++++++++++++++++++++++++++++-- web/htdocs/webconf.py | 64 +++++++++++++++++++-- web/plugins/pages/webconf.py | 1 + 3 files changed, 188 insertions(+), 10 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4871308544…

13 years, 7 months

Check_MK Git: check_mk: webconf: display service table correctly

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 68fb857c85fdbe9b10c621a6f3ca08762316bf55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68fb857c85fdbe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 14 08:54:11 2010 +0100 webconf: display service table correctly --- modules/check_mk.py | 4 ++-- web/htdocs/htmllib.py | 2 +- web/htdocs/webconf.py | 46 ++++++++++++++++++++++++++++++++-------------- 3 files changed, 35 insertions(+), 17 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 17e47cf..c7b0fc0 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3455,7 +3455,7 @@ def automation_try_inventory(args): try: result = check_function(item, params, info) except MKCounterWrapped, e: - result = (0, "WAITING - Counter based check, cannot be done offline") + result = (None, "WAITING - Counter based check, cannot be done offline") except Exception, e: result = (3, "UNKNOWN - invalid output from agent or error in check implementation") if len(result) == 2: @@ -3463,7 +3463,7 @@ def automation_try_inventory(args): exitcode, output, perfdata = result else: descr = item - exitcode = 0 + exitcode = None output = "WAITING - Legacy check, cannot be done offline" perfdata = [] table.append((state_type, ct, item, params, descr, exitcode, output, perfdata)) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 88143a7..dbd31e2 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -275,7 +275,7 @@ class html: checked = " CHECKED" else: checked = "" - self.write("<input type=checkbox name=%s%s>" % (varname, checked)) + self.write("<input type=checkbox name=\"%s\"%s>" % (urlencode(varname), checked)) self.form_vars.append(varname) def datetime_input(self, varname, default_value): diff --git a/web/htdocs/webconf.py b/web/htdocs/webconf.py index 8ce32b9..14db080 100644 --- a/web/htdocs/webconf.py +++ b/web/htdocs/webconf.py @@ -272,29 +272,47 @@ def page_services(h): raise MKGeneralException("Error calling check_mk: %s, exit code %s" % (code, exit_code)) table = eval(code) table.sort() - + + + html.begin_form("checks") + html.button("add", "Add marked checks") + html.button("remove", "Remove marked checks") + html.hidden_fields() html.write("<table class=services>\n") - for state_name, state_type in [ - ( "Existing checks", "old", ), - ( "Available checks", "new", ), - ( "Ignored checks (configured away by admin)", "ignored" ), - ( "Obsolete checks (being checked, but should be ignored)", "obsolete" ), - ( "Vanished checks (checks, but no longer exist)", "vanished" ), - ( "Manual checks (defined in main.mk)", "manual" ), - ( "Legacy checks (defined in main.mk)", "legacy") + for state_name, state_type, checkbox in [ + ( "Available checks", "new", True ), + ( "Ignored checks (configured away by admin)", "ignored", False ), + ( "Already configured checks", "old", False, ), + ( "Obsolete checks (being checked, but should be ignored)", "obsolete", False ), + ( "Vanished checks (checks, but no longer exist)", "vanished", False ), + ( "Manual checks (defined in main.mk)", "manual", None ), + ( "Legacy checks (defined in main.mk)", "legacy", None) ]: first = True + trclass = "even" for st, ct, item, params, descr, state, output, perfdata in table: if state_type != st: continue if first: - html.write("<tr><td colspan=7>%s</td></tr>\n" % state_name) - html.write("<tr><th>Checktype</th><th>Item</th><th>Service Description</th><th>Status</th><th>Current check</th></tr>\n") + html.write('<tr class=groupheader><td colspan=7><br>%s</td></tr>\n' % state_name) + html.write("<tr><th>Status</th><th>Checktype</th><th>Item</th>" + "<th>Service Description</th><th>Current check</th><th></th></tr>\n") first = False - html.write("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td>" % - (ct, item, descr, state, output)) + trclass = trclass == "even" and "odd" or "even" + statename = nagios_short_state_names.get(state, "PEND") + if statename == "PEND": + stateclass = "state svcstate statep" + state = 0 # for tr class + else: + stateclass = "state svcstate state%s" % state + html.write("<tr class=\"data %s%d\"><td class=\"%s\">%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>" % + (trclass, state, stateclass, statename, ct, item, descr, output)) + if checkbox != None: + varname = "%s %s" % (ct, item) + html.checkbox(varname, checkbox) + html.write("</td></tr>\n") html.write("</table>\n") - + html.end_form() html.footer()

13 years, 7 months

Check_MK Git: check_mk: webconf: you now can configure host aliases

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 36bfe40ab2d4c1eecb6ff03c0c2e6de340fd73ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36bfe40ab2d4c1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 15 13:29:38 2010 +0100 webconf: you now can configure host aliases --- web/htdocs/webconf.py | 73 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 55 insertions(+), 18 deletions(-) diff --git a/web/htdocs/webconf.py b/web/htdocs/webconf.py index 14db080..fd96a2d 100644 --- a/web/htdocs/webconf.py +++ b/web/htdocs/webconf.py @@ -22,8 +22,9 @@ def read_configuration_file(filename): if os.path.exists(path): variables = { - "all_hosts" : [], - "ipaddresses" : {}, + "all_hosts" : [], + "ipaddresses" : {}, + "extra_host_conf" : { "alias" : [] }, } execfile(path, variables, variables) hosts = {} @@ -32,7 +33,13 @@ def read_configuration_file(filename): hostname = parts[0] tags = parts[1:] ipaddress = variables["ipaddresses"].get(hostname) - hosts[hostname] = (ipaddress, tags) + aliases = host_extra_conf(hostname, variables["extra_host_conf"]["alias"]) + if len(aliases) > 0: + alias = aliases[0] + else: + alias = None + hosts[hostname] = (alias, ipaddress, tags) + return hosts else: return {} @@ -40,10 +47,13 @@ def read_configuration_file(filename): def write_configuration_file(filename, hosts): all_hosts = [] ipaddresses = {} + aliases = [] hostnames = hosts.keys() hostnames.sort() for hostname in hostnames: - ipaddress, tags = hosts[hostname] + alias, ipaddress, tags = hosts[hostname] + if alias: + aliases.append((alias, [hostname])) all_hosts.append("|".join([hostname] + tags)) if ipaddress: ipaddresses[hostname] = ipaddress @@ -54,12 +64,24 @@ def write_configuration_file(filename, hosts): if len(all_hosts) > 0: 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("\nextra_host_conf['alias'] += ") + out.write(pprint.pformat(aliases)) if len(ipaddresses) > 0: out.write("\n\nipaddresses.update(") out.write(pprint.pformat(ipaddresses)) out.write(")") out.write("\n") +# This is a dummy implementation which works without tags +# and implements only a special case of Check_MK's real logic. +def host_extra_conf(hostname, conflist): + for value, hostlist in conflist: + if hostname in hostlist: + return [value] + return [] + def check_filename(): filename = html.var("filename") if not filename: @@ -106,18 +128,22 @@ def page_index(h): # Show table of hosts in this file html.write("<table class=services>\n") - html.write("<tr><th>Hostname</th><th>IP Address</th><th>Tags</th><th>Actions</th></tr>\n") + html.write("<tr><th>Hostname</th><th>Alias</th>" + "<th>IP Address</th><th>Tags</th><th>Actions</th></tr>\n") odd = "even" hostnames = hosts.keys() hostnames.sort() for hostname in hostnames: - ipaddress, tags = hosts[hostname] + alias, ipaddress, tags = hosts[hostname] edit_url = "webconf_edithost.py?filename=%s&host=%s" % (filename, hostname) clone_url = "webconf_edithost.py?filename=%s&clone=%s" % (filename, hostname) delete_url = "webconf.py?filename=%s&_delete=%s" % (filename, hostname) odd = odd == "odd" and "even" or "odd" - html.write("<tr class=\"data %s0\"><td>%s</td>" % (odd, hostname)) + + 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 "")) if not ipaddress: try: ip = socket.gethostbyname(hostname) @@ -132,8 +158,8 @@ def page_index(h): html.buttonlink(delete_url, "Delete") html.write("</td>") html.write("</tr>\n") - html.write("</table>\n") + html.write("</table>\n") html.footer() @@ -148,17 +174,16 @@ def page_edithost(h): clonename = html.var("clone") if clonename: title = "Create clone of %s" % clonename - ipaddress, tags = hosts[clonename] + alias, ipaddress, tags = hosts[clonename] mode = "clone" elif hostname in hosts: title = "Edit host " + hostname - ipaddress, tags = hosts.get(hostname) + alias, ipaddress, tags = hosts.get(hostname) mode = "edit" else: title = "Create new host" - ipaddress, tags = None, [] + alias, ipaddress, tags = None, None, [] mode = "new" - html.header(title) html.begin_context_buttons() @@ -169,9 +194,14 @@ def page_edithost(h): # Form submitted if html.var("save") and html.check_transaction(): try: + alias = html.var("alias") + if not alias: + alias = None # make sure no alias is set - not an empty one + ipaddress = html.var("ipaddress") if not ipaddress: - ipaddress = None + ipaddress = None # make sure no IP address is set + tags = [] for tagno, (tagname, taglist) in enumerate(config.host_tags): value = html.var("tag_%d" % tagno) @@ -188,7 +218,7 @@ def page_edithost(h): elif not re.match("^[a-zA-Z0-9-_.]+$", hostname): raise MKUserError("name", "Invalid host name: must contain only characters, digits, dash, underscore and dot.") - hosts[hostname] = (ipaddress, tags) + hosts[hostname] = (alias, ipaddress, tags) write_configuration_file(filename, hosts) # html.set_browser_redirect(1, "webconf.py?filename=%s" % htmllib.urlencode(filename)) html.message("Saved changes.") @@ -200,18 +230,27 @@ def page_edithost(h): html.begin_form("edithost") - html.write("<table class=form>\n") + html.write('<table class=form>\n') + + # host name html.write("<tr><td class=legend>Hostname</td><td class=content>") if hostname and mode == "edit": html.write(hostname) else: html.text_input("name") html.write("</td></tr>\n") + + # alias + 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") + + # IP address html.write("<tr><td class=legend>IP-Address<br>" "<i>Leave empty for automatic<br>" "IP address lookup via DNS</td><td class=content>") html.text_input("ipaddress", ipaddress) - html.write("</td>\n") + html.write("</td></tr>\n") # Host tags found_tags = [] @@ -313,8 +352,6 @@ def page_services(h): html.write("</td></tr>\n") html.write("</table>\n") html.end_form() - - html.footer()

13 years, 7 months

Check_MK Git: check_mk: First start of web configuration

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: afb1e0e3115ded4044db31c28b18fba8c6d27273 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afb1e0e3115ded… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Oct 30 19:21:35 2010 +0200 First start of web configuration --- web/htdocs/config.py | 10 +++++ web/htdocs/webconf.py | 84 ++++++++++++++++++++++++++++++++++++++++ web/plugins/pages/webconf.py | 5 ++ web/plugins/sidebar/webconf.py | 24 +++++++++++ 4 files changed, 123 insertions(+), 0 deletions(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 76057d7..170c050 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -403,3 +403,13 @@ custom_style_sheet = None # URL for start page in main frame (welcome page) start_url = "main.py" + +# __ __ _ __ +# \ \ / /__| |__ ___ ___ _ __ / _| +# \ \ /\ / / _ \ '_ \ / __/ _ \| '_ \| |_ +# \ V V / __/ |_) | (_| (_) | | | | _| +# \_/\_/ \___|_.__/ \___\___/|_| |_|_| +# + +config_files = [] +host_tags = [] diff --git a/web/htdocs/webconf.py b/web/htdocs/webconf.py new file mode 100644 index 0000000..145179b --- /dev/null +++ b/web/htdocs/webconf.py @@ -0,0 +1,84 @@ +#!/usr/bin/python +import config, pprint +from lib import * + +config.declare_permission("use_webconf", + "Use Webconfiguration", + "Only with this permission, users are allowed to use Check_MK web configuration GUI.", + [ "admin", ]) + +def index(h): + global html + html = h + filename = html.var("filename") + if not filename: + raise MKGeneralException("You called this page without a filename!") + title = None + for fn, t, roles in config.config_files: + 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) + + if not config.may("use_webconf") or config.role not in roles: + raise MKAuthException("You are not allowed to edit this configuration file!") + + html.header("Check_MK Configuration: " + title) + hosts = read_configuration_file(filename) + + html.write("<table class=services>\n") + html.write("<tr><th>Hostname</th><th>IP Address</th><th>Tags</th></tr>\n") + odd = "even" + for hostname, ipaddress, tags in hosts: + odd = odd == "odd" and "even" or "odd" + html.write("<tr class=\"data %s0\"><td>%s</td>" % (odd, hostname)) + html.write("<td>%s</td>" % (ipaddress and ipaddress or "(DNS)")) + html.write("<td>%s</td>" % ", ".join(tags)) + html.write("</tr>\n") + html.write("</table>\n") + + + write_configuration_file(filename, hosts) + html.footer() + + +def read_configuration_file(filename): + path = defaults.check_mk_configdir + "/" + filename + + if os.path.exists(path): + variables = { + "all_hosts" : [], + "ipaddresses" : {}, + } + execfile(path, variables, variables) + hosts = [] + for h in variables["all_hosts"]: + parts = h.split('|') + hostname = parts[0] + tags = parts[1:] + ipaddress = variables["ipaddresses"].get(hostname) + hosts.append((hostname, ipaddress, tags)) + return hosts + else: + return [] + +def write_configuration_file(filename, hosts): + all_hosts = [] + ipaddresses = {} + for hostname, ipaddress, tags in hosts: + all_hosts.append("|".join([hostname] + tags)) + if ipaddress: + ipaddresses[hostname] = ipaddress + path = defaults.check_mk_configdir + "/" + filename + out = file(path, "w") + out.write("# Written by Check_MK Webconf\n\n") + if len(all_hosts) > 0: + out.write("all_hosts += ") + out.write(pprint.pformat(all_hosts)) + if len(ipaddresses) > 0: + out.write("\n\nipaddresses.update(") + out.write(pprint.pformat(ipaddresses)) + out.write(")") + out.write("\n") diff --git a/web/plugins/pages/webconf.py b/web/plugins/pages/webconf.py new file mode 100644 index 0000000..34cd557 --- /dev/null +++ b/web/plugins/pages/webconf.py @@ -0,0 +1,5 @@ +import webconf + +pagehandlers.update({ + "webconf" : webconf.index, +}) diff --git a/web/plugins/sidebar/webconf.py b/web/plugins/sidebar/webconf.py new file mode 100644 index 0000000..3b01eb6 --- /dev/null +++ b/web/plugins/sidebar/webconf.py @@ -0,0 +1,24 @@ +#!/usr/bin/python + +import config + +def render_webconf_files(): + if not config.may("use_webconf"): + 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. Please set the variable <tt>config_files</tt> in <tt>multisite.mk</tt>.") + + else: + for filename, title, roles in config.config_files: + if config.role in roles: + 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", + "author" : "Mathias Kettner", + "render" : render_webconf_files, + "allowed" : [ "admin", "user" ], +} + +

13 years, 7 months

← Newer
1
2
3
4
5
6
7
8
...
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