Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64597 discussions

Check_MK Git: check_mk: Removed caching function in Windows Update agent plugin

by Bastian Kuhn

Module: check_mk Branch: master Commit: a57bc69c3e35b2f11ea5788c45934e6a4e2ebbe8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a57bc69c3e35b2… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Mar 3 15:56:44 2014 +0100 Removed caching function in Windows Update agent plugin The current Windows Agent Versions has a build in caching mechanism. Cause of this the buildin caching features from windows_update.vbs are now removed. Please make shure that caching is activated in the check_mk.ini file. A example config can look like this: [plugin] cache_age windows_updates.vbs = 3600 --- .werks/138 | 12 +++ ChangeLog | 2 + agents/windows/plugins/windows_updates.vbs | 119 ++++++++++------------------ 3 files changed, 55 insertions(+), 78 deletions(-) diff --git a/.werks/138 b/.werks/138 new file mode 100644 index 0000000..a1dcfd6 --- /dev/null +++ b/.werks/138 @@ -0,0 +1,12 @@ +Title: Removed caching function in Windows Update agent plugin +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1393858396 +Class: incomp + +The current Windows Agent Versions has a build in caching mechanism. Cause of this the buildin caching features from windows_update.vbs are now removed. Please make shure that caching is activated in the check_mk.ini file. + +A example config can look like this: +[plugin] + cache_age windows_updates.vbs = 3600 diff --git a/ChangeLog b/ChangeLog index 07491e3..e1e009c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,8 @@ * 0704 windows_os_bonding: new check for bonding interfaces on windows... * 0562 esx_vsphere_vm.guest_tools: new check to monitor guest tools status... * 0674 brocade_fcport: Now supporting interface speed of 16 Gbit (just discovered in the wild) + * 0138 Removed caching function in Windows Update agent plugin... + NOTE: Please refer to the migration notes! * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/agents/windows/plugins/windows_updates.vbs b/agents/windows/plugins/windows_updates.vbs index 2a8aa70..b446d81 100644 --- a/agents/windows/plugins/windows_updates.vbs +++ b/agents/windows/plugins/windows_updates.vbs @@ -13,6 +13,9 @@ ' Based on code here: http://www.monitoring-portal.org/wbb/index.php?page=Thread&threadID=23509 ' Spawning a separate process to produce cached result (as in above forum discussion) caused me ' some issues, so I went for a simpler solution using only one script +' +' Updated by Bastian Kuhn, 2014-03-03: Removed all caching functions cause the current agent +' has a native caching support. Make shure that you activate caching for this script in check_mk.ini ' ----------------------------------------------------------------------------------------- Option Explicit @@ -36,12 +39,9 @@ end function Dim result, reboot, numImp, numOpt, important, opti Dim updtSearcher, colDownloads, objEntry -Dim objFSO, objFile +Dim objFSO, stdout Set objFSO = WScript.CreateObject("Scripting.FileSystemObject") - -Dim lastModificationDate -Dim updateNeeded -updateNeeded = True +Set stdout = objFSO.GetStandardStream(1) Dim WSHShell Set WSHShell = CreateObject("WScript.Shell") @@ -49,86 +49,49 @@ Set WSHShell = CreateObject("WScript.Shell") Dim RebootTime Dim RegPath -Dim scriptname, scriptpath, strFolder - -scriptname = Wscript.ScriptFullName -scriptpath = objFSO.getparentfoldername(scriptname) - -strFolder = scriptpath & "\windows-update" -set objFSO = createobject("Scripting.FileSystemObject") - -if objFSO.FolderExists(strFolder) = False then - objFSO.CreateFolder strFolder -end if - -Dim ts, TextLine -Dim rndFudge - -Randomize -rndFudge = Int(8 * 60 * Rnd) ' random fudge factor for test (0 to 8 hrs) - -If objFSO.FileExists(scriptpath &"\windows-update\windows_updates-log.txt") Then - lastModificationDate = objFSO.GetFile(scriptpath &"\windows-update\windows_updates-log.txt").DateLastModified - If DateDiff("n", lastModificationDate, now) < ((60*24)-rndFudge) Then ' 1 day minus 0 to 8 hours - updateNeeded = False - End If +If CreateObject("Microsoft.Update.AutoUpdate").DetectNow <> 0 Then + stdout.WriteLine("<<<windows_updates>>>") + WScript.Quit() End If -If updateNeeded Then - Set objFile = objFSO.CreateTextFile(scriptpath &"\windows-update\windows_updates-log.txt") +Set updtSearcher = CreateObject("Microsoft.Update.Session").CreateUpdateSearcher - If CreateObject("Microsoft.Update.AutoUpdate").DetectNow <> 0 Then - objFile.WriteLine("<<<windows_updates>>>") - WScript.Quit() - End If - - Set updtSearcher = CreateObject("Microsoft.Update.Session").CreateUpdateSearcher +RegPath = "HKEY_LOCAL_MACHINE\SOFTWARE\MICROSOFT\Windows\CurrentVersion\WindowsUpdate\Auto Update\" +RebootTime = ReadFromRegistry(RegPath & "NextFeaturedUpdatesNotificationTime","no_key") - RegPath = "HKEY_LOCAL_MACHINE\SOFTWARE\MICROSOFT\Windows\CurrentVersion\WindowsUpdate\Auto Update\" - RebootTime = ReadFromRegistry(RegPath & "NextFeaturedUpdatesNotificationTime","no_key") +reboot = 0 +numImp = 0 +numOpt = 0 - reboot = 0 - numImp = 0 - numOpt = 0 - - If CreateObject("Microsoft.Update.SystemInfo").RebootRequired Then - reboot = 1 - End If +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 - End If - numImp = numImp + 1 +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 + End If + numImp = numImp + 1 + Else + If numOpt = 0 Then + opti = objEntry.Title Else - If numOpt = 0 Then - opti = objEntry.Title - Else - opti = opti & "; " & objEntry.Title - End If - numOpt = numOpt + 1 - End If - Next - - objFile.WriteLine("<<<windows_updates>>>") - objFile.WriteLine(reboot & " " & numImp & " " & numOpt) - objFile.WriteLine(important) - objFile.WriteLine(opti) - objFile.WriteLine(RebootTime) - objFile.Close - -End If + opti = opti & "; " & objEntry.Title + End If + numOpt = numOpt + 1 + End If -Set ts = objFSO.GetFile(scriptpath &"\windows-update\windows_updates-log.txt").OpenAsTextStream(1, -2) -Do While ts.AtEndOfStream <> True - WScript.Echo ts.ReadLine -Loop -ts.Close +Next + stdout.WriteLine("<<<windows_updates>>>") + stdout.WriteLine(reboot & " " & numImp & " " & numOpt) + stdout.WriteLine(important) + stdout.WriteLine(opti) + stdout.WriteLine(RebootTime) WScript.Quit()

10 years, 7 months

Check_MK Git: check_mk: FIX windows agent: now able to process perl scripts

by Andreas Boesl

Module: check_mk Branch: master Commit: 6adafc008299cdd9b892464ac9f4151b3e00610f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6adafc008299cd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Mar 3 15:04:34 2014 +0100 FIX windows agent: now able to process perl scripts The windows agent was unable to process perl scripts in the local and plugin directories. --- .werks/563 | 9 +++++++++ ChangeLog | 1 + agents/windows/check_mk_agent-64.exe | Bin 190464 -> 190464 bytes agents/windows/check_mk_agent.cc | 5 +++++ agents/windows/check_mk_agent.exe | Bin 160768 -> 160768 bytes agents/windows/install_agent-64.exe | Bin 154588 -> 154557 bytes agents/windows/install_agent.exe | Bin 151690 -> 151776 bytes 7 files changed, 15 insertions(+) diff --git a/.werks/563 b/.werks/563 new file mode 100644 index 0000000..8a7514e --- /dev/null +++ b/.werks/563 @@ -0,0 +1,9 @@ +Title: windows agent: now able to process perl scripts +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1393855405 +Class: fix + +The windows agent was unable to process perl scripts +in the local and plugin directories. diff --git a/ChangeLog b/ChangeLog index af76085..6749199 100644 --- a/ChangeLog +++ b/ChangeLog @@ -193,6 +193,7 @@ * 0703 FIX: brocade_mlx: omit inventory of cpu and memory on more states... * 0137 FIX: Fixed printer_pages... * 0587 FIX: if64: problems resolved when running as a clustered service... + * 0563 FIX: windows agent: now able to process perl scripts... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index df20359..d8cc2e4 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.cc b/agents/windows/check_mk_agent.cc index 7f1bd40..07ca693 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2461,6 +2461,11 @@ char *add_interpreter(char *path, char *newpath) snprintf(newpath, 256, "powershell.exe -NoLogo -ExecutionPolicy RemoteSigned \"& \'%s\'\"", path); return newpath; } + else if (!strcmp(path + strlen(path) - 3, ".pl")) { + // Perl scripts get perl.exe as interpreter + snprintf(newpath, 256, "perl.exe \"%s\"", path); + return newpath; + } else { snprintf(newpath, 256, "\"%s\"", path); return newpath; diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 9bd2a02..9cccad6 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 896a244..fb29884 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 2331b58..ebb6a2a 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

10 years, 7 months

Check_MK Git: check_mk: New rules based notifications

by Mathias Kettner

Module: check_mk Branch: master Commit: 3066033e3282a928fa01c5e46fd92939ac26ec97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3066033e3282a9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 3 14:23:05 2014 +0100 New rules based notifications Check_MK comes now with a completely new notification system called Rule Based Notifications. While keeping the flexibility of the Flexible Notifications it is easier to configure and at the same time even more flexible. Please refer to <a href="http://mathias-kettner.com/checkmk_rbn.html">the online documentation</a> for details. Rule based notifications are turned off per default. They do not harm you in any way as long as you do not enable them. If you turn them on then your current flexible notification settings are not being converted! --- .werks/711 | 16 ++ ChangeLog | 1 + doc/drafts/README.rule_based_notifications | 274 ---------------------------- 3 files changed, 17 insertions(+), 274 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3066033e32…

10 years, 7 months

Check_MK Git: check_mk: RBN: locking also inhibits change of parameterfs

by Mathias Kettner

Module: check_mk Branch: master Commit: 1c239455cecbf0ed80ecada3c2c844a2e4053589 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c239455cecbf0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 3 14:00:37 2014 +0100 RBN: locking also inhibits change of parameterfs --- modules/notify.py | 4 ++++ web/htdocs/wato.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index b4eeefd..482795f 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -864,6 +864,10 @@ def notify_rulebased(context, analyse=False): for contact in contacts: key = contact, plugin if key in notifications: + locked, method = notifications[key] + if locked and "contact" in rule: + notify_log(" - cannot modify notification of %s via %s: it is locked" % key) + continue notify_log(" - modifying notification of %s via %s" % key) else: notify_log(" - adding notification of %s via %s" % key) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 43846a9..8895efc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7632,13 +7632,13 @@ def vs_notification_rule(userid = None): style = "dropdown", elements = [ ListOfStrings( - title = _("Call this plugin with the following parameters"), + title = _("Call the script with the following parameters"), valuespec = TextUnicode(size = 24), orientation = "horizontal", ), FixedValue( value = None, - title = _("Cancel all previous notifications with the plugin"), + title = _("Cancel all previous notifications with this method"), totext = "", ), ]

10 years, 7 months

Check_MK Git: check_mk: Create a history entry for events that failed their target count

by Mathias Kettner

Module: check_mk Branch: master Commit: 95fbc4d11f426e950c99a362f08aa7dbda9452e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95fbc4d11f426e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 3 13:11:43 2014 +0100 Create a history entry for events that failed their target count When a counting rule sees the first matching message, then an entry in the history is logged with the type <tt>NEW</tt>. When the event did not reach the configured number of required message within the configured time then no history entry was logged. Now an entry of type <tt>COUNTFAILED</tt> is being logged and you can see the count of messages received so far in that entry. --- .werks/710 | 12 ++++++++++++ ChangeLog | 6 ++---- mkeventd/bin/mkeventd | 3 +++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.werks/710 b/.werks/710 new file mode 100644 index 0000000..b7dd48c --- /dev/null +++ b/.werks/710 @@ -0,0 +1,12 @@ +Title: Create a history entry for events that failed their target count +Level: 1 +Component: ec +Version: 1.2.5i1 +Date: 1393848610 +Class: feature + +When a counting rule sees the first matching message, then an entry in the history +is logged with the type <tt>NEW</tt>. When the event did not reach the configured +number of required message within the configured time then no history entry was +logged. Now an entry of type <tt>COUNTFAILED</tt> is being logged and you can see +the count of messages received so far in that entry. diff --git a/ChangeLog b/ChangeLog index 58dcab2..07491e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -190,12 +190,9 @@ * 0719 FIX: postfix_mailq: fix Linux agent in case of ssmtp being installed * 0584 FIX: agent_vsphere: special agent now handles non-standard https port correctly... * 0585 FIX: check_mk_agent.linux: more efficient handling of cups printer queues... -<<<<<<< HEAD - * 0587 FIX: if64: problems resolved when running as a clustered service... -======= * 0703 FIX: brocade_mlx: omit inventory of cpu and memory on more states... * 0137 FIX: Fixed printer_pages... ->>>>>>> 9a0fafc30f54e0e7f2af9ac1fa7a41136d2019d1 + * 0587 FIX: if64: problems resolved when running as a clustered service... Multisite: * 0371 Added log class filter to hostsvcevents view @@ -323,6 +320,7 @@ Event Console: * 0301 Handling messages of special syslog format correctly... * 0388 Moved Event Console related settings to own settings page... + * 0710 Create a history entry for events that failed their target count... * 0303 FIX: Old log entries were shown in event history first... * 0304 FIX: Escaping several unwanted chars from incoming log messages... * 0089 FIX: CSV export of event console was broken... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 5b87b74..b00f40f 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1187,11 +1187,14 @@ class EventServer: if event["count"] == 0: log("Rule %s, event %d: again without allowed rate, dropping event" % (rule["id"], event["id"])) + log_event_history(event, "COUNTFAILED") events_to_delete.append(nr) + else: # algorithm 'interval' if event["first"] + count["period"] <= now: # End of period reached log("Rule %s: reached only %d out of %d events within %d seconds. " "Resetting to zero." % (rule["id"], event["count"], count["count"], count["period"])) + log_event_history(event, "COUNTFAILED") events_to_delete.append(nr) # Handle delayed actions

10 years, 7 months

Check_MK Git: check_mk: RBN: new rule condition for matching WATO folders

by Mathias Kettner

Module: check_mk Branch: master Commit: 2102c7ed17d6a8a48f4094dad535bb04e0119ac0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2102c7ed17d6a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 3 11:31:58 2014 +0100 RBN: new rule condition for matching WATO folders --- modules/notify.py | 72 ++++++++++++++++++++++++++++++++++------------------ web/htdocs/wato.py | 20 ++++++++++++--- 2 files changed, 64 insertions(+), 28 deletions(-) diff --git a/modules/notify.py b/modules/notify.py index cf4a0bb..b4eeefd 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -872,39 +872,40 @@ def notify_rulebased(context, analyse=False): rule_info.append(("match", rule, "")) + plugin_info = [] + if not notifications: if num_rule_matches: notify_log("%d rules matched, but no notification has been created." % num_rule_matches) else: - if notification_fallback_email: + if notification_fallback_email and not analyse: notify_log("No rule matched, falling back to email to %s" % notification_fallback_email) contact = rbn_fake_email_contact(notification_fallback_email) rbn_add_contact_information(context, contact) call_notification_script("mail", [], context) - return - # Now do the actual notifications - plugin_info = [] - notify_log("Executing %d notifications:" % len(notifications)) - entries = notifications.items() - entries.sort() - for (contact, plugin), (locked, params) in entries: - if analyse: - verb = "would notify" - else: - verb = "notifying" - notify_log(" * %s %s via %s, parameters: %s" % (verb, contact, plugin, ", ".join(params))) - plugin_info.append((contact, plugin, params)) - try: - rbn_add_contact_information(context, contact) - if not analyse: - call_notification_script(plugin, params, context) - except Exception, e: - if opt_debug: - raise - fe = format_exception() - notify_log(" ERROR: %s" % e) - notify_log(fe) + else: + # Now do the actual notifications + notify_log("Executing %d notifications:" % len(notifications)) + entries = notifications.items() + entries.sort() + for (contact, plugin), (locked, params) in entries: + if analyse: + verb = "would notify" + else: + verb = "notifying" + notify_log(" * %s %s via %s, parameters: %s" % (verb, contact, plugin, ", ".join(params))) + plugin_info.append((contact, plugin, params)) + try: + rbn_add_contact_information(context, contact) + if not analyse: + call_notification_script(plugin, params, context) + except Exception, e: + if opt_debug: + raise + fe = format_exception() + notify_log(" ERROR: %s" % e) + notify_log(fe) analysis_info = rule_info, plugin_info return analysis_info @@ -982,6 +983,7 @@ def rbn_match_rule(rule, context): return "This rule is disabled" return \ + rbn_match_folder(rule, context) or \ rbn_match_hosttags(rule, context) or \ rbn_match_hosts(rule, context) or \ rbn_match_exclude_hosts(rule, context) or \ @@ -995,6 +997,28 @@ def rbn_match_rule(rule, context): rbn_match_host_event(rule, context) or \ rbn_match_service_event(rule, context) +def rbn_match_folder(rule, context): + if "match_folder" in rule: + mustfolder = rule["match_folder"] + mustpath = mustfolder.split("/") + hasfolder = None + for tag in context.get("HOSTTAGS", "").split(): + if tag.startswith("/wato/"): + hasfolder = tag[6:].rstrip("/") + haspath = hasfolder.split("/") + if mustpath == ["",]: + return # Match is on main folder, always OK + while mustpath: + if not haspath or mustpath[0] != haspath[0]: + return "The rule requires WATO folder '%s', but the host is in '%s'" % ( + mustfolder, hasfolder) + mustpath = mustpath[1:] + haspath = haspath[1:] + + if hasfolder == None: + return "The host is not managed via WATO, but the rule requires a WATO folder" + + def rbn_match_hosttags(rule, context): required = rule.get("match_hosttags") diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5d9dcb4..43846a9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7365,6 +7365,12 @@ def save_notification_rules(rules): file(root_dir + "notifications.mk", "w").write("notification_rules += %s\n" % pprint.pformat(rules)) +def FolderChoice(**kwargs): + kwargs["choices"] = folder_selection(g_root_folder) + kwargs.setdefault("title", _("Folder")) + return DropdownChoice(**kwargs) + + def vs_notification_rule(userid = None): if userid: contact_headers = [] @@ -7455,6 +7461,13 @@ def vs_notification_rule(userid = None): [ # Matching + ( "match_folder", + FolderChoice( + help = _("This condition makes the rule match only hosts that are managed " + "via WATO and that are contained in this folder - either directly " + "or in one of its subfolders."), + ), + ), ( "match_hosttags", HostTagCondition( title = _("Match Host Tags")) @@ -7633,8 +7646,8 @@ def vs_notification_rule(userid = None): ) ], - optional_keys = [ "match_hosttags", "match_hosts", "match_exclude_hosts", "match_services", "match_exclude_services", - "match_plugin_output", + optional_keys = [ "match_folder", "match_hosttags", "match_hosts", "match_exclude_hosts", + "match_services", "match_exclude_services", "match_plugin_output", "match_timeperiod", "match_escalation", "match_sl", "match_host_event", "match_service_event", "match_checktype", "contact_users", "contact_groups", "contact_emails" ], headers = [ @@ -7642,7 +7655,7 @@ def vs_notification_rule(userid = None): ( _("Notification Method"), [ "notify_plugin", "notify_method" ] ),] + contact_headers + [ - ( _("Conditions"), [ "match_hosttags", "match_hosts", "match_exclude_hosts", + ( _("Conditions"), [ "match_folder", "match_hosttags", "match_hosts", "match_exclude_hosts", "match_services", "match_exclude_services", "match_plugin_output", "match_checktype", "match_timeperiod", "match_escalation", "match_sl", "match_host_event", "match_service_event" ] ), @@ -12846,7 +12859,6 @@ def folder_selection(folder, depth=0): return sel - def create_rule(rulespec, hostname=None, item=NO_ITEM): new_rule = [] valuespec = rulespec["valuespec"]

10 years, 7 months

Check_MK Git: check_mk: fixed typo

by Andreas Boesl

Module: check_mk Branch: master Commit: 8c822f9393eafb34a6500a7a3c6d81d2c24a3dbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c822f9393eafb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Mar 3 11:20:33 2014 +0100 fixed typo --- web/htdocs/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index b68400d..934cbfa 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -671,7 +671,7 @@ def page_edit_view(): html.write(_("Reload page every ")) html.number_input("browser_reload", 0) html.write(_(" seconds")) - html.help(_("Leave this empty or at 0 for now automatic reload.")) + html.help(_("Leave this empty or at 0 for no automatic reload.")) forms.section(_("Audible alarm sounds"), simple=True) html.checkbox("play_sounds", False, label=_("Play alarm sounds"))

10 years, 7 months

Check_MK Git: check_mk: FIX if64: problems resolved when running as a clustered service

by Götz Golla

Module: check_mk Branch: master Commit: 830bfc4b5b5a8f7c299cc6ed212e45e5119e3d38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=830bfc4b5b5a8f… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Mar 3 11:13:55 2014 +0100 FIX if64: problems resolved when running as a clustered service When running as a clustered service counter warps may have been triggered without actual reason, leading to invalid unknown check results. This has been fixed. --- .werks/587 | 10 ++++++++++ ChangeLog | 3 ++- checks/if.include | 11 ++++++++--- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.werks/587 b/.werks/587 new file mode 100644 index 0000000..f0c616a --- /dev/null +++ b/.werks/587 @@ -0,0 +1,10 @@ +Title: if64: problems resolved when running as a clustered service +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1393841515 +Class: fix + +When running as a clustered service counter warps may have been triggered +without actual reason, leading to invalid unknown check results. This +has been fixed. diff --git a/ChangeLog b/ChangeLog index d6ac156..785b75f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,8 +93,8 @@ * 0556 esx_vsphere_counters.diskio: now also shows disk latency * 0583 stulz_pump: now monitors the pumps rpm in precent of maximum and gathers performance data * 0560 check_mk_agent.solaris: report statgrab_mem section if solaris_mem section is missing... - * 0586 rmon_stats: new snmp check to gather network traffic statistics on RMON enabled network interfaces * 0702 Rule for checking agents for wanted version... + * 0586 rmon_stats: new snmp check to gather network traffic statistics on RMON enabled network interfaces * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... @@ -187,6 +187,7 @@ * 0719 FIX: postfix_mailq: fix Linux agent in case of ssmtp being installed * 0584 FIX: agent_vsphere: special agent now handles non-standard https port correctly... * 0585 FIX: check_mk_agent.linux: more efficient handling of cups printer queues... + * 0587 FIX: if64: problems resolved when running as a clustered service... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/if.include b/checks/if.include index a915911..897fb12 100644 --- a/checks/if.include +++ b/checks/if.include @@ -501,9 +501,14 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, has_n ( "outerr", ifOutErrors, err_warn, err_crit, None, None) ]: try: - timedif, rate = get_counter("if.%s.%s" % (name, item), this_time, saveint(counter)) - if force_counter_wrap: - raise MKCounterWrapped("if.%s.%s" % (name, item), "Forced counter wrap") + if node == None: + timedif, rate = get_counter("if.%s.%s" % (name, item), this_time, saveint(counter)) + if force_counter_wrap: + raise MKCounterWrapped("if.%s.%s" % (name, item), "Forced counter wrap") + else: # clustered check needs one counter per variable, item AND NODE + timedif, rate = get_counter("if.%s.%s.%s" % (node, name, item), this_time, saveint(counter)) + if force_counter_wrap: + raise MKCounterWrapped("if.%s.%s.%s" % (node, name, item), "Forced counter wrap") rates.append(rate) perfdata.append( (name, rate, warn, crit, mmin, mmax) ) except MKCounterWrapped:

10 years, 7 months

Check_MK Git: check_mk: FIX Fix NoneType has not attribute userdb_automatic_sync bug in D-WATO

by Mathias Kettner

Module: check_mk Branch: master Commit: 9a0fafc30f54e0e7f2af9ac1fa7a41136d2019d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a0fafc30f54e0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 3 09:49:25 2014 +0100 FIX Fix NoneType has not attribute userdb_automatic_sync bug in D-WATO --- .werks/709 | 9 +++++++++ ChangeLog | 1 + web/plugins/wato/userdb.py | 13 ++++++++++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.werks/709 b/.werks/709 new file mode 100644 index 0000000..d50f91d --- /dev/null +++ b/.werks/709 @@ -0,0 +1,9 @@ +Title: Fix NoneType has not attribute userdb_automatic_sync bug in D-WATO +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1393836538 + + diff --git a/ChangeLog b/ChangeLog index da48fa2..649a992 100644 --- a/ChangeLog +++ b/ChangeLog @@ -297,6 +297,7 @@ * 0690 FIX: Fix language jumping to German when saving user profiles * 0666 FIX: Minimum port for the mknotifyd is now 1024 (never use well known ports)... * 0559 FIX: WATO snapshots: improved validation of (uploaded) snapshots... + * 0709 FIX: Fix NoneType has not attribute userdb_automatic_sync bug in D-WATO Notifications: * 0362 sms: now searching PATH for sendsms and smssend commands... diff --git a/web/plugins/wato/userdb.py b/web/plugins/wato/userdb.py index 43608fd..ff7a0ef 100644 --- a/web/plugins/wato/userdb.py +++ b/web/plugins/wato/userdb.py @@ -24,9 +24,16 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import userdb - def sync_pre_activate_changes(_unused): - if 'wato_pre_activate_changes' in config.userdb_automatic_sync: + # In some rare cases for still unknown reasons at this time the + # variable config sometimes has the value None. This could or could + # not be a mod_python problem. But it makes the activation of changes + # in a D-WATO setup break. So better handle this case here. + try: + do_sync = 'wato_pre_activate_changes' in config.userdb_automatic_sync + except: + do_sync = False + if do_sync: userdb.hook_sync() + api.register_hook('pre-activate-changes', sync_pre_activate_changes)

10 years, 7 months

Check_MK Git: check_mk: brocade_fcport: Now supporting interface speed of 16 Gbit (just discovered in the wild)

by Lars Michelsen

Module: check_mk Branch: master Commit: a65190c9c29293f32a34898bc22645ec25280b9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a65190c9c29293… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Mar 3 08:26:22 2014 +0100 brocade_fcport: Now supporting interface speed of 16 Gbit (just discovered in the wild) --- .bugs/2127 | 13 +++++++++++++ .werks/674 | 8 ++++++++ ChangeLog | 1 + checks/brocade_fcport | 6 +++++- 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/.bugs/2127 b/.bugs/2127 new file mode 100644 index 0000000..c1c411c --- /dev/null +++ b/.bugs/2127 @@ -0,0 +1,13 @@ +Title: EC-Check: Make check for hostname AND ipaddress match possible +Component: ec +State: open +Date: 2014-03-03 08:20:36 +Targetversion: 1.2.5i1 +Class: nastiness + +When e.g. receiving SNMP-traps, only the ipaddress is known in the event. The view resolves the ipaddress to existing +hostnames. As a result, the user thinks the "check event state in event console" check can check for events with matching +host name. But this is not true, since the event only has the ipaddress stored. + +Either add an option "hostname or ipaddress" to the ec-check or use livestatus to try to resolve ipaddres to hostnames +to make this easier to handle. diff --git a/.werks/674 b/.werks/674 new file mode 100644 index 0000000..d97e152 --- /dev/null +++ b/.werks/674 @@ -0,0 +1,8 @@ +Title: brocade_fcport: Now supporting interface speed of 16 Gbit (just discovered in the wild) +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1393831533 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index b273ac7..da48fa2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,7 @@ * 0586 rmon_stats: new snmp check to gather network traffic statistics on RMON enabled network interfaces * 0704 windows_os_bonding: new check for bonding interfaces on windows... * 0562 esx_vsphere_vm.guest_tools: new check to monitor guest tools status... + * 0674 brocade_fcport: Now supporting interface speed of 16 Gbit (just discovered in the wild) * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checks/brocade_fcport b/checks/brocade_fcport index 40078c7..c112e7a 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -25,11 +25,15 @@ # Boston, MA 02110-1301 USA. # lookup tables for check implementation +# Taken from swFCPortPhyState brocade_fcport_phystates = [ '', 'noCard', 'noTransceiver', 'laserFault', 'noLight', 'noSync', 'inSync', 'portFault', 'diagFault', 'lockRef' ] +# Taken from swFCPortOpStatus brocade_fcport_opstates = [ 'unknown', 'online', 'offline', 'testing', 'faulty' ] +# Taken from swFCPortAdmStatus brocade_fcport_admstates = [ '', 'online', 'offline', 'testing', 'faulty' ] -brocade_fcport_speed = [ 'unknown', '1Gbit', '2Gbit', 'auto-Neg', '4Gbit', '8Gbit', '10Gbit', ] +# Taken from swFCPortSpeed +brocade_fcport_speed = [ '', '1Gbit', '2Gbit', 'auto-Neg', '4Gbit', '8Gbit', '10Gbit', 'unknown', '16Gbit' ] # settings for inventory: which ports should be inventorized

10 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits