Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64553 discussions

Check_MK Git: check_mk: Updated bug entries #1085

by Lars Michelsen

Module: check_mk Branch: master Commit: d822b94e2acf89c21794d29d9950f21e43cbab0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d822b94e2acf89… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 16 11:29:34 2013 +0100 Updated bug entries #1085 --- .bugs/1085 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.bugs/1085 b/.bugs/1085 index 0890761..d144dd3 100644 --- a/.bugs/1085 +++ b/.bugs/1085 @@ -1,9 +1,12 @@ Title: Personal settings: name of language de missing Component: multisite -State: open +Class: nastiness +State: done Date: 2013-11-25 10:36:27 Targetversion: future -Class: nastiness In the personal setting when you want to select a language, instead of "German" there is just a "de". + +2013-12-16 11:26:00: changed state open -> done +Just added the missing alias file

10 years, 9 months

Check_MK Git: check_mk: Moved modbus checks to doc/treasures/modbus

by Mathias Kettner

Module: check_mk Branch: master Commit: 919f4b9bb65a6702496b93019edf1c3285beb5dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=919f4b9bb65a67… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 16 11:17:06 2013 +0100 Moved modbus checks to doc/treasures/modbus Reason: these checks only work if you have the modbus library installed. Also you need to compile the special agent yourself. --- .../special => doc/treasures/modbus}/agent_modbus | Bin 7472 -> 7472 bytes .../treasures/modbus}/agent_modbus.cpp | 0 .../treasures/modbus/checkman}/modbus_value | 0 .../treasures/modbus/checks}/agent_modbus | 0 {checks => doc/treasures/modbus}/modbus_value | 0 doc/treasures/modbus/perfometer/modbus.py | 10 ++++ doc/treasures/modbus/wato/modbus.py | 54 ++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 8 --- web/plugins/wato/check_parameters.py | 14 ----- web/plugins/wato/datasource_programs.py | 35 ------------- 10 files changed, 64 insertions(+), 57 deletions(-) diff --git a/agents/special/agent_modbus b/doc/treasures/modbus/agent_modbus similarity index 100% rename from agents/special/agent_modbus rename to doc/treasures/modbus/agent_modbus diff --git a/agents/special/agent_modbus.cpp b/doc/treasures/modbus/agent_modbus.cpp similarity index 100% rename from agents/special/agent_modbus.cpp rename to doc/treasures/modbus/agent_modbus.cpp diff --git a/checkman/modbus_value b/doc/treasures/modbus/checkman/modbus_value similarity index 100% rename from checkman/modbus_value rename to doc/treasures/modbus/checkman/modbus_value diff --git a/checks/agent_modbus b/doc/treasures/modbus/checks/agent_modbus similarity index 100% rename from checks/agent_modbus rename to doc/treasures/modbus/checks/agent_modbus diff --git a/checks/modbus_value b/doc/treasures/modbus/modbus_value similarity index 100% rename from checks/modbus_value rename to doc/treasures/modbus/modbus_value diff --git a/doc/treasures/modbus/perfometer/modbus.py b/doc/treasures/modbus/perfometer/modbus.py new file mode 100644 index 0000000..e464c15 --- /dev/null +++ b/doc/treasures/modbus/perfometer/modbus.py @@ -0,0 +1,10 @@ +#!/usr/bin/python +# Put this file into share/check_mk/web/plugins/perfometer + +def perfometer_modbus_value(row, check_command, perf_data): + value = int(perf_data[0][1]) + return perf_data[0][1], perfometer_logarithmic(value, value*3, 2, '#3366cc') + +perfometers['check_mk-modbus_value'] = perfometer_modbus_value + + diff --git a/doc/treasures/modbus/wato/modbus.py b/doc/treasures/modbus/wato/modbus.py new file mode 100644 index 0000000..851d575 --- /dev/null +++ b/doc/treasures/modbus/wato/modbus.py @@ -0,0 +1,54 @@ +#!/usr/bin/python +# Put this file into share/check_mk/web/plugins/wato. It will create a rules +# for modbus checks and a rule in the configuration of the special agents. + +register_check_parameters( + subgroup_environment, + "modbus_value", + _("Modbus Performance Values"), + Tuple( + elements = [ + Integer(title = _("Warning if above")), + Integer(title = _("Critical if above")) + ] + ), + TextAscii( title = _("Value Name") ), + None +) + + +register_rule(group, + "special_agents:modbus", + Tuple( + title = _("Check Modbus devices"), + help = _( "Configure the Server Address and the ids you want to query from the device" + "Please refer to the documentation of the device to find out which ids you want"), + elements = [ + Integer( title = _("Port Number"), default_value=502 ), + ListOf( + Tuple( + elements = [ + Integer( title=_("Counter ID") ), + DropdownChoice( + title = _("Number of words"), + choices = [ + ( 1 , _("1 Word") ), + ( 2, _("2 Words") ), + ] + ), + DropdownChoice( + title = _("Value type"), + choices = [ + ( "counter" , _("Its a counter value") ), + ( "gauge", _("Its a gauge value") ), + ] + ), + TextAscii( title = _("Counter Description")), + ] + ) + ) + ] + ), + match = "first") + + diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index a828747..1a21a18 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -758,11 +758,3 @@ def perfometer_fanspeed(row, check_command, perf_data): return "%.2f%%" % value, perfometer_linear(value, "silver") perfometers["check_mk-apc_inrow_fanspeed"] = perfometer_fanspeed - - -def perfometer_modbus_value(row, check_command, perf_data): - value = int(perf_data[0][1]) - return perf_data[0][1], perfometer_logarithmic(value, value*3, 2, '#3366cc') - -perfometers['check_mk-modbus_value'] = perfometer_modbus_value - diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index f6c35b1..6f6bee9 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3748,20 +3748,6 @@ register_check_parameters( register_check_parameters( - subgroup_environment, - "modbus_value", - _("Modubus Performance Values"), - Tuple( - elements = [ - Integer(title = _("Warning if above")), - Integer(title = _("Critical if above")) - ] - ), - TextAscii( title = _("Value Name") ), - None -) - -register_check_parameters( subgroup_environment, "ups_capacity", _("UPS Capacity"), diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index e84830a..0a031f9 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -142,41 +142,6 @@ register_rule(group, match = "first") register_rule(group, - "special_agents:modbus", - Tuple( - title = _("Check Modbus devices"), - help = _( "Configure the Server Address and the ids you want to query from the device" - "Please refer to the documentation of the device to find out which ids you want"), - elements = [ - Integer( title = _("Port Number"), default_value=502 ), - ListOf( - Tuple( - elements = [ - Integer( title=_("Counter ID") ), - DropdownChoice( - title = _("Number of words"), - choices = [ - ( 1 , _("1 Word") ), - ( 2, _("2 Words") ), - ] - ), - DropdownChoice( - title = _("Value type"), - choices = [ - ( "counter" , _("Its a counter value") ), - ( "gauge", _("Its a gauge value") ), - ] - ), - TextAscii( title = _("Counter Description")), - ] - ) - ) - ] - ), - match = "first") - - -register_rule(group, "special_agents:random", FixedValue( {},

10 years, 9 months

Check_MK Git: check_mk: Removed obsolete Fritz special agent

by Mathias Kettner

Module: check_mk Branch: master Commit: 967192ff050aa968a24cc0bac731f251ca405eb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=967192ff050aa9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 16 11:02:57 2013 +0100 Removed obsolete Fritz special agent Better use the new one now --- agents/special/agent_fritz | 51 -------------------------------------------- 1 file changed, 51 deletions(-) diff --git a/agents/special/agent_fritz b/agents/special/agent_fritz deleted file mode 100755 index df86197..0000000 --- a/agents/special/agent_fritz +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/python -# encoding: utf-8 - -from lxml import etree -import hashlib, sys -import inspect, pprint -import urllib - -address = "http://fritz.box" -username = '' -password = u"test123" -sidfile = '/tmp/sid_cache' - -try: - """ - Session IDs are valid for 10minutes. - Cause of the limited number of Session IDs for a fritzbox, why - have to try to persist thes IDs - """ - sid = file(sidfile).read() -except IOError: - sid = "" - -login_url = '%s/login_sid.lua' % address -# Try to login with old session id -login_page = etree.parse(login_url+"?sid="+sid).getroot() -sid = login_page.findtext('SID') -# If login with old session id not work, try to get a new one -if sid == "0000000000000000": - challenge = login_page.findtext('Challenge') - rep = (challenge + '-' + password).encode('utf-16le') - response = challenge + '-' + hashlib.md5(rep).hexdigest() - login_page = etree.parse(login_url+"?username=%s&response=%s" % (username, response)).getroot() - sid = login_page.findtext('SID') - #if still not possible to get an id, exit with error - if sid == "0000000000000000": - print "Canot get a session id. Please check passwort" - sys.exit(1) - file(sidfile,'w').write(sid) - -#Just testing yet: -urls = [ - "system/ecostat.lua", - "/net/home_auto_overview.lua" - -] - -print urllib.urlopen("%s/%s?sid=%s" % (address,urls[0], sid)).read() - - -

10 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0942

by Mathias Kettner

Module: check_mk Branch: master Commit: d6bd3fce9a87d5beca282c0448ee43a4682146e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6bd3fce9a87d5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 16 11:01:12 2013 +0100 Updated bug entries #0942 --- .bugs/942 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.bugs/942 b/.bugs/942 index d85870b..cb3db2f 100644 --- a/.bugs/942 +++ b/.bugs/942 @@ -1,12 +1,17 @@ Title: Painter log_type paints wrong data Component: multisite -State: open +Class: bug +State: wontfix Date: 2013-10-24 16:14:43 Targetversion: 1.2.3i6 -Class: bug This painter should contain SERVICE_ALERT / HOST_ALERT / ... however the painter displayed Warning: Check result queue contained results for -> livestatus issue + +2013-12-16 11:01:10: changed state open -> wontfix +This works as designed. We cannot change anything here, since that +would make everything incompatible. Root case is that Nagios puts +informational stuff into the same logfile as object history.

10 years, 9 months

Check_MK Git: check_mk: FIX Most forms did now work with "Profile Requests" enabled

by Lars Michelsen

Module: check_mk Branch: master Commit: 8b30c1b62259783c4263b18bed94a2bd5ce3ecce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8b30c1b6225978… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 16 11:09:09 2013 +0100 FIX Most forms did now work with "Profile Requests" enabled In multisite profiling mode all POST requests were not working in the latest versions. The POST vars were not available during processing the profiled page. --- .bugs/2102 | 7 ++++-- .werks/327 | 12 +++++++++ ChangeLog | 54 +++++++++++++++++++++++++++++++++++++++++ web/htdocs/html_mod_python.py | 9 ++++--- web/htdocs/index.py | 22 ++++++++++------- 5 files changed, 90 insertions(+), 14 deletions(-) diff --git a/.bugs/2102 b/.bugs/2102 index f9ddb21..3115618 100644 --- a/.bugs/2102 +++ b/.bugs/2102 @@ -1,12 +1,15 @@ Title: Multisite python profiler can not handle POST data. Component: multisite -State: open +Class: bug +State: done Date: 2013-12-11 16:22:53 Targetversion: future -Class: bug Any POST data vanishs by the second run of the index.handler(apache._profiling_req) function GET parameters of the same query are preserved. Enabling the global option "Profile Requests" successfully shuts down most of the formulars which are using the POST method. This also applies to the snapshot synchronisation. + +2013-12-16 11:07:34: changed state open -> done +Has been fixed diff --git a/.werks/327 b/.werks/327 new file mode 100644 index 0000000..a59338b --- /dev/null +++ b/.werks/327 @@ -0,0 +1,12 @@ +Title: Most forms did now work with "Profile Requests" enabled +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387188456 +Targetversion: future + +In multisite profiling mode all POST requests were not working in +the latest versions. The POST vars were not available during processing +the profiled page. diff --git a/ChangeLog b/ChangeLog index 30fdfac..5c1fc12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,58 @@ 1.2.5i1: + Core & Setup: + * 0087 FIX: Fixed possible locking issue when using datasource program with long output... + * 0313 FIX: Avoid duplicate reading of configuration file on --create-rrd... + + Checks & Agents: + * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets + * 0073 moxa_iologik_register: new check to monitor moxa e2000 series registers + * 0105 apc_humidity: New Check for humidity levels on APC Devices + * 0106 3ware_units: The verifying state is now handled as ok... + * 0086 timemachine: new check checking the age of latest backup by timemachine on MAC OS + * 0074 raritan_pdu_plugs: new check for Raritan PX-2000 family PDUs... + * 0107 stulz_alerts, stulz_powerstate, stulz_temp, stulz_humidity: New Checks for Stulz clima devices + * 0075 raritan_pdu_inlet: new check to monitor inlet sensors of the Raritan PX-2000 PDUs + * 0315 hitachi_hnas_quorumdevice, hitachi_hnas_pnode, hitachi_hnas_vnode: New checks for Hitachi HNAS devices + * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... + * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now + * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... + * 0305 FIX: apache_status: Fixed exception when agent reports HTML code as apache-status data... + * 0104 FIX: mssql: Server instances with underline in name are now supported.... + * 0240 FIX: Virtualmachine names with space no longer have missing piggyback data... + * 0310 FIX: apache_status: Improved handling of unexpeted data sent by agents... + * 0088 FIX: esx_vsphere_datastores: fixed error with reported capacity of 0 bytes... + * 0243 FIX: cisco_qos: no longer crashes when the qos policy name is not set... + * 0326 FIX: hr_fs printer_supply: Improved translation of wrong encoded chars... + + Multisite: + * 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE + * 0239 FIX: Fixed incorrect html formatting when displaying host or service comments... + * 0307 FIX: Increased performance of multisite GUI with a large userbase... + * 0312 FIX: Hiding views related to not existing datasources, like the EC now... + * 0325 FIX: Removed CSV export icon from availability views... + * 0327 FIX: Most forms did now work with "Profile Requests" enabled... + + WATO: + * 0308 Multisite can now set rotation view permissions for NagVis... + * 0057 FIX: Fix exception in WATO host editor on custom tag without topic... + * 0241 FIX: Improved sorting of WATO folders in dropdown menu... + * 0019 FIX: Fixed wording in WATO rule for MSSQL check + * 0242 FIX: Parameters for clustered services can now be configured on the cluster host... + * 0309 FIX: Trying to prevent read/write conflicts with a large user base... + * 0311 FIX: Fixed "Inventory failed" message when trying an inventory on clusters via WATO... + + Notifications: + * 0108 FIX: Prevent service notification on host alerts... + + Reporting & Availability: + * 0018 New option for displaying a legend for the colors used in the timeline... + + Event Console: + * 0301 Handling messages of special syslog format correctly... + * 0303 FIX: Old log entries were shown in event history first... + * 0304 FIX: Escaping several unwanted chars from incoming log messages... + * 0089 FIX: CSV export of event console was broken... + 1.2.3i7: Core & Setup: diff --git a/web/htdocs/html_mod_python.py b/web/htdocs/html_mod_python.py index 3ad0d04..2bcde4d 100644 --- a/web/htdocs/html_mod_python.py +++ b/web/htdocs/html_mod_python.py @@ -5,7 +5,7 @@ import defaults class html_mod_python(htmllib.html): - def __init__(self, req): + def __init__(self, req, fields): # All URIs end in .py. We strip away the .py and get the # name of the page. @@ -13,6 +13,10 @@ class html_mod_python(htmllib.html): self.req = req htmllib.html.__init__(self) self.user = req.user + if fields: + self.fields = fields + else: + self.fields = util.FieldStorage(self.req, keep_blank_values = 1) self.read_get_vars() self.read_cookies() @@ -41,8 +45,7 @@ class html_mod_python(htmllib.html): self.cookies = Cookie.get_cookies(self.req) def read_get_vars(self): - fields = util.FieldStorage(self.req, keep_blank_values = 1) - self.parse_field_storage(fields) + self.parse_field_storage(self.fields) def lowlevel_write(self, text): if self.io_error: diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 7c080a8..1cd53eb 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -180,16 +180,14 @@ def load_all_plugins(): __builtin__.load_all_plugins = load_all_plugins # Main entry point for all HTTP-requests (called directly by mod_apache) -def handler(req, profiling = True): +def handler(req, fields = None, profiling = True): req.content_type = "text/html; charset=UTF-8" req.header_sent = False - # Create an object that contains all data about the request and # helper functions for creating valid HTML. Parse URI and # store results in the request object for later usage. - html = html_mod_python(req) - + html = html_mod_python(req, fields) html.enable_debug = config.debug html.id = {} # create unique ID for this request __builtin__.html = html @@ -213,13 +211,19 @@ def handler(req, profiling = True): # profiling can be enabled in multisite.mk if profiling and config.profile: import cProfile # , pstats, sys, StringIO, tempfile - # the profiler looses the memory about all modules. We need to park - # the request object in the apache module. This seems to be persistent. + # the profiler looses the memory about all modules. We need to hand over + # the request object in the apache module. # Ubuntu: install python-profiler when using this feature - apache._profiling_req = req profilefile = defaults.var_dir + "/web/multisite.profile" - retcode = cProfile.run("import index; from mod_python import apache; index.handler(apache._profiling_req, False)", profilefile) - file(profilefile + ".py", "w").write("#!/usr/bin/python\nimport pstats\nstats = pstats.Stats(%r)\nstats.sort_stats('time').print_stats()\n" % profilefile) + retcode = cProfile.runctx( + "import index; " + "index.handler(profile_req, profile_fields, False)", + {'profile_req': req, 'profile_fields': html.fields}, {}, profilefile) + file(profilefile + ".py", "w").write( + "#!/usr/bin/python\n" + "import pstats\n" + "stats = pstats.Stats(%r)\n" + "stats.sort_stats('time').print_stats()\n" % profilefile) os.chmod(profilefile + ".py", 0755) release_all_locks() return apache.OK

10 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0939

by Mathias Kettner

Module: check_mk Branch: master Commit: 27c3e925289f9f9bd7a072cb7eeca36c5574894f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27c3e925289f9f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 16 10:49:40 2013 +0100 Updated bug entries #0939 --- .bugs/939 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.bugs/939 b/.bugs/939 index 4e113ed..6b00772 100644 --- a/.bugs/939 +++ b/.bugs/939 @@ -1,9 +1,9 @@ Title: windows_agent: loadlibrary call with *.rll fails Component: checks -State: open +Class: bug +State: wontfix Date: 2013-09-24 10:06:29 Targetversion: 1.2.3i6 -Class: bug 0.078000 - record 219666: process_eventlog_entries bytesread 448, event->Length 448 0.078000 - record 219667: DLLs to load: C:\Program Files\Microsoft SQL Server\MSSQL10_50.MSSQLSERVER\MSSQL\Binn\Resources\1031\sqlevn70.rll @@ -13,3 +13,10 @@ rll files are Windows Resource Libraries ( used for localisation ) The loadlibrary call in the check_mk_agent fails when loading the sqlevn70.rll file, leading to an incorrect localized (not localized at all...) message + +2013-12-16 10:49:37: changed state open -> wontfix +There is no documentation in the internet of how to correctly +load *.rll files. It could even be the case the that file should +be loaded by the DLL itself. Since this seems to be hard to +fix and the error message seems to be present at least unlocalized +or incomplete, we close this bug.

10 years, 9 months

Check_MK Git: check_mk: Updated bug entries #0828

by Mathias Kettner

Module: check_mk Branch: master Commit: 80fb5bc743a13ab22c94f6e82c131453ba9e112e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80fb5bc743a13a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 16 10:36:09 2013 +0100 Updated bug entries #0828 --- .bugs/828 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bugs/828 b/.bugs/828 index 9d51899..f8416f1 100644 --- a/.bugs/828 +++ b/.bugs/828 @@ -1,10 +1,12 @@ Title: locale C.UTF8 is missing at least in Debian Squeeze Component: checks -State: open +Class: bug +State: done Date: 2013-08-19 09:38:38 Targetversion: future -Class: bug If using Debian 6 with flexible notification system, plain email and umlauts in alias, the mail never receives the mail. Reason is the missing C.UTF8 locale. In german debian versions, there is only de_DE.utf8. + +2013-12-16 10:36:03: changed state open -> done

10 years, 9 months

Check_MK Git: check_mk: FIX Fix email notifications containing non-ASCII characters in some situtations

by Mathias Kettner

Module: check_mk Branch: master Commit: 1d851786ea31c49853325260c63ccbbbd35905d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d851786ea31c4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 16 10:33:10 2013 +0100 FIX Fix email notifications containing non-ASCII characters in some situtations On some systems the locale C.UTF-8 was not always available. One of these is Debien Squeeze. Sending a notification email containing non-ASCII characters like german Umlauts failed in these situations. This now has been fixed by scanning all available encodings (output of locale -a) and selecting an existing UTF-8 encoding. Please make sure that at least one such encoding exists. This fix also makes sure that the output of a failed mail submission is being logged in the notification log (if you have enabled it). --- .werks/58 | 19 +++++++++++++++++++ ChangeLog | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ modules/notify.py | 46 ++++++++++++++++++++++++++++++++++----------- 3 files changed, 108 insertions(+), 11 deletions(-) diff --git a/.werks/58 b/.werks/58 new file mode 100644 index 0000000..c37c918 --- /dev/null +++ b/.werks/58 @@ -0,0 +1,19 @@ +Title: Fix email notifications containing non-ASCII characters in some situtations +Level: 2 +Component: notifications +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387186122 +Targetversion: future + +On some systems the locale C.UTF-8 was not always available. One of these is +Debien Squeeze. Sending a notification email containing non-ASCII characters +like german Umlauts failed in these situations. + +This now has been fixed by scanning all available encodings (output of locale +-a) and selecting an existing UTF-8 encoding. Please make sure that at least +one such encoding exists. + +This fix also makes sure that the output of a failed mail submission is +being logged in the notification log (if you have enabled it). diff --git a/ChangeLog b/ChangeLog index 30fdfac..91fad79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,58 @@ 1.2.5i1: + Core & Setup: + * 0087 FIX: Fixed possible locking issue when using datasource program with long output... + * 0313 FIX: Avoid duplicate reading of configuration file on --create-rrd... + + Checks & Agents: + * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets + * 0073 moxa_iologik_register: new check to monitor moxa e2000 series registers + * 0105 apc_humidity: New Check for humidity levels on APC Devices + * 0106 3ware_units: The verifying state is now handled as ok... + * 0086 timemachine: new check checking the age of latest backup by timemachine on MAC OS + * 0074 raritan_pdu_plugs: new check for Raritan PX-2000 family PDUs... + * 0107 stulz_alerts, stulz_powerstate, stulz_temp, stulz_humidity: New Checks for Stulz clima devices + * 0075 raritan_pdu_inlet: new check to monitor inlet sensors of the Raritan PX-2000 PDUs + * 0315 hitachi_hnas_quorumdevice, hitachi_hnas_pnode, hitachi_hnas_vnode: New checks for Hitachi HNAS devices + * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... + * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now + * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... + * 0305 FIX: apache_status: Fixed exception when agent reports HTML code as apache-status data... + * 0104 FIX: mssql: Server instances with underline in name are now supported.... + * 0240 FIX: Virtualmachine names with space no longer have missing piggyback data... + * 0310 FIX: apache_status: Improved handling of unexpeted data sent by agents... + * 0088 FIX: esx_vsphere_datastores: fixed error with reported capacity of 0 bytes... + * 0243 FIX: cisco_qos: no longer crashes when the qos policy name is not set... + * 0326 FIX: hr_fs printer_supply: Improved translation of wrong encoded chars... + + Multisite: + * 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE + * 0239 FIX: Fixed incorrect html formatting when displaying host or service comments... + * 0307 FIX: Increased performance of multisite GUI with a large userbase... + * 0312 FIX: Hiding views related to not existing datasources, like the EC now... + * 0325 FIX: Removed CSV export icon from availability views... + + WATO: + * 0308 Multisite can now set rotation view permissions for NagVis... + * 0057 FIX: Fix exception in WATO host editor on custom tag without topic... + * 0241 FIX: Improved sorting of WATO folders in dropdown menu... + * 0019 FIX: Fixed wording in WATO rule for MSSQL check + * 0242 FIX: Parameters for clustered services can now be configured on the cluster host... + * 0309 FIX: Trying to prevent read/write conflicts with a large user base... + * 0311 FIX: Fixed "Inventory failed" message when trying an inventory on clusters via WATO... + + Notifications: + * 0108 FIX: Prevent service notification on host alerts... + * 0058 FIX: Fix email notifications containing non-ASCII characters in some situtations... + + Reporting & Availability: + * 0018 New option for displaying a legend for the colors used in the timeline... + + Event Console: + * 0301 Handling messages of special syslog format correctly... + * 0303 FIX: Old log entries were shown in event history first... + * 0304 FIX: Escaping several unwanted chars from incoming log messages... + * 0089 FIX: CSV export of event console was broken... + 1.2.3i7: Core & Setup: diff --git a/modules/notify.py b/modules/notify.py index f72e5b9..c845081 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -34,7 +34,7 @@ # hostname, servicedesc, hoststate, servicestate, output in # the form %(variable)s -import pprint, urllib, select +import pprint, urllib, select, subprocess # Default settings notification_logdir = var_dir + "/notify" @@ -246,7 +246,7 @@ def process_context(context, write_into_spoolfile, use_method = None): elif method == "email": # We are searching for a specific # but this contact does not offer any - notify_log("ERROR: contact %r do not have any plugins (required: %s)" % (contact, use_method)) + notify_log("ERROR: contact %r does not have any plugins (required: %s)" % (contact, use_method)) return 2 else: found_plugin = {} @@ -261,9 +261,12 @@ def process_context(context, write_into_spoolfile, use_method = None): method = ('flexible', [found_plugin]) if type(method) == tuple and method[0] == 'flexible': + notify_log("Preparing flexible notifications for %s" % context["CONTACTNAME"]) return notify_flexible(context, method[1], write_into_spoolfile) else: + notify_log("Sending plain email to %s" % context["CONTACTNAME"]) return notify_via_email(context, write_into_spoolfile) + except Exception, e: notify_log("ERROR: %s\n%s" % (e, format_exception())) sys.stderr.write("ERROR: %s\n" % e) @@ -505,6 +508,7 @@ def notify_notify(context): def notify_via_email(context, write_into_spoolfile): if write_into_spoolfile: + notify_log("Spooled this notification.") create_spoolfile({"context": context}) return 0 @@ -520,24 +524,44 @@ def notify_via_email(context, write_into_spoolfile): subject = substitute_context(subject_t, context) context["SUBJECT"] = subject body = substitute_context(notification_common_body + body_t, context) - command = substitute_context(notification_mail_command, context) + " >/dev/null 2>&1" + command = substitute_context(notification_mail_command, context) command_utf8 = command.encode("utf-8") - if notification_logging >= 2: - notify_log("Executing command: %s" % command) notify_log(body) - # Make sure that mail(x) is using UTF-8. More then - # setting the locale cannot be done here. We hope that - # C.UTF-8 is always available. Please check the output - # of 'locale -a' on your system if you are curious. - os.putenv("LANG", "C.UTF-8") + + # Make sure that mail(x) is using UTF-8. Otherwise we cannot send notifications + # with non-ASCII characters. Unfortunately we do not know whether C.UTF-8 is + # available. If e.g. nail detects a non-Ascii character in the mail body and + # the specified encoding is not available, it will silently not send the mail! + # Our resultion in future: use /usr/sbin/sendmail directly. + # Our resultion in the present: look with locale -a for an existing UTF encoding + # and use that. + for encoding in os.popen("locale -a"): + l = encoding.lower() + if "utf8" in l or "utf-8" in l or "utf.8" in l: + encoding = encoding.strip() + os.putenv("LANG", encoding) + if notification_logging >= 2: + notify_log("Setting locale for mail to %s." % encoding) + break + else: + notify_log("No UTF-8 encoding found in your locale -a! Please provide C.UTF-8 encoding.") + if notification_logging >= 2: file(var_dir + "/notify/body.log", "w").write(body.encode("utf-8")) # Important: we must not output anything on stdout or stderr. Data of stdout # goes back into the socket to the CMC in keepalive mode and garbles the # handshake signal. - return os.popen(command_utf8, "w").write(body.encode("utf-8")) + if notification_logging >= 2: + notify_log("Executing command: %s" % command) + p = subprocess.Popen(command_utf8, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE) + stdout_txt, stderr_txt = p.communicate(body.encode("utf-8")) + exitcode = p.returncode + if exitcode != 0: + notify_log("ERROR: could not deliver mail. Exit code of command is %r" % exitcode) + for line in (stdout_txt + stderr_txt).splitlines(): + notify_log("mail: %s" % line.rstrip())

10 years, 9 months

Check_MK Git: check_mk: Set version to 1.2.5i1

by Lars Michelsen

Module: check_mk Branch: master Commit: 0d98ae87afded4de9163d21faeb64d74ca6495fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d98ae87afded4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 16 10:34:14 2013 +0100 Set version to 1.2.5i1 --- Makefile | 2 +- agents/check_mk_agent.aix | 2 +- agents/check_mk_agent.freebsd | 2 +- agents/check_mk_agent.hpux | 2 +- agents/check_mk_agent.linux | 2 +- agents/check_mk_agent.macosx | 2 +- agents/check_mk_agent.netbsd | 2 +- agents/check_mk_agent.openbsd | 2 +- agents/check_mk_agent.openvms | 2 +- agents/check_mk_agent.solaris | 2 +- agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 153088 -> 153088 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 147595 -> 147601 bytes agents/windows/installer.nsi | 2 +- agents/windows/nowin.exe | Bin 22511 -> 22511 bytes debian/files | 2 +- doc/treasures/mknotifyd | 2 +- livestatus/configure.ac | 2 +- mkeventd/bin/mkeventd | 2 +- scripts/setup.sh | 2 +- 21 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 7667506..7a810ae 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Boston, MA 02110-1301 USA. SHELL = /bin/bash -VERSION = 1.2.3i7 +VERSION = 1.2.5i1 NAME = check_mk RPM_TOPDIR = rpm.topdir RPM_BUILDROOT = rpm.buildroot diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index be51a38..cc40d03 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -48,7 +48,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i7 +echo Version: 1.2.5i1 echo AgentOS: aix echo '<<<df>>>' diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index 7537c37..caa1823 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.2.3i7 +echo Version: 1.2.5i1 echo AgentOS: freebsd diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux index ed754fe..35a1876 100755 --- a/agents/check_mk_agent.hpux +++ b/agents/check_mk_agent.hpux @@ -48,7 +48,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.3i7 +echo Version: 1.2.5i1 echo AgentOS: hpux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index fd7499d..ff0eb8d 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -93,7 +93,7 @@ function run_cached () { } echo '<<<check_mk>>>' -echo Version: 1.2.3i7 +echo Version: 1.2.5i1 echo AgentOS: linux echo PluginsDirectory: $PLUGINSDIR echo LocalDirectory: $LOCALDIR diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index 64cb90c..9209244 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -43,7 +43,7 @@ fi echo '<<<check_mk>>>' -echo Version: 1.2.3i7 +echo Version: 1.2.5i1 echo AgentOS: macosx osver="$(uname -r)" diff --git a/agents/check_mk_agent.netbsd b/agents/check_mk_agent.netbsd index d7a472f..6870915 100755 --- a/agents/check_mk_agent.netbsd +++ b/agents/check_mk_agent.netbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i7 +echo Version: 1.2.5i1 echo AgentOS: netbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd index 737f578..0e295f0 100644 --- a/agents/check_mk_agent.openbsd +++ b/agents/check_mk_agent.openbsd @@ -59,7 +59,7 @@ else fi echo '<<<check_mk>>>' -echo Version: 1.2.3i7 +echo Version: 1.2.5i1 echo AgentOS: openbsd osver="$(uname -r)" diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms index 9d40b62..18f5514 100644 --- a/agents/check_mk_agent.openvms +++ b/agents/check_mk_agent.openvms @@ -162,7 +162,7 @@ $set noVerify $define sys$output "''cacheFile'_new" $on error then goto WCFdone $say "<<<check_mk>>>" -$say "Version: 1.2.3i7" +$say "Version: 1.2.5i1" $say "AgentOS: openvms" $say "Nodename: ",f$getsyi("nodename") $say "Architecture: ''HWinfo'" diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index cabab17..90f058e 100644 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -92,7 +92,7 @@ function run_cached () { echo '<<<check_mk>>>' -echo Version: 1.2.3i7 +echo Version: 1.2.5i1 echo AgentOS: solaris diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index bd7d858..adeda0f 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -75,7 +75,7 @@ // | Declarations of macrosk, structs and function prototypes | // '----------------------------------------------------------------------' -#define CHECK_MK_VERSION "1.2.3i7" +#define CHECK_MK_VERSION "1.2.5i1" #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 fe3ce5b..5f4da3e 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 df4eb2b..6da1d7a 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index cebbc7d..7ed56ef 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/installer.nsi b/agents/windows/installer.nsi index 1205fbb..750d0b1 100644 --- a/agents/windows/installer.nsi +++ b/agents/windows/installer.nsi @@ -4,7 +4,7 @@ ; Useful sources: ; http://nsis.sourceforge.net/Reusable_installer_script -!define CHECK_MK_VERSION "1.2.3i7" +!define CHECK_MK_VERSION "1.2.5i1" !define NAME "Check_MK Agent ${CHECK_MK_VERSION}" XPStyle on diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 03480aa..67318d9 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/debian/files b/debian/files index a95fdf6..84b6925 100644 --- a/debian/files +++ b/debian/files @@ -1 +1 @@ -check-mk_1.2.3i7-1_all.deb net optional +check-mk_1.2.5i1-1_all.deb net optional diff --git a/doc/treasures/mknotifyd b/doc/treasures/mknotifyd index 798e0df..138a4f8 100755 --- a/doc/treasures/mknotifyd +++ b/doc/treasures/mknotifyd @@ -30,7 +30,7 @@ from pwd import getpwnam from grp import getgrnam -VERSION="1.2.3i7" +VERSION="1.2.5i1" # .--Helper functions----------------------------------------------------. # | _ _ _ | # | | | | | ___| |_ __ ___ _ __ ___ | diff --git a/livestatus/configure.ac b/livestatus/configure.ac index 10dfd6e..fc0f65a 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.2.3i7], [mk(a)mathias-kettner.de]) +AC_INIT([MK Livestatus], [1.2.5i1], [mk(a)mathias-kettner.de]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADER([config.h]) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 1ce3f9c..940f2b6 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -6,7 +6,7 @@ import socket, os, time, sys, getopt, signal, thread, pprint, re, \ from pwd import getpwnam from grp import getgrnam -VERSION="1.2.3i7" +VERSION="1.2.5i1" # .--Declarations--------------------------------------------------------. # | ____ _ _ _ | diff --git a/scripts/setup.sh b/scripts/setup.sh index 0736329..41d1c64 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -24,7 +24,7 @@ # Boston, MA 02110-1301 USA. -VERSION=1.2.3i7 +VERSION=1.2.5i1 NAME=check_mk LANG= LC_ALL=

10 years, 9 months

Check_MK Git: check_mk: Versions rewritten to 1.2.5i1

by Lars Michelsen

10 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits