Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

Check_MK Git: check_mk: #2620 FIX Fixed issue loading correct graph templates when HTTP is disabled on system apache level

by Lars Michelsen

Module: check_mk Branch: master Commit: 85cf4188d5574d572b75d40e67419020d82e4349 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85cf4188d5574d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 7 13:19:56 2015 +0200 #2620 FIX Fixed issue loading correct graph templates when HTTP is disabled on system apache level --- .werks/2620 | 9 +++++++++ ChangeLog | 1 + pnp-templates/default.php | 12 +++++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/2620 b/.werks/2620 new file mode 100644 index 0000000..ce0b1cf --- /dev/null +++ b/.werks/2620 @@ -0,0 +1,9 @@ +Title: Fixed issue loading correct graph templates when HTTP is disabled on system apache level +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i3 +Date: 1444216764 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 0b167f2..20f768d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -267,6 +267,7 @@ * 2615 FIX: Fixed bug in legacy dashboard conversion when having users not permitted to access embedded views... * 2429 FIX: check_mk-netapp_api_disk.summary.php: fixed broken php-template * 2618 FIX: Fixed "move folder" popup being positioned out of screen on the right + * 2620 FIX: Fixed issue loading correct graph templates when HTTP is disabled on system apache level WATO: * 2365 Removed old deprecated notification global options for plain emails... diff --git a/pnp-templates/default.php b/pnp-templates/default.php index 48d7ef1..2e0609b 100644 --- a/pnp-templates/default.php +++ b/pnp-templates/default.php @@ -2,9 +2,19 @@ # Fetch dynamic PNP template from Check_MK's new metrics system +function get_apache_port() { + $path = getenv("OMD_ROOT") . "/etc/omd/site.conf"; + foreach (file($path) as $line) { + if (strpos($line, "CONFIG_APACHE_TCP_PORT") === 0) { + list($key, $val) = explode("=", $line); + return trim($val, "'\n\r"); + } + } +} + $omd_site = getenv("OMD_SITE"); if ($omd_site) { - $url = "http://localhost/$omd_site/check_mk/"; + $url = "http://localhost:".get_apache_port()."/$omd_site/check_mk/"; $template_cache_dir = getenv("OMD_ROOT") . "/var/check_mk/pnp_template_cache"; } else {

8 years, 11 months

Check_MK Git: check_mk: updated windows agent makefile so that setting the version on executables doesen 't cause a rebuild

by Sebastian Herbord

Module: check_mk Branch: master Commit: 7da5eb0d3283dd110a6747efc6807b7d201b91c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7da5eb0d3283dd… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Oct 7 12:55:53 2015 +0200 updated windows agent makefile so that setting the version on executables doesen't cause a rebuild --- agents/windows/Makefile | 23 +++++++++++++++------- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 826368 -> 826368 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 826368 -> 826368 bytes agents/windows/check_mk_agent.exe | Bin 743424 -> 743424 bytes agents/windows/check_mk_agent.msi | Bin 1827328 -> 1827328 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 743424 -> 743424 bytes agents/windows/install_agent-64.exe | Bin 380170 -> 380165 bytes agents/windows/install_agent.exe | Bin 370671 -> 370666 bytes 9 files changed, 17 insertions(+), 8 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index b56fa35..a9e1eb8 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -38,7 +38,7 @@ else CXX = mingw32-g++ endif -all: directories fix_linebreaks install_agent.exe install_agent-64.exe msi_installer +all: directories fix_linebreaks check_mk_agent.exe check_mk_agent-64.exe install_agent.exe install_agent-64.exe msi_installer .PHONY: directories inc_build_version fix_linebreaks @@ -46,7 +46,7 @@ setversion: sed -i 's/!define CHECK_MK_VERSION .*/!define CHECK_MK_VERSION "'$(NEW_VERSION)'"/' installer*.nsi ; \ sed -ri 's/^(VERSION[[:space:]]*= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ rm check_mk_agent.exe check_mk_agent-64.exe check_mk_agent.msi ; \ - make + make install_agent.exe install_agent-64.exe msi_installer # Converts all files which are targeted to a windows system to CRLF fix_linebreaks: @@ -111,14 +111,23 @@ check_mk_agent-64.unversioned.exe: obj64/check_mk_agent.o obj64/SettingsCollecto # 4. Create final executable files by inserting actual version number. No # recompilation is thus needed during 'make version' # ----------------------------------------------------------------------------- -%.exe: %.unversioned.exe - ./bin_replace $(VERSION_DUMMY) "$(VERSION)" < $< > $@ - chmod 755 $@ + +check_mk_agent.exe.versioned: + ./bin_replace $(VERSION_DUMMY) "$(VERSION)" < check_mk_agent.unversioned.exe > check_mk_agent.exe + chmod 755 check_mk_agent.exe + +check_mk_agent-64.exe.versioned: + ./bin_replace $(VERSION_DUMMY) "$(VERSION)" < check_mk_agent-64.unversioned.exe > check_mk_agent-64.exe + chmod 755 check_mk_agent-64.exe + + +%.exe: %.unversioned.exe %.exe.versioned + # ----------------------------------------------------------------------------- # NSIS installer will be removed and replaced by multiarch MSI installer # ----------------------------------------------------------------------------- -install_agent.exe: check_mk_agent.exe crash.exe nowin.exe +install_agent.exe: check_mk_agent.exe.versioned crash.exe nowin.exe if ! which makensis; then \ echo "ERROR: makensis missing. Please install the nsis package." ; \ exit 1 ; \ @@ -126,7 +135,7 @@ install_agent.exe: check_mk_agent.exe crash.exe nowin.exe makensis installer.nsi chmod +x install_agent.exe -install_agent-64.exe: check_mk_agent-64.exe crash.exe nowin.exe +install_agent-64.exe: check_mk_agent-64.exe.versioned crash.exe nowin.exe if ! which makensis; then \ echo "ERROR: makensis missing. Please install the nsis package." ; \ exit 1 ; \ diff --git a/agents/windows/build_version b/agents/windows/build_version index 408b885..5873851 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -461 +467 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index d222258..f084614 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 4466414..beb4cbe 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 095da70..c807ed5 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 2c1cce5..42340c5 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index f1cb145..6c1907a 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 6f09190..988b428 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index ecd9a38..0040c28 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 11 months

Check_MK Git: check_mk: #2637 etherbox2_temp: new check for the etherbox 2 (from firmware version 1.21 on) / MessPC

by Simon Betz

Module: check_mk Branch: master Commit: 0a58a0afe13d9afee4d111bfd1d0c16ddce65066 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a58a0afe13d9a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Oct 7 12:41:59 2015 +0200 #2637 etherbox2_temp: new check for the etherbox 2 (from firmware version 1.21 on) / MessPC To run this check you have to configure the WATO rule <i>Hosts without system description OID</i>. --- .werks/2637 | 9 +++++++++ ChangeLog | 1 + checkman/etherbox2_temp | 21 +++++++++++++++++++++ checks/etherbox2_temp | 2 +- 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/.werks/2637 b/.werks/2637 new file mode 100644 index 0000000..2799f23 --- /dev/null +++ b/.werks/2637 @@ -0,0 +1,9 @@ +Title: etherbox2_temp: new check for the etherbox 2 (from firmware version 1.21 on) / MessPC +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1444214094 +Class: feature + +To run this check you have to configure the WATO rule <i>Hosts without system description OID</i>. diff --git a/ChangeLog b/ChangeLog index 0b167f2..fa0126d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -99,6 +99,7 @@ * 2636 ucd_mem, ucd_processes, ucd_disk: new checks for systems using UCD SNMP Daemon... * 2655 Windows Agent can now read additional settings from an optional check_mk_local.ini file... * 2656 windows agent can now optionally output the full command line in the ps section... + * 2637 etherbox2_temp: new check for the etherbox 2 (from firmware version 1.21 on) / MessPC... * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/checkman/etherbox2_temp b/checkman/etherbox2_temp new file mode 100644 index 0000000..e925e85 --- /dev/null +++ b/checkman/etherbox2_temp @@ -0,0 +1,21 @@ +title: Etherbox 2 / MessPC: Sensor Temperature +catalog: hw/environment/betternet +agents: snmp +license: GPL +distribution: check_mk +description: + This check monitors the temperature sensors connected to + the etherbox 2, firmware version 1.21, from MessPC. + + Default upper levels are 30, 35 celsius. + + Lower and upper levels are configurable. + +item: + The sensor number. + +perfdata: + The temperature and its upper warn/crit levels. + +inventory: + One service for each temperature sensor is created. diff --git a/checks/etherbox2_temp b/checks/etherbox2_temp index 4e2465e..d1f1fbc 100644 --- a/checks/etherbox2_temp +++ b/checks/etherbox2_temp @@ -41,7 +41,7 @@ # suggested by customer factory_settings['etherbox_temp_default_levels'] = { - 'levels' : (25, 30), + 'levels' : (30, 35), }

8 years, 11 months

Check_MK Git: check_mk: Minor code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 6ad0a368a69c338b3c8f7e4ddba3dd2d87808f9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6ad0a368a69c33… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 7 12:10:31 2015 +0200 Minor code cleanup --- checks/etherbox | 2 +- checks/etherbox2_temp | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/checks/etherbox b/checks/etherbox index 8b32a69..4fb5c19 100644 --- a/checks/etherbox +++ b/checks/etherbox @@ -94,7 +94,7 @@ def check_etherbox_temp(item, params, info): check_info["etherbox.temp"] = { "check_function" : check_etherbox_temp, - "inventory_function" : lambda x: inventory_etherbox(x, "1"), + "inventory_function" : lambda info: inventory_etherbox(info, "1"), "service_description" : "Sensor %s", "has_perfdata" : True, "group" : "temperature", diff --git a/checks/etherbox2_temp b/checks/etherbox2_temp index 5d0983d..4e2465e 100644 --- a/checks/etherbox2_temp +++ b/checks/etherbox2_temp @@ -42,7 +42,6 @@ # suggested by customer factory_settings['etherbox_temp_default_levels'] = { 'levels' : (25, 30), - 'levels_lower' : (10, 15), } @@ -58,9 +57,9 @@ def parse_etherbox_temp(info): parsed = {} sensor_indicators, sensors = info for sensor_index in range(0, len(sensors)): - indicator_index_1, indicator_index_2 = (lambda x: (2*x, 2*x+1))(sensor_index) - if float(sensor_indicators[indicator_index_1][0].split(" ")[0]) > 4 and \ - float(sensor_indicators[indicator_index_2][0].split(" ")[0]) > 1: + indicator_index = 2 * sensor_index + if float(sensor_indicators[indicator_index][0].split(" ")[0]) > 4 and \ + float(sensor_indicators[indicator_index + 1][0].split(" ")[0]) > 1: parsed["Sensor %s" % sensors[sensor_index][0]] = float(sensors[sensor_index][1]) / 10 return parsed @@ -75,7 +74,7 @@ def check_etherbox_temp(item, params, parsed): return check_temperature(parsed[item], params) -check_info['etherbox_temp'] = { +check_info['etherbox2_temp'] = { 'parse_function' : parse_etherbox_temp, 'inventory_function' : inventory_etherbox_temp, 'check_function' : check_etherbox_temp, @@ -88,7 +87,7 @@ check_info['etherbox_temp'] = { # located under these OIDs. There are no standard OIDs for # disk space reasons. 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "" and \ - "Version 1.21" in oid(".1.3.6.1.4.1.14848.2.1.1.1.0", ""), + "Version 1.2" in oid(".1.3.6.1.4.1.14848.2.1.1.1.0", ""), 'default_levels_variable' : 'etherbox_temp_default_levels', 'group' : 'temperature', 'includes' : [ "temperature.include" ],

8 years, 11 months

Check_MK Git: check_mk: Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: b2af91c36fbd5cf2e08c86319d63f03b9494692e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2af91c36fbd5c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 7 12:04:49 2015 +0200 Testcommit --- agents/windows/Configuration.h | 1 - 1 file changed, 1 deletion(-) diff --git a/agents/windows/Configuration.h b/agents/windows/Configuration.h index 783fe7b..a723dcb 100644 --- a/agents/windows/Configuration.h +++ b/agents/windows/Configuration.h @@ -22,7 +22,6 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. - #ifndef Configuration_h #define Configuration_h

8 years, 11 months

Check_MK Git: check_mk: Merge mathias-kettner.de:check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 88351f47207b3a0171e370727b91003e3b395f41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88351f47207b3a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 7 12:05:02 2015 +0200 Merge mathias-kettner.de:check_mk ---

8 years, 11 months

Check_MK Git: check_mk: preliminary version of check etherbox2_temp

by Simon Betz

Module: check_mk Branch: master Commit: a272404b1a19194b97db24710dc14ff892aa4d75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a272404b1a1919… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Oct 7 11:54:57 2015 +0200 preliminary version of check etherbox2_temp --- checks/etherbox2_temp | 95 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/checks/etherbox2_temp b/checks/etherbox2_temp new file mode 100644 index 0000000..5d0983d --- /dev/null +++ b/checks/etherbox2_temp @@ -0,0 +1,95 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2015 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +# .1.3.6.1.4.1.14848.2.1.7.1.2.1 -0.0008 Volt --> BETTER-NETWORKS-ETHERNETBOX-MIB::ethernetboxObjects.7.1.2.1 +# .1.3.6.1.4.1.14848.2.1.7.1.2.2 -0.0008 Volt --> BETTER-NETWORKS-ETHERNETBOX-MIB::ethernetboxObjects.7.1.2.2 +# .1.3.6.1.4.1.14848.2.1.7.1.2.3 5.0015 Volt --> BETTER-NETWORKS-ETHERNETBOX-MIB::ethernetboxObjects.7.1.2.3 +# .1.3.6.1.4.1.14848.2.1.7.1.2.4 2.0031 Volt --> BETTER-NETWORKS-ETHERNETBOX-MIB::ethernetboxObjects.7.1.2.4 +# .1.3.6.1.4.1.14848.2.1.7.1.2.5 -0.0005 Volt --> BETTER-NETWORKS-ETHERNETBOX-MIB::ethernetboxObjects.7.1.2.5 +# .1.3.6.1.4.1.14848.2.1.7.1.2.6 -0.0004 Volt --> BETTER-NETWORKS-ETHERNETBOX-MIB::ethernetboxObjects.7.1.2.6 +# .1.3.6.1.4.1.14848.2.1.7.1.2.7 5.0002 Volt --> BETTER-NETWORKS-ETHERNETBOX-MIB::ethernetboxObjects.7.1.2.7 +# .1.3.6.1.4.1.14848.2.1.7.1.2.8 2.0010 Volt --> BETTER-NETWORKS-ETHERNETBOX-MIB::ethernetboxObjects.7.1.2.8 + +# .1.3.6.1.4.1.14848.2.1.9.1.2.1 -2472 --> BETTER-NETWORKS-ETHERNETBOX-MIB::ethernetboxObjects.9.1.2.1 +# .1.3.6.1.4.1.14848.2.1.9.1.2.2 252 --> BETTER-NETWORKS-ETHERNETBOX-MIB::ethernetboxObjects.9.1.2.2 +# .1.3.6.1.4.1.14848.2.1.9.1.2.3 0 --> BETTER-NETWORKS-ETHERNETBOX-MIB::ethernetboxObjects.9.1.2.3 +# .1.3.6.1.4.1.14848.2.1.9.1.2.4 248 --> BETTER-NETWORKS-ETHERNETBOX-MIB::ethernetboxObjects.9.1.2.4 + + +# suggested by customer +factory_settings['etherbox_temp_default_levels'] = { + 'levels' : (25, 30), + 'levels_lower' : (10, 15), +} + + +def parse_etherbox_temp(info): + # We have to use xxx.7.1.2.a to know if a temperature sensor + # is connected: + # - if oid(xxx.7.1.2.{a}) == 5.fff and oid(xxx.7.1.2.{a+1}) == 2.fff + # then a temperature sensor is connected to oid(xxx.9.1.2.{(a+1)/2}) + # (a = 1, 3, 5, ...) + # - otherwise there's no sensor connected. + # Furthermore we cannot only use xxx.9.1.2.{a} < 0 (or something like that) + # because the temperature can drop below 0. + parsed = {} + sensor_indicators, sensors = info + for sensor_index in range(0, len(sensors)): + indicator_index_1, indicator_index_2 = (lambda x: (2*x, 2*x+1))(sensor_index) + if float(sensor_indicators[indicator_index_1][0].split(" ")[0]) > 4 and \ + float(sensor_indicators[indicator_index_2][0].split(" ")[0]) > 1: + parsed["Sensor %s" % sensors[sensor_index][0]] = float(sensors[sensor_index][1]) / 10 + + return parsed + + +def inventory_etherbox_temp(parsed): + return [ (sensor, {}) for sensor in parsed ] + + +def check_etherbox_temp(item, params, parsed): + if item in parsed: + return check_temperature(parsed[item], params) + + +check_info['etherbox_temp'] = { + 'parse_function' : parse_etherbox_temp, + 'inventory_function' : inventory_etherbox_temp, + 'check_function' : check_etherbox_temp, + 'service_description' : 'Temperature %s', + 'has_perfdata' : True, + 'snmp_info' : [(".1.3.6.1.4.1.14848.2.1.7.1.2", [ "" ]), + (".1.3.6.1.4.1.14848.2.1.9.1.2", [ OID_END, "" ])], + # From firmware version 1.21 on the ethernetbox 2 from MessPC + # supports additional temperature sensors. The sensor data are + # located under these OIDs. There are no standard OIDs for + # disk space reasons. + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "" and \ + "Version 1.21" in oid(".1.3.6.1.4.1.14848.2.1.1.1.0", ""), + 'default_levels_variable' : 'etherbox_temp_default_levels', + 'group' : 'temperature', + 'includes' : [ "temperature.include" ], +}

8 years, 11 months

Check_MK Git: check_mk: added another missing include

by Sebastian Herbord

Module: check_mk Branch: master Commit: b208be4b38630c0716f00c302ad1a41826232f5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b208be4b38630c… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Oct 7 11:39:08 2015 +0200 added another missing include --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 826368 -> 826368 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 826368 -> 826368 bytes agents/windows/check_mk_agent.exe | Bin 743424 -> 743424 bytes agents/windows/check_mk_agent.msi | Bin 1827328 -> 1827328 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 743424 -> 743424 bytes agents/windows/install_agent-64.exe | Bin 380170 -> 380170 bytes agents/windows/install_agent.exe | Bin 370670 -> 370671 bytes agents/windows/stringutil.cc | 1 + 9 files changed, 2 insertions(+), 1 deletion(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 658bd78..408b885 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -459 +461 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 558ff07..d222258 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index f54e7dd..4466414 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 80599e4..095da70 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 79dec61..2c1cce5 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index e94d6ec..f1cb145 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index e0be91d..6f09190 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index f8c8a8d..ecd9a38 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/stringutil.cc b/agents/windows/stringutil.cc index 91313ff..51e6e0c 100644 --- a/agents/windows/stringutil.cc +++ b/agents/windows/stringutil.cc @@ -1,6 +1,7 @@ #include "stringutil.h" #include <cstring> #include <cctype> +#include <cstdio> #include <windows.h>

8 years, 11 months

Check_MK Git: check_mk: added missing include

by Sebastian Herbord

Module: check_mk Branch: master Commit: 4799e3bf3b4222a33dcc4e1d88d9d385add90c0a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4799e3bf3b4222… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Oct 7 09:59:31 2015 +0200 added missing include --- agents/windows/Configuration.cc | 2 ++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 826368 -> 826368 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 826368 -> 826368 bytes agents/windows/check_mk_agent.exe | Bin 743424 -> 743424 bytes agents/windows/check_mk_agent.msi | Bin 1827328 -> 1827328 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 743424 -> 743424 bytes agents/windows/install_agent-64.exe | Bin 380168 -> 380170 bytes agents/windows/install_agent.exe | Bin 370669 -> 370670 bytes 9 files changed, 3 insertions(+), 1 deletion(-) diff --git a/agents/windows/Configuration.cc b/agents/windows/Configuration.cc index f07c08b..5db2c8a 100644 --- a/agents/windows/Configuration.cc +++ b/agents/windows/Configuration.cc @@ -25,6 +25,8 @@ #include "Configuration.h" #include "stringutil.h" +#include <cstdio> + extern void verbose(const char *format, ...); diff --git a/agents/windows/build_version b/agents/windows/build_version index de2a00c..658bd78 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -457 +459 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 5b18161..558ff07 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 89b8f29..f54e7dd 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index a103921..80599e4 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 41a1ee7..79dec61 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index f896251..e94d6ec 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 04b3b3a..e0be91d 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 06fa276..f8c8a8d 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 11 months

Check_MK Git: check_mk: #2656 windows agent can now optionally output the full command line in the ps section

by Sebastian Herbord

Module: check_mk Branch: master Commit: c7345b5411f8d52a65afb2dce0c184a5b07a2571 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7345b5411f8d5… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Oct 6 16:56:01 2015 +0200 #2656 windows agent can now optionally output the full command line in the ps section This feature requires wmi which is also a configuration switch. As a side-effect, the windows agent now includes a native c++ wmi wrapper which may be useful in the future. --- .werks/2656 | 10 + ChangeLog | 1 + agents/windows/Configuration.cc | 23 ++ agents/windows/Configuration.h | 10 + agents/windows/Makefile | 9 +- agents/windows/build_version | 2 +- agents/windows/check_mk.example.ini | 7 + agents/windows/check_mk_agent-64.exe | Bin 633344 -> 826368 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 633344 -> 826368 bytes agents/windows/check_mk_agent.cc | 106 ++++- agents/windows/check_mk_agent.exe | Bin 545792 -> 743424 bytes agents/windows/check_mk_agent.msi | Bin 1433088 -> 1827328 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 545792 -> 743424 bytes agents/windows/install_agent-64.exe | Bin 313788 -> 380168 bytes agents/windows/install_agent.exe | Bin 302107 -> 370669 bytes agents/windows/stringutil.cc | 4 +- agents/windows/stringutil.h | 32 +- agents/windows/types.h | 31 +- agents/windows/wmiHelper.cc | 448 ++++++++++++++++++++++ agents/windows/wmiHelper.h | 190 +++++++++ 20 files changed, 853 insertions(+), 20 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c7345b5411…

8 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2015