Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
65242 discussions

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7c9683ea517c3b5a9e0666367f391db9d41794a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c9683ea517c3b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 15 14:20:24 2010 +0100 Updated internal doku --- LIESMICH.zutun | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index 9ddff78..e8c921f 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -546,3 +546,7 @@ rendern. Also geht das nicht... if-Check: Die Bandbreiten-Erkennung klappt manchmal nicht, z.B. weil der Provider die Bandbreite runterregelt. In den Check-Params sollte man die tatsächliche Bandbreite angeben können. + +SNMP: Hier könnte man weiter Parameter konfigurierbar machen, +z.B. snmp_parameters = []. Auf die Art kann man auch z.B. eine +alternative Portnummer angeben.

13 years, 10 months

Check_MK Git: check_mk: Linux agent: fixed problem with OnlyFrom and section <<<df>>>

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f4ed0bd2e5d9edb3987409d56f0727cb4f4d9e57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4ed0bd2e5d9ed… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 15 14:12:04 2010 +0100 Linux agent: fixed problem with OnlyFrom and section <<<df>>> --- ChangeLog | 3 +++ agents/check_mk_agent.linux | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 88eafe9..d2adf2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ OMD users put the icons into ~/local/share/check_mk/web/htdocs/images/icons. * fix problem with PNP-links with services containing a ':' (thanks to Dirk Mayer) + Checks & Agents: + * Fixed problem with OnlyFrom: in Linux agent (df didn't work properly) + 1.1.9i2: Checks & Agents: * ibm_imm_health: fix inventory function diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 297d751..e7ec806 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -63,7 +63,7 @@ echo AgentDirectory: $MK_CONFDIR if [ -n "$REMOTE_HOST" ] then echo -n 'OnlyFrom: ' - sed -n '/^service[[:space:]]*check_mk/,/}/s/^[[:space:]]*only_from[[:space:]]*=[[:space:]]*$.*$/\1/p' /etc/xinetd.d/* | head -n1 + echo $(sed -n '/^service[[:space:]]*check_mk/,/}/s/^[[:space:]]*only_from[[:space:]]*=[[:space:]]*$.*$/\1/p' /etc/xinetd.d/* | head -n1) fi # Partitionen (-P verhindert Zeilenumbruch bei langen Mountpunkten)

13 years, 10 months

Check_MK Git: check_mk: Multisite: fix colons in PNP links

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 27975cadf290f2ef806a0634061f399d6fa7f980 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27975cadf290f2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 15 12:25:59 2010 +0100 Multisite: fix colons in PNP links thanks to Dirk Mayer --- ChangeLog | 1 + web/plugins/views/painters.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index a54422f..88eafe9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * Finally show host/services icons from the nagios value "icon_image". Put your icon files in /usr/share/check_mk/web/htdocs/images/icons. OMD users put the icons into ~/local/share/check_mk/web/htdocs/images/icons. + * fix problem with PNP-links with services containing a ':' (thanks to Dirk Mayer) 1.1.9i2: Checks & Agents: diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 50f7a5b..ff1197d 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1105,7 +1105,7 @@ def pnp_icon_link(row): if config.site_is_local(row["site"]): # Where is our RRD? basedir = defaults.rrd_path + "/" + row["host_name"] - xmlpath = basedir + "/" + row["service_description"].replace("/", "_").replace(" ", "_") + ".xml" + xmlpath = basedir + "/" + row["service_description"].replace("/", "_").replace(" ", "_").replace(":", "_") + ".xml" if os.path.exists(xmlpath): return a else:

13 years, 10 months

Check_MK Git: check_mk: Multisite: finally support icon images

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 961b749f44f72a24538e5db882ddd6586be325ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=961b749f44f72a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 15 11:04:41 2010 +0100 Multisite: finally support icon images --- ChangeLog | 6 ++++++ LIESMICH.zutun | 2 -- web/.f12 | 2 +- web/htdocs/images/icons/README | 9 +++++++++ web/htdocs/images/icons/cactus.png | Bin 0 -> 6388 bytes web/htdocs/images/icons/earth.png | Bin 0 -> 8319 bytes web/htdocs/images/icons/home.png | Bin 0 -> 7482 bytes web/htdocs/images/icons/missing.png | Bin 0 -> 7279 bytes web/htdocs/images/icons/networkdevice.png | Bin 0 -> 4068 bytes web/htdocs/images/icons/printer.png | Bin 0 -> 5656 bytes web/htdocs/images/icons/processor.png | Bin 0 -> 6593 bytes web/htdocs/images/icons/security.png | Bin 0 -> 8453 bytes web/htdocs/images/icons/shed.png | Bin 0 -> 4516 bytes web/htdocs/images/icons/terminal.png | Bin 0 -> 4321 bytes web/plugins/views/painters.py | 7 ++++++- 15 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4facbc..9581a10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1.1.9i3: + Multisite: + * Finally show host/services icons from the nagios value "icon_image". + Put your icon files in /usr/share/check_mk/web/htdocs/images/icons. + OMD users put the icons into ~/local/share/check_mk/web/htdocs/images/icons. + 1.1.9i2: Checks & Agents: * ibm_imm_health: fix inventory function diff --git a/LIESMICH.zutun b/LIESMICH.zutun index c7c6af7..591d665 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -116,8 +116,6 @@ kann man eben kein SNMP machen. PNP4Nagios-Popups automatisch einbauen, mit eigenen intelligenten Icons. -Host- und Serviceicons (icon_image) anzeigen. - Aliasse einbauen (Wrappen in bin/): cmk = check_mk mkp = check_mk -P diff --git a/web/.f12 b/web/.f12 index 27c68e1..037e052 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,2 +1,2 @@ sudo cp -prv * /omd/versions/default/share/check_mk/web/ - +sudo omd restart wato apache diff --git a/web/htdocs/images/icons/README b/web/htdocs/images/icons/README new file mode 100644 index 0000000..be44c48 --- /dev/null +++ b/web/htdocs/images/icons/README @@ -0,0 +1,9 @@ +The icons in this directory and also some of the icons in web/htdocs/images are +from the "NUVOLA" icon set, copyright by David Vignoni. They are contributed +under the terms of the LGPL Version 2.1. Please visit the home page of NUVOLA +for details: + +http://www.icon-king.com/projects/nuvola/ + +We wish to thank David for his nice artwork and for him making this open +source! diff --git a/web/htdocs/images/icons/cactus.png b/web/htdocs/images/icons/cactus.png new file mode 100644 index 0000000..07454be Binary files /dev/null and b/web/htdocs/images/icons/cactus.png differ diff --git a/web/htdocs/images/icons/earth.png b/web/htdocs/images/icons/earth.png new file mode 100644 index 0000000..2d0fdf9 Binary files /dev/null and b/web/htdocs/images/icons/earth.png differ diff --git a/web/htdocs/images/icons/home.png b/web/htdocs/images/icons/home.png new file mode 100644 index 0000000..7b20e56 Binary files /dev/null and b/web/htdocs/images/icons/home.png differ diff --git a/web/htdocs/images/icons/missing.png b/web/htdocs/images/icons/missing.png new file mode 100644 index 0000000..07d9337 Binary files /dev/null and b/web/htdocs/images/icons/missing.png differ diff --git a/web/htdocs/images/icons/networkdevice.png b/web/htdocs/images/icons/networkdevice.png new file mode 100644 index 0000000..4e402f6 Binary files /dev/null and b/web/htdocs/images/icons/networkdevice.png differ diff --git a/web/htdocs/images/icons/printer.png b/web/htdocs/images/icons/printer.png new file mode 100644 index 0000000..0291e3f Binary files /dev/null and b/web/htdocs/images/icons/printer.png differ diff --git a/web/htdocs/images/icons/processor.png b/web/htdocs/images/icons/processor.png new file mode 100644 index 0000000..4fe3373 Binary files /dev/null and b/web/htdocs/images/icons/processor.png differ diff --git a/web/htdocs/images/icons/security.png b/web/htdocs/images/icons/security.png new file mode 100644 index 0000000..61ac0aa Binary files /dev/null and b/web/htdocs/images/icons/security.png differ diff --git a/web/htdocs/images/icons/shed.png b/web/htdocs/images/icons/shed.png new file mode 100644 index 0000000..f4b83c9 Binary files /dev/null and b/web/htdocs/images/icons/shed.png differ diff --git a/web/htdocs/images/icons/terminal.png b/web/htdocs/images/icons/terminal.png new file mode 100644 index 0000000..5e93201 Binary files /dev/null and b/web/htdocs/images/icons/terminal.png differ diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index bfb6c7f..50f7a5b 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -75,7 +75,7 @@ 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" ] + "custom_variable_names", "custom_variable_values", "icon_image" ] # Additional columns only to fetch for services icon_service_columns = [ "service_description" ] @@ -100,6 +100,11 @@ def paint_icons(what, row): # what is "host" or "service" prefix = "service_" custom_vars = dict(zip(row[prefix + "custom_variable_names"], row[prefix + "custom_variable_values"])) + # Icons configured in Nagios via icon_image + if row[prefix + "icon_image"]: + image = row[prefix + "icon_image"] + output += '<img class=icon src="images/icons/%s">' % image + # Link to detail host if this is a summary host if "_REALNAME" in custom_vars: newrow = row.copy()

13 years, 10 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://git.mathias-kettner. de/var/www/80/git.mathias-kettner.de/check_mk

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: 53e3851d037297fd5aa34c52cadd885a896b401d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53e3851d037297… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 15 11:05:14 2010 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 10 months

Check_MK Git: check_mk: Switched version to 1.1.9i2

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 93ccef76433451673ad221018adace902f4a04f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=93ccef76433451… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 14 15:00:57 2010 +0100 Switched version to 1.1.9i2 --- Makefile | 4 ++-- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 95232 -> 95232 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes livestatus/configure.ac | 2 +- scripts/install_nagios.sh | 2 +- scripts/setup.sh | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index e8db70d..d31bc7f 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.1.9i1 +VERSION = 1.1.9i2 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot @@ -104,7 +104,7 @@ version: if [ -n "$$newversion" ] ; then \ sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$$newversion/" Makefile ; \ for agent in agents/* ; do \ - if [ "$$agent" != agents/windows ] ; then \ + if [ "$$agent" != agents/windows -a "$$agent" != agents/plugins ] ; then \ sed -i 's/echo Version: [0-9.a-z]*/'"echo Version: $$newversion/g" $$agent; \ fi ; \ done ; \ diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index df1e5b8..e251549 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -38,7 +38,7 @@ LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.9i1 +echo Version: 1.1.9i2 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 3c6ddfc..78695b1 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -66,7 +66,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.9i1 +echo Version: 1.1.9i2 echo AgentOS: freebsd # Partitionen (-P verhindert Zeilenumbruch bei langen Mountpunkten) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 4b1ae52..297d751 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -53,7 +53,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.1.9i1 +echo Version: 1.1.9i2 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 273c2c4..e548c4b 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -38,7 +38,7 @@ PLUGINSDIR=$MK_LIBDIR/plugins LOCALDIR=$MK_LIBDIR/local echo '<<<check_mk>>>' -echo Version: 1.1.9i1 +echo Version: 1.1.9i2 echo AgentOS: solaris echo '<<<df>>>' diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 1491d24..09caa88 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -61,7 +61,7 @@ #include <ctype.h> // isspace() -#define CHECK_MK_VERSION "1.1.9i1" +#define CHECK_MK_VERSION "1.1.9i2" #define CHECK_MK_AGENT_PORT 6556 #define SERVICE_NAME "Check_MK_Agent" #define KiloByte 1024 diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index a88973f..4a6d506 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 04d75de..f409d1c 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/livestatus/configure.ac b/livestatus/configure.ac index ae8a44a..dd796ae 100644 --- a/livestatus/configure.ac +++ b/livestatus/configure.ac @@ -28,7 +28,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([MK Livestatus], [1.1.9i1], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.1.9i2], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/scripts/install_nagios.sh b/scripts/install_nagios.sh index 48f8228..451c403 100644 --- a/scripts/install_nagios.sh +++ b/scripts/install_nagios.sh @@ -57,7 +57,7 @@ set -e NAGIOS_VERSION=3.2.2 PLUGINS_VERSION=1.4.15 RRDTOOL_VERSION=1.4.3 -CHECK_MK_VERSION=1.1.9i1 +CHECK_MK_VERSION=1.1.9i2 PNP_VERSION=0.6.6 NAGVIS_VERSION=1.5.1 diff --git a/scripts/setup.sh b/scripts/setup.sh index 88eeb73..95a5741 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.1.9i1 +VERSION=1.1.9i2 NAME=check_mk LANG= LC_ALL=

13 years, 10 months

Check_MK Git: check_mk: WATO: fix help for /etc/sudoers

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3df654e57a4768362824fdc77d138ec26ba9fb5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3df654e57a4768… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 14 14:59:34 2010 +0100 WATO: fix help for /etc/sudoers --- ChangeLog | 2 +- web/htdocs/wato.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index beec4f3..397c8f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ lines (e.g. Frame Relay) Multisite: - * WATO: Fixed omd mode/site detection + * WATO: Fixed omd mode/site detection and help for /etc/sudoers * WATO: Use and show common log for pending changes * Sidebar Quicksearch: Now really disabling browser built-in completion dropdown selections diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9af1fa1..45f76fa 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -496,6 +496,7 @@ def check_mk_automation(command, args=[], indata=""): # - When not set try to detect the command for OMD or non OMD installations # - OMD 'own' apache mode or non OMD: check_mk --automation # - OMD 'shared' apache mode: Full path to the binary and the defaults + sudoline = None if defaults.check_mk_automation: commandargs = defaults.check_mk_automation.split() cmd = commandargs + [ command ] + args @@ -507,9 +508,16 @@ def check_mk_automation(command, args=[], indata=""): else: # OMD shared mode commandargs = [ 'sudo', '/bin/su', '-', omd_site, '-c', 'check_mk --automation' ] cmd = commandargs[:-1] + [ commandargs[-1] + ' ' + ' '.join([ command ] + args) ] + sudoline = "%s ALL = (root) NOPASSWD: /bin/su - %s -c check_mk\\ --automation\\ *" % (html.apache_user(), omd_site) sudo_msg = '' if commandargs[0] == 'sudo': + if not sudoline: + if commandargs[1] == '-u': # skip -u USER in /etc/sudoers + sudoline = "%s ALL = (%s) NOPASSWD: %s *" % (html.apache_user(), commandargs[2], " ".join(commandargs[3:])) + else: + sudoline = "%s ALL = (root) NOPASSWD: %s *" % (html.apache_user(), commandargs[0], " ".join(commandargs[1:])) + sudo_msg = ("<p>The webserver is running as user which has no rights on the " "needed Check_MK/Nagios files.<br />Please ensure you have set-up " "the sudo environment correctly. e.g. proceed as follows:</p>\n" @@ -517,10 +525,10 @@ def check_mk_automation(command, args=[], indata=""): "<li>Append the following to the <code>/etc/sudoers</code> file:\n" "<pre># Needed for WATO - the Check_MK Web Administration Tool\n" "Defaults:%s !requiretty\n" - "%s ALL = (root) NOPASSWD: %s\ *\n" + "%s\n" "</pre></li>\n" "<li>Retry this operation</li></ol>\n" % - (html.apache_user(), html.apache_user(), " ".join(commandargs[1:-1] + [ commandargs[-1].replace(' ', '\ ')]))) + (html.apache_user(), sudoline)) try: p = subprocess.Popen(cmd,

13 years, 10 months

Check_MK Git: check_mk: WATO: use and show common pending changes log

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6cf03cd77562d6eb36495ecf7881b6afccc9c1d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cf03cd77562d6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 14 14:27:41 2010 +0100 WATO: use and show common pending changes log --- ChangeLog | 1 + modules/check_mk.py | 20 +++++++++++++++++--- web/htdocs/wato.py | 49 ++++++++++++++++++++++++++++--------------------- 3 files changed, 46 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4facbc..beec4f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ Multisite: * WATO: Fixed omd mode/site detection + * WATO: Use and show common log for pending changes * Sidebar Quicksearch: Now really disabling browser built-in completion dropdown selections diff --git a/modules/check_mk.py b/modules/check_mk.py index 5a7ce51..9598889 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3144,8 +3144,8 @@ def do_restart_nagios(only_reload): process = os.popen(command, "r") output = process.read() if process.close(): - sys.stdout.write("ERROR:\n") - raise MKGeneralException("Cannot re%s Nagios" % action) + sys.stdout.write("ERROR: %s\n" % output) + raise MKGeneralException("Cannot re%s Nagios: %s" % (action, output)) else: sys.stdout.write(tty_ok + "\n") @@ -3506,7 +3506,20 @@ def automation_try_inventory(args): infotype = ct.split('.')[0] opt_use_cachefile = True opt_no_tcp = True - info = get_host_info(hostname, ipaddress, infotype) + try: + info = get_host_info(hostname, ipaddress, infotype) + # Handle cases where agent does not output data + except MKAgentError, e: + if str(e) == "": + continue + else: + raise + except MKSNMPError, e: + if str(e) == "": + continue + else: + raise + check_function = check_info[ct][0] # apply check_parameters try: @@ -3706,6 +3719,7 @@ def do_automation(cmd, args): if opt_debug: raise sys.exit(1) + except Exception, e: if opt_debug: raise diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0231071..9af1fa1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -22,8 +22,8 @@ import htmllib # config = importer.import_module("config") config.declare_permission("use_wato", - "Use Webconfiguration", - "Only with this permission, users are allowed to use Check_MK web configuration GUI.", + "Use WATO", + "This permissions allows users to use WATO - Check_MK's Web Administration Tool. Please make sure, that they also have the permission for the WATO snapin.", [ "admin", ]) conf_dir = defaults.var_dir + "/wato" @@ -169,7 +169,7 @@ def mode_index(phase): if not ipaddress: try: ip = socket.gethostbyname(hostname) - ipaddress = "(DNS: %s)" % ip + ipaddress = "%s (DNS)" % ip tdclass = ' class="dns"' except: ipaddress = "(hostname not resolvable!)" @@ -206,14 +206,19 @@ def host_link(hostname): return hostname -def render_audit_log(log, what): +def render_audit_log(log, what, with_filename = False): htmlcode = '<table class="wato auditlog %s">' even = "even" - for t, user, action, text in log: + for t, filename, user, action, text in log: text = parse_host_names(text) even = even == "even" and "odd" or "even" - htmlcode += '<tr class="%s0"><td>%s</td><td>%s</td><td>%s</td><td width="100%%">%s</td></tr>\n' % ( - even, + htmlcode += '<tr class="%s0">' % even + if with_filename: + if filename != g_filename: + htmlcode += '<td><a href="wato.py?mode=changelog&filename=%s">%s</a></td>' % (filename, filename) + else: + htmlcode += '<td>%s</td>' % filename + htmlcode += '<td>%s</td><td>%s</td><td>%s</td><td width="100%%">%s</td></tr>\n' % ( time.strftime("%Y-%m-%d", time.localtime(float(t))), time.strftime("%H:%M:%S", time.localtime(float(t))), user, @@ -241,11 +246,10 @@ def mode_changelog(phase): return None, "The new configuration has been successfully activated." else: - pending = parse_audit_log("pending") if len(pending) > 0: message = "<h1>Changes which are not yet activated:</h1>" - message += render_audit_log(pending, "pending") + message += render_audit_log(pending, "pending", True) message += '<a href="%s" class=button>Activate Changes!</a>' % \ html.makeuri([("_action", "activate"), ("_transid", html.current_transid(html.req.user))]) html.show_warning(message) @@ -254,7 +258,8 @@ def mode_changelog(phase): audit = parse_audit_log("audit") if len(audit) > 0: - html.write(render_audit_log(audit, "audit")) + html.write("<b>Audit log of configuration file %s</b><br>" % g_filename) + html.write(render_audit_log(audit, "audit", False)) else: html.write("<p>Logfile is empty. No host has been created or changed yet.</p>") @@ -453,8 +458,8 @@ def log_entry(hostname, action, message, logfilename): 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)) + create_user_file(log_file, "a").write("%d %s %s %s %s\n" % + (int(time.time()), g_filename, html.req.user, action, message)) def log_audit(hostname, what, message): @@ -462,22 +467,24 @@ def log_audit(hostname, what, message): def log_pending(hostname, what, message): - log_entry(hostname, what, message, "pending.log") + log_entry(hostname, what, message, "../pending.log") log_entry(hostname, what, message, "audit.log") - def log_commit_pending(): - pending = conf_dir + "/" + g_filename + "/pending.log" + pending = conf_dir + "/pending.log" if os.path.exists(pending): os.remove(pending) def parse_audit_log(what): - path = "%s/%s/%s.log" % (conf_dir, g_filename, what) + if what == "pending": + path = "%s/%s.log" % (conf_dir, what) + else: + path = "%s/%s/%s.log" % (conf_dir, g_filename, what) if os.path.exists(path): entries = [] for line in file(path): line = line.rstrip() - entries.append(line.split(None, 3)) + entries.append(line.split(None, 4)) entries.reverse() return entries return [] @@ -491,13 +498,13 @@ def check_mk_automation(command, args=[], indata=""): # - OMD 'shared' apache mode: Full path to the binary and the defaults if defaults.check_mk_automation: commandargs = defaults.check_mk_automation.split() - cmd = commandargs + [ command ] + args + cmd = commandargs + [ command ] + args else: omd_mode, omd_site = html.omd_mode() if not omd_mode or omd_mode == 'own': commandargs = [ 'check_mk', '--automation' ] cmd = commandargs + [ command ] + args - else: + else: # OMD shared mode commandargs = [ 'sudo', '/bin/su', '-', omd_site, '-c', 'check_mk --automation' ] cmd = commandargs[:-1] + [ commandargs[-1] + ' ' + ' '.join([ command ] + args) ] @@ -528,8 +535,8 @@ def check_mk_automation(command, args=[], indata=""): outdata = p.stdout.read() exitcode = p.wait() if exitcode != 0: - raise MKGeneralException("Error running <tt>%s</tt>: <pre>%s</pre>%s" % - (" ".join(cmd), outdata, sudo_msg)) + raise MKGeneralException("Error running <tt>%s</tt> (exit code %d): <pre>%s</pre>%s" % + (" ".join(cmd), exitcode, outdata, sudo_msg)) try: return eval(outdata) except Exception, e:

13 years, 10 months

Check_MK Git: check_mk: Updated internal doku

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8c986e23dd97f43fa2ea97da009f52c1aac8c437 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c986e23dd97f4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 14 09:58:16 2010 +0100 Updated internal doku --- LIESMICH.zutun | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index c7c6af7..bcca82b 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -544,3 +544,7 @@ Bei den Views z.B. im Titel die Anzahl der Antwortzeilen der Anfrage anzeigen - Generell und bei jeder View. Bei Gruppierten Views evtl. die Anzahl der Gruppen? Dann wüsste man die Zahl aber erst nach dem rendern. Also geht das nicht... + +if-Check: Die Bandbreiten-Erkennung klappt manchmal nicht, z.B. +weil der Provider die Bandbreite runterregelt. In den Check-Params +sollte man die tatsächliche Bandbreite angeben können.

13 years, 10 months

Check_MK Git: check_mk: Updated ChangeLog

by mk＠mathias-kettner.de

Module: check_mk Branch: master Commit: d15aab716c9c7d14fbaab83b4abaef0c9418f291 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d15aab716c9c7d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 13 12:08:12 2010 +0100 Updated ChangeLog --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5dac6be..c4facbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 1.1.9i2: Checks & Agents: * ibm_imm_health: fix inventory function + * if/if64: fix average line in PNP-template, fix display of speed for 20MBit + lines (e.g. Frame Relay) Multisite: * WATO: Fixed omd mode/site detection

13 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits