Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65229 discussions

Check_MK Git: check_mk: Merge branch 'wato'

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: a9fbb36a20ca20d88bc7dcdb4de64258dcb60f86 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9fbb36a20ca20… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 30 12:37:43 2010 +0100 Merge branch 'wato' ---

13 years, 11 months

Check_MK Git: check_mk: wato: create logfile wato-file specific

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: cd3c8da303334f90d8f2ff1ff71cea8ca18cd361 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd3c8da303334f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 29 15:49:28 2010 +0100 wato: create logfile wato-file specific --- LIESMICH.wato | 56 ++++++--------------------------------------------- web/htdocs/wato.py | 22 +++++++++++--------- 2 files changed, 19 insertions(+), 59 deletions(-) diff --git a/LIESMICH.wato b/LIESMICH.wato index 1e7281f..7f1b8da 100644 --- a/LIESMICH.wato +++ b/LIESMICH.wato @@ -1,56 +1,14 @@ -* Es fehlt noch SNMP. Keine Ahnung, wie ich das am besten umsetze - -Inventursteuerung heute - -check_mk -I tcp --> Alle TCP Checks -check_mk -I snmp --> Alle SNMP Checks - -Inventurcheck: Prüft alle TCP Checks (falls tag snmp fehlt) und -alle SNMP Checks, von denen der Host schon mindestens einen hat. --> irgendwie doof. - -Besser wäre es, systematischer Tags einzuführen: - -snmp: Host wird per SNMP angesprochen -tcp: Host wird per TCP angesprochen -ping: Host wird nur angepingt (kein TCP und kein SNMP) -tcp+snmp: Host wird per TCP und SNMP angesprochen - -gar kein Tag: gleichbedeutend mit tcp - -der Inventurcheck wird das berücksichtigen und gleichzeitig -die Beschränkung aufheben, dass nur nach schon bestehenden -Checks gesucht wird. - - -Umsetzung: - -Erst Funktionen: - -is_snmp_host() --> hat Tag 'snmp' -is_tcp_host() --> hat *nicht* 'ping' oder 'snmp' oder hat 'tcp' -is_ping_host() --> hat 'ping' ( bzw. ist weder snmp_host noch tcp_host ) - -Beim Generieren der Services wird aber der 'PING' unabhängig von -den Tags erzeugt, sondern immer dann, wenn kein Service eingerichtet ist. - -Jetzt könnte man den Aufruf von check_mk -I abwandeln. Man könnte das -tcp oder snmp weglassen und stattdessen nach den Tags gehen. - -check_mk -I zbghora50 --> diesen Host inventurisieren, je nach Tag-Lage -check_mk --checks df,mem.used -I zbghora50 --> Checktypen explizit angeben -check_mk --checks snmp -I zbghora50 --> Alle snmp checks (Warnung, falls Tags snmp bei dem Host fehlt) - -Die Konfigurationsprüfung prüft folgendes: - -Wenn ein Host SNMP Checks hat, dann muss es auch ein SNMP-Host sein. -Gleiches gilt für TCP. - -WICHTIG FUER DIE DOKU: SNMP Hosts *müssen* das Tag snmp bekommen - sonst geht garnichts. Keine Inventur. Auch nicht mit expliziten Checks. Nichts. * Doku +* Logfiles pro Dateiname +* Berechtigungen für nicht-OMD bzw. OMD 'shared' + * check_mk --automation als welcher Benutzer? + * check_mk -R ==> check_mk --automation restart + * Rechte für die conf.d/hirni.mk + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5593e2c..55bebce 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1,9 +1,6 @@ #!/usr/bin/python # encoding: utf-8 -# TODO: Ein Logfile pro filename anlegen, z.B. mit Unterverzeichnis -# var/web/wato/windows/audit.log - # ----------------------------------------------------------------- # ___ _ _ # |_ _|_ __ (_) |_ @@ -29,7 +26,7 @@ config.declare_permission("use_wato", "Only with this permission, users are allowed to use Check_MK web configuration GUI.", [ "admin", ]) -conf_dir = defaults.var_dir + "/wato/" +conf_dir = defaults.var_dir + "/wato" # ----------------------------------------------------------------- # __ __ _ @@ -159,14 +156,15 @@ def mode_index(phase): odd = odd == "odd" and "even" or "odd" - html.write('<tr class="data %s0"><td><a href="%s">%s</a></td>' % - (odd, edit_url, hostname)) + html.write('<tr class="data %s0">' % odd) + html.write("<td>") html.buttonlink(edit_url, "Edit") html.buttonlink(services_url, "Services") html.buttonlink(clone_url, "Clone") html.buttonlink(delete_url, "Delete") html.write("</td>") + html.write('<td><a href="%s">%s</a></td>' % (edit_url, hostname)) html.write("<td>%s</td>" % (alias and alias or "")) tdclass = "" if not ipaddress: @@ -452,9 +450,11 @@ def mode_inventory(phase, firsttime): # # ----------------------------------------------------------------- -def log_entry(hostname, action, message, g_filename): +def log_entry(hostname, action, message, logfilename): make_nagios_directory(conf_dir) - log_file = conf_dir + g_filename + log_dir = conf_dir + "/" + g_filename + make_nagios_directory(log_dir) + log_file = log_dir + "/" + logfilename create_user_file(log_file, "a").write("%d %s %s %s\n" % (int(time.time()), html.req.user, action, message)) @@ -469,12 +469,12 @@ def log_pending(hostname, what, message): def log_commit_pending(): - pending = conf_dir + "pending.log" + pending = conf_dir + "/" + g_filename + "/pending.log" if os.path.exists(pending): os.remove(pending) def parse_audit_log(what): - path = "%s%s.log" % (conf_dir, what) + path = "%s/%s/%s.log" % (conf_dir, g_filename, what) if os.path.exists(path): entries = [] for line in file(path): @@ -573,6 +573,8 @@ def check_filename(): filename = html.var("filename") if not filename: raise MKGeneralException("You called this page without a filename!") + if '/' in filename: + raise MKGeneralException("You called this page with an invalid filename!") # Get alias (title) for filename title = None

13 years, 11 months

Check_MK Git: check_mk: host tags: rework tags snmp, tcp and ping

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 106ee0ef2d841dcc18117ac1fdffaaf94dd60e60 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=106ee0ef2d841d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 29 14:58:26 2010 +0100 host tags: rework tags snmp, tcp and ping --- ChangeLog | 12 +++++++----- LIESMICH.wato | 6 +++--- modules/check_mk.py | 50 +++++++++++++++++++++++++++++++++++--------------- web/htdocs/wato.py | 42 ++++++++++++++++++++++++++---------------- 4 files changed, 71 insertions(+), 39 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=106ee0ef2d…

13 years, 11 months

Check_MK Git: check_mk: wato: improve layout

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 92811278398219fcd499d7cdfaf1ea7d8e611088 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92811278398219… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 29 15:56:07 2010 +0100 wato: improve layout --- web/htdocs/check_mk.css | 4 ++++ web/htdocs/wato.py | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index ae7edb9..712aadc 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -1728,3 +1728,7 @@ div.wato { .wato td.dnserror { color: #f00; } + +.wato td.takeall { + width: 100%; +} diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 55bebce..99314aa 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -141,8 +141,8 @@ def mode_index(phase): else: # Show table of hosts in this file html.write("<table class=services>\n") - html.write("<tr><th></th><th>Hostname</th><th>Alias</th>" - "<th>IP Address</th><th>Tags</th></tr>\n") + html.write("<tr><th></th><th>Hostname</th>" + "<th>IP Address</th><th>Tags</th><th>Alias</th></tr>\n") odd = "even" hostnames = g_hosts.keys() @@ -165,7 +165,6 @@ def mode_index(phase): html.buttonlink(delete_url, "Delete") html.write("</td>") html.write('<td><a href="%s">%s</a></td>' % (edit_url, hostname)) - html.write("<td>%s</td>" % (alias and alias or "")) tdclass = "" if not ipaddress: try: @@ -176,7 +175,8 @@ def mode_index(phase): ipaddress = "(hostname not resolvable!)" tdclass = ' class="dnserror"' html.write("<td%s>%s</td>" % (tdclass, ipaddress)) - html.write("<td>%s</td>" % ", ".join(tags)) + html.write("<td>%s</td>" % ", ".join(tags)) + html.write("<td class=takeall>%s</td>" % (alias and alias or "")) html.write("</tr>\n") html.write("</table>\n")

13 years, 11 months

Check_MK Git: check_mk: wato: new example for multisite.mk

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2016470c0a04068b095adc5b4c50065a98776536 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2016470c0a0406… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 29 16:25:38 2010 +0100 wato: new example for multisite.mk --- multisite.mk | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/multisite.mk b/multisite.mk index eb60e5b..d336dda 100644 --- a/multisite.mk +++ b/multisite.mk @@ -138,7 +138,40 @@ show_livestatus_errors = True # Default is 'main.py' # start_url = 'view.py?view_name=hostgroups' - # Quicksearch: Limit the number of hits to shop in dropdown. # Default is to show at most 80 items. # quicksearch_dropdown_limit = 80 + +# __ ___ _____ ___ +# \ \ / / \|_ _/ _ \ +# \ \ /\ / / _ \ | || | | | +# \ V V / ___ \| || |_| | +# \_/\_/_/ \_\_| \___/ +# +# Check_MK's Web Administration Tool + +# Declare files in conf.d/ to be editable with WATO +# config_files = [ +# ("datacenter.mk", "Servers in Datacenter", [ "admin" ]), +# ("network.mk", "Network, Infrastructure", [ "admin", "user" ] ), +# ] + +# Host tags to be used in WATO +# host_tags = [ +# ( "Operating System", [ +# ( "lnx", "Linux", [ 'tcp' ]), +# ( "win", "Windows", [ 'tcp', 'snmp' ]), +# ( "net", "Network device", [ 'snmp' ]), +# ( "ping", "Other PING-only device", ), +# ]), +# ( "Productivity", [ +# ( "prod", "Production System" ), +# ( "test", "Test System" ), +# ]), +# ( "Bulkwalk (SNMP v2c)", [ +# ( None, "simple walk (SNMP v1)"), +# ( "bulk", "Bulkwalk (SNMP v2c)" ), +# ]), +# +# ] +

13 years, 11 months

Check_MK Git: check_mk: wato: prepare setup

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: a6d1ecab3f3f08d650ea0d7d5d20303ccbebf10d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6d1ecab3f3f08… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 29 17:12:09 2010 +0100 wato: prepare setup --- modules/check_mk.py | 53 ++++++++++++++++++++++++++++++++++++++++++++------ scripts/setup.sh | 6 +++- web/htdocs/wato.py | 27 ++++++++++++++----------- 3 files changed, 65 insertions(+), 21 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index f966e52..531d388 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3094,7 +3094,7 @@ def do_update(): def do_check_nagiosconfig(): command = nagios_binary + " -v " + nagios_config_file + " 2>&1" - sys.stderr.write("Validating Nagios configuration...") + sys.stdout.write("Validating Nagios configuration...") if opt_verbose: sys.stderr.write("Running '%s'" % command) sys.stderr.flush() @@ -3103,26 +3103,26 @@ def do_check_nagiosconfig(): output = process.read() exit_status = process.close() if not exit_status: - sys.stderr.write(tty_ok + "\n") + sys.stdout.write(tty_ok + "\n") return True else: - sys.stderr.write("ERROR:\n") + sys.stdout.write("ERROR:\n") sys.stderr.write(output) return False def do_restart_nagios(only_reload): action = only_reload and "load" or "start" - sys.stderr.write("Re%sing Nagios..." % action) - sys.stderr.flush() + sys.stdout.write("Re%sing Nagios..." % action) + sys.stdout.flush() command = nagios_startscript + " re%s 2>&1" % action process = os.popen(command, "r") output = process.read() if process.close(): - sys.stderr.write("ERROR:\n") + sys.stdout.write("ERROR:\n") raise MKGeneralException("Cannot re%s Nagios" % action) else: - sys.stderr.write(tty_ok + "\n") + sys.stdout.write(tty_ok + "\n") def do_reload(): do_restart(True) @@ -3624,6 +3624,43 @@ def automation_delete_host(args): "%s/%s.*" % (tcp_cache_dir, hostname)]: os.system("rm -rf '%s'" % path) +def automation_restart(): + old_stdout = sys.stdout + sys.stdout = file('/dev/null', 'w') + try: + if os.path.exists(nagios_objects_file): + backup_path = nagios_objects_file + ".save" + os.rename(nagios_objects_file, backup_path) + else: + backup_path = None + + try: + create_nagios_config(file(nagios_objects_file, "w")) + except Exception, e: + if backup_path: + os.rename(backup_path, nagios_objects_file) + raise MKAutomationError("Error creating configuration: %s" % e) + + if do_check_nagiosconfig(): + if backup_path: + os.remove(backup_path) + do_precompile_hostchecks() + do_restart_nagios(False) + else: + if backup_path: + os.rename(backup_path, nagios_objects_file) + else: + os.remove(nagios_objects_file) + raise MKAutomationError("Nagios configuration is invalid. Rolling back.") + + except Exception, e: + if backup_path and os.path.exists(backup_path): + os.remove(backup_path) + raise MKAutomationError(str(e)) + + sys.stdout = old_stdout + + def do_automation(cmd, args): try: if cmd == "try-inventory": @@ -3634,6 +3671,8 @@ def do_automation(cmd, args): result = automation_set_autochecks(args) elif cmd == "delete-host": result = automation_delete_host(args) + elif cmd == "restart": + result = automation_restart() else: raise MKAutomationError("Automation command '%s' is not implemented." % cmd) diff --git a/scripts/setup.sh b/scripts/setup.sh index db48008..e43740e 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -586,14 +586,16 @@ do sed -ri 's@^export MK_LIBDIR="(.*)"@export MK_LIBDIR="'"$agentslibdir"'"@' $agent sed -ri 's@^export MK_CONFDIR="(.*)"@export MK_CONFDIR="'"$agentsconfdir"'"@' $agent done && - mkdir -p $DESTDIR$vardir/{autochecks,counters,precompiled,cache,logwatch,web} && + mkdir -p $DESTDIR$vardir/{autochecks,counters,precompiled,cache,logwatch,web,wato} && if [ -z "$DESTDIR" ] && id "$nagiosuser" > /dev/null 2>&1 && [ $UID = 0 ] ; then chown -R $nagiosuser $DESTDIR$vardir/{counters,cache,logwatch} chown $nagiosuser $DESTDIR$vardir/web fi && if [ -z "$DESTDIR" ] ; then chgrp -R $wwwgroup $DESTDIR$vardir/web && - chmod -R g+w $DESTDIR$vardir/web + chmod -R g+w $DESTDIR$vardir/web && + chgrp -R $wwwgroup $DESTDIR$vardir/wato && + chmod -R g+w $DESTDIR$vardir/wato fi && mkdir -p $DESTDIR$confdir/conf.d && tar xzf $SRCDIR/conf.tar.gz -C $DESTDIR$confdir && diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 99314aa..dab6df6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -232,15 +232,13 @@ def mode_changelog(phase): elif phase == "action": 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." + try: + check_mk_automation("restart") + except Exception, e: + raise MKUserError(None, str(e)) + 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: @@ -485,15 +483,20 @@ def parse_audit_log(what): return [] -def check_mk_automation(command, args, indata=""): - p = subprocess.Popen(["check_mk", "--automation", command ] + args, +def check_mk_automation(command, args=[], indata=""): + commandargs = defaults.check_mk_automation.split() + try: + p = subprocess.Popen(commandargs + [ command ] + args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + except Exception, e: + raise MKGeneralException("Cannot execute <tt>%s</tt>: %s" % (commandargs[0], e)) p.stdin.write(repr(indata)) p.stdin.close() outdata = p.stdout.read() exitcode = p.wait() if exitcode != 0: - raise MKGeneralException(outdata) + raise MKGeneralException("Error running <tt>%s %s %s</tt>: <pre>%s</pre>" % + (defaults.check_mk_automation, command, " ".join(args), outdata)) return eval(outdata)

13 years, 11 months

Check_MK Git: check_mk: wato: sudo setup for setup.sh

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: c5206f3f1ecc1811938cf48def5b6d2018048351 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5206f3f1ecc18… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 29 17:54:57 2010 +0100 wato: sudo setup for setup.sh --- scripts/setup.sh | 53 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 46 insertions(+), 7 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index e43740e..654306e 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -284,6 +284,12 @@ that need to be writable by the Nagios user (which is running check_mk in check mode). Please specify the user that should own those directories" +ask_dir -d wwwuser www-data www-data "User of Apache process" \ + "Check_MK WATO (Web Administration Tool) needs a sudo configuration, +such that Apache can run certain commands as $(id -un). If you specify +the correct user of the apache process here, then we can create a valid +sudo configuration for you later:" + ask_dir -d wwwgroup nagios $(id -un) "Common group of Nagios+Apache" \ "Check_mk creates files and directories while running as $nagiosuser. Some of those need to be writable by the user that is running the webserver. @@ -337,7 +343,7 @@ Please specify the complete path (dir + filename) of check_icmp" ask_title "Integration with Apache" # ------------------------------------------------------------------- -ask_dir url_prefix / / "URL Prefix for Multisite and addons" \ +ask_dir url_prefix / / "URL Prefix for Web addons" \ "Usually the Multisite GUI is available at /check_mk/ and PNP4Nagios is located at /pnp4nagios/. In some cases you might want to define some prefix in order to be able to run more instances of Nagios on one host. @@ -378,7 +384,7 @@ Those templates make the history graphs look nice. PNP4Nagios expects such templates in the directory pnp/templates in your document root for static web pages" -ask_dir pnprraconf /usr/share/$NAME/pnp-rraconf $HOMEBASEDIR/pnp-rraconf "RRA configuration for PNP4Nagios" \ +ask_dir pnprraconf /usr/share/$NAME/pnp-rraconf $HOMEBASEDIR/pnp-rraconf "RRA config for PNP4Nagios" \ "Check_MK ships RRA configuration files for its checks that can be used by PNP when creating the RRDs. Per default, PNP creates RRD such that for each variable the minimum, maximum @@ -463,7 +469,7 @@ nagios_command_pipe_path = '$nagpipe' nagios_status_file = '$nagios_status_file' nagios_conf_dir = '$nagconfdir' nagios_user = '$nagiosuser' -logwatch_notes_url = '$url_prefix/check_mk/logwatch.py?host=%s&file=%s' +logwatch_notes_url = '${url_prefix}check_mk/logwatch.py?host=%s&file=%s' www_group = '$wwwgroup' nagios_config_file = '$nagios_config_file' nagios_startscript = '$nagios_startscript' @@ -475,10 +481,11 @@ web_dir = '$web_dir' livestatus_unix_socket = '$livesock' livebackendsdir = '$livebackendsdir' url_prefix = '$url_prefix' -pnp_url = '$url_prefix/pnp4nagios/' +pnp_url = '${url_prefix}pnp4nagios/' pnp_templates_dir = '$pnptemplates' pnp_rraconf_dir = '$pnprraconf' doc_dir = '$docdir' +check_mk_automation = 'sudo -u $(id -un) $bindir/check_mk --automation' EOF } @@ -528,6 +535,37 @@ EOF } +create_sudo_configuration () +{ + # sudo only possible if running as root + if [ $UID != 0 ] ; then + return + fi + + sudoline="$wwwuser ALL = (root) NOPASSWD: $bindir/check_mk --automation *" + + if [ ! -e /etc/sudoers ] ; then + echo "You do not have sudo installed. Please install sudo " + echo "and add the following line to /etc/sudoers if you want" + echo "to use WATO - the Check_MK Web Administration Tool" + echo + echo "$sudoline" + echo + echo + return + fi + + if fgrep -q 'check_mk --automation' /etc/sudoers 2>/dev/null + then + # already present. Do not touch. + return + fi + + echo >> /etc/sudoers + echo "# Needed for WATO - the Check_MK Web Administration Tool" >> /etc/sudoers + echo "$sudoline" >> /etc/sudoers +} + while true do if [ -z "$DESTDIR" -a -z "$YES" ] ; then @@ -660,7 +698,7 @@ do # inconveniance. <IfModule mod_python.c> - Alias $url_prefix/check_mk $web_dir/htdocs + Alias ${url_prefix}check_mk $web_dir/htdocs <Directory $web_dir/htdocs> AddHandler mod_python .py PythonHandler index @@ -695,7 +733,7 @@ and change the path there. Restart Apache afterwards." </IfModule> <IfModule !mod_python.c> - Alias $url_prefix/check_mk $web_dir/htdocs + Alias ${url_prefix}check_mk $web_dir/htdocs <Directory $web_dir/htdocs> Deny from all ErrorDocument 403 "<h1>Check_mk: Incomplete Apache2 Installation</h1>\ @@ -711,10 +749,11 @@ EOF sed -i "s@$web_dir@$web_dir/htdocs@g" $d fi done && + create_sudo_configuration && if [ -z "$YES" ] ; then echo -e "Installation completed successfully.\nPlease restart Nagios and Apache in order to update/active check_mk's web pages." echo - echo -e "You can access the new Multisite GUI at http://localhost$url_prefix/check_mk/" + echo -e "You can access the new Multisite GUI at http://localhost${url_prefix}check_mk/" fi || echo "ERROR!" exit

13 years, 11 months

Check_MK Git: check_mk: wato: link to WATO from inventory check

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: a37b734d101688d7ef34fb3182b409922fc15d42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a37b734d101688… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 27 12:43:58 2010 +0100 wato: link to WATO from inventory check --- web/htdocs/wato.py | 13 ++++++++++--- web/plugins/views/painters.py | 33 +++++++++++++++++++++++++-------- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 12f01ab..3f55574 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -493,9 +493,11 @@ def read_configuration_file(): if os.path.exists(path): variables = { - "all_hosts" : [], - "ipaddresses" : {}, - "extra_host_conf" : { "alias" : [] }, + "ALL_HOSTS" : ['@all'], + "all_hosts" : [], + "ipaddresses" : {}, + "extra_host_conf" : { "alias" : [] }, + "extra_service_conf" : { "_WATO" : [] }, } execfile(path, variables, variables) for h in variables["all_hosts"]: @@ -542,6 +544,11 @@ def write_configuration_file(): out.write(")") out.write("\n") + # all WATO information to Check_MK's inventory checks (needed for link in Multisite) + out.write("extra_service_conf['_WATO'] = [ \n" + " ('hirni.mk', [ 'wato', 'hirni.mk' ], ALL_HOSTS, [ 'Check_MK inventory' ] ) ]\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): diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 7694c6d..0df84ef 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -70,14 +70,27 @@ # + +# Columns to fetch from hosts or services for displaying the icons icon_columns = [ "acknowledged", "scheduled_downtime_depth", "downtimes_with_info", "comments_with_info", "notifications_enabled", "is_flapping", "modified_attributes_list", "active_checks_enabled", "accept_passive_checks", "action_url_expanded", "notes_url_expanded", "in_notification_period", "custom_variable_names", "custom_variable_values" ] -def wato_link(filename, site, hostname): +# Additional columns only to fetch for services +icon_service_columns = [ "service_description" ] + +def wato_link(filename, site, hostname, where): prefix = config.site(site)["url_prefix"] + "check_mk/" - return prefix + "wato.py?filename=%s&host=%s&mode=edithost" % (htmllib.urlencode(filename), htmllib.urlencode(hostname)) + url = prefix + "wato.py?filename=%s&host=%s" % (htmllib.urlencode(filename), htmllib.urlencode(hostname)) + if where == "inventory": + url += "&mode=inventory" + help = "Edit services" + else: + url += "&mode=edithost" + help = "Open this host" + return '<a href="%s"><img class=icon src="images/icon_wato.gif" ' \ + 'title="%s in WATO - the Check_MK Web Administration Tool"></a>' % (url, help) def paint_icons(what, row): # what is "host" or "service" output = "" @@ -152,15 +165,19 @@ 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 + # Link to WATO for hosts 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 + output += wato_link(wato_filename, row["site"], row["host_name"], "edithost") + + + # Link to WATO for Check_MK Inventory service + if what == "service": + wato_filename = custom_vars.get("WATO") + if wato_filename: + output += wato_link(wato_filename, row["site"], row["host_name"], "inventory") return "icons", output @@ -168,7 +185,7 @@ def iconpainter_columns(what): cols = [ what + "_" + c for c in icon_columns ] cols += [ "host_name" ] if what == "service": - cols += [ "service_description" ] + cols += icon_service_columns return cols multisite_painters["service_icons"] = {

13 years, 11 months

Check_MK Git: check_mk: wato: buttons for adding/removing all services

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: d1e426bb9ee5d69bc08b9424f8f2b785a7a3e40d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1e426bb9ee5d6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 27 13:57:14 2010 +0100 wato: buttons for adding/removing all services --- web/htdocs/htmllib.py | 3 +++ web/htdocs/wato.py | 44 +++++++++++++++++++++++++++++++++----------- 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index ddae25f..3fb7a74 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -433,6 +433,9 @@ class html: def set_var(self, varname, value): self.req.vars[varname] = value + def del_var(self, varname): + del self.req.vars[varname] + def javascript(self, code): self.write("<script language=\"javascript\">\n%s\n</script>\n" % code) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3f55574..00399fe 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -412,15 +412,21 @@ def mode_inventory(phase, firsttime): table = check_mk_automation("try-inventory", ["tcp", hostname]) table.sort() active_checks = {} + new_target = "index" for st, ct, item, paramstring, params, descr, state, output, perfdata in table: - varname = "_%s_%s" % (ct, item) - if html.var(varname, "") != "": + if (html.has_var("_cleanup") or html.has_var("_fixall")) and st in [ "vanished", "obsolete" ]: + pass + elif (html.has_var("_activate_all") or html.has_var("_fixall")) and st == "new": active_checks[(ct, item)] = paramstring + else: + 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 + return new_target, message return "index" elif phase == "buttons": @@ -600,17 +606,33 @@ def show_service_table(hostname, firsttime): table.sort() html.begin_form("checks") - html.button("_save", "Save check configuration") + fixall = 0 + for entry in table: + if entry[0] == 'new' and not html.has_var("_activate_all") and not firsttime: + html.button("_activate_all", "Activate missing") + fixall += 1 + break + for entry in table: + if entry[0] in [ 'obsolete', 'vanished', ]: + html.button("_cleanup", "Remove exceeding") + fixall += 1 + break + if fixall == 2: + html.button("_fixall", "Fix all missing/exceeding") + + + html.button("_save", "Save manual check configuration") html.hidden_fields() html.write("<table class=services>\n") + for state_name, state_type, checkbox in [ - ( "Available checks", "new", firsttime ), - ( "Already configured checks", "old", True, ), - ( "Obsolete checks (being checked, but should be ignored)", "obsolete", True ), - ( "Ignored checks (configured away by admin)", "ignored", False ), - ( "Vanished checks (checks, but no longer exist)", "vanished", True ), - ( "Manual checks (defined in main.mk)", "manual", None ), - ( "Legacy checks (defined in main.mk)", "legacy", None ) + ( "Available (missing) services", "new", firsttime ), + ( "Already configured services", "old", True, ), + ( "Obsolete services (being checked, but should be ignored)", "obsolete", True ), + ( "Ignored services (configured away by admin)", "ignored", False ), + ( "Vanished services (checked, but no longer exist)", "vanished", True ), + ( "Manual services (defined in main.mk)", "manual", None ), + ( "Legacy services (defined in main.mk)", "legacy", None ) ]: first = True trclass = "even"

13 years, 11 months

Check_MK Git: check_mk: wato: fix link from inventory check

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: d2b08e7ae806d5ddd51b093310cc593c3c2854b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2b08e7ae806d5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 27 14:19:44 2010 +0100 wato: fix link from inventory check --- web/htdocs/wato.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 00399fe..0d5b6b3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -551,9 +551,8 @@ def write_configuration_file(): out.write("\n") # all WATO information to Check_MK's inventory checks (needed for link in Multisite) - out.write("extra_service_conf['_WATO'] = [ \n" - " ('hirni.mk', [ 'wato', 'hirni.mk' ], ALL_HOSTS, [ 'Check_MK inventory' ] ) ]\n") - + out.write("\nextra_service_conf['_WATO'] += [ \n" + " ('%s', [ 'wato', '%s' ], ALL_HOSTS, [ 'Check_MK inventory' ] ) ]\n" % (g_filename, g_filename)) # This is a dummy implementation which works without tags # and implements only a special case of Check_MK's real logic.

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