Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: d3e4bfdc483ff777290cd4336574e71cb7a4b507 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d3e4bfdc483ff7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 29 12:06:58 2015 +0100 Removed unused images --- web/htdocs/images/button_commands.png | Bin 1115 -> 0 bytes web/htdocs/images/button_commands_down_hi.png | Bin 1109 -> 0 bytes web/htdocs/images/button_commands_down_lo.png | Bin 1062 -> 0 bytes web/htdocs/images/button_commands_off.png | Bin 1109 -> 0 bytes web/htdocs/images/button_filters.png | Bin 1140 -> 0 bytes web/htdocs/images/button_filters_off.png | Bin 1100 -> 0 bytes web/htdocs/images/button_filters_set_off.png | Bin 1185 -> 0 bytes 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/button_commands.png b/web/htdocs/images/button_commands.png deleted file mode 100644 index 8c92d24..0000000 Binary files a/web/htdocs/images/button_commands.png and /dev/null differ diff --git a/web/htdocs/images/button_commands_down_hi.png b/web/htdocs/images/button_commands_down_hi.png deleted file mode 100644 index e12bcc9..0000000 Binary files a/web/htdocs/images/button_commands_down_hi.png and /dev/null differ diff --git a/web/htdocs/images/button_commands_down_lo.png b/web/htdocs/images/button_commands_down_lo.png deleted file mode 100644 index c239ddb..0000000 Binary files a/web/htdocs/images/button_commands_down_lo.png and /dev/null differ diff --git a/web/htdocs/images/button_commands_off.png b/web/htdocs/images/button_commands_off.png deleted file mode 100644 index 3089678..0000000 Binary files a/web/htdocs/images/button_commands_off.png and /dev/null differ diff --git a/web/htdocs/images/button_filters.png b/web/htdocs/images/button_filters.png deleted file mode 100644 index c92262a..0000000 Binary files a/web/htdocs/images/button_filters.png and /dev/null differ diff --git a/web/htdocs/images/button_filters_off.png b/web/htdocs/images/button_filters_off.png deleted file mode 100644 index f38180b..0000000 Binary files a/web/htdocs/images/button_filters_off.png and /dev/null differ diff --git a/web/htdocs/images/button_filters_set_off.png b/web/htdocs/images/button_filters_set_off.png deleted file mode 100644 index be3f13d..0000000 Binary files a/web/htdocs/images/button_filters_set_off.png and /dev/null differ

8 years, 11 months

fixed a crash in the windows agent when starting without argumenst

by Sebastian Herbord

Module: check_mk Branch: master Commit: 9ffc17af3f1af463da47ac772b9e8da3699c69ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ffc17af3f1af4… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Oct 29 17:41:39 2015 +0100 fixed a crash in the windows agent when starting without argumenst --- agents/windows/Makefile | 2 ++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 829952 -> 829952 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 829952 -> 829952 bytes agents/windows/check_mk_agent.cc | 14 ++++++++------ agents/windows/check_mk_agent.exe | Bin 748032 -> 748032 bytes agents/windows/check_mk_agent.msi | Bin 1835520 -> 1835520 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 748032 -> 748032 bytes agents/windows/install_agent-64.exe | Bin 383027 -> 383088 bytes agents/windows/install_agent.exe | Bin 373952 -> 373956 bytes 10 files changed, 11 insertions(+), 7 deletions(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 011d7d5..67c21e1 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -28,6 +28,8 @@ VERSION = 1.2.7i4 VERSION_DUMMY = @@@@@CHECK_MK_VERSION@@@@@ WINDRES = i686-w64-mingw32-windres COPTIONS = -s -O2 -Wall -Werror -static -static-libgcc -static-libstdc++ -fno-rtti -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO +# for debug builds +# COPTIONS = -O0 -Wall -Werror -static -static-libgcc -static-libstdc++ -fno-rtti -ggdb -DCHECK_MK_VERSION='"$(VERSION_DUMMY)"' -D__USE_MINGW_ANSI_STDIO MKDIR = mkdir -p ifeq ($(shell uname),Linux) diff --git a/agents/windows/build_version b/agents/windows/build_version index cb3e25b..212abf5 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -609 +618 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 816438a..6a2cf2a 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 b3263c8..557f849 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.cc b/agents/windows/check_mk_agent.cc index 7e9a5ba..1afedc5 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3682,13 +3682,15 @@ void cleanup() unregister_all_eventlogs(); // frees a few bytes - for (fileinfo_paths_t::iterator it_path = g_config->fileinfoPaths().begin(); - it_path != g_config->fileinfoPaths().end(); it_path++) { - free(*it_path); - } - g_config->fileinfoPaths().clear(); + if (g_config != NULL) { + for (fileinfo_paths_t::iterator it_path = g_config->fileinfoPaths().begin(); + it_path != g_config->fileinfoPaths().end(); it_path++) { + free(*it_path); + } + g_config->fileinfoPaths().clear(); - cleanup_logwatch(); + cleanup_logwatch(); + } } void show_version() diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index b09b44b..096dbf8 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 20e216b..79cc655 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 95f9956..7996e3a 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 88dec84..a5f67dc 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 6f2937d..12e980d 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 11 months

Minor code cleanup

by Konstantin Büttner

Module: check_mk Branch: master Commit: bd30e84c029da01ca31a118626fa7ada0aff8ebf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd30e84c029da0… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Oct 29 15:49:39 2015 +0100 Minor code cleanup --- checks/cmciii | 2 -- 1 file changed, 2 deletions(-) diff --git a/checks/cmciii b/checks/cmciii index b310024..0176256 100644 --- a/checks/cmciii +++ b/checks/cmciii @@ -735,8 +735,6 @@ check_info['cmciii.humidity'] = { # | | |_) | | | | (_| \__ \ __/ | # | | .__/|_| |_|\__,_|___/\___| | # | |_| | -# +----------------------------------------------------------------------+ -# | | # '----------------------------------------------------------------------' def inventory_cmciii_phase(info):

8 years, 11 months

#2699 windows_tasks: new task success constant ' an instance of the task is already running'

by Simon Betz

Module: check_mk Branch: master Commit: d0590df507f9ffdc1ffc72bb96f72e3f263afec5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0590df507f9ff… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 29 15:41:36 2015 +0100 #2699 windows_tasks: new task success constant 'an instance of the task is already running' --- .werks/2699 | 9 +++++++++ ChangeLog | 1 + checks/windows_tasks | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/2699 b/.werks/2699 new file mode 100644 index 0000000..a1f5e2b --- /dev/null +++ b/.werks/2699 @@ -0,0 +1,9 @@ +Title: windows_tasks: new task success constant 'an instance of the task is already running' +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1446129364 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 4231352..96c507e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * 2688 mssql agent plugin can now handle clustered MSSQL instances * 2703 logwatch.ec: now transfers the service level to the event console... * 2705 winperf_if: added option to warn if an interface is using dhcp... + * 2699 windows_tasks: new task success constant 'an instance of the task is already running' * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checks/windows_tasks b/checks/windows_tasks index f9ef25d..b3c551d 100644 --- a/checks/windows_tasks +++ b/checks/windows_tasks @@ -67,7 +67,7 @@ def check_windows_tasks(item, _no_params, info): state = 0 label = "" msg = [] - if last_result not in [ 0, 0x00041301, 0x00041325, 0x00041306 ]: # RUNNING, QUEUED, CANCELD + if last_result not in [ 0, 0x00041301, 0x00041325, 0x00041306, 0x8004131F ]: # RUNNING, QUEUED, CANCELD, Instance RUNNING state = 2 label = "(!!)" msg.append("Service in state: %s%s" % ( last_result, label ) ) @@ -75,6 +75,8 @@ def check_windows_tasks(item, _no_params, info): msg[-1] += " (currently running)" elif last_result == 0x00041325: msg[-1] += " (queued)" + elif last_result == 0x8004131F: + msg[-1] += " (an instance of the task already running)" if values['Scheduled Task State'] != 'Enabled': msg.append("Task not Enabled(!!)")

8 years, 11 months

Added TODO

by Konstantin Büttner

Module: check_mk Branch: master Commit: 277a735b5c846b2e6a8c66ba75e441362832c856 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=277a735b5c846b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Oct 29 14:58:04 2015 +0100 Added TODO --- checks/ups_modulys_battery | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ups_modulys_battery b/checks/ups_modulys_battery index b233b26..d7ace50 100644 --- a/checks/ups_modulys_battery +++ b/checks/ups_modulys_battery @@ -58,7 +58,7 @@ def check_ups_modulys_battery(item, params, info): if elapsed_sec == 0: yield 0, "on mains" else: - yield 0, "discharging for %d minutes" % (elapsed_sec / 60) + yield 0, "discharging for %d minutes" % (elapsed_sec / 60) # TODO: Echt OK? # test 2: battery health if condition == 1:

8 years, 11 months

ups_modulys_battery: Fix default params in inventory function

by Konstantin Büttner

Module: check_mk Branch: master Commit: cf7e2c36d877018a83c2e4a718c684fef7115c42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf7e2c36d87701… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Oct 29 14:33:43 2015 +0100 ups_modulys_battery: Fix default params in inventory function --- checks/ups_modulys_battery | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ups_modulys_battery b/checks/ups_modulys_battery index f9bd24f..b233b26 100644 --- a/checks/ups_modulys_battery +++ b/checks/ups_modulys_battery @@ -32,7 +32,7 @@ factory_settings['ups_modulys_battery_default_levels'] = { def inventory_ups_modulys_battery(info): - return [ (None, None) ] + return [ (None, {}) ] def check_ups_modulys_battery(item, params, info):

8 years, 11 months

fixed make clean in windows agent

by Sebastian Herbord

Module: check_mk Branch: master Commit: ae7069fd03c94aa66798cdfa9ab0827ffae539d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae7069fd03c94a… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Oct 29 11:51:01 2015 +0100 fixed make clean in windows agent --- agents/windows/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/Makefile b/agents/windows/Makefile index 30409e3..011d7d5 100644 --- a/agents/windows/Makefile +++ b/agents/windows/Makefile @@ -155,7 +155,7 @@ nowin.exe: nowin.cc $(CXX) -o $@ $< clean: - rm -f *.o *~ svn-*.tmp *.rc *.res + rm -f *.o *~ svn-*.tmp *.rc *.res obj/*.o obj64/*.o make -C msibuild clean mrproper: clean

8 years, 11 months

fixed typo

by Simon Betz

Module: check_mk Branch: master Commit: 13c71fb9ec95a000b0278f464511fc8bcadfec69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13c71fb9ec95a0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 29 13:40:58 2015 +0100 fixed typo --- inventory/solaris_prtdiag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/solaris_prtdiag b/inventory/solaris_prtdiag index 4c951a0..f74e9a0 100644 --- a/inventory/solaris_prtdiag +++ b/inventory/solaris_prtdiag @@ -120,7 +120,7 @@ def inv_solaris_prtdiag(info): vendor = "Oracle Corporation" index = 2 elif "supermicro" in system_info.lower(): - vendor = "Supermirco" + vendor = "Supermicro" index = 1 elif "vmware, inc." in system_info.lower(): vendor = "VMWare, Inc."

8 years, 11 months

#2698 FIX ups_capacity: fixed missing battery time and fuel information

by Simon Betz

Module: check_mk Branch: master Commit: 40f3ce3b7f1488da22ecc56b2aaa3a6f7b35894d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40f3ce3b7f1488… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 29 13:26:11 2015 +0100 #2698 FIX ups_capacity: fixed missing battery time and fuel information --- .werks/2698 | 10 +++++++++ ChangeLog | 1 + checks/liebert_bat_temp | 2 +- checks/ups_bat_temp | 2 +- checks/ups_capacity.include | 50 +++++++++++++++++++++++-------------------- 5 files changed, 40 insertions(+), 25 deletions(-) diff --git a/.werks/2698 b/.werks/2698 new file mode 100644 index 0000000..620a68f --- /dev/null +++ b/.werks/2698 @@ -0,0 +1,10 @@ +Title: ups_capacity: fixed missing battery time and fuel information +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1446121438 + + diff --git a/ChangeLog b/ChangeLog index e5c4f35..4231352 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * 2692 FIX: check_http: Fixed broken check when using Nagios (introduced with 1.2.7i3) * 2706 FIX: winperf_if: fixed rare crashes of windows_if.ps1 plugin... * 1297 FIX: emcvnx_hba: Prevent old emc versions from inventory... + * 2698 FIX: ups_capacity: fixed missing battery time and fuel information Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/liebert_bat_temp b/checks/liebert_bat_temp index fd21e7e..766f91f 100644 --- a/checks/liebert_bat_temp +++ b/checks/liebert_bat_temp @@ -38,7 +38,7 @@ def check_liebert_bat_temp(item, params, info): line = info[0] temp = saveint(line[0]) perfdata = [ ( "temp", temp, warn, crit, 80 ) ] - infotext = "temperature: %d°C , (warn/crit at %d°C/%d°C) " % \ + infotext = "%d°C (warn/crit at %d°C/%d°C) " % \ (temp, warn, crit) if temp >= crit: diff --git a/checks/ups_bat_temp b/checks/ups_bat_temp index 8a29847..8d684b9 100644 --- a/checks/ups_bat_temp +++ b/checks/ups_bat_temp @@ -35,7 +35,7 @@ def inventory_ups_bat_temp(info): def check_ups_bat_temp(item, params, info): for line in info: - if line[0] == item: + if line[0] == item: status, infotext, perfdata = check_temperature(int(line[1]), params) perfdatanew = [ perfdata[0] + (80,) ] return status, infotext, perfdatanew diff --git a/checks/ups_capacity.include b/checks/ups_capacity.include index fd175d5..70bd87f 100644 --- a/checks/ups_capacity.include +++ b/checks/ups_capacity.include @@ -36,34 +36,38 @@ def check_ups_capacity(item, params, info): warn, crit = (0, 0) cap_warn, cap_crit = (95, 90) - time_on_bat, minutes_left, percent_fuel = map(int, info[0]) + time_on_bat, minutes_left, percent_fuel = info[0] # Check time left on battery - levelsinfo = "" - if minutes_left <= crit: - state = 2 - levelsinfo = " (crit at %d min)" % cap_crit - elif minutes_left < warn: - state = 1 - levelsinfo = " (warn at %d min)" % cap_warn - else: - state = 0 - yield state, "%d min left on battery" % minutes_left + levelsinfo, [ ('capacity', minutes_left, warn, crit) ] + if minutes_left: + minutes_left = int(minutes_left) + levelsinfo = "" + if minutes_left <= crit: + state = 2 + levelsinfo = " (crit at %d min)" % cap_crit + elif minutes_left < warn: + state = 1 + levelsinfo = " (warn at %d min)" % cap_warn + else: + state = 0 + yield state, "%d min left on battery" % minutes_left + levelsinfo, [ ('capacity', minutes_left, warn, crit) ] # Check percentual capacity - levelsinfo = "" - if percent_fuel <= cap_crit: - state = 2 - levelsinfo = " (crit at %d%%)" % cap_crit - elif percent_fuel < cap_warn: - state = 1 - levelsinfo = " (warn at %d%%)" % cap_warn - else: - state = 0 - yield state, "capacity: %d%%" % percent_fuel + levelsinfo, [ ('percent', percent_fuel, cap_warn, cap_crit) ] + if percent_fuel: + percent_fuel = int(percent_fuel) + levelsinfo = "" + if percent_fuel <= cap_crit: + state = 2 + levelsinfo = " (crit at %d%%)" % cap_crit + elif percent_fuel < cap_warn: + state = 1 + levelsinfo = " (warn at %d%%)" % cap_warn + else: + state = 0 + yield state, "capacity: %d%%" % percent_fuel + levelsinfo, [ ('percent', percent_fuel, cap_warn, cap_crit) ] # Output time on battery - if time_on_bat > 0: - yield 0, "On battery for %d min" % time_on_bat + if time_on_bat and int(time_on_bat) > 0: + yield 0, "On battery for %d min" % int(time_on_bat)

8 years, 11 months

#2670 FIX Fix problem that no site is configured when user has deleted only site

by Mathias Kettner

Module: check_mk Branch: master Commit: d48bdbcb699dff2e2a98e70be668f5b3a7c7a3de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d48bdbcb699dff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 29 12:18:43 2015 +0100 #2670 FIX Fix problem that no site is configured when user has deleted only site This problem was introduced by dropping the "single site" mode internally totally in version 1.2.7i3 and treating a single site setup automatically as multi site setup with just one site. The problem occurred when you had <tt>sites = {}</tt> in your configuration (instead of having no <tt>sites = </tt> at all). --- .werks/2670 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/config.py | 8 +++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/2670 b/.werks/2670 new file mode 100644 index 0000000..49909c2 --- /dev/null +++ b/.werks/2670 @@ -0,0 +1,12 @@ +Title: Fix problem that no site is configured when user has deleted only site +Level: 2 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1446117423 +Class: fix + +This problem was introduced by dropping the "single site" mode internally totally +in version 1.2.7i3 and treating a single site setup automatically as multi site +setup with just one site. The problem occurred when you had <tt>sites = {}</tt> +in your configuration (instead of having no <tt>sites = </tt> at all). diff --git a/ChangeLog b/ChangeLog index 12497f6..e5c4f35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ * 2689 FIX: LDAP: Fixed broken sync when using "Filter Group" in the user sync settings * 2438 FIX: Manpage icons: fixed manpage links for active checks * 2691 FIX: Fixed exception in host address painter when displaying hosts/services of older sites + * 2670 FIX: Fix problem that no site is configured when user has deleted only site... WATO: * 2666 FIX: Fix search for global configuration variables: ignore case now diff --git a/web/htdocs/config.py b/web/htdocs/config.py index cdc4239..0a0051d 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -141,7 +141,7 @@ def include(filename): # Load multisite.mk and all files in multisite.d/. This will happen # for *each* HTTP request. def load_config(): - global modification_timestamps + global modification_timestamps, sites modification_timestamps = [] # Set default values for all user-changable configuration settings @@ -163,6 +163,12 @@ def load_config(): for p in filelist: include(p) + # Prevent problem when user has deleted all sites from his configuration + # and sites is {}. We assume a default single site configuration in + # that case. + if not sites: + sites = default_single_site_configuration() + def reporting_available(): try:

8 years, 11 months

← Newer
1
2
3
4
5
6
7
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2015