Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64653 discussions

Check_MK Git: check_mk: 642 FIX fc_port: scan function of check modified .. . again

by Goetz Golla

Module: check_mk Branch: master Commit: 14cf0e3138b866889afe4243bf8fb9dbc4b4e6b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14cf0e3138b866… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Jul 24 17:35:14 2014 +0200 642 FIX fc_port: scan function of check modified ... again --- .werks/642 | 8 ++++++++ ChangeLog | 1 + checks/fc_port | 5 +++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/642 b/.werks/642 new file mode 100644 index 0000000..ebbf24c --- /dev/null +++ b/.werks/642 @@ -0,0 +1,8 @@ +Title: fc_port: scan function of check modified ... again +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1406216089 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index aa916c2..98a191e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,7 @@ * 1049 FIX: ups_capacity: Fix exception when running on battery... * 0639 FIX: jolokia_metrics: fix for problem when catalina uses the standalone engine * 1050 FIX: websphere_mq_queues: make compatible with old agent, fix not-found case + * 0642 FIX: fc_port: scan function of check modified ... again Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/checks/fc_port b/checks/fc_port index 5986b27..634b250 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -317,8 +317,9 @@ check_info["fc_port"] = { 'has_perfdata' : True, 'group' : 'fc_port', 'default_levels_variable': 'fc_port_default_levels', - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "Fibre Channel Switch." \ - and not oid(".1.3.6.1.4.1.1588.2.1.1.1.6.2.1.1"), + 'snmp_scan_function' : lambda oid: + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.1.1") \ + and not oid(".1.3.6.1.4.1.1588.2.1.1.1.6.2.1.1"), 'snmp_info' : ( ".1.3.6.1.3.94", [ "1.10.1.2", # connUnitPortIndex # 0 "1.10.1.3", # connUnitPortType # 1

10 years, 2 months

Check_MK Git: check_mk: 1076 FIX Fix wrong percentual host availability > 100% when excluding downtimes

by Mathias Kettner

Module: check_mk Branch: master Commit: 1b71cae033e65979de0cb75ac9f6abf2d60d871c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b71cae033e659… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 24 17:34:42 2014 +0200 1076 FIX Fix wrong percentual host availability > 100% when excluding downtimes When you chose to exclude scheduled downtimes from the "100%" then hosts with actual downtime periods could get an availability for more then 100%. This has been fixed. The Settings ignore and honor were not affected. Also not the display of absolute time values. --- .werks/1076 | 12 ++++++++++++ ChangeLog | 1 + web/plugins/views/availability.py | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/1076 b/.werks/1076 new file mode 100644 index 0000000..51d6046 --- /dev/null +++ b/.werks/1076 @@ -0,0 +1,12 @@ +Title: Fix wrong percentual host availability > 100% when excluding downtimes +Level: 2 +Component: reporting +Class: fix +State: unknown +Version: 1.2.5i5 +Date: 1406215992 + +When you chose to exclude scheduled downtimes from the "100%" then hosts with +actual downtime periods could get an availability for more then 100%. This has +been fixed. The Settings ignore and honor were not affected. Also +not the display of absolute time values. diff --git a/ChangeLog b/ChangeLog index aa916c2..c5b4196 100644 --- a/ChangeLog +++ b/ChangeLog @@ -108,6 +108,7 @@ Reporting & Availability: * 0991 FIX: Availability: optionally show time stamps as UNIX epoch time... + * 1076 FIX: Fix wrong percentual host availability > 100% when excluding downtimes... Event Console: * 1040 FIX: Avoid sporadic errors when checking event state in Event Console... diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 58b48c5..ec12741 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -754,9 +754,9 @@ def do_render_availability(rows, what, avoptions, timeline, timewarpcode): elif s == "host_down": s = avoptions["state_grouping"]["host_down"] - timeline_rows.append((span, s)) total_duration += span["duration"] if consider: + timeline_rows.append((span, s)) considered_duration += span["duration"] # Now merge consecutive rows with identical state

10 years, 2 months

Check_MK Git: check_mk: 641 FIX windows inventory: moved encoding from checks to windows agent plugin

by Goetz Golla

Module: check_mk Branch: master Commit: b9484493bfcca550d63458dddac937bc6c748375 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9484493bfcca5… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Jul 24 17:28:31 2014 +0200 641 FIX windows inventory: moved encoding from checks to windows agent plugin --- .werks/641 | 8 ++++++++ ChangeLog | 1 + agents/windows/plugins/mk_inventory.ps1 | 3 ++- inventory/win_bios | 1 - inventory/win_disks | 1 - inventory/win_os | 2 +- inventory/win_reg_uninstall | 8 ++++---- inventory/win_system | 1 - inventory/win_video | 1 - inventory/win_wmi_software | 6 +++--- 10 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.werks/641 b/.werks/641 new file mode 100644 index 0000000..f33c864 --- /dev/null +++ b/.werks/641 @@ -0,0 +1,8 @@ +Title: windows inventory: moved encoding from checks to windows agent plugin +Level: 1 +Component: inv +Version: 1.2.5i5 +Date: 1406210953 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 68f6b22..aa916c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -125,6 +125,7 @@ * 0167 FIX: mk_inventory.linux: Changed field separator from pipe to tab... * 1005 FIX: Fix exception when using pretty-print output format * 0946 FIX: hw/sw inventory: fixed display bug for byte fields with the value 0... + * 0641 FIX: windows inventory: moved encoding from checks to windows agent plugin 1.2.5i4: diff --git a/agents/windows/plugins/mk_inventory.ps1 b/agents/windows/plugins/mk_inventory.ps1 index 8d33bb7..1bb89b0 100644 --- a/agents/windows/plugins/mk_inventory.ps1 +++ b/agents/windows/plugins/mk_inventory.ps1 @@ -1,3 +1,4 @@ +[Console]::OutputEncoding = [System.Text.Encoding]::UTF8 $name = (Get-Item env:\Computername).Value $separator = "|" # filename for timestamp @@ -14,7 +15,7 @@ If (Test-Path $timestamp){ # exit if timestamp to young if ( $filedate -gt $earlier ) { exit } } - # create new timestamp file +# create new timestamp file New-Item $timestamp -type file -force | Out-Null # calculate unix timestamp diff --git a/inventory/win_bios b/inventory/win_bios index 2840260..c48f50d 100644 --- a/inventory/win_bios +++ b/inventory/win_bios @@ -44,7 +44,6 @@ def inv_win_bios(info): for varname, value in info: varname = re.sub(" *","", varname) value = re.sub("^ ", "", value) - value = value.decode("cp437") if varname == "BIOSVersion": bios_version = value elif varname == "SMBIOSBIOSVersion": diff --git a/inventory/win_disks b/inventory/win_disks index d19e431..e056500 100644 --- a/inventory/win_disks +++ b/inventory/win_disks @@ -63,7 +63,6 @@ def inv_win_disks(info): for varname, value in info: varname = re.sub(" *","", varname) value = re.sub("^ ", "", value) - value = value.decode("cp437") if varname == "Manufacturer": array["vendor"] = value elif varname == "InterfaceType": diff --git a/inventory/win_os b/inventory/win_os index 0d0a6ab..37c4439 100644 --- a/inventory/win_os +++ b/inventory/win_os @@ -32,7 +32,7 @@ def inv_win_os(info): node = inv_tree("software.os.") line = info[0] if len(line) == 6: - node["name"] = line[1].decode("cp437") + node["name"] = line[1] node["kernel_version"] = line[2] if line[3] == "64-Bit": node["arch"] = "x86_64" diff --git a/inventory/win_reg_uninstall b/inventory/win_reg_uninstall index 78fe197..022d85d 100644 --- a/inventory/win_reg_uninstall +++ b/inventory/win_reg_uninstall @@ -37,10 +37,10 @@ def inv_win_reg_uninstall(info): install_date = int(time.mktime(time.strptime(date, "%Y%m%d"))) entry = { - "name" : pacname.decode("cp437"), - "version" : version.decode("cp437"), - "vendor" : publisher.decode("cp437"), - "summary" : display_name.decode("cp437"), + "name" : pacname, + "version" : version, + "vendor" : publisher, + "summary" : display_name, "install_date" : install_date, "size" : estimated_size, "package_type" : "reg_uninstall", diff --git a/inventory/win_system b/inventory/win_system index b00f7fb..5c232d1 100644 --- a/inventory/win_system +++ b/inventory/win_system @@ -40,7 +40,6 @@ def inv_win_system(info): for varname, value in info: varname = re.sub(" *","", varname) value = re.sub("^ ", "", value) - value = value.decode("cp437") if varname == "SerialNumber": node["serial"] = value elif varname == "Manufacturer": diff --git a/inventory/win_video b/inventory/win_video index 5238a33..4eebf19 100644 --- a/inventory/win_video +++ b/inventory/win_video @@ -42,7 +42,6 @@ def inv_win_video(info): for varname, value in info: varname = re.sub(" *","", varname) value = re.sub("^ ", "", value) - value = value.decode("cp437") if varname == "Name": array["name"] = value elif varname == "DriverVersion": diff --git a/inventory/win_wmi_software b/inventory/win_wmi_software index aa7cc76..496321f 100644 --- a/inventory/win_wmi_software +++ b/inventory/win_wmi_software @@ -44,9 +44,9 @@ def inv_win_wmi_software(info): install_date = int(time.mktime(time.strptime(dat, "%Y%m%d"))) entry = { - "name" : pacname.decode("cp437"), - "version" : version.decode("cp437"), - "vendor" : vendor.decode("cp437"), + "name" : pacname, + "version" : version, + "vendor" : vendor, "install_date" : install_date, "package_type" : "wmi", }

10 years, 2 months

Check_MK Git: check_mk: 1050 FIX websphere_mq_queues: make compatible with old agent, fix not-found case

by Mathias Kettner

Module: check_mk Branch: master Commit: a3f2496e8e4d2c267c98d7ad80de45d417ec0b00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3f2496e8e4d2c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 24 15:49:02 2014 +0200 1050 FIX websphere_mq_queues: make compatible with old agent, fix not-found case --- .werks/1050 | 8 ++++++++ ChangeLog | 1 + checks/websphere_mq_queues | 35 +++++++++++++++++++++++++--------- web/plugins/wato/check_parameters.py | 4 ++-- 4 files changed, 37 insertions(+), 11 deletions(-) diff --git a/.werks/1050 b/.werks/1050 new file mode 100644 index 0000000..74fb9ff --- /dev/null +++ b/.werks/1050 @@ -0,0 +1,8 @@ +Title: websphere_mq_queues: make compatible with old agent, fix not-found case +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1406209719 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 348e787..68f6b22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,7 @@ * 1087 FIX: Active checks: Non-ascii check commands now converted into utf-8... * 1049 FIX: ups_capacity: Fix exception when running on battery... * 0639 FIX: jolokia_metrics: fix for problem when catalina uses the standalone engine + * 1050 FIX: websphere_mq_queues: make compatible with old agent, fix not-found case Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/checks/websphere_mq_queues b/checks/websphere_mq_queues index 087c118..00f7239 100644 --- a/checks/websphere_mq_queues +++ b/checks/websphere_mq_queues @@ -24,12 +24,20 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -#<<<websphere_mq_queues>>> -#0 CD.ISS.CATSOS.REPLY.C000052 5000 -#0 CD.ISS.COBA.REPLY.C000052 5000 -#0 CD.ISS.DEUBA.REPLY.C000052 5000 -#0 CD.ISS.TIQS.REPLY.C000052 5000 -#0 CD.ISS.VWD.REPLY.C000052 5000 +# <<<websphere_mq_queues>>> +# 0 CD.ISS.CATSOS.REPLY.C000052 5000 +# 0 CD.ISS.COBA.REPLY.C000052 5000 +# 0 CD.ISS.DEUBA.REPLY.C000052 5000 +# 0 CD.ISS.TIQS.REPLY.C000052 5000 +# 0 CD.ISS.VWD.REPLY.C000052 5000 + +# Old output +# <<<websphere_mq_queues>>> +# 0 CD.ISS.CATSOS.REPLY.C000052 +# 0 CD.ISS.COBA.REPLY.C000052 +# 0 CD.ISS.DEUBA.REPLY.C000052 +# 0 CD.ISS.TIQS.REPLY.C000052 +# 0 CD.ISS.VWD.REPLY.C000052 websphere_mq_queues_default_levels = ( 1000, 1200 ) @@ -37,11 +45,18 @@ def inventory_websphere_mq_queues(info): return [ ( x[1], 'websphere_mq_queues_default_levels' ) for x in info ] def check_websphere_mq_queues(item, params, info): - for messages, queue, queue_length in info: + for line in info: + queue = line[1] if queue == item: + messages = int(line[0]) + if len(line) >= 3: + queue_length = int(line[2]) + length_info = "/%d" % queue_length + else: + length_info = "" + message = "%d%s messages in queue" % ( messages, length_info ) + warn, crit = params - messages = saveint(messages) - message = "%d/%s Messages in Queue" % ( messages, queue_length ) perf = [ ( "queue", messages, warn, crit ) ] if messages >= crit: return 2, message, perf @@ -49,6 +64,8 @@ def check_websphere_mq_queues(item, params, info): return 1, message, perf return 0, message, perf + return 3, "No message queue named %s in agent output" % item + check_info["websphere_mq_queues"] = { "group" : "websphere_mq", "check_function" : check_websphere_mq_queues, diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 2b49628..3f5fee7 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -530,8 +530,8 @@ register_check_parameters( Tuple( title = _('Maximum number of messages'), elements = [ - Integer(title = _("Warning if above") ), - Integer(title = _("Critical if above") ), + Integer(title = _("Warning if above"), default_value = 1000 ), + Integer(title = _("Critical if above"), default_value = 1200 ), ] ), TextAscii(title = _("Name of Channel or Queue")),

10 years, 2 months

Check_MK Git: check_mk: Fixed missing space in help text

by Mathias Kettner

Module: check_mk Branch: master Commit: 32ef11a0877057b0e1c4317606e375a9e1d80737 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32ef11a0877057… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 24 14:38:24 2014 +0200 Fixed missing space in help text --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 654504b..f6e8637 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1092,7 +1092,7 @@ register_configvar(group, ), title = _("Log exceptions in check plugins"), help = _("If this option is enabled Check_MK will create a debug logfile at " - "<tt>%s/chrashed-checks.log</tt>" + "<tt>%s/chrashed-checks.log</tt> " "containing details about failed checks (those which have the state UNKNOWN " "and the output UNKNOWN - invalid output from plugin...) Per default no " "logfile is written.") % defaults.log_dir,

10 years, 2 months

Check_MK Git: check_mk: Removed *lots* of trailing spaces, also in agent plugins

by Mathias Kettner

Module: check_mk Branch: master Commit: d7cbcce36ab871d1499cfd940a2370a6c46d5949 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7cbcce36ab871… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 24 14:25:21 2014 +0200 Removed *lots* of trailing spaces, also in agent plugins --- Makefile | 21 +++++++++++---------- agents/check_mk_agent.aix | 14 +++++++------- agents/check_mk_agent.freebsd | 8 ++++---- agents/check_mk_agent.hpux | 4 ++-- agents/check_mk_agent.linux | 6 +++--- agents/check_mk_agent.macosx | 6 +++--- agents/check_mk_agent.netbsd | 2 +- agents/check_mk_agent.openbsd | 4 ++-- agents/check_mk_agent.solaris | 4 ++-- agents/plugins/dmraid | 2 +- agents/plugins/jar_signature | 4 ++-- agents/plugins/mk_inventory.aix | 8 ++++---- agents/plugins/mk_inventory.linux | 4 ++-- agents/plugins/mk_jolokia | 2 +- agents/plugins/mk_logwatch | 10 +++++----- agents/plugins/mk_oracle | 14 +++++++------- agents/plugins/mk_sap | 2 +- agents/plugins/mk_tsm | 6 +++--- agents/plugins/nfsexports | 2 +- agents/plugins/plesk_backups | 6 +++--- agents/plugins/smart | 4 ++-- agents/plugins/sylo | 4 ++-- agents/plugins/unitrends_backup.php | 18 +++++++++--------- agents/plugins/unitrends_replication.py | 2 +- agents/plugins/veritas/vxvm_multipath | 4 ++-- agents/plugins/veritas/vxvm_objstatus | 2 +- agents/plugins/websphere_mq.sh | 8 ++++---- checkman/aix_memory | 2 +- checkman/allnet_ip_sensoric.humidity | 2 +- checkman/allnet_ip_sensoric.temp | 2 +- checkman/allnet_ip_sensoric.tension | 2 +- checkman/bintec_sensors.fan | 2 +- checkman/bintec_sensors.temp | 2 +- checks/aix_memory | 2 +- checks/hp_proliant_power | 2 +- checks/logwatch | 4 ++-- checks/sentry_pdu | 6 +++--- modules/check_mk.py | 6 +++--- pnp-templates/check_mk-bintec_sensors.fan.php | 4 ++-- pnp-templates/check_mk-if.php | 6 +++--- web/plugins/views/filters.py | 6 +++--- web/plugins/wato/active_checks.py | 4 ++-- web/plugins/wato/check_parameters.py | 14 +++++++------- 43 files changed, 119 insertions(+), 118 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d7cbcce36a…

10 years, 2 months

Check_MK Git: check_mk: Updated bug entries #2138

by Lars Michelsen

Module: check_mk Branch: master Commit: dcfffd71dc419a03bb723bad99b1fa8fe1699b45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dcfffd71dc419a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 24 13:11:57 2014 +0200 Updated bug entries #2138 --- .bugs/2138 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/2138 b/.bugs/2138 new file mode 100644 index 0000000..12411a9 --- /dev/null +++ b/.bugs/2138 @@ -0,0 +1,12 @@ +Title: Multisite does handle state, has_been_checked and initial_state wrong +Component: multisite +State: open +Date: 2014-07-24 13:10:32 +Targetversion: future +Class: bug + +When a host/service has an initial_state configured and the host/service has +never been checked, it is always shown as pending host/service. The initial +state is not handled by multisite. + +Livestatus provides the correct information.

10 years, 2 months

Check_MK Git: check_mk: 1063 SEC Fixed several XSS issues on different pages

by Lars Michelsen

Module: check_mk Branch: master Commit: 24436ace2fe9a21790d0e9eec14ee14cd2e80050 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24436ace2fe9a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 24 12:54:19 2014 +0200 1063 SEC Fixed several XSS issues on different pages Several pages like views and prediction pages missed to escape user provided values before writing them back on the pages. --- .werks/1062 | 9 +++++++++ .werks/1063 | 9 +++++++++ ChangeLog | 2 ++ web/htdocs/htmllib.py | 2 +- web/plugins/views/commands.py | 2 +- web/plugins/views/painters.py | 2 +- werk | 2 +- 7 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.werks/1062 b/.werks/1062 new file mode 100644 index 0000000..a6153e1 --- /dev/null +++ b/.werks/1062 @@ -0,0 +1,9 @@ +Title: Fixed several XSS issues on different pages +Level: 2 +Component: multisite +Version: 1.2.5i5 +Date: 1406198826 +Class: security + +Some pages, like the views and prediction pages missed to escape values +provided by the user. diff --git a/.werks/1063 b/.werks/1063 new file mode 100644 index 0000000..c09be24 --- /dev/null +++ b/.werks/1063 @@ -0,0 +1,9 @@ +Title: Fixed several XSS issues on different pages +Level: 2 +Component: multisite +Version: 1.2.5i5 +Date: 1406199218 +Class: security + +Several pages like views and prediction pages missed to escape user +provided values before writing them back on the pages. diff --git a/ChangeLog b/ChangeLog index c06a11f..348e787 100644 --- a/ChangeLog +++ b/ChangeLog @@ -81,6 +81,8 @@ * 1052 SEC: index start URL can not be used to redirect to absolute URLs anymore... * 1085 quicksearch: multiple hostname matches now lead to the searchhost view instead of the hosts view... * 1047 Virtual Host Tree: Allow to use topic as tree level... + * 1062 SEC: Fixed several XSS issues on different pages... + * 1063 SEC: Fixed several XSS issues on different pages... * 0945 FIX: Sidebar snapin "Problem hosts": Now excludes hosts and services in downtime * 1036 FIX: doc/treasures/downtime: fix --url option, better error output * 1074 FIX: Fix Virtual Host Tree snapin... diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index afde184..be17fff 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -746,7 +746,7 @@ class html: self.write('<table class=header><tr><td width="*" class=heading>') self.write('<a href="#" onfocus="if (this.blur) this.blur();" ' 'onclick="this.innerHTML=\'%s\'; document.location.reload();">%s</a></td>' % - (_("Reloading..."), title)) + (_("Reloading..."), self.attrencode(title))) def top_heading_right(self): cssclass = self.help_visible and "active" or "passive" diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py index 77a0595..a5461a0 100644 --- a/web/plugins/views/commands.py +++ b/web/plugins/views/commands.py @@ -157,7 +157,7 @@ def command_fake_checks(cmdtag, spec, row): for s in [0,1,2,3]: statename = html.var("_fake_%d" % s) if statename: - pluginoutput = _("Manually set to %s by %s") % (statename, config.user_id) + pluginoutput = _("Manually set to %s by %s") % (html.attrencode(statename), config.user_id) if cmdtag == "SVC": cmdtag = "SERVICE" command = "PROCESS_%s_CHECK_RESULT;%s;%s;%s" % (cmdtag, spec, s, pluginoutput) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index b05e5e6..6b8e2bc 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1258,7 +1258,7 @@ def paint_host_group_memberlist(row): for group in row["host_groups"]: link = "view.py?view_name=hostgroup&hostgroup=" + group if html.var("display_options"): - link += "&display_options=%s" % html.var("display_options") + link += "&display_options=%s" % html.attrencode(html.var("display_options")) links.append('<a href="%s">%s</a>' % (link, group)) return "", ", ".join(links) diff --git a/werk b/werk index cc2db14..9f18bc5 100755 --- a/werk +++ b/werk @@ -249,7 +249,7 @@ def git_commit(werk, custom_files): if prefix: title = "%s %s" % (prefix, title) - title = werk["id"] + " " + title + title = "%d %s" % (werk['id'], title) if custom_files: files_to_commit = custom_files

10 years, 2 months

Check_MK Git: check_mk: Added werk-id to commit message

by Lars Michelsen

Module: check_mk Branch: master Commit: f1abef23034b03e3bf3dca6068fd0c075198d2ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1abef23034b03… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 24 11:56:53 2014 +0200 Added werk-id to commit message --- werk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/werk b/werk index c002b9e..cc2db14 100755 --- a/werk +++ b/werk @@ -249,6 +249,8 @@ def git_commit(werk, custom_files): if prefix: title = "%s %s" % (prefix, title) + title = werk["id"] + " " + title + if custom_files: files_to_commit = custom_files default_files = [ ".werks", "ChangeLog" ]

10 years, 2 months

Check_MK Git: check_mk: Updated changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: 31abc22e88ad539e266af37bc0f848f1a7ddc979 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31abc22e88ad53… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 24 11:41:30 2014 +0200 Updated changelog --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e3a48c8..c06a11f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,9 +40,9 @@ * 1135 bintec_sensors.voltage, bintec_sensors.temp: New Checks for Voltage and Temperature Sensors of Bintec Routers * 1048 mem.win: support predictive levels... * 1136 bintec_brrp_status: New Check for BRRP States on Bintec Routers - * 0183 sentry_pdu: New check to monitor plugs of sentry PDUs * 0640 jolokia_metrics.gc, jolokia_metrics.tp: now come with its own pnp templates * 1088 included check_mk_agent windows msi installer... + * 0183 sentry_pdu: New check to monitor plugs of sentry PDUs * 0994 FIX: agent plugin smart: fixed syntax error * 0989 FIX: logwatch.ec: Fix forwarding multiple messages via syslog/TCP... * 0943 FIX: if.include: fixed incorrect traffic percentage values in the check output of if checks...

10 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits