Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64356 discussions

Check_MK Git: check_mk: New implementatin of J4P Monitoring in doc/ treasures

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 74e2a5fae80fd0efa1341f08e0ddef9846dbb32d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74e2a5fae80fd0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 12 16:28:15 2012 +0200 New implementatin of J4P Monitoring in doc/treasures Still under development --- doc/treasures/j4p_new/checks/j4p_performance | 286 +++++++++++++++++++++++++ doc/treasures/j4p_new/plugins/j4p_performance | 196 +++++++++++++++++ 2 files changed, 482 insertions(+), 0 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=74e2a5fae8…

12 years, 3 months

Check_MK Git: check_mk: Fix text output in j4p memory check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: aa7d6f31d227b2c70a293c518757a9a782d775dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa7d6f31d227b2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 12 13:15:30 2012 +0200 Fix text output in j4p memory check --- checks/j4p_performance | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/j4p_performance b/checks/j4p_performance index 70173ae..5188d6a 100644 --- a/checks/j4p_performance +++ b/checks/j4p_performance @@ -122,7 +122,7 @@ def check_j4p_performance_mem(item, params, info): total = heap + non_heap perfdata = [ ("heap", heap, warn, crit), ("nonheap", non_heap, warn, crit) ] - infotext = "%.0f MB total (%.0f heap, %.0f MB non-heap), levels at %.0f/%.0f" % (total, heap, non_heap, warn, crit) + infotext = "%.0f MB total (%.0f MB heap, %.0f MB non-heap), levels at %.0f/%.0f" % (total, heap, non_heap, warn, crit) if total >= crit: return (2, "CRIT - " + infotext, perfdata) elif total >= warn:

12 years, 3 months

Check_MK Git: check_mk: if_lancom: silently ignore Logical and Point-To-Point interfaces

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cfe41ae9a66dfd494ca11a01fd6ec6acb6934d3b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cfe41ae9a66dfd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 12 10:15:04 2012 +0200 if_lancom: silently ignore Logical and Point-To-Point interfaces --- ChangeLog | 3 +++ checks/if_lancom | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index dd8d452..e27dff7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.0p2: + Checks & Agents: + * if_lancom: silently ignore Logical and Point-To-Point interfaces + Multisite: * Show number of rows and number of selected rows in header line (also for WATO hosts table) diff --git a/checks/if_lancom b/checks/if_lancom index ed84c5d..cf1634d 100644 --- a/checks/if_lancom +++ b/checks/if_lancom @@ -29,11 +29,23 @@ def fix_if_64_highspeed(info): if type(line[3]) == str: # not yet converted line[3] = saveint(line[3]) * 1000000 +def if_lancom_strip_logical(info): + new_info = [] + for line in info: + if line[-1].startswith("Logical Network") or \ + line[-1].startswith("Point-2-Point"): + continue + else: + new_info.append(line[:-1]) + return new_info + def inventory_if_lancom(info): + info = if_lancom_strip_logical(info) fix_if_64_highspeed(info) return inventory_if_common(info) def check_if_lancom(item, params, info): + info = if_lancom_strip_logical(info) fix_if_64_highspeed(info) return check_if_common(item, params, info) @@ -45,7 +57,6 @@ check_default_levels['if_lancom'] = "if_default_levels" snmp_info['if_lancom'] = \ ( ".1.3.6.1.2.1", [ "2.2.1.1", # ifIndex 0 - # "2.2.1.2", # ifDescr 1 "31.1.1.1.1", # ifName (LANCOM has no useful information if Descr) "2.2.1.3", # ifType 2 "31.1.1.1.15", # ifHighSpeed .. 1000 means 1GBit @@ -65,6 +76,8 @@ snmp_info['if_lancom'] = \ "2.2.1.21", # ifOutQLen 17 "31.1.1.1.18", # ifAlias 18 "2.2.1.6", # ifPhysAddress 19 + # Used in order to ignore some logical NICs + "2.2.1.2", # ifDescr 1 ] ) # check if number of network interfaces (IF-MIB::ifNumber.0) is at least 2

12 years, 3 months

Check_MK Git: check_mk: Make WATO rule for CPU util work for Windows CPU util

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 03cdfb1c6fca84bf156e07cafd1717025c0de948 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03cdfb1c6fca84… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 12 10:03:52 2012 +0200 Make WATO rule for CPU util work for Windows CPU util --- checks/winperf_processor | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/checks/winperf_processor b/checks/winperf_processor index 18cee0b..44761fc 100644 --- a/checks/winperf_processor +++ b/checks/winperf_processor @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. -winperf_cpu_default_levels = ( 101, 101 ) +winperf_cpu_default_levels = ( 101.0, 101.0 ) def inventory_winperf_util(info): if len(info) <= 1: @@ -77,3 +77,4 @@ def check_winperf_util(item, params, info): return (3, "UNKNOWN - counter for CPU (6) not found") check_info['winperf_processor.util'] = (check_winperf_util, "CPU utilization", 1, inventory_winperf_util) +checkgroup_of['winperf_processor.util'] = "cpu_utilization"

12 years, 3 months

Check_MK Git: check_mk: FIX: add missing context help to host details dialog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d7714d9056bfae8f852f1770874424083ab13e76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d7714d9056bfae… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 11 16:12:29 2012 +0200 FIX: add missing context help to host details dialog --- ChangeLog | 1 + web/htdocs/wato.py | 10 +--------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index a752071..dd8d452 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * Main menu of ruleeditor (Host & Service Parameters) now has a topic for "Used rules" - a short overview of all non-empty rulesets. + * FIX: add missing context help to host details dialog 1.2.0p1: Core: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e144771..52184dc 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4740,14 +4740,6 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute else: # "host" active = attrname in host - # Legend and Help - # html.write('<tr id="attr_%s" %s><td class=legend>' % (attrname, hide_attribute and 'style="display: none"' or "")) - # html.write("<b>%s</b>" % attr.title()) - # html.help(attr.help()) - # html.write("</td>") - - - # html.write('<td class=checkbox>') if force_entry: checkbox_code = '<input type=checkbox name="ignored_%s" CHECKED DISABLED>' % checkbox_name checkbox_code += '<input type=hidden name="%s" value="on">' % checkbox_name @@ -4756,7 +4748,7 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute checkbox_code = '<input type=checkbox name="%s" %s onclick="%s">' % ( checkbox_name, active and "CHECKED" or "", onclick) forms.section(attr.title(), checkbox=checkbox_code, id="attr_" + attrname) - # html.write("</td>") + html.help(attr.help()) # Now comes the input fields and the inherited / default values # as two DIV elements, one of which is visible at one time.

12 years, 3 months

Check_MK Git: check_mk: Added missing icon

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 166e3ce65acfe4269d92230af1999397b8d28444 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=166e3ce65acfe4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 11 16:14:05 2012 +0200 Added missing icon --- web/htdocs/images/icon_usedrulesets.png | Bin 0 -> 2704 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_usedrulesets.png b/web/htdocs/images/icon_usedrulesets.png new file mode 100644 index 0000000..099c51f Binary files /dev/null and b/web/htdocs/images/icon_usedrulesets.png differ

12 years, 3 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: 675bc2c0047ea70cec02293e1a8a69d518f7c8a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=675bc2c0047ea7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 12 09:08:01 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: WATO: overview of all used rulesets

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a678ee4c6caa7e1e6f6f9edc3eb7ec85d0ab68c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a678ee4c6caa7e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 11 14:25:33 2012 +0200 WATO: overview of all used rulesets --- ChangeLog | 5 +++++ web/htdocs/pages.css | 3 +++ web/htdocs/wato.css | 4 +++- web/htdocs/wato.py | 48 +++++++++++++++++++++++++++++++++++------------- 4 files changed, 46 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8fd0cd4..a752071 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,11 @@ * Show number of rows and number of selected rows in header line (also for WATO hosts table) + WATO: + * Main menu of ruleeditor (Host & Service Parameters) now has + a topic for "Used rules" - a short overview of all non-empty + rulesets. + 1.2.0p1: Core: * Added macros $DATE$, $SHORTDATETIME$ and $LONGDATETIME$' to diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 2b0f2e7..501ef80 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -211,6 +211,9 @@ div.contextlink a { display: block; width: 158px; height: 25px; + text-overflow: ellipsis; + max-width: 158px; + overflow: hidden; } /* Icon image in a context button */ diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 7c53388..9a8ab58 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -621,8 +621,10 @@ form#form_timeperiod td.vlof_content { /* main menu */ .wato div.mainmenu { - background-color: red; + display: table-cell; + margin-bottom: 10px; } + .wato div.mainmenu a { width: 317px; height: 76px; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3eed116..e144771 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9210,19 +9210,32 @@ def mode_ruleeditor(phase): if main_group not in groupnames: groupnames.append(main_group) menu = [] - for groupname in groupnames: + for groupname in groupnames + ["used"]: url = make_link([("mode", "rulesets"), ("group", groupname), ("host", only_host), ("local", only_local)]) - title, help = g_rulegroups.get(groupname, (groupname, "")) + if groupname == "used": + title = _("Used Rulesets") + help = _("Show only modified rulesets<br>(all rulesets with at least one rule)") + icon = "usedrulesets" + else: + title, help = g_rulegroups.get(groupname, (groupname, "")) + icon = "rulesets" help = help.split('\n')[0] # Take only first line as button text - menu.append((url, title, "rulesets", "rulesets", help)) + menu.append((url, title, icon, "rulesets", help)) render_main_menu(menu) def mode_rulesets(phase): group = html.var("group") # obligatory - title, help = g_rulegroups.get(group, (group, None)) + if group == "used": + title = _("Used Rulesets") + help = _("Non-empty rulesets") + only_used = True + else: + title, help = g_rulegroups.get(group, (group, None)) + only_used = False + only_host = html.var("host", "") only_local = "" # html.var("local") @@ -9264,18 +9277,20 @@ def mode_rulesets(phase): all_rulesets[varname] += [ (g_folder, rule) for rule in rules ] else: all_rulesets = load_all_rulesets() + if only_used: + all_rulesets = dict([ r for r in all_rulesets.items() if len(r[1]) > 0 ]) # Select matching rule groups while keeping their configured order groupnames = [ gn for gn, rulesets in g_rulespec_groups - if gn == group or gn.startswith(group + "/") ] + if only_used or gn == group or gn.startswith(group + "/") ] do_folding = len(groupnames) > 1 something_shown = False html.write('<div class=rulesets>') # Loop over all ruleset groups + title_shown = False for groupname in groupnames: # Show information about a ruleset - title_shown = False # Sort rulesets according to their title g_rulespec_group[groupname].sort( cmp = lambda a, b: cmp(a["title"], b["title"])) @@ -9285,7 +9300,7 @@ def mode_rulesets(phase): valuespec = rulespec["valuespec"] rules = all_rulesets.get(varname, []) num_rules = len(rules) - if num_rules == 0 and only_local: + if num_rules == 0 and (only_used or only_local): continue # Handle case where a host is specified @@ -9303,14 +9318,18 @@ def mode_rulesets(phase): if only_local and num_local_rules == 0: continue - if not title_shown: + if only_used: + titlename = g_rulegroups[groupname.split("/")[0]][0] + else: if '/' in groupname: - subgroupname = groupname.split("/", 1)[1] + titlename = groupname.split("/", 1)[1] else: - subgroupname = title - forms.header(subgroupname) + titlename = title + + if title_shown != titlename: + forms.header(titlename) forms.container() - title_shown = True + title_shown = titlename something_shown = True @@ -9395,8 +9414,11 @@ def mode_edit_ruleset(phase): elif phase == "buttons": global_buttons() group = rulespec["group"].split("/")[0] - html.context_button(_("All rulesets"), + groupname = g_rulegroups[group][0] + html.context_button(groupname, make_link([("mode", "rulesets"), ("group", group), ("host", hostname)]), "back") + html.context_button(_("Used Rulesets"), + make_link([("mode", "rulesets"), ("group", "used"), ("host", hostname)]), "usedrulesets") if hostname: html.context_button(_("Services"), make_link([("mode", "inventory"), ("host", hostname)]), "back")

12 years, 3 months

Check_MK Git: check_mk: MK MySQL change shell

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7267e02342bb7f96d1342536a8bafbc6940854ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7267e02342bb7f… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Sun Jun 10 22:51:42 2012 +0200 MK MySQL change shell --- agents/plugins/mk_mysql | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/agents/plugins/mk_mysql b/agents/plugins/mk_mysql index 39fecf1..e634149 100755 --- a/agents/plugins/mk_mysql +++ b/agents/plugins/mk_mysql @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/bin/bash # -*- encoding: utf-8; py-indent-offset: 4 -*- # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ |

12 years, 3 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: 9eeeaa44d5b53d3b00ad6ee68a952823f5d14833 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9eeeaa44d5b53d… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Mon Jun 11 09:57:40 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits