Checkmk git commits November 2012

checkmk-commits@lists.checkmk.com

3 participants
219 discussions

Check_MK Git: check_mk: Remove _() from internal filter code

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e953e94ce92c52d434c156d49e830cd83e186177 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e953e94ce92c52… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 6 13:37:57 2012 +0100 Remove _() from internal filter code --- web/plugins/views/filters.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 4fe3a1b..3415559 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -42,7 +42,7 @@ class FilterText(Filter): htmlvar = self.htmlvars[0] current_value = html.var(htmlvar) if current_value: - return _("Filter: %s %s %s\n") % (self.column, self.op, current_value) + return "Filter: %s %s %s\n" % (self.column, self.op, current_value) else: return ""

11 years, 7 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a966de2e570461560a1b4a829af7694c8c8a6c67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a966de2e570461… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Nov 7 09:38:43 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: Dashboard header can now be hidden by setting " title" to None

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 85211d3b3d7ead4072d0495b2b3d263fba730e95 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=85211d3b3d7ead… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 7 08:37:04 2012 +0100 Dashboard header can now be hidden by setting "title" to None --- ChangeLog | 1 + web/htdocs/dashboard.py | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b8ce60d..1ade945 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ * Dashboard globes can now be filtered by host_contact_group/service_contact_group * Dashboard "iframe" attribute can now be rendered dynamically using the "iframefunc" attribute in the dashlet declaration + * Dashboard header can now be hidden by setting "title" to None Livestatus: * Added new table statehist, used for SLA queries diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 2bb4e12..7aa0907 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -123,8 +123,16 @@ def render_dashboard(name): # in order to make it clear to the user, that he is seeing only partial # data. title = board["title"] - if wato_folder is not None: + + if title is None: + # If the title is none, hide the header line + html.set_render_headfoot(False) + header_height = 0 + title = '' + + elif wato_folder is not None: title = wato.api.get_folder_title(wato_folder) + " - " + title + html.header(title, javascripts=["dashboard"], stylesheets=["pages", "dashboard", "status", "views"]) html.write("<div id=dashboard class=\"dashboard_%s\">\n" % name) # Container of all dashlets

11 years, 7 months

Check_MK Git: check_mk: Fix: Changed pdu_gude from INT to FLOAT output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4944a849d88a65e38f1f615e3fc8967c3517cdd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4944a849d88a65… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Nov 5 17:15:16 2012 +0100 Fix: Changed pdu_gude from INT to FLOAT output --- checks/pdu_gude.include | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/pdu_gude.include b/checks/pdu_gude.include index 53f77f9..279b013 100644 --- a/checks/pdu_gude.include +++ b/checks/pdu_gude.include @@ -52,7 +52,7 @@ def check_pdu_gude(item, params, info): perf = [] state = 0 for pos, data in units.items(): - value = saveint(values[pos]) + value = savefloat(values[pos]) unit, div = data if div: value = value / div @@ -73,7 +73,7 @@ def check_pdu_gude(item, params, info): elif warn != None and value > warn: state = max(state, 1) label = "(!)" - message.append("%d%s%s" % (value, unit, label)) + message.append("%.2f%s%s" % (value, unit, label)) return(state, nagios_state_names[0] + " - " + ", ".join(message), perf)

11 years, 7 months

Check_MK Git: check_mk: Changed cisco_mem check to inventory all available memory pools.

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9915937b8bac2d04318f0ba2467e43f6a5c8150d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9915937b8bac2d… Author: Andreas Doehler <andreas.doehler(a)gmail.com> Date: Sun Nov 4 17:25:52 2012 +0100 Changed cisco_mem check to inventory all available memory pools. Signed-off-by: Andreas Doehler <andreas.doehler(a)gmail.com> --- checks/cisco_mem | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/checks/cisco_mem b/checks/cisco_mem index ec439e9..65e25a1 100644 --- a/checks/cisco_mem +++ b/checks/cisco_mem @@ -23,22 +23,23 @@ # License along with GNU Make; see the file COPYING. If not, write # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. - -# .1.3.6.1.4.1.9.9.48.1.1.1.7.1 ciscoMemoryPoolLargestFree CPU Pool -# .1.3.6.1.4.1.9.9.48.1.1.1.7.2 ciscoMemoryPoolLargestFree CPU Pool -# .1.3.6.1.4.1.9.9.48.1.1.1.6.1 ciscoMemoryPoolUsed I/0 Pool -# .1.3.6.1.4.1.9.9.48.1.1.1.6.2 ciscoMemoryPoolUsed I/0 Pool +# +# ciscoMemoryPoolName 1.3.6.1.4.1.9.9.48.1.1.1.2 +# ciscoMemoryPoolUsed 1.3.6.1.4.1.9.9.48.1.1.1.5 +# ciscoMemoryPoolFree 1.3.6.1.4.1.9.9.48.1.1.1.6 +# ciscoMemoryPoolLargestFree 1.3.6.1.4.1.9.9.48.1.1.1.7 +# cisco_mem_default_levels = (80.0, 90.0) -def check_cisco_mem(item, params, info): - if item == 'cpu': - mem_free = saveint(info[0][0]) - mem_used = saveint(info[0][1]) - elif item == 'io': - mem_free = saveint(info[0][2]) - mem_used = saveint(info[0][3]) +def inventory_cisco_mem(info): + return [ (line[0], "cisco_mem_default_levels") for line in info ] +def check_cisco_mem(item, params, info): + for line in info: + if line[0] == item: + mem_free = saveint(line[2]) + mem_used = saveint(line[1]) mem_total = mem_free + mem_used return check_cisco_mem_sub(params, mem_used, mem_total) @@ -69,11 +70,10 @@ def check_cisco_mem_sub(params, mem_used, mem_total): check_info["cisco_mem"] = { "check_function" : check_cisco_mem, - "inventory_function" : lambda info: [("cpu", "cisco_mem_default_levels"), ("io", "cisco_mem_default_levels")], - "service_description" : "Mem used %s pool", + "inventory_function" : inventory_cisco_mem, + "service_description" : "Mem used %s", "has_perfdata" : True, "group" : "memory", "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.9.9.48.1.1.1.6.1"), - "snmp_info" : ( ".1.3.6.1.4.1.9.9.48.1.1.1", [ 6.1, 6.2, 7.1, 7.2 ]), + "snmp_info" : ( ".1.3.6.1.4.1.9.9.48.1.1.1", [ "2", "5", "6", "7" ]), } -

11 years, 7 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1b47b5749c5f04e8547023d09466196efdc5e461 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b47b5749c5f04… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Nov 5 17:16:01 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: updated check_mk.example.ini with logfiles section

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: fd23888d4759adb655edc8ddfe4b444c5d76573f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd23888d4759ad… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 5 16:06:45 2012 +0100 updated check_mk.example.ini with logfiles section --- agents/windows/check_mk.example.ini | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk.example.ini b/agents/windows/check_mk.example.ini index 04c1059..dab8f1b 100644 --- a/agents/windows/check_mk.example.ini +++ b/agents/windows/check_mk.example.ini @@ -21,6 +21,22 @@ # are needed by checks shipped with check_mk. # counters = 10332:msx_queues + +[logfiles] + # Define textfiles to be monitored, separated by | + textfile = C:\tmp logfiles\message_*.log | D:\log\sample.txt + # Set patterns for defined textfiles + ok = Successfully logged in* + crit = Error in* + warning = Unable to contact* + ignore = Backup * saved + + # Define additional textfiles with different patterns + textfile = C:\tmp\memo.udf + # Set patterns for defined textfile + warning = *overdue* + ok = *mail sent* + [logwatch] # Testing: output *all* messages from the eventlogs # sendall = yes

11 years, 7 months

Check_MK Git: check_mk: Added pnp Template for apc_symetra_power

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4e75df2d4a1c80ebe6e23e23a034b855b7ae348a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e75df2d4a1c80… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Nov 5 14:53:18 2012 +0100 Added pnp Template for apc_symetra_power --- pnp-templates/check_mk-apc_symmetra_power.php | 39 +++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/pnp-templates/check_mk-apc_symmetra_power.php b/pnp-templates/check_mk-apc_symmetra_power.php new file mode 100644 index 0000000..63b2c8b --- /dev/null +++ b/pnp-templates/check_mk-apc_symmetra_power.php @@ -0,0 +1,39 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + +$opt[1] = "--vertical-label \"Watt\" -l 0 -u 60 --title \"Current Power\" "; + + +$def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX "; +$def[1] .= "AREA:var1#800040:\"Power\:\" "; +$def[1] .= "GPRINT:var1:LAST:\"%2.0lfW\" "; +$def[1] .= "LINE1:var1#800040:\"\" "; +$def[1] .= "GPRINT:var1:MAX:\"(Max\: %2.0lfW,\" "; +$def[1] .= "GPRINT:var1:AVERAGE:\"Avg\: %2.0lfW)\" "; +$def[1] .= "HRULE:$CRIT[1]#FF0000:\"Critical\: $CRIT[1]W\" "; + + + +?>

11 years, 7 months

Check_MK Git: check_mk: Added new perfometer for ups_capacity

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e8d82e780314a70cedacabed3c08615a80438a69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8d82e780314a7… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Nov 2 10:08:42 2012 +0100 Added new perfometer for ups_capacity --- checks/ups_capacity | 4 +++- web/plugins/perfometer/check_mk.py | 14 ++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/checks/ups_capacity b/checks/ups_capacity index 2b7c193..1ae2480 100644 --- a/checks/ups_capacity +++ b/checks/ups_capacity @@ -57,8 +57,10 @@ def check_ups_capacity(item, params, info): time_on_bat, minutes_left, percent_fuel = map(int, info[0]) perf = [ - ('capacity', minutes_left) + ('capacity', minutes_left, warn, crit), + ('percent', percent_fuel), ] + info_text = "remaining capacity %d minutes (%d%%)" % (minutes_left, percent_fuel) if time_on_bat > crit: return(2, "CRIT - On battery since %ds(!!) " % time_on_bat + info_text, perf) diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 7332e2a..a36cbb3 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -592,14 +592,12 @@ def perfometer_carel_uniflair_cooling(row, check_command, perf_data): perfometers['check_mk-carel_uniflair_cooling'] = perfometer_carel_uniflair_cooling def perfometer_eaton(row, command, perf): - h = "<table><tr>" - vname, wert, einheit, warn, crit, minw, maxw = perf[0] - - h += perfometer_td(int(wert), "silver") - diff = 100 - int(wert) - h += perfometer_td(diff, "white") - h += "</tr></table>" - return u"%s°C" % wert, h + return u"%s°C" % str(perf[0][1]), perfometer_linear(float(perf[0][1]), 'silver') perfometers['check_mk-ups_eaton_enviroment'] = perfometer_eaton + +def perfometer_ups_capacity(row, command, perf): + return "%0.2f%%" % float(perf[1][1]), perfometer_linear(float(perf[1][1]), '#B2FF7F') + +perfometers['check_mk-ups_capacity'] = perfometer_ups_capacity

11 years, 7 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 31ae02d0519b8185babd44252e91b9e8bef96c59 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=31ae02d0519b81… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Nov 2 10:09:02 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2012