Checkmk git commits May 2011

checkmk-commits@lists.checkmk.com

2 participants
134 discussions

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 17090cb7278f419ec0636f79bfe2edd847493a32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17090cb7278f41… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 12 13:41:36 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 1 month

Check_MK Git: check_mk: FIX: Added host_is_active and host_is_flapping columns for NagStaMon views

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 02512f65828c0419b7f8f8229b3bdd91f3df93f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02512f65828c04… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 12 13:42:26 2011 +0200 FIX: Added host_is_active and host_is_flapping columns for NagStaMon views Conflicts: ChangeLog --- ChangeLog | 1 + web/plugins/views/builtin.py | 4 +++- web/plugins/views/painters.py | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf08f7d..b45dceb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ * FIX: Fixed handling of embedded graphs to support the changes made to * FIX: avoid duplicate import of plugins in OMD local installation the PNP webservice + * FIX: Added host_is_active and host_is_flapping columns for NagStaMon views * Added snmp_uptime, uptime and printer_supply perfometers * Allow for displaying service data in host tables * View editor foldable states are now permament per user diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 9fff76e..57cb3ea 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -1845,7 +1845,9 @@ multisite_builtin_views = { ('host_address', None, ''), ('host_in_downtime', None, ''), ('host_acknowledged', None, ''), - ('sitename_plain', None, '')], + ('sitename_plain', None, ''), + ('host_flapping', None, ''), + ('host_is_active', None, ''),], 'play_sounds': False, 'public': True, 'show_filters': ['host_scheduled_downtime_depth', diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 60ad7f6..ca21054 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -834,6 +834,20 @@ multisite_painters["host_notifper"] = { "paint" : lambda row: (None, row["host_notification_period"]) } +multisite_painters["host_flapping"] = { + "title" : "Host is flapping", + "short" : "Flap", + "columns" : [ "host_is_flapping" ], + "paint" : lambda row: paint_nagiosflag(row, "host_is_flapping", True) +} + +multisite_painters["host_is_active"] = { + "title" : "Host is active", + "short" : "Active", + "columns" : [ "host_active_checks_enabled" ], + "paint" : lambda row: paint_nagiosflag(row, "host_active_checks_enabled", None) +} + multisite_painters["host_pnpgraph" ] = { "title" : "PNP host graph", "short" : "PNP graph",

13 years, 1 month

Check_MK Git: check_mk: Fixed changelog note

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: bf9d91387ac41bb831204be462eb608d83a7d097 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf9d91387ac41b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 12 13:44:02 2011 +0200 Fixed changelog note --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b45dceb..3dbf23c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,7 +36,7 @@ * FIX: Fixed handling of embedded graphs to support the changes made to * FIX: avoid duplicate import of plugins in OMD local installation the PNP webservice - * FIX: Added host_is_active and host_is_flapping columns for NagStaMon views + * FIX: Added host_is_active and host_flapping columns for NagStaMon views * Added snmp_uptime, uptime and printer_supply perfometers * Allow for displaying service data in host tables * View editor foldable states are now permament per user

13 years, 1 month

Check_MK Git: check_mk: mbg_lantime_state, mbg_lantime_refclock: added new checks to monitor Meinberg LANTIME GPS clocks

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1d24cf3023bfd83a2c44b5853083feffe524e9ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d24cf3023bfd8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 12 11:13:45 2011 +0200 mbg_lantime_state,mbg_lantime_refclock: added new checks to monitor Meinberg LANTIME GPS clocks --- checkman/mbg_lantime_refclock | 37 ++++++++++++++ checkman/mbg_lantime_state | 36 ++++++++++++++ checks/mbg_lantime_refclock | 107 +++++++++++++++++++++++++++++++++++++++++ checks/mbg_lantime_state | 99 +++++++++++++++++++++++++++++++++++++ 4 files changed, 279 insertions(+), 0 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1d24cf3023…

13 years, 1 month

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 418402bf253578d0b3deeec4ece92215a5978800 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=418402bf253578… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 12 12:09:22 2011 +0200 Updated changelog --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index abecf8f..142f521 100644 --- a/ChangeLog +++ b/ChangeLog @@ -115,6 +115,8 @@ * hp_procurve_cpu: add PNP template * hp_procurve_cpu: rename load to utilization, rename service to CPU utilizition * df,df_netapp,df_netapp32,hr_fs,vms_df: convert to mergeable dictionaries + * mbg_lantime_state,mbg_lantime_refclock: added new checks to monitor + Meinberg LANTIME GPS clocks Livestatus: * Updated Perl API to version 0.74 (thanks to Sven Nierlein)

13 years, 1 month

Check_MK Git: check_mk: Fixed lantime_state thresholds

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7b339be623faed2bb10b311674631e8c15b25ee0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b339be623faed… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 12 12:17:29 2011 +0200 Fixed lantime_state thresholds --- checks/mbg_lantime_state | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/mbg_lantime_state b/checks/mbg_lantime_state index 135f503..c25b92a 100644 --- a/checks/mbg_lantime_state +++ b/checks/mbg_lantime_state @@ -57,10 +57,10 @@ def check_mbg_lantime_state(item, params, info): # handle the reported stratum thr_txt = '' - if params[0] is not None and int(stratum) > params[0]: + if params[0] is not None and int(stratum) > params[1]: state = max(state, 2) thr_txt = ' (!!)' - elif params[1] is not None and int(stratum) > params[1]: + elif params[1] is not None and int(stratum) > params[0]: state = max(state, 1) thr_txt = ' (!)' state_txt.append('Stratum: %s%s' % (stratum, thr_txt)) @@ -69,10 +69,10 @@ def check_mbg_lantime_state(item, params, info): state_txt.append('Refclock: %s (%s)' % (refclock_name, refclock_id)) thr_txt = '' - if params[2] is not None and int(refclock_offset) > params[2]: + if params[2] is not None and int(refclock_offset) > params[3]: state = max(state, 2) thr_txt = ' (!!)' - elif params[3] is not None and int(refclock_offset) > params[3]: + elif params[3] is not None and int(refclock_offset) > params[2]: state = max(state, 1) thr_txt = ' (!)' state_txt.append('Refclock Offset: %sms%s' % (refclock_offset, thr_txt))

13 years, 1 month

Check_MK Git: check_mk: FIX: fix two crashes of cmk -II in combination with clusters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9eea2c2036dbfc3ecee06b6590234f7fc689bc00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9eea2c2036dbfc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 12 11:56:58 2011 +0200 FIX: fix two crashes of cmk -II in combination with clusters --- modules/check_mk.py | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 493db25..7f15888 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -753,9 +753,17 @@ def cluster_of(hostname): # service and - if yes - return the cluster host of the service. If # no, returns the hostname of the physical host. def host_of_clustered_service(hostname, servicedesc): + my_cluster = cluster_of(hostname) + if not my_cluster: # we are not a cluster node + return hostname + # 1. New style: explicitlely assigned services for cluster, conf in clustered_services_of.items(): - if hostname in nodes_of(cluster) and \ + nodes = nodes_of(cluster) + if not nodes: + raise MKGeneralException("Invalid entry clustered_services_of['%s']: %s is not a cluster." % + (cluster, cluster)) + if hostname in nodes and \ in_boolean_serviceconf_list(hostname, servicedesc, conf): return cluster @@ -4229,7 +4237,7 @@ if __name__ == "__main__": clust = cluster_of(host) if clust: missing = [] - for node in clusters[clust]: + for node in nodes_of(clust): if node not in hostnames: missing.append(node) if len(missing) == 0:

13 years, 1 month

Check_MK Git: check_mk: FIX: hr_mem: ignore devices that report zero memory

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3a9834dd1b59948b1b651ca35119d6becc28736f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a9834dd1b5994… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 12 08:27:30 2011 +0200 FIX: hr_mem: ignore devices that report zero memory --- ChangeLog | 1 + checks/hr_mem | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index abecf8f..4776800 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ * Allow moving hosts from one to another config file Checks & Agents: + * FIX: hr_mem: ignore devices that report zero memory * FIX: cisco_power: fix syntax error in man page (broke also Multisite) * FIX: local: fixed search for custom templates PNP template * FIX: if/if64: always generate unique items (in case ifAlias is used) diff --git a/checks/hr_mem b/checks/hr_mem index 86ac031..2dc5032 100644 --- a/checks/hr_mem +++ b/checks/hr_mem @@ -34,7 +34,8 @@ def inventory_hr_mem(checktype, info): for hrtype, hrdescr, hrunits, hrsize, hrused in info: if hrtype in [ ".1.3.6.1.2.1.25.2.1.2", ".1.3.6.1.2.1.25.2.1.3" ]: - return [(None, "memused_default_levels")] + if int(hrsize) > 0: # some device have zero (broken) values + return [(None, "memused_default_levels")] def check_hr_mem(item, params, info): usage = {}

13 years, 1 month

Check_MK Git: check_mk: Multisite: show custom title also in single layout

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4f2ef43a8347a0817cf7e9f72c3156d134fbfe47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f2ef43a8347a0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 12 09:46:34 2011 +0200 Multisite: show custom title also in single layout --- web/plugins/views/layouts.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/web/plugins/views/layouts.py b/web/plugins/views/layouts.py index 960c8e6..ea4e029 100644 --- a/web/plugins/views/layouts.py +++ b/web/plugins/views/layouts.py @@ -45,7 +45,11 @@ def render_single_dataset(rows, view, group_painters, painters, num_columns): thispart = rows[rownum:rownum + num_columns] for p in painters: painter, link = p[0:2] - html.write("<tr class=data><td class=left>%s</td>" % painter["title"]) + if len(p) >= 5 and p[4]: + title = p[4] # Use custom title + else: + title = painter["title"] + html.write("<tr class=data><td class=left>%s</td>" % title) for row in thispart: paint(p, row) if len(thispart) < num_columns:

13 years, 1 month

Check_MK Git: check_mk: check_mk_templates.cfg: make check-mk-ping take arguments

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8c99482c13e2294fa16028653a95fc4f16048592 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c99482c13e229… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 12 10:00:24 2011 +0200 check_mk_templates.cfg: make check-mk-ping take arguments --- ChangeLog | 1 + doc/check_mk_templates.cfg | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4776800..7dcffd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * new option --debug: creates execution profile of check_mk itself * sped up use of stored snmp walks * find configuration file in subdirectories of conf.d also + * check_mk_templates.cfg: make check-mk-ping take arguments Multisite: * FIX: Display limit-exceeded message also in multi site setups diff --git a/doc/check_mk_templates.cfg b/doc/check_mk_templates.cfg index 2519fd6..803b4cb 100644 --- a/doc/check_mk_templates.cfg +++ b/doc/check_mk_templates.cfg @@ -282,13 +282,13 @@ define command { define command { command_name check-mk-ping - command_line @CHECK_ICMP@ $HOSTADDRESS$ + command_line @CHECK_ICMP@ $ARG1$ $HOSTADDRESS$ } # Check for clusters: it is UP if at least one node is up define command { command_name check-mk-ping-cluster - command_line @CHECK_ICMP@ -m 1 $_HOSTNODEIPS$ + command_line @CHECK_ICMP@ -m 1 $ARG1$ $_HOSTNODEIPS$ } # _____ _ _ _

13 years, 1 month

← Newer
1
...
6
7
8
9
10
11
12
13
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2011