Checkmk git commits April 2014

checkmk-commits@lists.checkmk.com

6 participants
180 discussions

Check_MK Git: check_mk: FIX Fix exception on non-UTF-8 encoded characters in software list

by Mathias Kettner

Module: check_mk Branch: master Commit: 0985d7fe14a25558d9b30220e74d024d856f85f5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0985d7fe14a255… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 14 17:04:04 2014 +0200 FIX Fix exception on non-UTF-8 encoded characters in software list --- .werks/886 | 9 +++++++++ ChangeLog | 3 +++ web/plugins/views/inventory.py | 8 ++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/886 b/.werks/886 new file mode 100644 index 0000000..77c3c46 --- /dev/null +++ b/.werks/886 @@ -0,0 +1,9 @@ +Title: Fix exception on non-UTF-8 encoded characters in software list +Level: 2 +Component: inv +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1397487819 + + diff --git a/ChangeLog b/ChangeLog index c6573f3..a538050 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,9 @@ Livestatus: * 0747 FIX: livestatus table hostsbygroup: fixed bug with group_authorization strict... + inv: + * 0886 FIX: Fix exception on non-UTF-8 encoded characters in software list + 1.2.5i2: Checks & Agents: diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 290ef2c..48c65e9 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -374,9 +374,13 @@ def render_inv_subtree_leaf(hostname, invpath, node): elif "render" in hint: hint["render"](node) elif type(node) == str: - html.write(node.decode("utf-8")) + try: + text = node.decode("utf-8") + except: + text = node + html.write(html.attrencode(node)) elif type(node) == unicode: - html.write(node) + html.write(html.attrencode(node)) elif type(node) == int: html.write(str(node)) elif type(node) == float:

10 years, 5 months

Check_MK Git: check_mk: New option for writing all messages into a syslog-like logfile

by Mathias Kettner

Module: check_mk Branch: master Commit: 8ab1c0413c1af037379832d0842f2d24e96306d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ab1c0413c1af0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 14 15:36:41 2014 +0200 New option for writing all messages into a syslog-like logfile The new Event Console global option Syslog-like message logging will enable logging of all incoming events into logfiles that have syslog format. These files will be stored below <tt>var/check_mk/mkeventd/messages</tt> and will be named with the same scheme as the history logfiles. They will adopt the same rotation principle as the history files. If you are using Check_MK in a non-OMD environment and enable this option then please make sure that you have some logrotate configuration or similar for deleting outdated files. If you are using OMD then consider enabling the global Diskspace Cleanup. --- .werks/885 | 18 ++++++++++++++++++ ChangeLog | 3 +++ mkeventd/bin/mkeventd | 27 ++++++++++++++++++++++++--- mkeventd/web/plugins/wato/mkeventd.py | 13 +++++++++++++ web/plugins/wato/backup_domains.py | 2 ++ 5 files changed, 60 insertions(+), 3 deletions(-) diff --git a/.werks/885 b/.werks/885 new file mode 100644 index 0000000..3cbae30 --- /dev/null +++ b/.werks/885 @@ -0,0 +1,18 @@ +Title: New option for writing all messages into a syslog-like logfile +Level: 1 +Component: ec +Version: 1.2.5i3 +Date: 1397482457 +Class: feature + +The new Event Console global option Syslog-like message logging will enable +logging of all incoming events into logfiles that have syslog format. +These files will be stored below <tt>var/check_mk/mkeventd/messages</tt> and will +be named with the same scheme as the history logfiles. They will adopt the same +rotation principle as the history files. + +If you are using Check_MK in a non-OMD environment and enable this option then +please make sure that you have some logrotate configuration or similar for +deleting outdated files. + +If you are using OMD then consider enabling the global Diskspace Cleanup. diff --git a/ChangeLog b/ChangeLog index 7510b61..afeded1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,9 @@ Reporting & Availability: * 0756 Allow availability of multisite BI aggregates at once... + Event Console: + * 0885 New option for writing all messages into a syslog-like logfile... + Livestatus: * 0747 FIX: livestatus table hostsbygroup: fixed bug with group_authorization strict... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 66ced83..463c7ef 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -407,7 +407,7 @@ def log_event_history(event, what, who="", addinfo=""): columns += [ quote_tab(event.get(colname[6:], defval)) # drop "event_" for colname, defval in event_columns ] - get_logfile().write("\t".join(map(to_utf8, columns)) + "\n") + get_logfile("history").write("\t".join(map(to_utf8, columns)) + "\n") def to_utf8(x): if type(x) == unicode: @@ -429,9 +429,9 @@ active_history_period = None # Get file object to current log file, handle also # history and lifetime limit. -def get_logfile(): +def get_logfile(basename): global active_history_period - log_dir = g_state_dir + "/history" + log_dir = g_state_dir + "/" + basename make_parentdirs(log_dir + "/foo") # Log into file starting at current history period, @@ -732,6 +732,7 @@ class EventServer: self.open_syslog() self.open_syslog_tcp() self.open_snmptrap() + self._rules = [] self._hash_stats = [] for facility in range(32): @@ -1483,6 +1484,10 @@ class EventServer: self.process_event(self.parse_event(line, address)) def process_event(self, event): + # Log all incoming messages into a syslog-like text file if that is enabled + if g_config["log_messages"]: + self.log_message(event) + # Rule optimizer if g_config["rule_optimizer"]: self._hash_stats[event["facility"]][event["priority"]] += 1 @@ -1900,6 +1905,21 @@ class EventServer: return event + def log_message(self, event): + try: + get_logfile("messages").write("%s %s %s%s: %s\n" % ( + time.strftime("%b %d %H:%M:%S", time.localtime(event["time"])), + event["host"], + event["application"], + event["pid"] and ("[%s]" % event["pid"]) or "", + event["text"])) + except Exception, e: + if opt_debug: + raise + # Better silently ignore errors. We could have run out of + # diskspace and make things worse by logging that we could + # not log. + #. @@ -2993,6 +3013,7 @@ def load_configuration(): "debug_rules" : False, "rule_optimizer" : True, "log_rulehits" : False, + "log_messages" : False, "retention_interval" : 60, "housekeeping_interval" : 60, "statistics_interval" : 5, diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index 65cf707..0366a9e 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1649,6 +1649,19 @@ if mkeventd_enabled: ) register_configvar(group, + "log_messages", + Checkbox(title = _("Syslog-like message logging"), + label = _("Log all messages into syslog-like logfiles"), + help = _("When this option is enabled, then every incoming message is being " + "logged into the directory <tt>messages</tt> in the Event Consoles state " + "directory. The logfile rotation is analog to that of the history logfiles. " + "Please note that if you have lots of incoming messages then these " + "files can get very large."), + default_value = False), + domain = "mkeventd", + ) + + register_configvar(group, "rule_optimizer", Checkbox(title = _("Optimize rule execution"), label = _("enable optimized rule execution"), diff --git a/web/plugins/wato/backup_domains.py b/web/plugins/wato/backup_domains.py index e036a6f..14d7c6c 100644 --- a/web/plugins/wato/backup_domains.py +++ b/web/plugins/wato/backup_domains.py @@ -180,6 +180,8 @@ else: "paths" : [ ("dir", "var/mkeventd/history"), ("file", "var/mkeventd/status"), + ("file", "var/mkeventd/messages"), + ("dir", "var/mkeventd/messages-history"), ], }, "dokuwiki": {

10 years, 5 months

Check_MK Git: check_mk: FIX apache_status: now also sends an accept header to make it work with mod_security enables servers

by Götz Golla

Module: check_mk Branch: master Commit: b7bd87d4dae634668594db08792852275afa1320 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7bd87d4dae634… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Apr 14 11:33:11 2014 +0200 FIX apache_status: now also sends an accept header to make it work with mod_security enables servers --- .werks/606 | 8 ++++++++ ChangeLog | 1 + agents/plugins/apache_status | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/606 b/.werks/606 new file mode 100644 index 0000000..442d91f --- /dev/null +++ b/.werks/606 @@ -0,0 +1,8 @@ +Title: apache_status: now also sends an accept header to make it work with mod_security enables servers +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1397467941 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 3d936f0..6360411 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ * 0605 FIX: enterasys_cpu_util enterasys_lsnat: syntax fixes * 0889 FIX: logwatch: fix case where rule wouldn't be applied... * 0882 FIX: check_bi_local.py: fix crash in case of non-ascii characters... + * 0606 FIX: apache_status: now also sends an accept header to make it work with mod_security enables servers Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index f2bd8fa..0b91371 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -103,7 +103,8 @@ for server in servers: url = '%s://%s:%s/%s?auto' % (proto, address, port, page) # Try to fetch the status page for each server try: - fd = urllib2.urlopen(url) + request = urllib2.Request(url, headers={"Accept" : "text/plain"}) + fd = urllib2.urlopen(request) except urllib2.URLError, e: if 'SSL23_GET_SERVER_HELLO:unknown protocol' in str(e): # HACK: workaround misconfigurations where port 443 is used for

10 years, 5 months

Check_MK Git: check_mk: New options --oid and --extraoid for cmk --snmpwalk

by Mathias Kettner

Module: check_mk Branch: master Commit: bdf710a7c789ddc2fd74701c98e609aae8ec67ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bdf710a7c789dd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 14 10:08:12 2014 +0200 New options --oid and --extraoid for cmk --snmpwalk It is now possible to specify alternative or additional OIDs to fetch from a host when using <tt>cmk --snmpwalk</tt>. Please always specify numeric OIDs. Example: C+: OM:cmk --extraoid .1.3.6.1.4.1.8072 --snmpwalk switch4712 C-: --- .werks/884 | 14 ++++++++++++++ ChangeLog | 1 + modules/check_mk.py | 30 +++++++++++++++++++++++++----- modules/check_mk_base.py | 2 ++ 4 files changed, 42 insertions(+), 5 deletions(-) diff --git a/.werks/884 b/.werks/884 new file mode 100644 index 0000000..903692a --- /dev/null +++ b/.werks/884 @@ -0,0 +1,14 @@ +Title: New options --oid and --extraoid for cmk --snmpwalk +Level: 2 +Component: core +Version: 1.2.5i3 +Date: 1397462765 +Class: feature + +It is now possible to specify alternative or additional OIDs to fetch +from a host when using <tt>cmk --snmpwalk</tt>. Please always specify +numeric OIDs. Example: + +C+: +OM:cmk --extraoid .1.3.6.1.4.1.8072 --snmpwalk switch4712 +C-: diff --git a/ChangeLog b/ChangeLog index 4835d69..7510b61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.2.5i3: Core & Setup: + * 0884 New options --oid and --extraoid for cmk --snmpwalk... * 0785 FIX: Availability: fixed memory leak in table statehist... Checks & Agents: diff --git a/modules/check_mk.py b/modules/check_mk.py index fffad57..0439188 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4367,6 +4367,9 @@ def do_snmptranslate(walk): sys.stdout.write(format_string % (translation, line)) def do_snmpwalk(hostnames): + if opt_oids and opt_extra_oids: + raise MKGeneralException("You cannot specify --oid and --extraoid at the same time.") + if len(hostnames) == 0: sys.stderr.write("Please specify host names to walk on.\n") return @@ -4386,10 +4389,14 @@ def do_snmpwalk_on(hostname, filename): ip = lookup_ipaddress(hostname) out = file(filename, "w") - for oid in [ + oids_to_walk = opt_oids + if not opt_oids: + oids_to_walk = [ ".1.3.6.1.2.1", # SNMPv2-SMI::mib-2 ".1.3.6.1.4.1" # SNMPv2-SMI::enterprises - ]: + ] + opt_extra_oids + + for oid in oids_to_walk: if opt_verbose: sys.stdout.write("Walk on \"%s\"..." % oid) sys.stdout.flush() @@ -4673,7 +4680,7 @@ def usage(): cmk --restore BACKUPFILE.tar.gz restore configuration and data cmk --flush [HOST1 HOST2...] flush all data of some or all hosts cmk --donate Email data of configured hosts to MK - cmk --snmpwalk HOST1 HOST2 ... Do snmpwalk on host + cmk --snmpwalk HOST1 HOST2 ... Do snmpwalk on one or more hosts cmk --snmptranslate HOST Do snmptranslate on walk cmk --snmpget OID HOST1 HOST2 ... Fetch single OIDs and output them cmk --scan-parents [HOST1 HOST2...] autoscan parents, create conf.d/parents.mk @@ -4705,6 +4712,10 @@ OPTIONS: --keepalive used by Check_MK Mirco Core: run check and --notify in continous mode. Read data from stdin and von from cmd line and environment --cmc-file=X relative filename for CMC config file (used by -B/-U) + --extraoid A Do --snmpwalk also on this OID, in addition to mib-2 and enterprises. + You can specify this option multiple times. + --oid A Do --snmpwalk on this OID instead of mib-2 and enterprises. + You can specify this option multiple times. NOTES: -I can be restricted to certain check types. Write '--checks df -I' if you @@ -4773,7 +4784,11 @@ NOTES: --snmpwalk does a complete snmpwalk for the specified hosts both on the standard MIB and the enterprises MIB and stores the - result in the directory %s. + result in the directory %s. Use the option --oid one or several + times in order to specify alternative OIDs to walk. You need to + specify numeric OIDs. If you want to keep the two standard OIDS + .1.3.6.1.2.1 and .1.3.6.1.4.1 then use --extraoid for just adding + additional OIDs to walk. --snmptranslate does not contact the host again, but reuses the hosts walk from the directory %s.%s @@ -5807,7 +5822,8 @@ if __name__ == "__main__": short_options = 'SHVLCURODMmd:Ic:nhvpXPNBil' long_options = [ "help", "version", "verbose", "compile", "debug", "list-checks", "list-hosts", "list-tag", "no-tcp", "cache", - "flush", "package", "localize", "donate", "snmpwalk", "snmptranslate", + "flush", "package", "localize", "donate", "snmpwalk", "oid=", "extraoid=", + "snmptranslate", "usewalk", "scan-parents", "procs=", "automation=", "notify", "snmpget=", "profile", "keepalive", "keepalive-fd=", "create-rrd", "no-cache", "update", "restart", "reload", "dump", "fake-dns=", @@ -5860,6 +5876,10 @@ if __name__ == "__main__": opt_keepalive_fd = int(a) elif o == '--usewalk': opt_use_snmp_walk = True + elif o == '--oid': + opt_oids.append(a) + elif o == '--extraoid': + opt_extra_oids.append(a) elif o == '--procs': max_num_processes = int(a) elif o == '--nowiki': diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index cc3dffc..3af4219 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -106,6 +106,8 @@ fake_dns = False opt_keepalive = False opt_cmc_relfilename = "config" opt_keepalive_fd = None +opt_oids = [] +opt_extra_oids = [] # register SIGINT handler for consistenct CTRL+C handling def interrupt_handler(signum, frame):

10 years, 5 months

Check_MK Git: check_mk: Added Date / Time to HTML notification email

by Mathias Kettner

Module: check_mk Branch: master Commit: 76125168e64cbbcf2b32b71c493ddb5d4199903d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76125168e64cbb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 14 09:05:08 2014 +0200 Added Date / Time to HTML notification email --- .werks/883 | 8 ++++++++ ChangeLog | 1 + notifications/mail | 6 +++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/883 b/.werks/883 new file mode 100644 index 0000000..aaefbff --- /dev/null +++ b/.werks/883 @@ -0,0 +1,8 @@ +Title: Added Date / Time to HTML notification email +Level: 1 +Component: notifications +Version: 1.2.5i3 +Date: 1397459095 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 3d936f0..4835d69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ Notifications: * 0754 Allow users to disable their notifications completely... * 0755 Added variables LASTHOSTUP_REL and LASTSERVICEOK_REL to notification context... + * 0883 Added Date / Time to HTML notification email * 0752 FIX: FIX: compute correct state transitions for notifications... * 0753 FIX: FIX: correctly show original state in HTML notification mails... diff --git a/notifications/mail b/notifications/mail index f3aad46..c051b73 100755 --- a/notifications/mail +++ b/notifications/mail @@ -233,6 +233,10 @@ tmpl_service_html = tmpl_head_html + ''' <th colspan=2>State</th> </tr> <tr class="odd0"> + <td class="left">Date / Time</td> + <td>$LONGDATETIME$</td> +</tr> +<tr class="even0"> <td class=left>State</td> <td class="state"> $PREVIOUSSERVICEHARDSTATE$ → @@ -240,7 +244,7 @@ tmpl_service_html = tmpl_head_html + ''' since $LASTSERVICESTATECHANGE_REL$ </td> </tr> -<tr class="even0"> +<tr class="odd0"> <td class="left">Output</td> <td>$SERVICEOUTPUT$</td> </tr>

10 years, 5 months

Check_MK Git: check_mk: more general scan function for TP-Link Switches

by Götz Golla

Module: check_mk Branch: master Commit: 8ced5eedb2ca4732c361100ce3ff2ce9700f9d8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ced5eedb2ca47… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Fri Apr 11 19:10:30 2014 +0200 more general scan function for TP-Link Switches --- checks/rmon_stats | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/rmon_stats b/checks/rmon_stats index f779be1..8c5169c 100644 --- a/checks/rmon_stats +++ b/checks/rmon_stats @@ -74,6 +74,6 @@ check_info["rmon_stats"] = { # for the scan we need to check for any single object in the RMON tree, # we choose netDefaultGateway in the hope that it will always be present 'snmp_scan_function' : lambda oid: ( oid(".1.3.6.1.2.1.1.1.0").lower().startswith("cisco") \ - or oid(".1.3.6.1.2.1.1.1.0").startswith("10G Managed Switch") ) \ - and oid(".1.3.6.1.2.1.16.19.12.0") != None, + or oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.11863.1.1.3" \ + ) and oid(".1.3.6.1.2.1.16.19.12.0") != None, }

10 years, 5 months

Check_MK Git: check_mk: readded 64 bit windows agent

by Andreas Boesl

Module: check_mk Branch: master Commit: 00f8f76cd92d7380def45fa6d311752090910305 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00f8f76cd92d73… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 11 13:49:04 2014 +0200 readded 64 bit windows agent --- agents/windows/check_mk_agent-64.exe | Bin 0 -> 204800 bytes agents/windows/install_agent-64.exe | Bin 0 -> 158157 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe new file mode 100755 index 0000000..b5313de Binary files /dev/null and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe new file mode 100755 index 0000000..e5ca176 Binary files /dev/null and b/agents/windows/install_agent-64.exe differ

10 years, 5 months

Check_MK Git: check_mk: Revert "FIX windows agent: no longer reports negative SWAP values"

by Andreas Boesl

Module: check_mk Branch: master Commit: 7fe5e9b501527ed7e825d0b21d34e8a4947274ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fe5e9b501527e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Apr 11 13:47:56 2014 +0200 Revert "FIX windows agent: no longer reports negative SWAP values" This reverts commit 9934dbcadcf6616f1240e5b6eca82464ae4e9992. --- .werks/830 | 9 --------- ChangeLog | 1 - agents/windows/Makefile | 6 +++--- agents/windows/check_mk_agent-64.exe | Bin 205312 -> 0 bytes agents/windows/check_mk_agent.cc | 9 ++------- agents/windows/check_mk_agent.exe | Bin 180224 -> 175104 bytes agents/windows/crash.exe | Bin 94971 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 158266 -> 0 bytes agents/windows/install_agent.exe | Bin 149511 -> 151408 bytes agents/windows/nowin.exe | Bin 102109 -> 22511 bytes 10 files changed, 5 insertions(+), 20 deletions(-) diff --git a/.werks/830 b/.werks/830 deleted file mode 100644 index a250471..0000000 --- a/.werks/830 +++ /dev/null @@ -1,9 +0,0 @@ -Title: windows agent: no longer reports negative SWAP values -Level: 1 -Component: checks -Version: 1.2.5i3 -Date: 1397137476 -Class: fix - -SWAP values are calculated with the help of the pagefiles size. -The function to determine the systems maximum/available pagefile size was incorrect. diff --git a/ChangeLog b/ChangeLog index fa1b298..b9b0279 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,7 +35,6 @@ * 0605 FIX: enterasys_cpu_util enterasys_lsnat: syntax fixes * 0889 FIX: logwatch: fix case where rule wouldn't be applied... * 0882 FIX: check_bi_local.py: fix crash in case of non-ascii characters... - * 0830 FIX: windows agent: no longer reports negative SWAP values... Multisite: * 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 0e55071..a88ec5a 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -27,7 +27,7 @@ VERSION = 1.2.5i3 WINDRES = i586-mingw32msvc-windres ifeq ($(shell uname),Linux) - CXX = echo -e "\n\nWARNING: MinGW under Linux is broken! Use at your own risk!\n\n" ; i686-w64-mingw32-g++ + CXX = echo -e "\n\nWARNING: MinGW under Linux is broken! Use at your own risk!\n\n" ; i586-mingw32msvc-g++ CXX_64 = x86_64-w64-mingw32-g++ WINDRES_64 = x86_64-w64-mingw32-windres else @@ -56,10 +56,10 @@ install_agent-64.exe: check_mk_agent-64.exe crash.exe nowin.exe chmod +x install_agent-64.exe check_mk_agent.exe: check_mk_agent.cc Makefile check_mk_agent.res - $(CXX) -s -O2 -Wall -Werror -o $@ $< -static -lpsapi -lwsock32 check_mk_agent.res + $(CXX) -s -O2 -Wall -Werror -o $@ $< -static -lwsock32 check_mk_agent.res check_mk_agent-64.exe: check_mk_agent.cc Makefile check_mk_agent-64.res - $(CXX_64) -s -O2 -Wall -Werror -o $@ $< -static -lpsapi -lwsock32 check_mk_agent-64.res + $(CXX_64) -s -O2 -Wall -Werror -o $@ $< -static -lwsock32 check_mk_agent-64.res check_mk_agent.res: check_mk_agent.rc $(WINDRES) $< -O coff -o $@ diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe deleted file mode 100755 index 6eba2e0..0000000 Binary files a/agents/windows/check_mk_agent-64.exe and /dev/null differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 4d8260d..204b993 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -51,7 +51,6 @@ #include <winsock2.h> #include <windows.h> #include <winbase.h> -#include <psapi.h> #include <winreg.h> // performance counters from registry #include <tlhelp32.h> // list of processes #include <stdarg.h> @@ -2247,14 +2246,10 @@ void section_mem(SOCKET &out) statex.dwLength = sizeof (statex); GlobalMemoryStatusEx (&statex); - PERFORMANCE_INFORMATION pi; - pi.cb = sizeof(pi); - GetPerformanceInfo(&pi, sizeof(pi)); - output(out, "MemTotal: %11d kB\n", statex.ullTotalPhys / 1024); output(out, "MemFree: %11d kB\n", statex.ullAvailPhys / 1024); - output(out, "SwapTotal: %11d kB\n", ((pi.CommitLimit * pi.PageSize) - statex.ullTotalPhys) / 1024); - output(out, "SwapFree: %11d kB\n", (((pi.CommitLimit - pi.CommitTotal) * pi.PageSize)- statex.ullAvailPhys) / 1024); + output(out, "SwapTotal: %11d kB\n", (statex.ullTotalPageFile - statex.ullTotalPhys) / 1024); + output(out, "SwapFree: %11d kB\n", (statex.ullAvailPageFile - statex.ullAvailPhys) / 1024); output(out, "PageTotal: %11d kB\n", statex.ullTotalPageFile / 1024); output(out, "PageFree: %11d kB\n", statex.ullAvailPageFile / 1024); output(out, "VirtualTotal: %11d kB\n", statex.ullTotalVirtual / 1024); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 714e2ce..b5cc3f8 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 38d3f0a..952e63a 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe deleted file mode 100755 index c9b6d19..0000000 Binary files a/agents/windows/install_agent-64.exe and /dev/null differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index ed4953c..6dda9ec 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 26a3d55..492340b 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

10 years, 5 months

Check_MK Git: check_mk: Fixed version transform for nightly builds

by Lars Michelsen

Module: check_mk Branch: master Commit: a8266fc182e0a17d503c172df50c6244ee902a11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8266fc182e0a1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 11 13:22:49 2014 +0200 Fixed version transform for nightly builds --- agents/windows/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index fea1d34..7a369e8 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -68,10 +68,14 @@ check_mk_agent-64.res: check_mk_agent.rc $(WINDRES_64) $< -O coff -o $@ check_mk_agent.rc: check_mk_agent.rc.in + # length checks are needed to add missing parts to version. + # 6: e.g. 1.2.4 + # 12: nightly builds + # 11: i1 releases V=$(VERSION) ; V=$${V//./, } ; V=$${V//i/, 1} ; V=$${V//b/, 2} ; V=$${V//p/0} ; \ - if [ $${#V} -eq 6 ]; then V+=", 0"; fi ; \ # e.g. 1.2.4 - if [ $${#V} -eq 12 ]; then V+=", 0"; fi ; \ # nightly builds - if [ $${#V} -eq 11 ]; then V+="00"; fi ; \ # i1 releases + if [ $${#V} -eq 6 ]; then V+=", 0"; fi ; \ + if [ $${#V} -eq 12 ]; then V+=", 0"; fi ; \ + if [ $${#V} -eq 11 ]; then V+="00"; fi ; \ sed "s/%VERSION%/$(VERSION)/g;s/%YEAR%/$$(date +%Y)/g" check_mk_agent.rc.in > check_mk_agent.rc ; \ sed -i "s/%PVERSION%/$$V/g" check_mk_agent.rc

10 years, 5 months

Check_MK Git: check_mk: Fixed version transform for nightly builds

by Lars Michelsen

Module: check_mk Branch: master Commit: d60eab79864c39f6a3a9da0d3296946100bdc907 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d60eab79864c39… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 11 13:19:33 2014 +0200 Fixed version transform for nightly builds --- agents/windows/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index a88ec5a..f247f04 100755 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -69,8 +69,9 @@ check_mk_agent-64.res: check_mk_agent.rc check_mk_agent.rc: check_mk_agent.rc.in V=$(VERSION) ; V=$${V//./, } ; V=$${V//i/, 1} ; V=$${V//b/, 2} ; V=$${V//p/0} ; \ - if [ $${#V} -eq 6 ]; then V+=", 0"; fi ; \ - if [ $${#V} -eq 11 ]; then V+="00"; fi ; \ + if [ $${#V} -eq 6 ]; then V+=", 0"; fi ; \ # e.g. 1.2.4 + if [ $${#V} -eq 12 ]; then V+=", 0"; fi ; \ # nightly builds + if [ $${#V} -eq 11 ]; then V+="00"; fi ; \ # i1 releases sed "s/%VERSION%/$(VERSION)/g;s/%YEAR%/$$(date +%Y)/g" check_mk_agent.rc.in > check_mk_agent.rc ; \ sed -i "s/%PVERSION%/$$V/g" check_mk_agent.rc

10 years, 5 months

← Newer
1
...
6
7
8
9
10
11
12
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2014