Checkmk git commits September 2017

checkmk-commits@lists.checkmk.com

11 participants
255 discussions

by Sven Panne

Module: check_mk Branch: master Commit: 5021905c8a82f5dd0005c63c57481e09bcc43468 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5021905c8a82f5… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Sep 8 16:58:40 2017 +0200 Better metric name typing. Distinguish between the real metric names and their mangled counterparts on the type level. We are now very explicit about this, making some mangling Kung Fu visible. Some cleanups on the way. Change-Id: I2f708134a9c753b8d63178108594810aaed37aa0 --- livestatus/src/ChronoUtils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/ChronoUtils.h b/livestatus/src/ChronoUtils.h index fd21248..b823c37 100644 --- a/livestatus/src/ChronoUtils.h +++ b/livestatus/src/ChronoUtils.h @@ -46,8 +46,8 @@ inline double elapsed_ms_since(std::chrono::steady_clock::time_point then) { inline tm to_tm(std::chrono::system_clock::time_point tp) { time_t t = std::chrono::system_clock::to_time_t(tp); struct tm ret; - // NOTE: A brilliant example of how to make a simple API function a total - // chaos follows... +// NOTE: A brilliant example of how to make a simple API function a total +// chaos follows... #if defined(__STDC_LIB_EXT1__) // C11 function, only guaranteed to be available when a // #define __STDC_WANT_LIB_EXT1_ 1

7 years

WinAgent: Call WinAPI through adaptor interface

by Jukka Aro

Module: check_mk Branch: master Commit: d0e60a30a20ed75349ea192a6200fc0c7501dc1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0e60a30a20ed7… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Jul 27 14:26:19 2017 +0200 WinAgent: Call WinAPI through adaptor interface The target is to clean dependencies to Win API and to place them behind an adaptor interface. This is necessary for unit testing, among others. Use basic dependency injection: pass reference to adaptor instance instead of calling windows API directly. Additional fixes for portability and mocking: * Use int64_t and uint64_t instead of Windows-specific (unsigned) __int64. * Some win_error.* preprocessor _WIN32 defines were broken: they did not compile without MINGW (that apparently always had _WIN32 on). * CreateService from WinAPI has 13 (!) parameters, anything above 10 cannot be properly mocked with Google Mock. We never use the last 5 parameters (always zeroes), so they could be left out of WinApiAdaptor and be filled in at the last step. Additionally, refactor Environment in order to clear valgrind errors: * Use const string members that are initialized in constructor member initializer list. * Use std::vector<char> as char buffer instead of manually heap-allocated buffer. Change-Id: I6a9503ab837c900d1f928c9d86cc711869c2e139 --- agents/windows/Configurable.h | 28 +- agents/windows/Configuration.cc | 7 +- agents/windows/Configuration.h | 6 +- agents/windows/CrashHandler.cc | 80 +-- agents/windows/CrashHandler.h | 35 +- agents/windows/Crypto.cc | 140 ++-- agents/windows/Crypto.h | 13 +- agents/windows/Environment.cc | 167 +++-- agents/windows/Environment.h | 51 +- agents/windows/EventLog.cc | 294 ++++---- agents/windows/EventLog.h | 79 +- agents/windows/EventLogVista.cc | 144 +++- agents/windows/EventLogVista.h | 102 ++- agents/windows/ExternalCmd.cc | 84 ++- agents/windows/ExternalCmd.h | 19 +- agents/windows/IEventLog.cc | 11 +- agents/windows/IEventLog.h | 9 +- agents/windows/ListenSocket.cc | 72 +- agents/windows/ListenSocket.h | 12 +- agents/windows/Logger.cc | 49 +- agents/windows/Logger.h | 13 +- agents/windows/LoggerAdaptor.h | 11 +- agents/windows/Makefile | 2 +- agents/windows/OHMMonitor.cc | 51 +- agents/windows/OHMMonitor.h | 6 +- agents/windows/OutputProxy.cc | 28 +- agents/windows/OutputProxy.h | 10 +- agents/windows/PerfCounter.cc | 279 ++++---- agents/windows/PerfCounter.h | 31 +- agents/windows/PerfCounterCommon.cc | 24 +- agents/windows/PerfCounterCommon.h | 10 +- agents/windows/PerfCounterPdh.cc | 3 +- agents/windows/PerfCounterPdh.h | 1 - agents/windows/Section.cc | 11 +- agents/windows/Section.h | 7 +- agents/windows/SectionManager.cc | 133 ++-- agents/windows/SectionManager.h | 8 +- agents/windows/Thread.cc | 18 +- agents/windows/Thread.h | 7 +- agents/windows/WinApi.cc | 870 +++++++++++++++++++++++ agents/windows/WinApi.h | 429 +++++++++++ agents/windows/WinApiAdaptor.h | 460 ++++++++++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1372160 -> 1382912 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 17176174 -> 17449197 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1372160 -> 1382912 bytes agents/windows/check_mk_agent.cc | 216 +++--- agents/windows/check_mk_agent.exe | Bin 1354240 -> 1359872 bytes agents/windows/check_mk_agent.msi | Bin 2997248 -> 3013632 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 14999417 -> 15247150 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1354240 -> 1359872 bytes agents/windows/crash.exe | Bin 358864 -> 358864 bytes agents/windows/dynamic_func.h | 18 +- agents/windows/install_agent-64.exe | Bin 604756 -> 606728 bytes agents/windows/install_agent.exe | Bin 604190 -> 605804 bytes agents/windows/nowin.exe | Bin 361000 -> 361000 bytes agents/windows/plugins/citrix_xenapp.ps1 | 2 +- agents/windows/plugins/mk_jolokia.exe | Bin 10088473 -> 10106814 bytes agents/windows/sections/SectionCheckMK.cc | 47 +- agents/windows/sections/SectionCheckMK.h | 9 +- agents/windows/sections/SectionCrashDebug.cc | 12 +- agents/windows/sections/SectionCrashDebug.h | 7 +- agents/windows/sections/SectionDF.cc | 57 +- agents/windows/sections/SectionDF.h | 6 +- agents/windows/sections/SectionEventlog.cc | 72 +- agents/windows/sections/SectionEventlog.h | 15 +- agents/windows/sections/SectionFileinfo.cc | 85 +-- agents/windows/sections/SectionFileinfo.h | 15 +- agents/windows/sections/SectionGroup.cc | 25 +- agents/windows/sections/SectionGroup.h | 6 +- agents/windows/sections/SectionLogwatch.cc | 107 ++- agents/windows/sections/SectionLogwatch.h | 26 +- agents/windows/sections/SectionMRPE.cc | 41 +- agents/windows/sections/SectionMRPE.h | 9 +- agents/windows/sections/SectionMem.cc | 17 +- agents/windows/sections/SectionMem.h | 5 +- agents/windows/sections/SectionOHM.cc | 17 +- agents/windows/sections/SectionOHM.h | 9 +- agents/windows/sections/SectionPS.cc | 113 +-- agents/windows/sections/SectionPS.h | 18 +- agents/windows/sections/SectionPerfcounter.cc | 28 +- agents/windows/sections/SectionPerfcounter.h | 7 +- agents/windows/sections/SectionPluginGroup.cc | 259 +++---- agents/windows/sections/SectionPluginGroup.h | 59 +- agents/windows/sections/SectionServices.cc | 60 +- agents/windows/sections/SectionServices.h | 27 +- agents/windows/sections/SectionSkype.cc | 23 +- agents/windows/sections/SectionSkype.h | 7 +- agents/windows/sections/SectionSpool.cc | 35 +- agents/windows/sections/SectionSpool.h | 7 +- agents/windows/sections/SectionSystemtime.cc | 7 +- agents/windows/sections/SectionSystemtime.h | 5 +- agents/windows/sections/SectionUptime.cc | 19 +- agents/windows/sections/SectionUptime.h | 8 +- agents/windows/sections/SectionWMI.cc | 25 +- agents/windows/sections/SectionWMI.h | 10 +- agents/windows/sections/SectionWinperf.cc | 26 +- agents/windows/sections/SectionWinperf.h | 5 +- agents/windows/stringutil.cc | 51 +- agents/windows/stringutil.h | 18 +- agents/windows/types.cc | 34 +- agents/windows/types.h | 69 +- agents/windows/win_error.cc | 56 ++ agents/windows/win_error.h | 45 ++ agents/windows/wmiHelper.cc | 164 +++-- agents/windows/wmiHelper.h | 33 +- 106 files changed, 4038 insertions(+), 1819 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d0e60a30a2…

7 years

df, df.include: Refactoring in preparation of new feature

by Konstantin Büttner

Module: check_mk Branch: master Commit: 1226d0a55ff9c53ff76d8585c864a8f05b328ff1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1226d0a55ff9c5… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Aug 31 11:41:43 2017 +0200 df, df.include: Refactoring in preparation of new feature Change-Id: I045e26129916cd42ee623cde3dde6f049633b488 --- checks/df | 89 +++++++++++++++++++++++------------------------- checks/df.include | 100 ++++++++++++++++++++++++++++++------------------------ 2 files changed, 97 insertions(+), 92 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1226d0a55f…

7 years

Fixed broken rename of hosts after refactoring in master

by Lars Michelsen

Module: check_mk Branch: master Commit: 92281b52ec0155d9d56a6f6ec928bf8f170985ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92281b52ec0155… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 11 12:40:23 2017 +0200 Fixed broken rename of hosts after refactoring in master Change-Id: I6706c4e92a7c3ed2eb5be5d4528365b41a1463d7 --- cmk_base/automations/check_mk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index 288d8c1..4abdd0a 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -448,7 +448,7 @@ s/(HOST|SERVICE) NOTIFICATION: ([^;]+);%(old)s;/\1 NOTIFICATION: \2;%(new)s;/ paths = glob.glob(path_pattern) if paths: extended = ["-r"] if extended_regex else [] - subprocess.call(["sed", "-i"] + extended + ["s@%s@/%s/@" % (old, new)] + paths, + subprocess.call(["sed", "-i"] + extended + ["s@%s@%s@" % (old, new)] + paths, stderr=open(os.devnull, "w")) return True else:

7 years

5205 FIX Host rename: Fixed broken renaming when new name uses dots

by Lars Michelsen

Module: check_mk Branch: master Commit: eca299f96737f56bfd225ca9542f8402f13cbaf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eca299f96737f5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 11 12:38:38 2017 +0200 5205 FIX Host rename: Fixed broken renaming when new name uses dots When using the host rename feature of WATO and setting a new name that contains a dot, for example myhost.domain, the rename failed to set a correct new name. Instead of setting the intended name, the name was set to "myhost[.]domain" in different places. The affected files are: <ul> <li>Nagios core: <tt>var/nagios/retention.dat</tt></li> <li>NagVis maps: <tt>etc/nagvis/maps/*.cfg</tt></li> <li>Monitoring history of all supported cores:<ul> <li><tt>var/check_mk/core/history</tt></li> <li><tt>var/check_mk/core/archive/*</tt></li> <li><tt>var/nagios/nagios.log</tt></li> <li><tt>var/nagios/archive/*</tt></li> </ul></li> </ul> In case you did such a rename action, you can stop your site and fix the wrong names in the mentioned files on your own, e.g. by using <tt>sed</tt>. Change-Id: Ic5615546b3f2ef645b311e536cd2041bd4c16104 --- .werks/5205 | 31 +++++++++++++++++++++++++++++++ cmk_base/automations/check_mk.py | 15 +++++++-------- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/.werks/5205 b/.werks/5205 new file mode 100644 index 0000000..cd1b6ec --- /dev/null +++ b/.werks/5205 @@ -0,0 +1,31 @@ +Title: Host rename: Fixed broken renaming when new name uses dots +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1505123538 + +When using the host rename feature of WATO and setting a new name that +contains a dot, for example myhost.domain, the rename failed to set +a correct new name. Instead of setting the intended name, the name was +set to "myhost[.]domain" in different places. + +The affected files are: + +<ul> +<li>Nagios core: <tt>var/nagios/retention.dat</tt></li> +<li>NagVis maps: <tt>etc/nagvis/maps/*.cfg</tt></li> +<li>Monitoring history of all supported cores:<ul> + <li><tt>var/check_mk/core/history</tt></li> + <li><tt>var/check_mk/core/archive/*</tt></li> + <li><tt>var/nagios/nagios.log</tt></li> + <li><tt>var/nagios/archive/*</tt></li> +</ul></li> +</ul> + +In case you did such a rename action, you can stop your site and +fix the wrong names in the mentioned files on your own, e.g. by using +<tt>sed</tt>. diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index cc38a55..288d8c1 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -342,7 +342,6 @@ class AutomationRenameHosts(Automation): # This functions could be moved out of Check_MK. def _omd_rename_host(self, oldname, newname): oldregex = oldname.replace(".", "[.]") - newregex = newname.replace(".", "[.]") actions = [] # Temporarily stop processing of performance data @@ -358,7 +357,7 @@ class AutomationRenameHosts(Automation): # Fix pathnames in XML files self.rename_host_in_files(os.path.join(cmk.paths.omd_root, "var/pnp4nagios/perfdata", oldname, "*.xml"), "/perfdata/%s/" % oldregex, - "/perfdata/%s/" % newregex) + "/perfdata/%s/" % newname) # RRD files if self._rename_host_dir(cmk.paths.omd_root + "/var/pnp4nagios/perfdata", oldname, newname): @@ -371,17 +370,17 @@ class AutomationRenameHosts(Automation): # entries of rrdcached journal if self.rename_host_in_files(os.path.join(cmk.paths.omd_root, "var/rrdcached/rrd.journal.*"), "/(perfdata|rrd)/%s/" % oldregex, - "/\\1/%s/" % newregex, + "/\\1/%s/" % newname, extended_regex=True): actions.append("rrdcached") # Spoolfiles of NPCD if self.rename_host_in_files("%s/var/pnp4nagios/perfdata.dump" % cmk.paths.omd_root, "HOSTNAME::%s " % oldregex, - "HOSTNAME::%s " % newregex) or \ + "HOSTNAME::%s " % newname) or \ self.rename_host_in_files("%s/var/pnp4nagios/spool/perfdata.*" % cmk.paths.omd_root, "HOSTNAME::%s " % oldregex, - "HOSTNAME::%s " % newregex): + "HOSTNAME::%s " % newname): actions.append("pnpspool") finally: if rrdcache_running: @@ -398,7 +397,7 @@ s/(INITIAL|CURRENT) (HOST|SERVICE) STATE: %(old)s;/\1 \2 STATE: %(new)s;/ s/(HOST|SERVICE) (DOWNTIME |FLAPPING |)ALERT: %(old)s;/\1 \2ALERT: %(new)s;/ s/PASSIVE (HOST|SERVICE) CHECK: %(old)s;/PASSIVE \1 CHECK: %(new)s;/ s/(HOST|SERVICE) NOTIFICATION: ([^;]+);%(old)s;/\1 NOTIFICATION: \2;%(new)s;/ -''' % { "old" : oldregex, "new" : newregex } +''' % { "old" : oldregex, "new" : newname } path_patterns = [ "var/check_mk/core/history", "var/check_mk/core/archive/*", @@ -423,7 +422,7 @@ s/(HOST|SERVICE) NOTIFICATION: ([^;]+);%(old)s;/\1 NOTIFICATION: \2;%(new)s;/ if config.monitoring_core == "nagios": if self.rename_host_in_files("%s/var/nagios/retention.dat" % cmk.paths.omd_root, "^host_name=%s$" % oldregex, - "host_name=%s" % newregex, + "host_name=%s" % newname, extended_regex=True): actions.append("retention") @@ -437,7 +436,7 @@ s/(HOST|SERVICE) NOTIFICATION: ([^;]+);%(old)s;/\1 NOTIFICATION: \2;%(new)s;/ # NagVis maps if self.rename_host_in_files("%s/etc/nagvis/maps/*.cfg" % cmk.paths.omd_root, "^[[:space:]]*host_name=%s[[:space:]]*$" % oldregex, - "host_name=%s" % newregex, + "host_name=%s" % newname, extended_regex=True): actions.append("nagvis")

7 years

5204 FIX Host rename: Fixed broken rename of hosts in rrdcached journal

by Lars Michelsen

Module: check_mk Branch: master Commit: 3ec6925600e615903ae02d18353492a79fcd4a97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ec6925600e615… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 11 11:47:34 2017 +0200 5204 FIX Host rename: Fixed broken rename of hosts in rrdcached journal When using the new Check_MK rrd format (single value per RRD), the host rename feature was not renaming host specific entries in the journal of the rrdcached. This resulted in lost RRD values that have not been written to the RRDs yet. Manual fix: You could stop the rrdcached (or the whole site), go to var/rrdcached and rename the host in the journal files manually, e.g. using <tt>sed</tt>. Change-Id: Ib330541438a87692f40a2856add7d1f066379c01 --- .werks/5204 | 20 ++++++++++++++++++++ cmk_base/automations/check_mk.py | 5 +++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.werks/5204 b/.werks/5204 new file mode 100644 index 0000000..f2cde4d --- /dev/null +++ b/.werks/5204 @@ -0,0 +1,20 @@ +Title: Host rename: Fixed broken rename of hosts in rrdcached journal +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1505122976 + +When using the new Check_MK rrd format (single value per RRD), the +host rename feature was not renaming host specific entries in the +journal of the rrdcached. + +This resulted in lost RRD values that have not been written to the +RRDs yet. + +Manual fix: You could stop the rrdcached (or the whole site), go +to var/rrdcached and rename the host in the journal files manually, +e.g. using <tt>sed</tt>. diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index daaa0c4..cc38a55 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -370,8 +370,9 @@ class AutomationRenameHosts(Automation): # entries of rrdcached journal if self.rename_host_in_files(os.path.join(cmk.paths.omd_root, "var/rrdcached/rrd.journal.*"), - "/perfdata/%s/" % oldregex, - "/perfdata/%s/" % newregex): + "/(perfdata|rrd)/%s/" % oldregex, + "/\\1/%s/" % newregex, + extended_regex=True): actions.append("rrdcached") # Spoolfiles of NPCD

7 years

5203 FIX Removed sorting of perfometers

by Lars Michelsen

Module: check_mk Branch: master Commit: f93aab66082fdac2484fd95c5a4f7365e5ddd540 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f93aab66082fda… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Sep 11 11:18:36 2017 +0200 5203 FIX Removed sorting of perfometers The user could interactively sort a view by the sorter by clicking on the column header. The sorter was not sorting by the shown value(s), but was simply using the first perfdata value of the service for sorting. This could be wrong since the base for the shown value is often not the first perfdata value. The broken sorting function has been removed now. Maybe we could add a more intelligent sorting in the future. For the moment you can create a custom view and add a sorter that sorts the view using a custom perfdata value. Change-Id: I855f873bcf597d6c97f62b7c1fbda248b57c5d6d --- .werks/5203 | 19 +++++++++++++++++++ web/plugins/views/perfometer.py | 1 - 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/5203 b/.werks/5203 new file mode 100644 index 0000000..8c3b0c2 --- /dev/null +++ b/.werks/5203 @@ -0,0 +1,19 @@ +Title: Removed sorting of perfometers +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1505121322 + +The user could interactively sort a view by the sorter by clicking on the column header. The +sorter was not sorting by the shown value(s), but was simply using the first perfdata value +of the service for sorting. This could be wrong since the base for the shown value is often +not the first perfdata value. + +The broken sorting function has been removed now. + +Maybe we could add a more intelligent sorting in the future. For the moment you can create +a custom view and add a sorter that sorts the view using a custom perfdata value. diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index 9e48662..f2077cc 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -207,7 +207,6 @@ multisite_painters["perfometer"] = { "columns" : [ "service_perf_data", "service_state", "service_check_command", "service_pnpgraph_present", "service_plugin_output" ], "paint" : paint_perfometer, - "sorter" : "svc_perf_val01", "printable" : "perfometer", # Special rendering in PDFs }

7 years

4805 AIX agent can now output spool files as well

by Konstantin Büttner

Module: check_mk Branch: master Commit: 822079232c6b64bc3794e802f9b205f172f7b8e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=822079232c6b64… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Sep 11 10:51:43 2017 +0200 4805 AIX agent can now output spool files as well Change-Id: I7f45b130c943a11030d38bb1e0b16dafa0fcae29 --- .werks/4805 | 10 ++++++++++ agents/check_mk_agent.aix | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/.werks/4805 b/.werks/4805 new file mode 100644 index 0000000..f76f9fa --- /dev/null +++ b/.werks/4805 @@ -0,0 +1,10 @@ +Title: AIX agent can now output spool files as well +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1505119857 +Class: feature + + diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 1a91b67..6f5f5a7 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -48,6 +48,10 @@ PLUGINSDIR=$MK_LIBDIR/plugins # to online documentation for details. LOCALDIR=$MK_LIBDIR/local +# All files in SPOOLDIR will simply appended to the agent +# output if they are not outdated (see below) +SPOOLDIR=$MK_VARDIR/spool + #Avoid problems with wrong decimal separators in other language verions of aix export LC_NUMERIC="en_US" @@ -362,3 +366,39 @@ then echo "(${PLUGIN##*/}) $descr $? $OUTPUT" done fi + +# Agent output snippets created by cronjobs, etc. +if [ -d "$SPOOLDIR" ] +then + pushd "$SPOOLDIR" > /dev/null + now=$(date +%s) + + for file in * + do + # output every file in this directory. If the file is prefixed + # with a number, then that number is the maximum age of the + # file in seconds. If the file is older than that, it is ignored. + maxage="" + part="$file" + + # Each away all digits from the front of the filename and + # collect them in the variable maxage. + while [ "${part/#[0-9]/}" != "$part" ] + do + maxage=$maxage${part:0:1} + part=${part:1} + done + + # If there is at least one digit, than we honor that. + if [ "$maxage" ] ; then + mtime=$(stat -c %Y "$file") + if [ $((now - mtime)) -gt $maxage ] ; then + continue + fi + fi + + # Output the file + cat "$file" + done + popd > /dev/null +fi

7 years

5120 FIX ps, ps.perf: Fixed regex range introduced with werk 5114 which allows "/" in process name in manual checks

by Simon Betz

Module: check_mk Branch: master Commit: 6c37f8f7de7505520cfc68b79d203b875cf991ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c37f8f7de7505… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Sep 11 07:46:42 2017 +0200 5120 FIX ps, ps.perf: Fixed regex range introduced with werk 5114 which allows "/" in process name in manual checks Change-Id: I98f87c43e38516621384601bb6fe13111292e87b --- .werks/5120 | 11 +++++++++++ web/plugins/wato/check_parameters.py | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/5120 b/.werks/5120 new file mode 100644 index 0000000..39e6cae --- /dev/null +++ b/.werks/5120 @@ -0,0 +1,11 @@ +Title: ps, ps.perf: Fixed regex range introduced with werk 5114 which allows "/" in process name in manual checks +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1505108567 + + diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index e82ec6a..b89adce 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3671,9 +3671,9 @@ register_check_parameters( title = _("Process Name"), help = _("This name will be used in the description of the service"), allow_empty = False, - regex = "^[a-zA-Z_0-9 _.-/]*$", + regex = "^[a-zA-Z_0-9 _./-]*$", regex_error = _("Please use only a-z, A-Z, 0-9, space, underscore, " - "dot and hyphon for your service description"), + "dot, hyphon and slash for your service description"), ), "dict", has_inventory = False,

7 years

Fixed copy-n-paste error in comment.

by Sven Panne

Module: check_mk Branch: master Commit: d0a36e52fecb0790ac7312ddfc22b61bf3a30346 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0a36e52fecb07… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Sep 8 16:15:07 2017 +0200 Fixed copy-n-paste error in comment. Change-Id: I0329357a894af36fce3a966df5d8f9e0e2b78c21 --- livestatus/src/ChronoUtils.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/livestatus/src/ChronoUtils.h b/livestatus/src/ChronoUtils.h index a55d22d..fd21248 100644 --- a/livestatus/src/ChronoUtils.h +++ b/livestatus/src/ChronoUtils.h @@ -65,7 +65,8 @@ inline tm to_tm(std::chrono::system_clock::time_point tp) { #else // POSIX.1-2008 variant, available under MinGW64 only under obscure // circumstances, so better avoid it there. Signature: - // struct tm *localtime(const time_t *timer) + // struct tm *localtime_r(const time_t *restrict timer, + // struct tm *restrict result); localtime_r(&t, &ret); #endif // Reason: see Win32 section above

7 years

← Newer
1
...
16
17
18
19
20
21
22
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2017