Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64478 discussions

Check_MK Git: check_mk: fixed wording check_mk.example.ini

by Andreas Boesl

Module: check_mk Branch: master Commit: 3e132088321aabfc62582742ad77fa47fa9116d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e132088321aab… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 20 14:42:50 2013 +0200 fixed wording check_mk.example.ini --- agents/windows/check_mk.example.ini | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/windows/check_mk.example.ini b/agents/windows/check_mk.example.ini index 1d8fe33..078eab5 100644 --- a/agents/windows/check_mk.example.ini +++ b/agents/windows/check_mk.example.ini @@ -42,18 +42,18 @@ # textfile = C:\tmp\memo.udf # # Set patterns for defined textfile # warn = *overdue* - # ok = *mail sent* + # ok = *mail sent* [logwatch] # Testing: output *all* messages from the eventlogs # sendall = yes # From application log send only critical messages - # logfile application = crit - + # logfile application = crit + # From system log send only warning/critical messages, # but suppress any context messages - # logfile application = warn nocontext + # logfile system = warn nocontext # From the security log send all messages # logfile security = all

11 years

Check_MK Git: check_mk: check_mk.example.ini erweitert

by Andreas Boesl

Module: check_mk Branch: master Commit: 2b68133e9b73f55b1f5f5a3a285f5d270bc89550 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b68133e9b73f5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 20 14:41:58 2013 +0200 check_mk.example.ini erweitert --- agents/windows/check_mk.example.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/agents/windows/check_mk.example.ini b/agents/windows/check_mk.example.ini index 3f1199d..1d8fe33 100644 --- a/agents/windows/check_mk.example.ini +++ b/agents/windows/check_mk.example.ini @@ -50,6 +50,10 @@ # From application log send only critical messages # logfile application = crit + + # From system log send only warning/critical messages, + # but suppress any context messages + # logfile application = warn nocontext # From the security log send all messages # logfile security = all

11 years

Check_MK Git: check_mk: windows_agent: now able to suppress context messages in windows eventlogs

by Andreas Boesl

Module: check_mk Branch: master Commit: a5c0bfc73d8af9bf908234e4378cbe63e0b301ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5c0bfc73d8af9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 20 14:20:35 2013 +0200 windows_agent: now able to suppress context messages in windows eventlogs --- ChangeLog | 1 + agents/windows/check_mk_agent.cc | 28 ++++++++++++++++++++++------ agents/windows/check_mk_agent.exe | Bin 151040 -> 151040 bytes agents/windows/install_agent.exe | Bin 146633 -> 146698 bytes 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index abd4704..cce16b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,7 @@ * windows_agent: windows eventlog informational/audit logs now reported with O prefix * mk_logwatch: ignored loglines now reported with an "." prefix (if required) * apache_status: Nopw also supports multithreaded mpm + * windows_agent: now able to suppress context messages in windows eventlogs * FIX: blade_blades: Fixed output of "(UNKNOWN)" even if state is OK * FIX: apache_status: fix exception if parameter is None * FIX: hr_mem: handle virtual memory correct on some devices diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index e0d9f7a..4869ddb 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -138,6 +138,7 @@ struct winperf_counter { struct eventlog_config_entry { char name[256]; int level; + int hide_context; }; // Definitions for scripts @@ -1120,7 +1121,7 @@ bool output_eventlog_entry(SOCKET &out, char *dllpath, EVENTLOGRECORD *event, ch void process_eventlog_entries(SOCKET &out, const char *logname, char *buffer, DWORD bytesread, DWORD *record_number, bool just_find_end, - int *worst_state, int level) + int *worst_state, int level, int hide_context) { WCHAR *strings[64]; char regpath[128]; @@ -1163,7 +1164,7 @@ void process_eventlog_entries(SOCKET &out, const char *logname, char *buffer, // If we are not just scanning for the current end and the worst state, // we output the event message - if (!just_find_end) + if (!just_find_end && (!hide_context || type_char != '.')) { // The source name is the name of the application that produced the event // It is UTF-16 encoded @@ -1234,14 +1235,14 @@ void process_eventlog_entries(SOCKET &out, const char *logname, char *buffer, } // type_char != '.' bytesread -= event->Length; - crash_log(" - record %d: event_processed, bytesread %d, event->Length %d", *record_number, bytesread, event->Length); + crash_log(" - record %d: event_processed, bytesread %d, event->Length %d", *record_number, bytesread, event->Length); event = (EVENTLOGRECORD *) ((LPBYTE) event + event->Length); } } void output_eventlog(SOCKET &out, const char *logname, - DWORD *record_number, bool just_find_end, int level) + DWORD *record_number, bool just_find_end, int level, int hide_context) { crash_log(" - event log \"%s\":", logname); @@ -1298,7 +1299,7 @@ void output_eventlog(SOCKET &out, const char *logname, { crash_log(" . got entries starting at %d (%d bytes)", *record_number + 1, bytesread); process_eventlog_entries(out, logname, eventlog_buffer, - bytesread, record_number, just_find_end || t==0, &worst_state, level); + bytesread, record_number, just_find_end || t==0, &worst_state, level, hide_context); } else { DWORD error = GetLastError(); @@ -1928,18 +1929,20 @@ void section_eventlog(SOCKET &out) else { // Get the configuration of that log file (which messages to send) int level = 1; + int hide_context = 0; for (int j=0; j<num_eventlog_configs; j++) { const char *cname = eventlog_config[j].name; if (!strcmp(cname, "*") || !strcasecmp(cname, eventlog_names[i])) { level = eventlog_config[j].level; + hide_context = eventlog_config[j].hide_context; break; } } if (level != -1) { output_eventlog(out, eventlog_names[i], &known_record_numbers[i], - first_run && !logwatch_send_initial_entries, level); + first_run && !logwatch_send_initial_entries, level, hide_context); } } } @@ -3214,6 +3217,18 @@ bool handle_logwatch_config_variable(char *var, char *value) int level; char *logfilename = lstrip(var + 8); lowercase(logfilename); + + // value might have the option nocontext + int hide_context = 0; + char *s = value; + while (*s && *s != ' ') + s++; + if (*s == ' ') { + if (!strcmp(s+1, "nocontext")) + hide_context = 1; + } + *s = 0; + if (!strcmp(value, "off")) level = -1; else if (!strcmp(value, "all")) @@ -3230,6 +3245,7 @@ bool handle_logwatch_config_variable(char *var, char *value) if (num_eventlog_configs < MAX_EVENTLOGS) { eventlog_config[num_eventlog_configs].level = level; + eventlog_config[num_eventlog_configs].hide_context = hide_context; strncpy(eventlog_config[num_eventlog_configs].name, logfilename, 256); num_eventlog_configs++; } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 7c217d0..a3247f6 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 39ebc45..a164dc2 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

11 years

Check_MK Git: check_mk: Moved LDAP-Settings button to users page

by Mathias Kettner

Module: check_mk Branch: master Commit: e83a815398a631158492453ec5044b5e53d2279b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e83a815398a631… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 20 14:14:32 2013 +0200 Moved LDAP-Settings button to users page --- .bugs/953 | 10 ++++++++++ web/htdocs/wato.py | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.bugs/953 b/.bugs/953 new file mode 100644 index 0000000..5430ba2 --- /dev/null +++ b/.bugs/953 @@ -0,0 +1,10 @@ +Title: Move LDAP-Settings button to user management +Component: multisite +Class: nastiness +State: done +Date: 2013-09-20 13:58:50 +Targetversion: 1.4.0 + +Currently it's in the global settings + +2013-09-20 14:14:22: changed state open -> done diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d743b89..7cde566 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5436,6 +5436,7 @@ def mode_ldap_config(phase): elif phase == 'buttons': global_buttons() + html.context_button(_("Users"), make_link([("mode", "users")]), "users") return config_vars = [ @@ -5598,8 +5599,6 @@ def mode_globalvars(phase): elif phase == "buttons": global_buttons() - if userdb.connector_enabled('ldap'): - html.context_button(_("LDAP Settings"), make_link([("mode", "ldap_config")]), "ldap") return # Get default settings of all configuration variables of interest in the domain @@ -8164,6 +8163,8 @@ def mode_users(phase): html.context_button(_("Sync Users"), html.makeactionuri([("_sync", 1)]), "replicate") if config.may("general.notify"): html.context_button(_("Notify Users"), 'notify.py', "notification") + if userdb.connector_enabled('ldap'): + html.context_button(_("LDAP Settings"), make_link([("mode", "ldap_config")]), "ldap") return # Execute all connectors synchronisations of users. This must be done before

11 years

Check_MK Git: check_mk: pnp-templates: fixed warn/ crit levels for etherbox humidity

by Andreas Boesl

Module: check_mk Branch: master Commit: a6110ad86c4574eae46495292afd7319952be1de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6110ad86c4574… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 20 13:16:07 2013 +0200 pnp-templates: fixed warn/crit levels for etherbox humidity --- pnp-templates/check_mk-etherbox.humidity.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pnp-templates/check_mk-etherbox.humidity.php b/pnp-templates/check_mk-etherbox.humidity.php index 1c32729..9d35399 100644 --- a/pnp-templates/check_mk-etherbox.humidity.php +++ b/pnp-templates/check_mk-etherbox.humidity.php @@ -29,7 +29,7 @@ # | Michael Nieporte <Michael.Nieporte(a)uk-essen.de> | # +------------------------------------------------------------------+ -$opt[1] = "--vertical-label \"Percent\" --title \"$servicedesc\" "; +$opt[1] = "--vertical-label \"Percent\" -l 0 -u 100 --title \"$servicedesc\" "; $def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX "; $def[1] .= "LINE2:var1#2080ff:\"Humidity\:\" "; @@ -37,8 +37,12 @@ $def[1] .= "GPRINT:var1:LAST:\"%2.0lf%%\" "; $def[1] .= "GPRINT:var1:AVERAGE:\"(Avg\: %2.0lf%%,\" "; $def[1] .= "GPRINT:var1:MIN:\"Min\: %2.0lf%%,\" "; $def[1] .= "GPRINT:var1:MAX:\"Max\: %2.0lf%%)\" "; -$def[1] .= "HRULE:$CRIT[1]#FFFF00 "; -$def[1] .= "HRULE:$WARN[1]#FF0000 "; -$def[1] .= "HRULE:$MIN[1]#FFFF00 "; -$def[1] .= "HRULE:$MAX[1]#FF0000 "; +if($CRIT[1]) + $def[1] .= "HRULE:$CRIT[1]#FFFF00 "; +if($WARN[1]) + $def[1] .= "HRULE:$WARN[1]#FF0000 "; +if($MIN[1]) + $def[1] .= "HRULE:$MIN[1]#FFFF00 "; +if($MAX[1]) + $def[1] .= "HRULE:$MAX[1]#FF0000 "; ?>

11 years

Check_MK Git: check_mk: Fixed exception on ldap test page

by Lars Michelsen

Module: check_mk Branch: master Commit: 2da655dd60b6a68e066cf58860b7ea6f69357da5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2da655dd60b6a6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 20 12:22:23 2013 +0200 Fixed exception on ldap test page --- web/htdocs/wato.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c059b11..d743b89 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5516,14 +5516,13 @@ def mode_ldap_config(phase): userdb.ldap_connect(enforce_new = True, enforce_server = address) try: ldap_users = userdb.ldap_get_users() + msg = _('Found no user object for synchronization. Please check your filter settings.') except Exception, e: ldap_users = None msg = str(e) if ldap_users and len(ldap_users) > 0: return (True, _('Found %d users for synchronization.') % len(ldap_users)) else: - if not msg: - msg = _('Found no user object for synchronization. Please check your filter settings.') return (False, msg) def test_group_base_dn(address): @@ -5537,14 +5536,13 @@ def mode_ldap_config(phase): userdb.ldap_connect(enforce_new = True, enforce_server = address) try: ldap_groups = userdb.ldap_get_groups() + msg = _('Found no group object for synchronization. Please check your filter settings.') except Exception, e: ldap_groups = None msg = str(e) if ldap_groups and len(ldap_groups) > 0: return (True, _('Found %d groups for synchronization.') % len(ldap_groups)) else: - if not msg: - msg = _('Found no group object for synchronization. Please check your filter settings.') return (False, msg) tests = [

11 years

Check_MK Git: check_mk: Removed debug output

by Lars Michelsen

Module: check_mk Branch: master Commit: 0c74b9ff0d1e554b7612fd57007f93d6d596064e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c74b9ff0d1e55… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 20 12:22:12 2013 +0200 Removed debug output --- web/htdocs/sidebar.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index e653ee1..31d5bdd 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -761,8 +761,6 @@ def search_open(): if ty is None: return - html.log(repr(data)) - if len(data) == 1: if len(data[0]) == 2: url = search_url_tmpl(ty) % {'name': html.urlencode(data[0][1]), 'site': data[0][0]}

11 years

Check_MK Git: check_mk: apache_status: Nopw also supports multithreaded mp

by Lars Michelsen

Module: check_mk Branch: master Commit: e38c93a847ceca3a6e4497d7f423407fe65b68a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e38c93a847ceca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 20 10:54:24 2013 +0200 apache_status: Nopw also supports multithreaded mp --- ChangeLog | 19 ++++++++++--------- checks/apache_status | 30 +++++++++++++++++------------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index dbf9419..6eb07ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,7 +32,6 @@ * windows_agent: Now available as 64 bit version * agent_vsphere: fix problem where sensors were missing when you queried multiple host systems via vCenter - * apache_status: fix exception if parameter is None * cached checks: no longer output cached data if the age of the cache file is twice the maximum cache age * windows agent: no longer tries to execute directories @@ -80,6 +79,16 @@ * New active check, check_form_submit, to submit HTML forms and check the resulting page * mk-job: /var/lib/check_mk_agent/job directory is now created with mode 1777 so mk-job can be used by unprivileged users too + * ADD: etherbox: new check for etherbox (messpc) sensors. + currently supported: temperature, humidity, switch contact and smoke sensors + * cisco_wlc_client: now supports low/high warn and crit levels + * cisco_wlc: now supports configuration options for missing AP + * agent_vsphere: completely rewritten, now considerably faster + vCenter is still queried by old version + * windows_agent: windows eventlog informational/audit logs now reported with O prefix + * mk_logwatch: ignored loglines now reported with an "." prefix (if required) + * apache_status: Nopw also supports multithreaded mpm + * FIX: apache_status: fix exception if parameter is None * FIX: hr_mem: handle virtual memory correct on some devices * FIX: apache_status agent plugin: now also works, if prog name contains slashes * FIX: check_dns: parameter -A does not get an additional string @@ -89,16 +98,8 @@ * FIX: esx_vsphere_datastores: Fix incomplete performance data and Perf-O-Meter * FIX: cleaned up fileinfo.groups pattern handling, manual configuration is now possible using WATO - * ADD: etherbox: new check for etherbox (messpc) sensors. - currently supported: temperature, humidity, switch contact and smoke sensors - * cisco_wlc_client: now supports low/high warn and crit levels - * cisco_wlc: now supports configuration options for missing AP * FIX: check_mk-ipmi.php: PNP template now displays correct units as delivered by the check plugin - * agent_vsphere: completely rewritten, now considerably faster - vCenter is still queried by old version - * windows_agent: windows eventlog informational/audit logs now reported with O prefix - * mk_logwatch: ignored loglines now reported with an "." prefix (if required) Notifications: diff --git a/checks/apache_status b/checks/apache_status index 79f53b6..0c5e746 100644 --- a/checks/apache_status +++ b/checks/apache_status @@ -36,19 +36,23 @@ def apache_status_open_slots(value, params): return 0, "", extra_perf apache_status_fields = { - # key sort convert-func param_function - 'Uptime': (0, int), - 'IdleWorkers': (5, int), - 'BusyWorkers': (6, int), - 'OpenSlots': (7, int, apache_status_open_slots), - 'TotalSlots': (8, int), - 'Total Accesses': (9, int), - 'CPULoad': (10, float), - 'Total kBytes': (11, float), - 'ReqPerSec': (12, float), - 'BytesPerReq': (13, float), - 'BytesPerSec': (14, float), - 'Scoreboard': (15, str), + # key sort convert-func param_function + 'Uptime': (0, int), + 'IdleWorkers': (5, int), + 'BusyWorkers': (6, int), + 'OpenSlots': (7, int, apache_status_open_slots), + 'TotalSlots': (8, int), + 'Total Accesses': (9, int), + 'CPULoad': (10, float), + 'Total kBytes': (11, float), + 'ReqPerSec': (12, float), + 'BytesPerReq': (13, float), + 'BytesPerSec': (14, float), + 'Scoreboard': (15, str), + 'ConnsTotal': (16, int), + 'ConnsAsyncWriting': (17, int), + 'ConnsAsyncKeepAlive': (18, int), + 'ConnsAsyncClosing': (19, int), } apache_status_stats = {

11 years

Check_MK Git: check_mk: FIX: blade_blades: Fixed output of "(UNKNOWN)" even if state is OK

by Lars Michelsen

Module: check_mk Branch: master Commit: 945acb7bc8d09d4423104ff0c73b85a0d2ea77b6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=945acb7bc8d09d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 20 10:59:52 2013 +0200 FIX: blade_blades: Fixed output of "(UNKNOWN)" even if state is OK --- ChangeLog | 1 + checks/blade_blades | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6eb07ad..4262106 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,7 @@ * windows_agent: windows eventlog informational/audit logs now reported with O prefix * mk_logwatch: ignored loglines now reported with an "." prefix (if required) * apache_status: Nopw also supports multithreaded mpm + * FIX: blade_blades: Fixed output of "(UNKNOWN)" even if state is OK * FIX: apache_status: fix exception if parameter is None * FIX: hr_mem: handle virtual memory correct on some devices * FIX: apache_status agent plugin: now also works, if prog name contains slashes diff --git a/checks/blade_blades b/checks/blade_blades index 55b6051..1313bb4 100644 --- a/checks/blade_blades +++ b/checks/blade_blades @@ -58,7 +58,7 @@ def check_blade_blades(item, params, info): output += ' (!)' elif nag_state == 2: output += ' (!!)' - else: + elif nag_state == 3: output += ' (UNKNOWN)' state = max(state, nag_state) output += ', '

11 years

Check_MK Git: check_mk: FIX: diskstat: Fixed wrong values for IO/ s computation on linux hosts

by Lars Michelsen

Module: check_mk Branch: master Commit: 51c65f1fbe15fd043bcf164475e79c79ff0b5dc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51c65f1fbe15fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 20 10:39:18 2013 +0200 FIX: diskstat: Fixed wrong values for IO/s computation on linux hosts Conflicts: ChangeLog --- ChangeLog | 2 ++ checks/diskstat | 22 +++++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4aa9efe..dbf9419 100644 --- a/ChangeLog +++ b/ChangeLog @@ -366,6 +366,8 @@ * FIX: zpool_status: Ignoring "No known data errors" text * FIX: dmi_sysinfo: Handling ":" in value correctly * FIX: check_http: Fixed syntax error when monitoring certificates + * FIX: check_dns: parameter -A does not get an additional string + * FIX: diskstat: Fixed wrong values for IO/s computation on linux hosts Multisite: * FIX: LDAP: Disabling use of referrals in active directory configuration diff --git a/checks/diskstat b/checks/diskstat index d390e7a..84d3039 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -115,9 +115,25 @@ def diskstat_rewrite_device(nameinfo, linestart): def linux_diskstat_convert(info): info, nameinfo = diskstat_parse_info(info) - rewritten = [ ( diskstat_rewrite_device(nameinfo, l[0:3]), int(l[5]), int(l[9]), - int(l[6]), int(l[10]), int(l[12])) for l in info[1:] - if len(l) >= 13 ] + # The generic function takes the following values per line: + # 0: devname + # 1: read bytes counter + # 2: write bytes counter + # Optional ones: + # 3: number of reads + # 4: number of writes + # 5: timems + # 6: read queue length *counters* + # 7: write queue length *counters* + rewritten = [ + ( diskstat_rewrite_device(nameinfo, l[0:3]), + int(l[5]), + int(l[9]), + int(l[3]), + int(l[7]), + int(l[12]) + ) for l in info[1:] if len(l) >= 13 + ] # Remove device mapper devices without a translated name return [ line for line in rewritten if not line[0].startswith("dm-") ]

11 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits