Checkmk git commits July 2012

checkmk-commits@lists.checkmk.com

1 participants
183 discussions

Check_MK Git: check_mk: Updated bug entries #0785

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 29b9f915ff7403ac4a7b76f7a1b62d9f11c6a0ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29b9f915ff7403… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 26 16:07:19 2012 +0200 Updated bug entries #0785 --- .bugs/785 | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/.bugs/785 b/.bugs/785 new file mode 100644 index 0000000..1eeeb79 --- /dev/null +++ b/.bugs/785 @@ -0,0 +1,16 @@ +Title: FOREACH_SERVICE in a leaf node does not work for direct host/services +Component: bi +State: open +Date: 2012-07-26 16:05:16 +Targetversion: 1.2.0 +Class: bug + +If you use FOREACH_SERVICE within an inner node then you cannot +directly add leaf nodes. The following produces an error: + +aggregation_rules[...] = ( + ... + [ + ( FOREACH_SERVICE, ALL_HOSTS, ".*", "$1$", HOST_STATE ), + ] +)

12 years, 2 months

Check_MK Git: check_mk: Added checks for fortigate Firewall

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8dbfe6a6ae57857d924cff35b3c481e29d059002 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8dbfe6a6ae5785… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 25 05:42:02 2012 +0200 Added checks for fortigate Firewall --- ChangeLog | 1 + checks/fortigate_cpu | 57 +++++++++++++++++++++++++++++++++++++++++++++ checks/fortigate_memory | 53 +++++++++++++++++++++++++++++++++++++++++ checks/fortigate_sessions | 52 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 163 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7effd3..82de0c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Checks & Agents: * mssql_backup: Fixed problems with datetime/timezone calculations * New Checks for Siemens Blades (BX600) + * New Checks for Fortigate Firewalls WATO: * FIX: remove line about number of rules in rule set overview diff --git a/checks/fortigate_cpu b/checks/fortigate_cpu new file mode 100644 index 0000000..9813c27 --- /dev/null +++ b/checks/fortigate_cpu @@ -0,0 +1,57 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + +fortigate_cpu_default_levels = (80.0, 90.0) + +def check_fortigate_cpu(item, params, info): + num_cpus = 0 + util = 0 + for line in info: + util += int(line[0]) + num_cpus += 1 + if num_cpus == 0: + return (3, "UNKNOWN - no data found in SNMP output") + util = float(util) / num_cpus + infotext = " - %2.1f%% utilization at %d CPUs" % (util, num_cpus) + warn, crit = params + perfdata = [("util", util, warn, crit, 0, 100)] + if util >= crit: + return (2, "CRIT" + infotext + " (critical at %d%%)" % crit, perfdata) + elif util >= warn: + return (1, "WARN" + infotext + " (warning at %d%%)" % warn, perfdata) + else: + return (0, "OK" + infotext, perfdata) + +check_info["fortigate_cpu"] = { + "check_function" : check_fortigate_cpu, + "inventory_function" : lambda info: [(None, "fortigate_cpu_default_levels")], + "service_description" : "CPU utilization", + "has_perfdata" : True, + "group" : "cpu_utilization", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.12356.1.8.0"), + "snmp_info" : ( ".1.3.6.1.4.1.12356.1", [ 8 ]), +} + diff --git a/checks/fortigate_memory b/checks/fortigate_memory new file mode 100644 index 0000000..81d6ac0 --- /dev/null +++ b/checks/fortigate_memory @@ -0,0 +1,53 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + +fortigate_memory_default_levels = (70, 80) + +def check_fortigate_memory(item, params, info): + warn, crit = params + current = saveint(info[0][0]) + state = 0 + icon = '' + if current >= warn: + state = 1 + icon = "(!)" + if current >= crit: + state = 2 + icon = "(!!)" + + perf = [("mem_usage", current, warn, crit)] + return(state, nagios_state_names[state] + " - %d%%%s (levels at %d/%d percent)" % (current, icon, warn, crit), perf) + +check_info["fortigate_memory"] = { + "check_function" : check_fortigate_memory, + "inventory_function" : lambda info: [(None, "fortigate_memory_default_levels")], + "service_description" : "Memory usage", + "has_perfdata" : True, + "group" : "memory", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.12356.1.9.0"), + "snmp_info" : ( ".1.3.6.1.4.1.12356.1", [ 9 ]), +} + diff --git a/checks/fortigate_sessions b/checks/fortigate_sessions new file mode 100644 index 0000000..31f7a6d --- /dev/null +++ b/checks/fortigate_sessions @@ -0,0 +1,52 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + +fortigate_sessions_default_levels = (100000, 150000) + +def check_fortigate_sessions(item, params, info): + warn, crit = params + current = saveint(info[0][0]) + state = 0 + icon = '' + if current >= warn: + state = 1 + icon = "(!)" + if current >= crit: + state = 2 + icon = "(!!)" + + perf = [("session", current, warn, crit)] + return(state, nagios_state_names[state] + " - %d Session%s (levels at %d/%d)" % (current, icon, warn, crit), perf) + +check_info["fortigate_sessions"] = { + "check_function" : check_fortigate_sessions, + "inventory_function" : lambda info: [(None, "fortigate_sessions_default_levels")], + "service_description" : "Sessions", + "has_perfdata" : True, + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.12356.1.10.0"), + "snmp_info" : ( ".1.3.6.1.4.1.12356.1", [ 10 ]), +} +

12 years, 2 months

Check_MK Git: check_mk: solved merge conflict

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c5776e8b8c236763959cac3bc602d80b5c42f195 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5776e8b8c2367… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Jul 25 15:28:57 2012 +0200 solved merge conflict ---

12 years, 2 months

Check_MK Git: check_mk: Fix default value of VS CascadingDropdown

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b37d969852c98093c019f72f8b2aecfe90e8f543 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b37d969852c980… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 25 14:54:41 2012 +0200 Fix default value of VS CascadingDropdown --- web/htdocs/valuespec.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 65a67db..bcb9242 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -857,6 +857,15 @@ class CascadingDropdown(ValueSpec): else: return self._choices[0][0] + def default_value(self): + try: + return self._default_value + except: + if self._choices[0][2]: + return (self._choices[0][0], self._choices[0][2].default_value()) + else: + return self._choices[0][0] + def render_input(self, varprefix, value): def_val = '0' options = []

12 years, 2 months

Check_MK Git: check_mk: Fix visibility of checkboxed form sections

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 696e213c552cf1c526c8d042817e66bf36c9f709 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=696e213c552cf1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 25 14:54:29 2012 +0200 Fix visibility of checkboxed form sections --- web/htdocs/htmllib.py | 6 ++++++ web/htdocs/valuespec.py | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 42571f7..a5b6cd6 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -470,6 +470,12 @@ class html: def number_input(self, varname, deflt = "", size=8, style=""): self.text_input(varname, str(deflt), "number", size=size, style=style) + + # Needed if input elements are put into forms without the helper + # functions of us. + def add_form_var(self, varname): + self.form_vars.append(varname) + def text_input(self, varname, default_value = "", cssclass = "text", label = None, id = None, **args): if default_value == None: default_value = "" diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 4c85365..65a67db 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1757,6 +1757,7 @@ class Dictionary(ValueSpec): onclick = "valuespec_toggle_option(this, %r)" % div_id checkbox_code = '<input type=checkbox name="%s" %s onclick="%s">' % ( vp + "_USE", visible and "CHECKED" or "", onclick) + html.add_form_var(vp + "_USE") forms.section(vs.title(), checkbox=checkbox_code) else: visible = True

12 years, 2 months

Check_MK Git: check_mk: New URL field for rules

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3a97f1f4a4c4b655180e3f2f9b9cdcae8faf6b96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a97f1f4a4c4b6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 23 18:11:53 2012 +0200 New URL field for rules --- ChangeLog | 5 +++-- web/htdocs/images/button_url_hi.png | Bin 0 -> 4467 bytes web/htdocs/images/button_url_lo.png | Bin 0 -> 5597 bytes web/htdocs/wato.py | 19 +++++++++++++++++-- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0bac8de..114b83c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,8 +26,9 @@ permissions of roles * FIX: remove line about number of rules in rule set overview (that garbled the logical layout) - * Rules now have an optional comment and can be disabled without - deleting them. + * Rules now have an optional comment and an URL for linking to + documntation + * Rule now can be disabled without deleting them. * Added new hook "sites-saved" * Allow @ in user names (needed for some Kerberos setups) * Implemented new option in WATO attributes: editable diff --git a/web/htdocs/images/button_url_hi.png b/web/htdocs/images/button_url_hi.png new file mode 100644 index 0000000..6fe94ac Binary files /dev/null and b/web/htdocs/images/button_url_hi.png differ diff --git a/web/htdocs/images/button_url_lo.png b/web/htdocs/images/button_url_lo.png new file mode 100644 index 0000000..b5f28c4 Binary files /dev/null and b/web/htdocs/images/button_url_lo.png differ diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3adb100..1050e3f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9286,9 +9286,19 @@ vs_rule_options = Dictionary( title = _("Comment"), help = _("An optional comment that helps you documenting the purpose of " "this rule"), - size = 64, + size = 80, ) ), + ( "docu_url", + TextAscii( + title = _("Docu-URL"), + help = _("An optional URL pointing to documentation or any other page. This will be displayed " + "as an icon <img class=icon src='images/icon_url.png'> and open a new page when clicked. " + "You can use either global URLs (beginning with <tt>http://</tt>), absolute local urls " + "(beginning with <tt>/</tt>) or relative URLs (that are relative to <tt>check_mk/</tt>)."), + size = 80, + ), + ), ( "disabled", Checkbox( title = _("Rule activation"), @@ -9739,7 +9749,12 @@ def mode_edit_ruleset(phase): html.write("</td>") # Comment - html.write('<td>%s</td>' % rule_options.get("comment", "")) + html.write('<td>') + url = rule_options.get("docu_url") + if url: + html.icon_button(url, _("Context information about this rule"), "url", target="_blank") + html.write(rule_options.get("comment", "")) + html.write('</td>') # Folder

12 years, 2 months

Check_MK Git: check_mk: FIX: fixed bug showing only sidebar after re-login in multisite

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 406d78571cdcad3191efd5894f01bdc1f0228fe8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=406d78571cdcad… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 23 08:44:58 2012 +0200 FIX: fixed bug showing only sidebar after re-login in multisite --- ChangeLog | 1 + web/htdocs/login.py | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c0df5de..0bac8de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,7 @@ * FIX: fixed localization of general permissions * FIX: show multisite warning messages even after page reload * FIX: fix bug in Age ValueSpec: days had been ignored + * FIX: fixed bug showing only sidebar after re-login in multisite Livecheck: * FIX: Compile livecheck also if diet libc is missing diff --git a/web/htdocs/login.py b/web/htdocs/login.py index b75bf55..aff6fa1 100644 --- a/web/htdocs/login.py +++ b/web/htdocs/login.py @@ -223,6 +223,13 @@ def normal_login_page(called_directly = True): if not origtarget and not html.req.myfile == 'login': origtarget = html.makeuri([]) + # When e.g. the password of a user is changed and the first frame that recognizes the + # non matching cookies is the sidebar it redirects the user to side.py while removing + # the frameset. This is not good. Instead of this redirect the user to the index page. + if html.req.myfile == 'side': + html.immediate_browser_redirect(0.1, 'index.py') + return apache.OK + # Never allow the login page to be opened in a frameset. Redirect top page to login page. # This will result in a full screen login page. html.javascript('''if(top != self) { @@ -232,7 +239,7 @@ def normal_login_page(called_directly = True): # When someone calls the login page directly and is already authed redirect to main page if html.req.myfile == 'login' and check_auth() != '': html.immediate_browser_redirect(0.5, origtarget and origtarget or 'index.py') - return + return apache.OK html.write("<div id=login>") html.write("<img id=login_window src=\"images/login_window.png\">")

12 years, 2 months

Check_MK Git: check_mk: mssql agent: Added WMI code to be able to monitor MSSQL version 9

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1c1943b7846816dfe8c7f7c31226795b59daec1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c1943b7846816… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 23 08:23:43 2012 +0200 mssql agent: Added WMI code to be able to monitor MSSQL version 9 --- agents/windows/plugins/mssql.vbs | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index faceb6f..7e12135 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -27,7 +27,23 @@ Dim WMI, prop, instId, instVersion, instIds, instName Set instIds = CreateObject("Scripting.Dictionary") ' Loop all found local MSSQL server instances +' Try different trees to handle different versions of MSSQL +On Error Resume Next +' MSSQL >= 10 Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement10") +If Err.Number <> 0 Then + Err.Clear() + + ' MSSQL < 10 + Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement") + If Err.Number <> 0 Then + wscript.echo "Error: " & Err.Number & " " & Err.Description + Err.Clear() + wscript.quit() + End If +End If +On Error Goto 0 + For Each prop In WMI.ExecQuery("SELECT * FROM SqlServiceAdvancedProperty WHERE " & _ "SQLServiceType = 1 AND PropertyName = 'VERSION'")

12 years, 2 months

Check_MK Git: check_mk: Updated changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 60cb274bfca04752c76a121eac1e41d8bc4f2441 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60cb274bfca047… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 23 08:24:56 2012 +0200 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2cb0e6..bb96457 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ * mysql_capacity: cleaned up check, levels are in MB now * jolokia_info, jolokia_metrics: new rewritten checks for jolokia (formerly jmx4perl). You need the new plugin mk_jokokia for using them + * FIX: mssql agent: Added compatibility code for MSSQL 9 WATO: * Added permission to control the "clone host" feature in WATO

12 years, 2 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: d7b33be067c8393ca8461d689bdf8437edb9aef6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7b33be067c839… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 23 08:25:36 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

12 years, 2 months

← Newer
1
2
3
4
5
6
7
8
9
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2012