Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64687 discussions

Check_MK Git: check_mk: Updated bug entries #2226

by Mathias Kettner

Module: check_mk Branch: master Commit: 18b269f2af45cd48d2284f96a20773c1521169c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18b269f2af45cd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 19 11:06:50 2014 +0100 Updated bug entries #2226 --- .bugs/2226 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/2226 b/.bugs/2226 new file mode 100644 index 0000000..7dd552e --- /dev/null +++ b/.bugs/2226 @@ -0,0 +1,12 @@ +Title: Remove update-alternatives stuff on Debuntu packages +Component: core +State: open +Date: 2014-11-19 11:04:56 +Targetversion: 1.2.5i1 +Class: nastiness + +Currently the *.deb packages use the alternatives-mechanism in order to +select the current default version and for handling the symlink of /usr/bin/omd. +Remove this and use the same mechanism as with RPM. Our deb packages anyway +can never adhere to the Debian package guidelines. So better make sure that +they exactly behave like on rpm based systems.

9 years, 10 months

Check_MK Git: check_mk: #1504 WATO makes host tag and group information available for NagVis

by Lars Michelsen

Module: check_mk Branch: master Commit: 20257385f74b982a2778ddbe0a1d0dd506591853 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20257385f74b98… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 19 10:43:26 2014 +0100 #1504 WATO makes host tag and group information available for NagVis NagVis can now (till version 1.8rc1) handle Check_MK's host tag and tag group information. These information can be added to the hover menus of the NagVis objects. WATO exports the host tag and tag group definitions to a PHP file which is then read by NagVis to gather the needed information. The PHP file is located at var/check_mk/wato/php-api/hosttags.php in OMD environments. --- .werks/1504 | 14 ++++++ ChangeLog | 1 + web/htdocs/wato.py | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+) diff --git a/.werks/1504 b/.werks/1504 new file mode 100644 index 0000000..af52a89 --- /dev/null +++ b/.werks/1504 @@ -0,0 +1,14 @@ +Title: WATO makes host tag and group information available for NagVis +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1416390031 +Class: feature + +NagVis can now (till version 1.8rc1) handle Check_MK's host tag and tag group information. +These information can be added to the hover menus of the NagVis objects. + +WATO exports the host tag and tag group definitions to a PHP file which is then read by +NagVis to gather the needed information. The PHP file is located at var/check_mk/wato/php-api/hosttags.php +in OMD environments. diff --git a/ChangeLog b/ChangeLog index f80562c..6c2e509 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog * 1489 Added iCalendar import for generating timeperiods e.g. for holidays... * 1495 Most WATO tables can now be sorted (where useful)... + * 1504 WATO makes host tag and group information available for NagVis... * 1165 FIX: Fixed exception in service discovery of logwatch event console forwarding checks... * 1490 FIX: Timperiod excludes can now even be configured when creating a timeperiod... * 1491 FIX: Fixed bug in dynamic lists where removing an item was not always possible... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c56d451..432691f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -123,6 +123,7 @@ sites_mk = defaults.default_config_dir + "/multisite.d/sites.mk" var_dir = defaults.var_dir + "/wato/" log_dir = var_dir + "log/" snapshot_dir = var_dir + "snapshots/" +php_api_dir = var_dir + "php-api/" repstatus_file = var_dir + "replication_status.mk" @@ -13080,6 +13081,126 @@ def show_localization_hint(): html.message("<sup>*</sup>" + _("These texts may be localized depending on the users' " "language. You can configure the localizations <a href=\"%s\">in the global settings</a>.") % url) +def format_php(data, lvl = 1): + s = '' + if isinstance(data, tuple) or isinstance(data, list): + s += 'array(\n' + for item in data: + s += ' ' * lvl + format_php(item, lvl + 1) + ',\n' + s += ' ' * (lvl - 1) + ')' + elif isinstance(data, dict): + s += 'array(\n' + for key, val in data.iteritems(): + s += ' ' * lvl + format_php(key, lvl + 1) + ' => ' + format_php(val, lvl + 1) + ',\n' + s += ' ' * (lvl - 1) + ')' + elif isinstance(data, str): + s += '\'%s\'' % data.replace('\'', '\\\'') + elif isinstance(data, unicode): + s += '\'%s\'' % data.encode('utf-8').replace('\'', '\\\'') + elif isinstance(data, bool): + s += data and 'true' or 'false' + elif data is None: + s += 'null' + else: + s += str(data) + + return s + +# Creates a includable PHP file which provides some functions which +# can be used by the calling program, for example NagVis. It declares +# the following API: +# +# taggroup_title(group_id) +# Returns the title of a WATO tag group +# +# taggroup_choice(group_id, list_of_object_tags) +# Returns either +# false: When taggroup does not exist in current config +# null: When no choice can be found for the given taggroup +# array(tag, title): When a tag of the taggroup +# +# all_taggroup_choices(object_tags): +# Returns an array of elements which use the tag group id as key +# and have an assiciative array as value, where 'title' contains +# the tag group title and the value contains the value returned by +# taggroup_choice() for this tag group. +# +def export_hosttags(hosttags, auxtags): + path = php_api_dir + '/hosttags.php' + make_nagios_directory(php_api_dir) + + # need an extra lock file, since we move the auth.php.tmp file later + # to auth.php. This move is needed for not having loaded incomplete + # files into php. + tempfile = path + '.tmp' + lockfile = path + '.state' + file(lockfile, 'a') + aquire_lock(lockfile) + + # Transform WATO internal data structures into easier usable ones + hosttags_dict = {} + for id, title, choices in hosttags: + tags = {} + for tag_id, tag_title, auxtags in choices: + tags[tag_id] = tag_title, auxtags + topic, title = parse_hosttag_title(title) + hosttags_dict[id] = topic, title, tags + auxtags_dict = dict(auxtags) + + # First write a temp file and then do a move to prevent syntax errors + # when reading half written files during creating that new file + file(tempfile, 'w').write('''<?php +// Created by WATO +global $mk_hosttags, $mk_auxtags; +$mk_hosttags = %s; +$mk_auxtags = %s; + +function taggroup_title($group_id) { + global $mk_hosttags; + if (isset($mk_hosttags[$group_id])) + return $mk_hosttags[$group_id][0]; + else + return $taggroup; +} + +function taggroup_choice($group_id, $object_tags) { + global $mk_hosttags; + if (!isset($mk_hosttags[$group_id])) + return false; + foreach ($object_tags AS $tag) { + if (isset($mk_hosttags[$group_id][2][$tag])) { + // Found a match of the objects tags with the taggroup + // now return an array of the matched tag and its alias + return array($tag, $mk_hosttags[$group_id][2][$tag][0]); + } + } + // no match found. Test whether or not a "None" choice is allowed + if (isset($mk_hosttags[$group_id][2][null])) + return array(null, $mk_hosttags[$group_id][2][null][0]); + else + return null; // no match found +} + +function all_taggroup_choices($object_tags) { + global $mk_hosttags; + $choices = array(); + foreach ($mk_hosttags AS $group_id => $group) { + $choices[$group_id] = array( + 'topic' => $group[0], + 'title' => $group[1], + 'value' => taggroup_choice($group_id, $object_tags), + ); + } + return $choices; +} + +?> +''' % (format_php(hosttags_dict), format_php(auxtags_dict))) + # Now really replace the destination file + os.rename(tempfile, path) + release_lock(lockfile) + os.unlink(lockfile) + # Current specification for hosttag entries: One tag definition is stored # as tuple of at least three elements. The elements are used as follows: # taggroup_id, group_title, list_of_choices, depends_on_tags, depends_on_roles, editable @@ -13112,6 +13233,7 @@ def save_hosttags(hosttags, auxtags): out.write("# Written by WATO\n# encoding: utf-8\n\n") out.write("wato_host_tags += \\\n%s\n\n" % pprint.pformat(hosttags)) out.write("wato_aux_tags += \\\n%s\n" % pprint.pformat(auxtags)) + export_hosttags(hosttags, auxtags) # Handle renaming and deletion of host tags: find affected # hosts, folders and rules. Remove or fix those rules according

9 years, 10 months

Check_MK Git: check_mk: Higher-Quality versions of several icons

by Mathias Kettner

Module: check_mk Branch: master Commit: e867a24c75ae156b9b500a4f76948fd30ed2d18b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e867a24c75ae15… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 19 10:32:37 2014 +0100 Higher-Quality versions of several icons --- web/htdocs/images/alert_flapping.png | Bin 856 -> 2485 bytes web/htdocs/images/alert_notify.png | Bin 1173 -> 4609 bytes web/htdocs/images/icon_flapping.gif | Bin 1037 -> 0 bytes web/htdocs/images/icon_flapping.png | Bin 843 -> 2485 bytes web/plugins/icons/builtin.py | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/images/alert_flapping.png b/web/htdocs/images/alert_flapping.png index e15b60c..6615736 100644 Binary files a/web/htdocs/images/alert_flapping.png and b/web/htdocs/images/alert_flapping.png differ diff --git a/web/htdocs/images/alert_notify.png b/web/htdocs/images/alert_notify.png index a8fdebd..fb5ca52 100644 Binary files a/web/htdocs/images/alert_notify.png and b/web/htdocs/images/alert_notify.png differ diff --git a/web/htdocs/images/icon_flapping.gif b/web/htdocs/images/icon_flapping.gif deleted file mode 100644 index e259ff8..0000000 Binary files a/web/htdocs/images/icon_flapping.gif and /dev/null differ diff --git a/web/htdocs/images/icon_flapping.png b/web/htdocs/images/icon_flapping.png index ce000d7..6615736 100644 Binary files a/web/htdocs/images/icon_flapping.png and b/web/htdocs/images/icon_flapping.png differ diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 47be9e7..affc9ab 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -426,7 +426,7 @@ def paint_flapping(what, row, tags, custom_vars): title = _("This host is flapping") else: title = _("This service is flapping") - return '<img class=icon title="%s" src="images/icon_flapping.gif">' % title + return '<img class=icon title="%s" src="images/icon_flapping.png">' % title multisite_icons.append({ 'columns': [ 'is_flapping' ],

9 years, 10 months

Check_MK Git: check_mk: You can add these icons with the new livedump option <tt> --include-host-icon</tt>

by Andreas Boesl

Module: check_mk Branch: master Commit: d0372febfd2fc665046df7887354f91fe1d625ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0372febfd2fc6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 18 16:02:45 2014 +0100 You can add these icons with the new livedump option <tt>--include-host-icon</tt> C+: livedump --config --include-host-icon C-: --- .werks/1440 | 14 ++++++++++++++ ChangeLog | 1 + doc/treasures/livedump/livedump | 40 +++++++++++++++++++-------------------- 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/.werks/1440 b/.werks/1440 new file mode 100644 index 0000000..734d196 --- /dev/null +++ b/.werks/1440 @@ -0,0 +1,14 @@ +Title: livedump: now able to add hosts icon_image on config generation +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1416322807 +Class: feature + +You can add these icons with the new livedump option <tt>--include-host-icon</tt> + +C+: +livedump --config --include-host-icon +C-: + diff --git a/ChangeLog b/ChangeLog index f80562c..c5e6ecc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 1445 quantum_libsmall_door, quantum_libsmall_status: Two new checks for monitoring small Quantum tape libraries * 1448 domino_info: check is extended to also show and monitor the lnNotesServerState * 1509 if, if64: New option for make inventory based on port alias... + * 1440 livedump: now able to add hosts icon_image on config generation... * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/doc/treasures/livedump/livedump b/doc/treasures/livedump/livedump index 443b9a6..f89c72f 100755 --- a/doc/treasures/livedump/livedump +++ b/doc/treasures/livedump/livedump @@ -107,39 +107,32 @@ def livedump_config(): # Dump host config query = \ "GET hosts\n" \ - "Columns: name alias address groups check_command " \ + "Columns: name alias address groups check_command icon_image " \ "max_check_attempts contacts contact_groups\n" + \ opt_host_headers + \ opt_host_only_headers for row in g_connection.query_table_assoc(query): prepare_row(row) row["groupstring"] = ",".join(row["groups"]) - if opt_groups: - sys.stdout.write( + sys.stdout.write( "define host {\n" " use livedump-host\n" " host_name %(name)s\n" " alias %(alias)s\n" " address %(address)s\n" - " host_groups %(groupstring)s\n" - " contact_groups %(contact_groups)s\n" + " host_groups %(groupstring)s\n" " check_command %(check_command)s\n" - " max_check_attempts %(max_check_attempts)d\n" - "}\n\n" - % row) + " max_check_attempts %(max_check_attempts)d\n" % row) + if opt_groups: + sys.stdout.write(" contacts %(contactsstring)s\n" % row) else: - sys.stdout.write( - "define host {\n" - " use livedump-host\n" - " host_name %(name)s\n" - " alias %(alias)s\n" - " address %(address)s\n" - " host_groups %(groupstring)s\n" - " contacts %(contactsstring)s\n" - " check_command %(check_command)s\n" - " max_check_attempts %(max_check_attempts)d\n" - "}\n\n" - % row) + sys.stdout.write(" contact_groups %(contact_groups)s\n" % row) + + if opt_host_icon: + if row.get("icon_image"): + sys.stdout.write(" icon_image %(icon_image)s\n" % row) + + sys.stdout.write("}\n\n") # Dump service config query = \ @@ -269,6 +262,8 @@ def usage(): with templates (-C -T). -v, --verbose output debug information an stderr + -G, --include-groups use contact groups instead of contacts on dumping config + --include-host-icon add host icon_image to config --debug do not catch Python exceptions """) @@ -292,7 +287,7 @@ short_options = 'hVvc:H:S:O:TCMGi:s:' long_options = [ "help", "version", "verbose", "debug", "socket=", "host-header=", "host-only-header=", "service-header=", "dump-templates", "config", "state", "mark-mode", - "include-groups", "interval" ] + "include-groups", "interval", "include-host-icon" ] opt_verbose = False opt_debug = False @@ -303,6 +298,7 @@ opt_host_only_headers = "" opt_service_headers = "" opt_dump_templates = False opt_groups = False +opt_host_icon = False opt_check_interval = None try: @@ -340,6 +336,8 @@ for o,a in opts: opt_mark_mode = True elif o in [ '-G', '--include-groups' ]: opt_groups = True + elif o in [ '--include-host-icon' ]: + opt_host_icon = True elif o in [ '-i', '--interval' ]: opt_check_interval = int(a)

9 years, 11 months

Check_MK Git: check_mk: #1440 livedump: now able to add hosts icon_image on config generation

by Andreas Boesl

Module: check_mk Branch: master Commit: 4f7be9759405356842378b009f3d7ac1bf31b94a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f7be975940535… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 18 16:02:45 2014 +0100 #1440 livedump: now able to add hosts icon_image on config generation You can add these icons with the new livedump option <tt>--include-host-icons</tt> C+: livedump --config --include-host-icons C-: --- .werks/1440 | 14 ++++++++++++++ ChangeLog | 1 + doc/treasures/livedump/livedump | 40 +++++++++++++++++++-------------------- 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/.werks/1440 b/.werks/1440 new file mode 100644 index 0000000..8c15f2d --- /dev/null +++ b/.werks/1440 @@ -0,0 +1,14 @@ +Title: livedump: now able to add hosts icon_image on config generation +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1416322807 +Class: feature + +You can add these icons with the new livedump option <tt>--include-host-icons</tt> + +C+: +livedump --config --include-host-icons +C-: + diff --git a/ChangeLog b/ChangeLog index f80562c..c5e6ecc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 1445 quantum_libsmall_door, quantum_libsmall_status: Two new checks for monitoring small Quantum tape libraries * 1448 domino_info: check is extended to also show and monitor the lnNotesServerState * 1509 if, if64: New option for make inventory based on port alias... + * 1440 livedump: now able to add hosts icon_image on config generation... * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/doc/treasures/livedump/livedump b/doc/treasures/livedump/livedump index 443b9a6..6722485 100755 --- a/doc/treasures/livedump/livedump +++ b/doc/treasures/livedump/livedump @@ -107,39 +107,32 @@ def livedump_config(): # Dump host config query = \ "GET hosts\n" \ - "Columns: name alias address groups check_command " \ + "Columns: name alias address groups check_command icon_image " \ "max_check_attempts contacts contact_groups\n" + \ opt_host_headers + \ opt_host_only_headers for row in g_connection.query_table_assoc(query): prepare_row(row) row["groupstring"] = ",".join(row["groups"]) - if opt_groups: - sys.stdout.write( + sys.stdout.write( "define host {\n" " use livedump-host\n" " host_name %(name)s\n" " alias %(alias)s\n" " address %(address)s\n" - " host_groups %(groupstring)s\n" - " contact_groups %(contact_groups)s\n" + " host_groups %(groupstring)s\n" " check_command %(check_command)s\n" - " max_check_attempts %(max_check_attempts)d\n" - "}\n\n" - % row) + " max_check_attempts %(max_check_attempts)d\n" % row) + if opt_groups: + sys.stdout.write(" contacts %(contactsstring)s\n" % row) else: - sys.stdout.write( - "define host {\n" - " use livedump-host\n" - " host_name %(name)s\n" - " alias %(alias)s\n" - " address %(address)s\n" - " host_groups %(groupstring)s\n" - " contacts %(contactsstring)s\n" - " check_command %(check_command)s\n" - " max_check_attempts %(max_check_attempts)d\n" - "}\n\n" - % row) + sys.stdout.write(" contact_groups %(contact_groups)s\n" % row) + + if opt_host_icon: + if row.get("icon_image"): + sys.stdout.write(" icon_image %(icon_image)s\n" % row) + + sys.stdout.write("}\n\n") # Dump service config query = \ @@ -269,6 +262,8 @@ def usage(): with templates (-C -T). -v, --verbose output debug information an stderr + -G, --include-groups use contact groups instead of contacts on dumping config + --include-host-icons add host icon_image to config --debug do not catch Python exceptions """) @@ -292,7 +287,7 @@ short_options = 'hVvc:H:S:O:TCMGi:s:' long_options = [ "help", "version", "verbose", "debug", "socket=", "host-header=", "host-only-header=", "service-header=", "dump-templates", "config", "state", "mark-mode", - "include-groups", "interval" ] + "include-groups", "interval", "include-host-icons" ] opt_verbose = False opt_debug = False @@ -303,6 +298,7 @@ opt_host_only_headers = "" opt_service_headers = "" opt_dump_templates = False opt_groups = False +opt_host_icon = False opt_check_interval = None try: @@ -340,6 +336,8 @@ for o,a in opts: opt_mark_mode = True elif o in [ '-G', '--include-groups' ]: opt_groups = True + elif o in [ '--include-host-icons' ]: + opt_host_icon = True elif o in [ '-i', '--interval' ]: opt_check_interval = int(a)

9 years, 11 months

Check_MK Git: check_mk: #1503 FIX Fixed monitoring of multiple SAP instances with one mk_sap plugin

by Lars Michelsen

Module: check_mk Branch: master Commit: 44dec50075fe2f78fb48afbf5b65821c5486b5ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44dec50075fe2f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 18 15:13:17 2014 +0100 #1503 FIX Fixed monitoring of multiple SAP instances with one mk_sap plugin When monitoring multiple SAP instances from one host by configuring multiple instances in the sap.cfg, the monitoring of all following instances was skipped when one single instance had connection problems. --- .werks/1503 | 14 ++++++++++++++ ChangeLog | 1 + agents/plugins/mk_sap | 21 ++++++++++----------- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.werks/1503 b/.werks/1503 new file mode 100644 index 0000000..061ba8d --- /dev/null +++ b/.werks/1503 @@ -0,0 +1,14 @@ +Title: Fixed monitoring of multiple SAP instances with one mk_sap plugin +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1416319927 + +When monitoring multiple SAP instances from one host by configuring +multiple instances in the sap.cfg, the monitoring of all following +instances was skipped when one single instance had connection +problems. + diff --git a/ChangeLog b/ChangeLog index c55d9c4..cd635e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ * 1437 FIX: veeam_jobs: fixed incorrect state for BackupSync job... * 1511 FIX: oracle_jobs: avoid broken checks, make compatible with old version... * 1513 FIX: Handle broken SNMP bulk walk implementation of Mikrotik Router firmware RouterOS v6.22... + * 1503 FIX: Fixed monitoring of multiple SAP instances with one mk_sap plugin... Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/agents/plugins/mk_sap b/agents/plugins/mk_sap index 0ce9546..8f867df 100755 --- a/agents/plugins/mk_sap +++ b/agents/plugins/mk_sap @@ -221,7 +221,7 @@ def logout(): 'INTERFACE': 'XAL', }) -def mon_list( cfg ): +def mon_list(cfg): f = query("BAPI_SYSTEM_MON_GETLIST", { 'EXTERNAL_USER_NAME': cfg['user'], }) @@ -355,21 +355,16 @@ def process_alerts(cfg, logs, ms_name, mon_name, node, alerts): -def connect(cfg): +def check(cfg): global conn - try: - conn = sapnwrfc.base.rfc_connect(cfg) - except sapnwrfc.RFCCommunicationError, e: - sys.stderr.write('ERROR: Unable to connect (%s)\n' % e) - return - + conn = sapnwrfc.base.rfc_connect(cfg) login() logs = {} sap_data = {} # This loop is used to collect all information from SAP - for ms_name, mon_name in mon_list( cfg ): + for ms_name, mon_name in mon_list(cfg): path = ms_name + SEPARATOR + mon_name if not to_be_monitored(path, True): continue @@ -455,10 +450,14 @@ def connect(cfg): logout() conn.close() +# It is possible to configure multiple SAP instances to monitor. Loop them all, but +# do not terminate when one connection failed for entry in cfg: try: - connect(entry) + check(entry) + except sapnwrfc.RFCCommunicationError, e: + sys.stderr.write('ERROR: Unable to connect (%s)\n' % e) except: - pass # Make sure that other entries are executed anyway + sys.stderr.write('ERROR: Unhandled exception (%s)\n' % e) sys.exit(0)

9 years, 11 months

Check_MK Git: check_mk: #1439 mk-job: now also available on solaris systems

by Andreas Boesl

Module: check_mk Branch: master Commit: 2a7b7594461b066d4d733ab77d5b825450cd4654 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a7b7594461b06… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 18 14:17:12 2014 +0100 #1439 mk-job: now also available on solaris systems Regarding the mk-job feature itself, you can find more information <a href="https://mathias-kettner.de/checkmk_job.html">here</a>. --- .werks/1439 | 12 +++++++ ChangeLog | 1 + agents/check_mk_agent.solaris | 30 +++++++++++++++-- agents/mk-job.solaris | 73 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 114 insertions(+), 2 deletions(-) diff --git a/.werks/1439 b/.werks/1439 new file mode 100644 index 0000000..51d4d76 --- /dev/null +++ b/.werks/1439 @@ -0,0 +1,12 @@ +Title: mk-job: now also available on solaris systems +Level: 1 +Component: core +Compatible: compat +Version: 1.2.5i7 +Date: 1416315864 +Class: feature + +Regarding the mk-job feature itself, you can find more information +<a href="https://mathias-kettner.de/checkmk_job.html">here</a>. + + diff --git a/ChangeLog b/ChangeLog index 3398a48..d32b19d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.2.5i7: Core & Setup: + * 1439 mk-job: now also available on solaris systems... * 1483 FIX: Savely replace illegal vertical bars in check plugin output... * 1431 FIX: windows_agent: fixed error on parsing unicode formatted logfiles... diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index b5babc3..e8dac81 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -6,7 +6,7 @@ # | | |___| | | | __/ (__| < | | | | . \ | # | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | # | | -# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | # +------------------------------------------------------------------+ # # This file is part of Check_MK. @@ -86,7 +86,7 @@ function run_cached () { # Cache file outdated and new job not yet running? Start it if [ -z "$USE_CACHEFILE" -a ! -e "$CACHEFILE.new" ] ; then - echo "set -o noclobber ; exec > \"$CACHEFILE.new\" || exit 1 ; $CMDLINE && mv \"$CACHEFILE.new\" \"$CACHEFILE\" || rm -f \"$CACHEFILE\" \"$CACHEFILE.new\"" | nohup bash 2>/dev/null & + echo "set -o noclobber ; exec > $CACHEFILE.new || exit 1 ; $CMDLINE && mv $CACHEFILE.new $CACHEFILE || rm -f $CACHEFILE $CACHEFILE.new" | nohup bash 2>/dev/null & fi } @@ -108,6 +108,32 @@ else fi +# Get statistics about monitored jobs. Below the job directory there +# is a sub directory per user that ran a job. That directory must be +# owned by the user so that a symlink or hardlink attack for reading +# arbitrary files can be avoided. +if pushd /var/lib/check_mk_agent/job >/dev/null; then + echo '<<<job>>>' + for username in * + do + if [ -d "$username" ] && cd "$username" ; then + count=$(su "$username" -c "ls -1 * | wc -l") + + if [ "$count" -eq "1" ]; then + filename=$(su "$username" -c "ls -1 *") + echo "==> $filename <==" + fi + + su "$username" -c "head -n1000 *" + cd .. + fi + done + popd > /dev/null +fi + + + + # Filesystem usage for UFS and VXFS echo '<<<df>>>' for fs in ufs vxfs samfs lofs diff --git a/agents/mk-job.solaris b/agents/mk-job.solaris new file mode 100644 index 0000000..f584b95 --- /dev/null +++ b/agents/mk-job.solaris @@ -0,0 +1,73 @@ +#!/bin/bash +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +help() { + echo "Usage: mk-job IDENT PROGRAM [ARGS...]" + echo "" + echo "Execute PROGRAM as subprocess while measuring performance information" + echo "about the running process and writing it to an output file. This file" + echo "can be monitored using Check_MK. The Check_MK Agent will forward the" + echo "information of all job files to the monitoring server." + echo "" + echo "This file is being distributed with the Check_MK Agent." +} + +if [ $# -lt 2 ]; then + help >&2 + exit 1 +fi + +MYSELF=$(id | awk -F')' '{print $1}' | awk -F'(' '{print $2}') +OUTPUT_PATH=/var/lib/check_mk_agent/job/$MYSELF +IDENT=$1 +shift + +if [ ! -d "$OUTPUT_PATH" ]; then + if [ "$MYSELF" = root ] ; then + mkdir -p "$OUTPUT_PATH" + else + echo "ERROR: Missing output directory $OUTPUT_PATH for non-root user '$MYSELF'." >&2 + exit 1 + fi +fi + +if ! type $1 >/dev/null 2>&1; then + echo -e "ERROR: Cannot run $1. Command not found.\n" >&2 + help >&2 + exit 1 +fi + + +echo "start_time $(perl -e 'print time')" > "$OUTPUT_PATH/$IDENT.running" + +info=$((/usr/bin/time -p sh -c "$@ 2>/dev/null 1>&2" 2>&1; echo $?) | sed -e 's/,/\./g'); +RC=$(echo $info | awk '{print $7}') + +(echo $info | awk '{print "exit_code "$7"\nreal_time "$2"\nuser_time "$4"\nsystem_time "$6""}') >> "$OUTPUT_PATH/$IDENT.running" +(echo -e "reads 0\nwrites 0\nmax_res_kbytes 0\navg_mem_kbytes 0\ninvol_context_switches 0\nvol_context_switches 0";) >> "$OUTPUT_PATH/$IDENT.running" + +mv "$OUTPUT_PATH/$IDENT.running" "$OUTPUT_PATH/$IDENT" +exit $RC +

9 years, 11 months

Check_MK Git: check_mk: #1502 FIX Fixed removing elements from ListOf choices during complain phase

by Lars Michelsen

Module: check_mk Branch: master Commit: 11cd8edb928215e30cc53c6465e9ce3448d8e837 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11cd8edb928215… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 18 14:01:31 2014 +0100 #1502 FIX Fixed removing elements from ListOf choices during complain phase --- .werks/1502 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/1502 b/.werks/1502 new file mode 100644 index 0000000..e410a1e --- /dev/null +++ b/.werks/1502 @@ -0,0 +1,10 @@ +Title: Fixed removing elements from ListOf choices during complain phase +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1416315651 + + diff --git a/ChangeLog b/ChangeLog index 3398a48..c55d9c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ * 1491 FIX: Fixed bug in dynamic lists where removing an item was not always possible... * 1492 FIX: Fixed too long URL bug when deleting a timeperiod right after creating one * 1498 FIX: Fixed displaying of global settings titles / help texts... + * 1502 FIX: Fixed removing elements from ListOf choices during complain phase Notifications: * 1512 Bulk notification can now be grouped according to custom macro values...

9 years, 11 months

Check_MK Git: check_mk: Another fix for ListOf valuespecs in complain phase

by Lars Michelsen

Module: check_mk Branch: master Commit: 960155e8244a8519da6878453177fc2578813d8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=960155e8244a85… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 18 13:58:49 2014 +0100 Another fix for ListOf valuespecs in complain phase --- web/htdocs/valuespec.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 4abd944..5b62e2d 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -837,7 +837,7 @@ class ListOf(ValueSpec): # Render reference element for cloning html.write('<table style="display:none" id="%s_prototype">' % varprefix) html.write('<tr><td class=vlof_buttons>') - html.hidden_field(varprefix + "_indexof_" + self._magic, "") # reconstruct order after moving stuff + html.hidden_field(varprefix + "_indexof_" + self._magic, "", add_var=True) # reconstruct order after moving stuff self.del_button(varprefix, self._magic) if self._movable: self.move_button(varprefix, self._magic, "up") @@ -870,7 +870,7 @@ class ListOf(ValueSpec): for nr, v in enumerate(value): html.push_transformation(lambda x: x.replace(self._magic, str(nr+1))) html.write('<tr><td class=vlof_buttons>') - html.hidden_field(varprefix + "_indexof_%d" % (nr+1), "") # reconstruct order after moving stuff + html.hidden_field(varprefix + "_indexof_%d" % (nr+1), "", add_var=True) # reconstruct order after moving stuff self.del_button(varprefix, nr+1) if self._movable: self.move_button(varprefix, self._magic, "up") # visibility fixed by javascript

9 years, 11 months

Check_MK Git: check_mk: Handle non-Ascii charachters in bulk directory names correctly

by Mathias Kettner

Module: check_mk Branch: master Commit: 6f26532376e6f6891e6d88203c97e3d8191ee278 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6f26532376e6f6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 18 13:39:20 2014 +0100 Handle non-Ascii charachters in bulk directory names correctly --- modules/notify.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/notify.py b/modules/notify.py index f9d6164..89ac7a8 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -1494,6 +1494,19 @@ def find_wato_folder(context): def create_bulk_dirname(bulk_path): dirname = notification_bulkdir + "/" + bulk_path[0] + "/" + bulk_path[1] + "/" dirname += ",".join([b.replace("/", "\\") for b in bulk_path[2:]]) + + # Remove non-Ascii-characters by special %02x-syntax + try: + str(dirname) + except: + new_dirname = "" + for char in dirname: + if ord(char) <= 0 or ord(char) > 127: + new_dirname += "%%%04x" % ord(char) + else: + new_dirname += char + dirname = new_dirname + if not os.path.exists(dirname): os.makedirs(dirname) notify_log(" - created bulk directory %s" % dirname)

9 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits