Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

Huge refactoring of Check_MK base data fetching

by Lars Michelsen

Module: check_mk Branch: master Commit: 203bfd8a62df19dd07a1ee8b9a97dbb3fba60372 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=203bfd8a62df19… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 9 10:30:37 2017 +0100 Huge refactoring of Check_MK base data fetching * Flipped the data gathering structure. It was first iterating over all check types and fetching the (agent) data on demand during the first check and caching these results to reuse it for the other checks. This has been changed into two phases: 1. Fetch ALL data (including SNMP scan + walks) 2. Execute discovery/check/inventory logic * Abstracted collection of data A new concept of "data sources" has been introduced. Each source of monitoring data is a data source. The following exist at the moment: TCPDataSource SNMPDataSource SNMPManagementBoardDataSource PiggyBackDataSource DSProgramDataSource SpecialAgentDataSource * With the above changes we have a far better situation now a) Exception handling (-> error reporting) is equal for all sources b) Caching of raw source data is exactly the same * This prepares the way for splitting up data fetching, which also includes expensive timeouts, from the check execution. Change-Id: I975cb49c8087c5e5d94bdf2786ca60e89c58171c --- cmk_base/agent_data.py | 1304 +++++++++++++++++++++----------------- cmk_base/automations/check_mk.py | 30 +- cmk_base/checking.py | 295 ++++----- cmk_base/crash_reporting.py | 4 +- cmk_base/discovery.py | 218 ++----- cmk_base/inventory.py | 61 +- cmk_base/modes/check_mk.py | 20 +- cmk_base/snmp.py | 27 - lib/paths.py | 4 +- 9 files changed, 977 insertions(+), 986 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=203bfd8a62…

6 years, 10 months

Fixed host tag visibility switching for tags not in default tag topic

by Lars Michelsen

Module: check_mk Branch: master Commit: 97136fc2d0f09799914842d0ff6f5065df4e91cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97136fc2d0f097… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 6 16:04:17 2017 +0100 Fixed host tag visibility switching for tags not in default tag topic Change-Id: I4085a9c28326b6177d6e5da6286fcf324236e321 --- web/htdocs/wato.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1822350..f6bb0b5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17274,7 +17274,7 @@ def configure_attributes(new, hosts, for_what, parent, myself=None, without_attr inherited_value = container.attributes()[attrname] has_inherited = True - if topic == _("Host tags"): + if isinstance(attr, watolib.HostTagAttribute): inherited_tags["attr_%s" % attrname] = '|'.join(attr.get_tag_list(inherited_value)) break @@ -17285,7 +17285,7 @@ def configure_attributes(new, hosts, for_what, parent, myself=None, without_attr inherited_from = _("Default value") inherited_value = attr.default_value() # Also add the default values to the inherited values dict - if topic == _("Host tags"): + if isinstance(attr, watolib.HostTagAttribute): inherited_tags["attr_%s" % attrname] = '|'.join(attr.get_tag_list(inherited_value)) # Checkbox for activating this attribute

6 years, 10 months

Basic implementation of multiple agent handling

by Lars Michelsen

Module: check_mk Branch: master Commit: 297ef61da0f4b26585dfc119dc83192a046006b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=297ef61da0f4b2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 7 10:51:47 2017 +0100 Basic implementation of multiple agent handling Change-Id: I842c15a78cc41ed65a764bb849623cf819c76cba --- cmk_base/agent_data.py | 485 ++++++++++++++++++++++++++++----------- cmk_base/automations/check_mk.py | 27 ++- cmk_base/checking.py | 12 +- cmk_base/config.py | 8 + cmk_base/discovery.py | 5 + cmk_base/dump_host.py | 19 +- cmk_base/exceptions.py | 15 +- cmk_base/modes/check_mk.py | 10 +- 8 files changed, 427 insertions(+), 154 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=297ef61da0…

6 years, 10 months

Built GUI part of new agent/snmp/ping tag configuration

by Lars Michelsen

Module: check_mk Branch: master Commit: 3f34066e2f895658612cc497e9a2d77721a66b21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f34066e2f8956… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 6 16:10:56 2017 +0100 Built GUI part of new agent/snmp/ping tag configuration Change-Id: I81a94cb3bd8195ace93a1eb1919f732b2360ad92 --- web/htdocs/config.py | 2 +- web/htdocs/js/wato.js | 70 ++++++++++------- web/htdocs/wato.py | 25 +++++-- web/htdocs/watolib.py | 132 +++++++++++++++++++++++++++++---- web/plugins/wato/builtin_attributes.py | 6 +- web/plugins/webapi/webapi.py | 4 +- 6 files changed, 186 insertions(+), 53 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3f34066e2f…

6 years, 10 months

Fixed access to not existant variable in exception handler

by Lars Michelsen

Module: check_mk Branch: master Commit: d01029e40d5c065feaca5f9debec6252a28662d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d01029e40d5c06… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 21 13:48:09 2017 +0100 Fixed access to not existant variable in exception handler Change-Id: I02a0937d460c6215dd25d776886733ebc1c832bf --- bin/mkeventd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/mkeventd b/bin/mkeventd index c384398..a127c6b 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -1773,7 +1773,7 @@ class EventServer(ECServerThread): if line: try: self.process_raw_data(self.process_line, (line, address)) - except Exception: + except Exception as e: self.logger.exception('Exception handling a log line (skipping this one): %s' % e) @@ -2230,7 +2230,7 @@ class EventServer(ECServerThread): try: result = self.event_rule_matches(rule, event) - except Exception: + except Exception as e: self.logger.exception(' Exception during matching:\n%s' % e) result = False

6 years, 10 months

Removed unused definition of "e" from global namespace (confused pylint)

by Lars Michelsen

Module: check_mk Branch: master Commit: 0365156f9c1d31980bcf54fff8e8bdffa7cebba7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0365156f9c1d31… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 21 13:48:39 2017 +0100 Removed unused definition of "e" from global namespace (confused pylint) Change-Id: I96c012ae09fab20b973776c6c7d80a767d9e5df5 --- bin/mkeventd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mkeventd b/bin/mkeventd index a127c6b..de5fc2b 100755 --- a/bin/mkeventd +++ b/bin/mkeventd @@ -5192,7 +5192,7 @@ if __name__ == "__main__": os.remove(g_pid_file) sys.exit(0) - except Exception as e: + except: if opt_debug: raise bail_out(traceback.format_exc())

6 years, 10 months

5534 FIX Fixed wrong host graph scaling when using DNS names as IPv4 address

by Lars Michelsen

Module: check_mk Branch: master Commit: c82eb0f4aa371a6b7ec600dd6785429439881e2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c82eb0f4aa371a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 21 14:07:46 2017 +0100 5534 FIX Fixed wrong host graph scaling when using DNS names as IPv4 address When configuring a host to use a DNS name as IPv4 address, the host is not being pinged anymore via Smart Ping. Instead of this the active check check_icmp is used. This check produces host graphs, which were scaled wrong by factor 1000 in previous versions. Change-Id: I8ecde73d0fe38779d23859681c902b0aad3c1b73 --- .werks/5534 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.werks/5534 b/.werks/5534 new file mode 100644 index 0000000..3ffb2c5 --- /dev/null +++ b/.werks/5534 @@ -0,0 +1,14 @@ +Title: Fixed wrong host graph scaling when using DNS names as IPv4 address +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i2 +Date: 1511269458 + +When configuring a host to use a DNS name as IPv4 address, the host is not +being pinged anymore via Smart Ping. Instead of this the active check +check_icmp is used. This check produces host graphs, which were scaled wrong +by factor 1000 in previous versions.

6 years, 10 months

4863 FIX MSSQL plugin: fixed backup detection for always-on and FOC systems

by Marcel Schulte

Module: check_mk Branch: master Commit: 248838891164ae3dcfdf49b48d9fc9035c367f38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=248838891164ae… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Tue Nov 21 12:39:15 2017 +0100 4863 FIX MSSQL plugin: fixed backup detection for always-on and FOC systems Database backups where not dtected on always-on and FOC systems the right way. This has been fixed. Change-Id: Iec0ded62ec0ef71de8898b063f2ae6d73f7617b2 --- .werks/4863 | 11 ++++++++ agents/windows/plugins/mssql.vbs | 54 ++++++++++++++++++++-------------------- 2 files changed, 38 insertions(+), 27 deletions(-) diff --git a/.werks/4863 b/.werks/4863 new file mode 100644 index 0000000..b5a60eb --- /dev/null +++ b/.werks/4863 @@ -0,0 +1,11 @@ +Title: MSSQL plugin: fixed backup detection for always-on and FOC systems +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1511264202 +Class: fix + +Database backups where not dtected on always-on and FOC systems the right way. +This has been fixed. diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index d2fd34a..29ddb8e 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -365,32 +365,31 @@ For Each instance_id In instances.Keys: Do ' Continue trick Dim lastBackupDate, backup_type, is_primary_replica, replica_id, backup_machine_name addOutput(sections("backup")) For Each dbName in dbNames.Keys - RS.Open "USE [" & dbName & "]", CONN - RS.open "IF EXISTS (select 1 from sys.sysobjects where name = 'dm_hadr_database_replica_states') " & _ - "BEGIN " & _ - "SELECT CONVERT(VARCHAR, DATEADD(s, DATEDIFF(s, '19700101', MAX(b.backup_finish_date)), '19700101'), 120) AS last_backup_date, " & _ - "b.type, b.machine_name, " & _ - "isnull(rep.is_primary_replica,0) as is_primary_replica, rep.is_local, isnull(convert(varchar(40), rep.replica_id), '') AS replica_id " & _ - "FROM msdb.dbo.backupset b " & _ - "LEFT OUTER JOIN sys.databases db ON b.database_name = db.name " & _ - "LEFT OUTER JOIN sys.dm_hadr_database_replica_states rep ON db.database_id = rep.database_id " & _ - "WHERE database_name = '" & dbName & "' " & _ - "AND b.machine_name = '" & hostname & "' " & _ - "AND (rep.is_local is null or rep.is_local = 1) " & _ - "AND (rep.is_primary_replica is null or rep.is_primary_replica = 1) " & _ - "GROUP BY type, rep.replica_id, rep.is_primary_replica, rep.is_local, b.database_name, b.machine_name, rep.synchronization_state, rep.synchronization_health " & _ - "END " & _ - "ELSE " & _ - "BEGIN " & _ - "SELECT CONVERT(VARCHAR, DATEADD(s, DATEDIFF(s, '19700101', MAX(backup_finish_date)), '19700101'), 120) AS last_backup_date," & _ - "type, machine_name, " & _ - "'1' as is_primary_replica, " &_ - "'1' as is_local, " & _ - "'' as replica_id " & _ - "FROM msdb.dbo.backupset " & _ - "WHERE database_name = '" & dbName & "' " & _ - "GROUP BY type, machine_name " & _ - "END", CONN + RS.Open "USE [master]", CONN + RS.Open "select 1 from sys.sysobjects where name = 'dm_hadr_database_replica_states'", CONN + If RS.EOF Then + RS.Close + RS.Open "SELECT CONVERT(VARCHAR, DATEADD(s, DATEDIFF(s, '19700101', MAX(backup_finish_date)), '19700101'), 120) AS last_backup_date," & _ + "type, machine_name, " & _ + "'True' as is_primary_replica, " &_ + "'1' as is_local, " & _ + "'' as replica_id " & _ + "FROM msdb.dbo.backupset " & _ + "WHERE database_name = '" & dbName & "' " & _ + "GROUP BY type, machine_name ", CONN + Else + RS.Close + RS.Open "SELECT CONVERT(VARCHAR, DATEADD(s, DATEDIFF(s, '19700101', MAX(b.backup_finish_date)), '19700101'), 120) AS last_backup_date, " & _ + "b.type, b.machine_name, " & _ + "isnull(rep.is_primary_replica,0) as is_primary_replica, rep.is_local, isnull(convert(varchar(40), rep.replica_id), '') AS replica_id " & _ + "FROM msdb.dbo.backupset b " & _ + "LEFT OUTER JOIN sys.databases db ON b.database_name = db.name " & _ + "LEFT OUTER JOIN sys.dm_hadr_database_replica_states rep ON db.database_id = rep.database_id " & _ + "WHERE database_name = '" & dbName & "' " & _ + "AND (rep.is_local is null or rep.is_local = 1) " & _ + "AND (rep.is_primary_replica is null or rep.is_primary_replica = 'True') " & _ + "GROUP BY type, rep.replica_id, rep.is_primary_replica, rep.is_local, b.database_name, b.machine_name, rep.synchronization_state, rep.synchronization_health ", CONN + End If Do While Not RS.Eof lastBackupDate = Trim(RS("last_backup_date")) @@ -404,10 +403,11 @@ For Each instance_id In instances.Keys: Do ' Continue trick is_primary_replica = Trim(RS("is_primary_replica")) backup_machine_name = Trim(RS("machine_name")) - If lastBackupDate <> "" and (replica_id = "" or is_primary_replica = "1") AND hostname = backup_machine_name Then + If lastBackupDate <> "" and (replica_id = "" or is_primary_replica = "True") Then addOutput("MSSQL_" & instance_id & " " & Replace(dbName, " ", "_") & _ " " & lastBackupDate & " " & backup_type) End If + RS.MoveNext Loop RS.Close

6 years, 10 months

5479 FIX fileinfo: handle globbing pattern expansion and whitespace in fileinfo.cfg

by Tom Baerwinkel

Module: check_mk Branch: master Commit: ff7ab6146060bb87784975686c789cc82ebbeca0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff7ab6146060bb… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Nov 20 18:26:39 2017 +0100 5479 FIX fileinfo: handle globbing pattern expansion and whitespace in fileinfo.cfg This werk fixes the issue that spaces and globbing patterns defined in fileinfo.cfg were not handled correctly. Now files containing spaces are recognized corretly and globbing patterns are expanded. Change-Id: Ic2f710811addd8cfe008d4c45402f60f15a8c601 --- .werks/5479 | 12 ++++++++++++ agents/check_mk_agent.aix | 25 +++++++++++++++---------- agents/check_mk_agent.freebsd | 18 +++++++++++------- agents/check_mk_agent.linux | 23 ++++++++++++----------- agents/check_mk_agent.macosx | 18 +++++++++++------- agents/check_mk_agent.openwrt | 18 +++++++++++------- agents/check_mk_agent.solaris | 42 +++++++++++++++++++++++------------------- 7 files changed, 95 insertions(+), 61 deletions(-) diff --git a/.werks/5479 b/.werks/5479 new file mode 100644 index 0000000..5612ef6 --- /dev/null +++ b/.werks/5479 @@ -0,0 +1,12 @@ +Title: fileinfo: handle globbing pattern expansion and whitespace in fileinfo.cfg +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1511197837 +Class: fix + +This werk fixes the issue that spaces and globbing patterns defined in +fileinfo.cfg were not handled correctly. Now files containing spaces +are recognized corretly and globbing patterns are expanded. diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 4031f66..532b08f 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -291,16 +291,21 @@ if [ -r "$MK_CONFDIR/fileinfo.cfg" ]; then date +%s # simulate output of the Linux "stat -c "%n|%s|%Y" command # TODO: feel free to improve this command. It opens the perl interpreter for every file found... - for pattern in $(cat "$MK_CONFDIR/fileinfo.cfg" 2>/dev/null) - do - if [ -f "$pattern" ]; then - ls -1 "$pattern" - fi - done |\ - while read file - do - /usr/bin/perl -e 'printf "$_|%s|%s\n", (stat) [7,9] for @ARGV' "$file" - done + OLD_IFS=$IFS + IFS=' +' + while read -r pattern; do + case $pattern in + /*) for file in $pattern; do + if [ -f "$file" ]; then + /usr/bin/perl -e 'printf "$_|%s|%s\n", (stat) [7,9] for @ARGV' "$file" + else + echo "$file|missing|`date +%s`" + fi + done ;; + esac + done < "$MK_CONFDIR/fileinfo.cfg" + IFS=$OLD_IFS fi # powerHA diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index d68df23..a944f61 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -380,14 +380,18 @@ fi if [ -r "$MK_CONFDIR/fileinfo.cfg" ] ; then echo '<<<fileinfo:sep(124)>>>' date +%s - for line in $(cat "$MK_CONFDIR/fileinfo.cfg") - do - stat -f "%N|%z|%m" "$line" 2>/dev/null - if [ $? -ne 0 ]; then - echo "$line|missing|$(date +%s)" - fi - done + OLD_IFS=$IFS + IFS=' +' + while read -r pattern; do + case $pattern in + /*) for file in $pattern; do + stat -f "%N|%z|%m" "$file" 2>/dev/null || echo "$file|missing|`date +%s`" + done ;; + esac + done < "$MK_CONFDIR/fileinfo.cfg" + IFS=$OLD_IFS fi diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 0e08cbf..7ce4333 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -766,18 +766,19 @@ function replace_datevariable() if [ -r "$MK_CONFDIR/fileinfo.cfg" ] ; then echo '<<<fileinfo:sep(124)>>>' date +%s - for line in $(cat "$MK_CONFDIR/fileinfo.cfg") - do - # only work on lines containing files, skip e.g. comments and blank lines - if [ "${line:0:1}" = "/" ]; then - line=$(replace_datevariable "$line") - stat -c "%n|%s|%Y" "${line}" 2>/dev/null - if [ $? -ne 0 ]; then - echo "$line|missing|$(date +%s)" - fi - fi - done + OLD_IFS=$IFS + IFS=' +' + while read -r pattern; do + case $pattern in + /*) pattern=`replace_datevariable "$pattern"` + for file in $pattern; do + stat -c "%n|%s|%Y" "$file" 2> /dev/null || echo "$file|missing|`date +%s`" + done ;; + esac + done < "$MK_CONFDIR/fileinfo.cfg" + IFS=$OLD_IFS fi # Get stats about OMD monitoring cores running on this machine. diff --git a/agents/check_mk_agent.macosx b/agents/check_mk_agent.macosx index a93ba28..99d5782 100755 --- a/agents/check_mk_agent.macosx +++ b/agents/check_mk_agent.macosx @@ -93,14 +93,18 @@ netstat -ntfinet | awk ' /^tcp/ { c[$6]++; } END { for (x in c) { print x, c[x]; if [ -r "$MK_CONFDIR/fileinfo.cfg" ] ; then echo '<<<fileinfo:sep(124)>>>' date +%s - for line in $(cat "$MK_CONFDIR/fileinfo.cfg") - do - stat -f "%N|%z|%m" "$line" 2>/dev/null - if [ $? -ne 0 ]; then - echo "$line|missing|$(date +%s)" - fi - done + OLD_IFS=$IFS + IFS=' +' + while read -r pattern; do + case $pattern in + /*) for file in $pattern; do + stat -f "%N|%z|%m" "$file" 2>/dev/null || echo "$file|missing|`date +%s`" + done ;; + esac + done < "$MK_CONFDIR/fileinfo.cfg" + IFS=$OLD_IFS fi if type tmutil >/dev/null diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index 5b10b6a..bd14ef6 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -681,14 +681,18 @@ fi if [ -r "$MK_CONFDIR/fileinfo.cfg" ] ; then echo '<<<fileinfo:sep(124)>>>' date +%s - for line in $(cat "$MK_CONFDIR/fileinfo.cfg") - do - stat -c "%n|%s|%Y" "$line" 2>/dev/null - if [ $? -ne 0 ]; then - echo "$line|missing|$(date +%s)" - fi - done + OLD_IFS=$IFS + IFS=' +' + while read -r pattern; do + case $pattern in + /*) for file in $pattern; do + stat -c "%n|%s|%Y" "$file" 2>/dev/null || echo "$file|missing|`date +%s`" + done ;; + esac + done < "$MK_CONFDIR/fileinfo.cfg" + IFS=$OLD_IFS fi # Get stats about OMD monitoring cores running on this machine. diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 5eda934..a27b13b 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -368,26 +368,30 @@ if [ -f "$MK_CONFDIR/fileinfo.cfg" ] then echo '<<<fileinfo:sep(124)>>>' /usr/bin/perl -e 'print time."\n"' + # note: patterns in the fileinfo.cfg are resolved inside this loop - for file in $(cat "$MK_CONFDIR/fileinfo.cfg") - do - # only work on lines containing files, skip e.g. comments and blank lines - if [ "${file:0:1}" = "/" ]; then - file=$(replace_datevariable "$file") - ls "$file" > /dev/null 2>&1 - if [ $? -eq 0 ]; then - echo "$file" | \ - /usr/bin/perl -e ' - while(my $file = <>) { - $file =~ s/\n$//; - ($device, $inode, $mode, $nlink, $uid, $gid, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks) = stat($file); - print("$file|$size|$mtime\n"); - }' - else - echo "$file|missing|$(/usr/bin/perl -e 'print time')" - fi - fi - done + OLD_IFS=$IFS + IFS=' +' + while read -r pattern; do + case $pattern in + /*) pattern=`replace_datevariable "$pattern"` + for file in $pattern; do + if [ -f "$file" ]; then + echo "$file" | /usr/bin/perl -e ' + while(my $file = <>) { + $file =~ s/\n$//; + ($device, $inode, $mode, $nlink, $uid, $gid, $rdev, $size, + $atime, $mtime, $ctime, $blksize, $blocks) = stat($file); + print("$file|$size|$mtime\n"); + }' + else + echo "$file|missing|`/usr/bin/perl -e 'print time'`" + fi + done ;; + esac + done < "$MK_CONFDIR/fileinfo.cfg" + IFS=$OLD_IFS fi # Libelle Business Shadow

6 years, 10 months

5462 FIX Fixed aggregation of performance data

by Sven Panne

Module: check_mk Branch: master Commit: 2af9ea5eca961831084847c5cc937d0318d04f65 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2af9ea5eca9618… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Nov 21 10:32:08 2017 +0100 5462 FIX Fixed aggregation of performance data Aggregating performance data via Stats: headers only handled a very restricted form of values, e.g. negative values were simply ignored, as were numbers in exponential notation. This has been fixed. Change-Id: I0c91fef2b9d84b4b51f73d79e6a0393fdb8472d9 --- .werks/5462 | 12 ++++++++++ livestatus/src/PerfdataAggregator.cc | 43 +++++++++++------------------------- 2 files changed, 25 insertions(+), 30 deletions(-) diff --git a/.werks/5462 b/.werks/5462 new file mode 100644 index 0000000..fc67203 --- /dev/null +++ b/.werks/5462 @@ -0,0 +1,12 @@ +Title: Fixed aggregation of performance data +Level: 1 +Component: livestatus +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1511256586 +Class: fix + +Aggregating performance data via Stats: headers only handled a very +restricted form of values, e.g. negative values were simply ignored, as +were numbers in exponential notation. This has been fixed. diff --git a/livestatus/src/PerfdataAggregator.cc b/livestatus/src/PerfdataAggregator.cc index ae562c7..3653477 100644 --- a/livestatus/src/PerfdataAggregator.cc +++ b/livestatus/src/PerfdataAggregator.cc @@ -23,46 +23,29 @@ // Boston, MA 02110-1301 USA. #include "PerfdataAggregator.h" -#include <cctype> #include <cmath> -#include <cstdlib> +#include <iterator> +#include <sstream> +#include <stdexcept> #include <utility> -#include <vector> #include "Renderer.h" #include "Row.h" #include "StringColumn.h" #include "contact_fwd.h" -#include "strutil.h" void PerfdataAggregator::consume(Row row, const contact * /* auth_user */, std::chrono::seconds /* timezone_offset */) { - std::string perf_data = _column->getValue(row); - std::vector<char> perf_data_vec(perf_data.begin(), perf_data.end()); - perf_data_vec.push_back('\0'); - char *scan = &perf_data_vec[0]; - - while (char *entry = next_field(&scan)) { - char *start_of_varname = entry; - char *place_of_equal = entry; - while ((*place_of_equal != 0) && *place_of_equal != '=') { - place_of_equal++; + std::istringstream iss(_column->getValue(row)); + std::istream_iterator<std::string> end; + for (auto it = std::istream_iterator<std::string>(iss); it != end; ++it) { + auto pos = it->find('='); + if (pos != std::string::npos) { + try { + consumeVariable(it->substr(0, pos), + std::stod(it->substr(pos + 1))); + } catch (const std::logic_error &e) { + } } - if (*place_of_equal == 0) { - continue; // ignore invalid perfdata - } - *place_of_equal = 0; // terminate varname - char *start_of_number = place_of_equal + 1; - char *end_of_number = start_of_number; - while ((*end_of_number != 0) && - ((isdigit(*end_of_number) != 0) || *end_of_number == '.')) { - end_of_number++; - } - if (start_of_number == end_of_number) { - continue; // empty number - } - *end_of_number = 0; // terminate number - double value = strtod(start_of_number, nullptr); - consumeVariable(start_of_varname, value); } }

6 years, 10 months

← Newer
1
...
15
16
17
18
19
20
21
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017