Checkmk git commits October 2012

checkmk-commits@lists.checkmk.com

1 participants
252 discussions

Check_MK Git: check_mk: Add new bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e728f02f1cc109ae5613895dab907df31ff134a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e728f02f1cc109… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Oct 10 12:59:38 2012 +0200 Add new bug entry --- .bugs/807 | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/.bugs/807 b/.bugs/807 new file mode 100644 index 0000000..75ab120 --- /dev/null +++ b/.bugs/807 @@ -0,0 +1,9 @@ +Title: cmk --restore does report errors +Component: core +State: open +Date: 2012-10-10 12:58:08 +Targetversion: 1.2.0 +Class: cleanup + +cmk --restore does not set an returncode != 1 or print errors if the restore +failed if the input file was unreadable or missing or somehow else troubled.

11 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ab7edf3717fb6c95fa05fd6015de5c63f683a16b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab7edf3717fb6c… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Oct 10 12:57:11 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Add new bug entry

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 08941efbd39e84548cef0304e3b6ccf3b5170fae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08941efbd39e84… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Oct 10 12:56:58 2012 +0200 Add new bug entry --- .bugs/806 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/806 b/.bugs/806 new file mode 100644 index 0000000..9859993 --- /dev/null +++ b/.bugs/806 @@ -0,0 +1,11 @@ +Title: IOPS calculation in diskstat gets wrong numbers +Component: checks +State: open +Date: 2012-10-10 12:54:15 +Targetversion: 1.2.0 +Class: bug + +Manually tracking the numbers reported by diskstat does not match the numbers +reported by the OS. 2K IOPS show up as >4k sometimes. possible cause from looking +at the check is the timedif handling. +Needs more debugging.

11 years, 11 months

Check_MK Git: check_mk: FIX: Fixed editing of icon_image rules

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 602327ebaac938ffad81e396fccfe4e5120a4017 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=602327ebaac938… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 10 08:52:05 2012 +0200 FIX: Fixed editing of icon_image rules --- ChangeLog | 5 +++-- web/plugins/wato/check_mk_configuration.py | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b8c420..b647584 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,10 +40,11 @@ WATO: * Added progress indicator in single site WATO "Activate Changes" + * Users & Contacts: Case-insensitive sorting of 'Full name' column * FIX: Implemented basic non HTTP 200 status code response handling in interactive progress dialogs (e.g. bulk inventory mode) - * Users & Contacts: Case-insensitive sorting of 'Full name' column - + * FIX: Fixed editing of icon_image rules + Checks & Agents: * New check mssql_counters.locks: Monitors locking related information of MSSQL tablespaces diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index a54857d..d8e0156 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1014,6 +1014,8 @@ class MonitoringIcon(ValueSpec): return icons def render_input(self, varprefix, value): + if value is None: + value = "" num_columns = 12 html.write("<table>") for nr, filename in enumerate([""] + self.available_icons()): @@ -1039,12 +1041,12 @@ class MonitoringIcon(ValueSpec): def from_html_vars(self, varprefix): nr = int(html.var(varprefix)) if nr == 0: - return "" + return None else: return self.available_icons()[nr-1] def validate_datatype(self, value, varprefix): - if type(value) != str: + if value is not None and type(value) != str: raise MKUserError(varprefix, _("The type is %s, but should be str") % type(value))

11 years, 11 months

Check_MK Git: check_mk: windows_updates agent plugin: Fetching data in background mode, caching update information for 30 minutes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5e059eddd6b8b6cf12157ed3060a7b4bb971ed11 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e059eddd6b8b6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 10 08:43:13 2012 +0200 windows_updates agent plugin: Fetching data in background mode, caching update information for 30 minutes --- ChangeLog | 2 + agents/plugins/apache_status | 2 +- agents/windows/plugins/windows_updates.vbs | 157 ++++++++++++++++++++++------ 3 files changed, 129 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad33a7b..32d70dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,8 @@ Checks & Agents: * New check mssql_counters.locks: Monitors locking related information of MSSQL tablespaces + * windows_updates agent plugin: Fetching data in background mode, caching + update information for 30 minutes 1.2.0p3: Mulitisite diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index d8a1bbc..871c428 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -86,4 +86,4 @@ for proto, address, port in servers: continue print address, port, line except Exception, e: - sys.stderr.write('Exception (%s:%d): %s' % (address, port, e)) + sys.stderr.write('Exception (%s:%d): %s\n' % (address, port, e)) diff --git a/agents/windows/plugins/windows_updates.vbs b/agents/windows/plugins/windows_updates.vbs index 972c5dd..451395d 100644 --- a/agents/windows/plugins/windows_updates.vbs +++ b/agents/windows/plugins/windows_updates.vbs @@ -11,46 +11,141 @@ Option Explicit Dim result, reboot, numImp, numOpt, important, opti -Dim updtSearcher, colDownloads, objEntry +Dim windows_update_maxage, temp_file, new_file +Dim updtSearcher, colDownloads, objEntry, objFS, objShell, objFile If CreateObject("Microsoft.Update.AutoUpdate").DetectNow <> 0 Then WScript.Echo "<<<windows_updates>>>" WScript.Quit(0) End If -Set updtSearcher = CreateObject("Microsoft.Update.Session").CreateUpdateSearcher +' Gathering the installed updates might take a lot of time, thus this +' check makes use of a cache. The cache saves and uses the current update +' information for windows_updates_maxage seconds. After the file is too old +' the information are refreshed. The check is executed in "refresh" mode to +' update the data in background while the regular check still uses the current +' information. Once the update finished in the background job, the new data +' is used. -reboot = 0 -numImp = 0 -numOpt = 0 - -If CreateObject("Microsoft.Update.SystemInfo").RebootRequired Then - reboot = 1 +' Gather mode of the current script run +Dim mode +mode = "check" +If Wscript.Arguments.Count = 1 Then + If Wscript.Arguments.Item(0) = "update" Then + mode = "update" + End If End If -Set result = updtSearcher.Search("IsInstalled = 0 and IsHidden = 0") -Set colDownloads = result.Updates +' Keep temporary file for 30 minutes +windows_update_maxage = 1800 + +Set objShell = CreateObject("WScript.Shell") +Set objFS = CreateObject("Scripting.FileSystemObject") + +temp_file = objShell.ExpandEnvironmentStrings("%Temp%") & "\cmk_windows_updates_cache.txt" +new_file = objShell.ExpandEnvironmentStrings("%Temp%") & "\cmk_windows_updates_cache_new.txt" + +Sub print_file(path) + Set objFile = objFS.OpenTextFile(path, 1) + Do Until objFile.AtEndOfStream + wscript.echo objFile.ReadLine + Loop + objFile.Close + Set objFile = nothing +End Sub + +Sub start_update() + ' First create the new temp file (locks!) + Set objFile = objFS.CreateTextFile(new_file, True) + objFile.Close + Set objFile = nothing + + ' Now start the update in background (0: hide window, False: dont wait) + objShell.Run Wscript.ScriptFullName + " update", 0, False +End Sub + +Sub update() + Set objFile = objFS.CreateTextFile(new_file, True) + Set updtSearcher = CreateObject("Microsoft.Update.Session").CreateUpdateSearcher + + reboot = 0 + numImp = 0 + numOpt = 0 + + If CreateObject("Microsoft.Update.SystemInfo").RebootRequired Then + reboot = 1 + End If + + Set result = updtSearcher.Search("IsInstalled = 0 and IsHidden = 0") + Set colDownloads = result.Updates -For Each objEntry in colDownloads - if objEntry.AutoSelectOnWebSites Then - if numImp = 0 Then - important = objEntry.Title - else - important = important & "; " & objEntry.Title + For Each objEntry in colDownloads + if objEntry.AutoSelectOnWebSites Then + if numImp = 0 Then + important = objEntry.Title + else + important = important & "; " & objEntry.Title + End If + numImp = numImp + 1 + Else + If numOpt = 0 Then + opti = objEntry.Title + Else + opti = opti & "; " & objEntry.Title + End If + numOpt = numOpt + 1 + End If + Next + + objFile.write("<<<windows_updates>>>" & vbCrLf) + objFile.write(reboot & " " & numImp & " " & numOpt & vbCrLf) + objFile.write(important & vbCrLf) + objFile.write(opti) + + objFile.Close() + Set objFile = nothing + + ' After completion, move the file + If objFS.FileExists(temp_file) Then + objFS.DeleteFile(temp_file) + End If + objFS.MoveFile new_file, temp_file +End Sub + +' Handle the update mode of this script. In this mode the new information +' are fetched via WMI. This should only be called in async mode because +' this might take a lot of time dependent on how many software is installed. +If mode = "update" Then + update() + WScript.Quit(0) +End If + +If objFS.FileExists(temp_file) Then + If DateDiff("s", objFS.GetFile(temp_file).DateLastModified, Now()) > windows_update_maxage Then + ' Too old! + If Not objFS.FileExists(new_file) Then + ' Start fetching new data in the bakground + start_update() + End If End If - numImp = numImp + 1 - Else - If numOpt = 0 Then - opti = objEntry.Title - Else - opti = opti & "; " & objEntry.Title + + ' Output current data if + ' a) The temp_file is new enough + ' b) The temp_file is too old but new data is being fetched now + print_file temp_file + WScript.Quit(0) +Else + ' No data fetched yet, + If Not objFS.FileExists(new_file) Then + ' Start fetching new data in background + start_update() End If - numOpt = numOpt + 1 - End If -Next - -WScript.Echo "<<<windows_updates>>>" -WScript.Echo reboot & " " & numImp & " " & numOpt -WScript.Echo important -WScript.Echo opti -WScript.Quit() + + ' Return empty + WScript.Echo "<<<windows_updates>>>" + WScript.Quit(0) +End If + +Set objFS = nothing +Set objShell = nothing +WScript.Quit() \ No newline at end of file

11 years, 11 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3c8392258cf2e8975f5cede2e78d3b08adcc53a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c8392258cf2e8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 10 08:43:34 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 11 months

Check_MK Git: check_mk: Livestatus/Multisite: New livestatus columns and

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 594d7b57e65c704d442394ed9e017ca886594475 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=594d7b57e65c70… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 9 16:47:26 2012 +0200 Livestatus/Multisite: New livestatus columns and multisite painters for check_command_expanded --- ChangeLog | 7 +++++++ livestatus/src/TableHosts.cc | 2 ++ livestatus/src/TableServices.cc | 2 ++ web/plugins/views/painters.py | 14 ++++++++++++++ 4 files changed, 25 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6ab0b1..fbf50d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,13 @@ * Quicksearch: Convert search text to regex when accessing livestatus * FIX: WATO Folder filter not available when WATO disabled * WATO Folder Filter no longer available in single host views + * Added new painters "Service check command expanded" and + "Host check command expanded" + + Livestatus: + * Added new table statehist, used for SLA queries + * Added new column check_command_expanded in table hosts + * Added new column check_command_expanded in table services BI: * Added missing localizations diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index c10440a..a141398 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -89,6 +89,8 @@ void TableHosts::addColumns(Table *table, string prefix, int indirect_offset) "IP address", (char *)(&hst.address) - ref, indirect_offset)); table->addColumn(new OffsetStringColumn(prefix + "check_command", "Nagios command for active host check of this host", (char *)(&hst.host_check_command) - ref, indirect_offset)); + table->addColumn(new OffsetStringHostMacroColumn(prefix + "check_command_expanded", + "Nagios command for active host check of this host with the macros expanded", (char *)(&hst.host_check_command) - ref, indirect_offset)); table->addColumn(new OffsetStringColumn(prefix + "event_handler", "Nagios command used as event handler", (char *)(&hst.event_handler) - ref, indirect_offset)); table->addColumn(new OffsetStringColumn(prefix + "notification_period", diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index 11e6e12..8199373 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -194,6 +194,8 @@ void TableServices::addColumns(Table *table, string prefix, int indirect_offset, "An optional display name (not used by Nagios standard web pages)", (char *)(&svc.display_name) - ref, indirect_offset)); table->addColumn(new OffsetStringColumn(prefix + "check_command", "Nagios command used for active checks", (char *)(&svc.service_check_command) - ref, indirect_offset)); + table->addColumn(new OffsetStringServiceMacroColumn(prefix + "check_command_expanded", + "Nagios command used for active checks with the macros expanded", (char *)(&svc.service_check_command) - ref, indirect_offset)); table->addColumn(new OffsetStringColumn(prefix + "event_handler", "Nagios command used as event handler", (char *)(&svc.event_handler) - ref, indirect_offset)); table->addColumn(new OffsetStringColumn(prefix + "plugin_output", diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 93038d7..2f96afb 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -460,6 +460,13 @@ multisite_painters["svc_check_command"] = { "paint" : lambda row: (None, row["service_check_command"]), } +multisite_painters["svc_check_command_expanded"] = { + "title" : _("Service check command expanded"), + "short" : _("Check command expanded"), + "columns" : ["service_check_command_expanded"], + "paint" : lambda row: (None, row["service_check_command_expanded"]), +} + multisite_painters["svc_contacts"] = { "title" : _("Service contacts"), "short" : _("Contacts"), @@ -810,6 +817,13 @@ multisite_painters["host_check_command"] = { "paint" : lambda row: (None, row["host_check_command"]), } +multisite_painters["host_check_command_expanded"] = { + "title" : _("Host check command expanded"), + "short" : _("Check command expanded"), + "columns" : ["host_check_command_expanded"], + "paint" : lambda row: (None, row["host_check_command_expanded"]), +} + multisite_painters["host_state_age"] = { "title" : _("The age of the current host state"), "short" : _("Age"),

11 years, 11 months

Check_MK Git: check_mk: resolved gitbug merge conflict

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: bc11e48e76b8690125fa86a1bced8f32ceaa08c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc11e48e76b869… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 9 16:16:22 2012 +0200 resolved gitbug merge conflict ---

11 years, 11 months

Check_MK Git: check_mk: Updated bug entries #0060

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b0ebc2e0a7adbf3ec98e11e3123bbdfec053bdcf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0ebc2e0a7adbf… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 9 16:15:08 2012 +0200 Updated bug entries #0060 --- .bugs/60 | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.bugs/60 b/.bugs/60 index 6633c82..d3747e3 100644 --- a/.bugs/60 +++ b/.bugs/60 @@ -1,8 +1,14 @@ Title: Warnung im Logfile, wenn environment_macros an sind Component: livestatus -State: open -Date: 2010-12-21 22:18:56 Class: feature +State: done +Date: 2010-12-21 22:18:56 +Targetversion: future Analog zu den broker options wäre das eine für die Stabilität wichtige Sache. + +2012-10-09 16:14:18: changed state open -> done +enable_environment_macros=1 +fuehrt zum Logeintrag +Warning: environment_macros are enabled

11 years, 11 months

Check_MK Git: check_mk: livestatus: enable_environment_macros == 1 creates a warning logentry on nagios startup

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 51bb2ab8a49919da250bfff83e5fb6e3e38aa0fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51bb2ab8a49919… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 9 16:18:07 2012 +0200 livestatus: enable_environment_macros == 1 creates a warning logentry on nagios startup --- livestatus/src/module.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 1100c47..dcb25b7 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -67,6 +67,7 @@ NEB_API_VERSION(CURRENT_NEB_API_VERSION) extern int event_broker_options; +extern int enable_environment_macros; extern char *log_file; int g_idle_timeout_msec = 300 * 1000; /* maximum idle time for connection in keep alive state */ @@ -572,7 +573,6 @@ int verify_event_broker_options() return errors == 0; } - void register_callbacks() { neb_register_callback(NEBCALLBACK_HOST_STATUS_DATA, g_nagios_handle, 0, broker_host); // Needed to start threads @@ -798,6 +798,9 @@ int nebmodule_init(int flags __attribute__ ((__unused__)), char *args, void *han else if (g_debug_level > 0) logger(LG_INFO, "Your event_broker_options are sufficient for livestatus.."); + if (enable_environment_macros == 1) + logger(LG_INFO, "Warning: environment_macros are enabled"); + store_init(); register_callbacks();

11 years, 11 months

← Newer
1
...
13
14
15
16
17
18
19
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2012