Checkmk git commits February 2013

checkmk-commits@lists.checkmk.com

3 participants
346 discussions

Check_MK Git: check_mk: cmk -d now handles ping-only hosts and piggybacked hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: 657997a4eab87c9dd3e51e3e749d70d0677195fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=657997a4eab87c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 20 12:17:34 2013 +0100 cmk -d now handles ping-only hosts and piggybacked hosts --- modules/check_mk.py | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 394793e..9bf7372 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3473,20 +3473,23 @@ def output_plain_hostinfo(hostname): if info: sys.stdout.write(info) return - try: - ipaddress = lookup_ipaddress(hostname) - sys.stdout.write(get_agent_info(hostname, ipaddress, 0)) - except MKAgentError, e: - sys.stderr.write("Problem contacting agent: %s\n" % (e,)) - sys.exit(3) - except MKGeneralException, e: - sys.stderr.write("General problem: %s\n" % (e,)) - sys.exit(3) - except socket.gaierror, e: - sys.stderr.write("Network error: %s\n" % e) - except Exception, e: - sys.stderr.write("Unexpected exception: %s\n" % (e,)) - sys.exit(3) + if is_tcp_host(hostname): + try: + ipaddress = lookup_ipaddress(hostname) + sys.stdout.write(get_agent_info(hostname, ipaddress, 0)) + except MKAgentError, e: + sys.stderr.write("Problem contacting agent: %s\n" % (e,)) + sys.exit(3) + except MKGeneralException, e: + sys.stderr.write("General problem: %s\n" % (e,)) + sys.exit(3) + except socket.gaierror, e: + sys.stderr.write("Network error: %s\n" % e) + except Exception, e: + sys.stderr.write("Unexpected exception: %s\n" % (e,)) + sys.exit(3) + + sys.stdout.write(get_piggyback_info(hostname)) def do_snmpwalk(hostnames): if len(hostnames) == 0:

11 years, 7 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 6d036e792bca1595e455e805a77be9a627f571bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d036e792bca15… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 20 12:17:44 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: WATO: service/host/contact groups now require

by Andreas Boesl

Module: check_mk Branch: master Commit: a9da19fc80bd2d0e9534f464326e968df92be083 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9da19fc80bd2d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 20 12:14:37 2013 +0100 WATO: service/host/contact groups now require group unique alias key --- ChangeLog | 2 ++ web/htdocs/wato.py | 5 +++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5aa6763..48c1c58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,8 @@ WATO: * FIX: flexible notification valuespec is now localizable + * FIX: Alias values of host/service/contact groups need to be set and unique + within the group 1.2.2b3: Checks & Agents: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e679022..a599191 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5785,6 +5785,11 @@ def mode_edit_group(phase, what): if phase == "action": if html.check_transaction(): alias = html.var_utf8("alias").strip() + if not alias: + raise MKUserError("alias", _("Please specify an alias name.")) + for key, value in groups.items(): + if alias == value and name != key: + raise MKUserError("alias", _("This alias is already used in the group %s ." % key)) if new: name = html.var("name").strip() if len(name) == 0:

11 years, 7 months

Check_MK Git: check_mk: FIX: WATO configuration of filesystem trends: it' s hours, not days

by Mathias Kettner

Module: check_mk Branch: master Commit: fe649b753c8bf57220d52dfd9c6845c81f332892 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe649b753c8bf5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 19 16:58:02 2013 +0100 FIX: WATO configuration of filesystem trends: it's hours, not days Conflicts: ChangeLog --- ChangeLog | 1 + web/plugins/wato/check_parameters.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a2dd1e2..5aa6763 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ Checks & Agents: * FIX: smart - not trying to parse unhandled lines to prevent errors * FIX: winperf_processor - fixed wrong calculations of usage + * FIX: WATO configuration of filesystem trends: it's hours, not days! Multisite: * FIX: Fixed problem with error during localization scanning diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b11f698..d2b94bf 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1126,8 +1126,8 @@ checkgroups.append(( Tuple( title = _("Levels on the time left until the filesystem gets full"), elements = [ - Integer(title = _("Warning at"), label = _("days left")), - Integer(title = _("Critical at"), label = _("days left")) + Integer(title = _("Warning at"), label = _("hours left")), + Integer(title = _("Critical at"), label = _("hours left")) ])), ( "trend_perfdata", Checkbox(

11 years, 7 months

Check_MK Git: check_mk: Livestatus: fixed code indentation

by Mathias Kettner

Module: check_mk Branch: master Commit: fe261f4d3a84654f82249bcff8683c8a27853714 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe261f4d3a8465… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 19 16:46:46 2013 +0100 Livestatus: fixed code indentation --- livestatus/src/module.c | 107 ++++++++++++++++++++++++----------------------- 1 files changed, 54 insertions(+), 53 deletions(-) diff --git a/livestatus/src/module.c b/livestatus/src/module.c index a977b30..74c0510 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -450,67 +450,68 @@ int broker_program(int event_type __attribute__ ((__unused__)), void *data __att char* get_downtime_comment(char* host_name, char* svc_desc) { - char* comment; - int matches = 0; - scheduled_downtime* dt_list = scheduled_downtime_list; - while (dt_list != NULL) { - if (dt_list->type == HOST_DOWNTIME) { - if (strcmp(dt_list->host_name, host_name) == 0) { - matches++; - comment = dt_list->comment; - } - } - if (svc_desc != NULL && dt_list->type == SERVICE_DOWNTIME) { - if( strcmp(dt_list->host_name, host_name) == 0 - && strcmp(dt_list->service_description, svc_desc) == 0) { - matches++; - comment = dt_list->comment; - } - } - dt_list = dt_list->next; - } - return matches == 0 ? "No comment" : matches > 1 ? "Multiple Downtime Comments" : comment; + char* comment; + int matches = 0; + scheduled_downtime* dt_list = scheduled_downtime_list; + while (dt_list != NULL) { + if (dt_list->type == HOST_DOWNTIME) { + if (strcmp(dt_list->host_name, host_name) == 0) { + matches++; + comment = dt_list->comment; + } + } + if (svc_desc != NULL && dt_list->type == SERVICE_DOWNTIME) { + if( strcmp(dt_list->host_name, host_name) == 0 + && strcmp(dt_list->service_description, svc_desc) == 0) { + matches++; + comment = dt_list->comment; + } + } + dt_list = dt_list->next; + } + return matches == 0 ? "No comment" : matches > 1 ? "Multiple Downtime Comments" : comment; } -void livestatus_log_initial_states(){ - // Log DOWNTIME hosts - host *h = (host *)host_list; - char buffer[8192]; - - while (h) { - if (h->scheduled_downtime_depth > 0) { - sprintf(buffer,"HOST DOWNTIME ALERT: %s;STARTED;%s", h->name, get_downtime_comment(h->name, NULL)); - write_to_all_logs(buffer, LG_INFO); - - } - h = h->next; - } - // Log DOWNTIME services - service *s = (service *)service_list; - while (s) { - if (s->scheduled_downtime_depth > 0) { - sprintf(buffer,"SERVICE DOWNTIME ALERT: %s;%s;STARTED;%s", s->host_name, s->description, - get_downtime_comment(s->host_name, s->description)); - write_to_all_logs(buffer, LG_INFO); - } - s = s->next; - } - // Log TIMERPERIODS - log_timeperiods_cache(); +void livestatus_log_initial_states() +{ + // Log DOWNTIME hosts + host *h = (host *)host_list; + char buffer[8192]; + + while (h) { + if (h->scheduled_downtime_depth > 0) { + sprintf(buffer,"HOST DOWNTIME ALERT: %s;STARTED;%s", h->name, get_downtime_comment(h->name, NULL)); + write_to_all_logs(buffer, LG_INFO); + + } + h = h->next; + } + // Log DOWNTIME services + service *s = (service *)service_list; + while (s) { + if (s->scheduled_downtime_depth > 0) { + sprintf(buffer,"SERVICE DOWNTIME ALERT: %s;%s;STARTED;%s", s->host_name, s->description, + get_downtime_comment(s->host_name, s->description)); + write_to_all_logs(buffer, LG_INFO); + } + s = s->next; + } + // Log TIMERPERIODS + log_timeperiods_cache(); } int broker_event(int event_type __attribute__ ((__unused__)), void *data) { - g_counters[COUNTER_NEB_CALLBACKS]++; - struct nebstruct_timed_event_struct *ts = (struct nebstruct_timed_event_struct *)data; - if( ts->event_type == EVENT_LOG_ROTATION){ - if( g_thread_running == 1 ){ - livestatus_log_initial_states(); - } else if (log_initial_states == 1) - write_to_all_logs("logging intitial states", LG_INFO); + g_counters[COUNTER_NEB_CALLBACKS]++; + struct nebstruct_timed_event_struct *ts = (struct nebstruct_timed_event_struct *)data; + if (ts->event_type == EVENT_LOG_ROTATION) + { + if (g_thread_running == 1 ) + livestatus_log_initial_states(); + else if (log_initial_states == 1) + write_to_all_logs("logging intitial states", LG_INFO); } - update_timeperiods_cache(ts->timestamp.tv_sec); return 0; }

11 years, 7 months

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

by Mathias Kettner

Module: check_mk Branch: master Commit: fc541a9bd00414700c4f7638e09a9e046fe8debf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc541a9bd00414… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 19 16:46:48 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 7 months

Check_MK Git: check_mk: FIX: winperf_processor - fixed wrong calculations of usage

by Lars Michelsen

Module: check_mk Branch: master Commit: d06088f1d0ad96c15798afc71f1970a0febf5d7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d06088f1d0ad96… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 19 16:43:01 2013 +0100 FIX: winperf_processor - fixed wrong calculations of usage --- ChangeLog | 1 + checks/winperf_processor | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2acd725..a2dd1e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ 1.2.2b4: Checks & Agents: * FIX: smart - not trying to parse unhandled lines to prevent errors + * FIX: winperf_processor - fixed wrong calculations of usage Multisite: * FIX: Fixed problem with error during localization scanning diff --git a/checks/winperf_processor b/checks/winperf_processor index 80f66b1..2fb9397 100644 --- a/checks/winperf_processor +++ b/checks/winperf_processor @@ -61,7 +61,7 @@ def check_winperf_util(item, params, info): # # 1 tick = 100ns, convert to seconds cpusecs_per_sec = ticks_per_sec / 10000000.0 - used_perc = (100.0 * num_cpus) * (1 - cpusecs_per_sec) + used_perc = 100 * (1 - cpusecs_per_sec) if used_perc < 0: used_perc = 0

11 years, 7 months

Check_MK Git: check_mk: FIX: flexible notification valuespec is now localizable

by Lars Michelsen

Module: check_mk Branch: master Commit: f31e762bca8aca39e66a099534141c1673ae965a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f31e762bca8aca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 19 16:29:56 2013 +0100 FIX: flexible notification valuespec is now localizable --- ChangeLog | 3 + web/htdocs/wato.py | 227 ++++++++++++++++++++++++++-------------------------- 2 files changed, 118 insertions(+), 112 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f31e762bca…

11 years, 7 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 1d49672007a24cc89101de96d389fe162a1e7123 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d49672007a24c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 19 16:30:20 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: FIX: diskstat: fix local variable ios_per_sec

by Mathias Kettner

Module: check_mk Branch: master Commit: 505f5ab87ee1a65ae3c244f706f6cd19257fb2f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=505f5ab87ee1a6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 19 16:26:53 2013 +0100 FIX: diskstat: fix local variable ios_per_sec --- ChangeLog | 3 ++- checks/diskstat.include | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3408605..8db35ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,7 +37,8 @@ * Linux agent: limit netstat to 10 seconds * ps: Allow %1, %2, .. instead of %s in process_inventory. That allows reordering of matched groups - * mysql: fixed crash on computing IO information + * FIX: mysql: fixed crash on computing IO information + * FIX: diskstat: fix local variable 'ios_per_sec' referenced before assignment BI: * FIX: fixed invalid links to hosts and services in BI tree view diff --git a/checks/diskstat.include b/checks/diskstat.include index 758f04f..aac8092 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -131,6 +131,7 @@ def check_diskstat_line(this_time, item, params, line): perfdata = [ perfdata[0], perfdata[2], perfdata[1], perfdata[3] ] # Process IOs when available + ios_per_sec = None if len(line) >= 5 and line[3] >= 0 and line[4] > 0: reads, writes = map(int, line[3:5]) ios = reads + writes

11 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2013