Checkmk git commits September 2013

checkmk-commits@lists.checkmk.com

6 participants
227 discussions

Check_MK Git: check_mk: Fixed error in non omd environments with local special agents directory

by Lars Michelsen

Module: check_mk Branch: master Commit: d8f6cadf091c7e975c211394e8ac2f23fd154cdc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8f6cadf091c7e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Sep 20 09:18:55 2013 +0200 Fixed error in non omd environments with local special agents directory --- modules/check_mk.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 83d4571..cce4568 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1107,7 +1107,8 @@ def get_sorted_check_table(hostname): # be None in most cases -> to TCP connect on port 6556 # HACK: special_agent_dir = agents_dir + "/special" -special_agent_local_dir = local_agents_dir + "/special" +if local_agents_dir: + special_agent_local_dir = local_agents_dir + "/special" def get_datasource_program(hostname, ipaddress): # First check WATO-style special_agent rules @@ -1116,7 +1117,7 @@ def get_datasource_program(hostname, ipaddress): if params: # rule match! # Create command line using the special_agent_info cmd_arguments = special_agent_info[agentname](params[0], hostname, ipaddress) - if special_agent_local_dir and \ + if local_agents_dir and \ os.path.exists(special_agent_local_dir + "/agent_" + agentname): path = special_agent_local_dir + "/agent_" + agentname else:

11 years, 2 months

Check_MK Git: check_mk: FIX: fix bug with missing special_agent_local_dir

by Mathias Kettner

Module: check_mk Branch: master Commit: 3e19fd2cf7bf8e09dd769c1e4e2a522d62e69c5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e19fd2cf7bf8e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 19 23:18:35 2013 +0200 FIX: fix bug with missing special_agent_local_dir --- modules/check_mk.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 83d4571..b2faee7 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1107,7 +1107,10 @@ def get_sorted_check_table(hostname): # be None in most cases -> to TCP connect on port 6556 # HACK: special_agent_dir = agents_dir + "/special" -special_agent_local_dir = local_agents_dir + "/special" +if local_agents_dir: + special_agent_local_dir = local_agents_dir + "/special" +else: + special_agent_local_dir = None def get_datasource_program(hostname, ipaddress): # First check WATO-style special_agent rules

11 years, 2 months

Check_MK Git: check_mk: Updated check_mk_agent binaries

by Andreas Boesl

Module: check_mk Branch: master Commit: 2397320ed6c5844d58ac4b6f5a8500e332510de6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2397320ed6c584… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 19 16:33:31 2013 +0200 Updated check_mk_agent binaries --- agents/windows/check_mk_agent.exe | Bin 151040 -> 151040 bytes agents/windows/install_agent.exe | Bin 146631 -> 146633 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 720d198..7c217d0 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 52023f7..39ebc45 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

11 years, 2 months

Check_MK Git: check_mk: Multisite: Using site alias in page title - if available

by Lars Michelsen

Module: check_mk Branch: master Commit: dedac25b3181c3b8808c273a28f7ce4d3888b549 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dedac25b3181c3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 19 16:21:23 2013 +0200 Multisite: Using site alias in page title - if available --- web/htdocs/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/main.py b/web/htdocs/main.py index 5ccb624..ce94309 100644 --- a/web/htdocs/main.py +++ b/web/htdocs/main.py @@ -33,7 +33,7 @@ def page_index(): #html.req.headers_out.add("Cache-Control", "max-age=7200, public"); html.req.headers_out.add("Cache-Control", "no-cache"); if "%s" in config.page_heading: - heading = config.page_heading % (defaults.omd_site or _("Multisite")) + heading = config.page_heading % (config.site(defaults.omd_site).get('alias', _("Multisite"))) else: heading = config.page_heading

11 years, 2 months

Check_MK Git: check_mk: mk_logwatch: ignored loglines now reported with an . prefix (if required)

by Andreas Boesl

Module: check_mk Branch: master Commit: bbad683d0ae9adecab27db221aaea6d841bcbcc3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbad683d0ae9ad… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 19 16:05:28 2013 +0200 mk_logwatch: ignored loglines now reported with an . prefix (if required) --- ChangeLog | 1 + agents/plugins/mk_logwatch | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 16fbfb8..4aa9efe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,7 @@ * 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/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index 1d64c76..6cd4e3f 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -291,6 +291,8 @@ def process_logfile(logfile, patterns): color = {'C': tty_red, 'W': tty_yellow, 'O': tty_green, 'I': tty_blue, '.': ''}[level] if debug: line = line.replace("\1", "\nCONT:") + if level == "I": + level = "." outputtxt += "%s%s %s%s\n" % (color, level, line[:-1], tty_normal) new_offset = os.lseek(fl, 0, 1) # os.SEEK_CUR not available in Python 2.4

11 years, 2 months

Check_MK Git: check_mk: windows_agent: windows eventlog informational/ audit logs now reported with O prefix

by Andreas Boesl

Module: check_mk Branch: master Commit: 509456818b370fddad8a5bdb66129960ff268b84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=509456818b370f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 19 16:01:41 2013 +0200 windows_agent: windows eventlog informational/audit logs now reported with O prefix --- ChangeLog | 1 + agents/windows/check_mk_agent.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9348809..16fbfb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,7 @@ 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 Notifications: diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index e495e2f..e0d9f7a 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1146,7 +1146,7 @@ void process_eventlog_entries(SOCKET &out, const char *logname, char *buffer, break; case EVENTLOG_INFORMATION_TYPE: case EVENTLOG_AUDIT_SUCCESS: - type_char = level == 0 ? 'I' : '.'; + type_char = level == 0 ? 'O' : '.'; this_state = 0; break; case EVENTLOG_AUDIT_FAILURE:

11 years, 2 months

Check_MK Git: check_mk: Revert "logwatch: fixed reclassification of solely informational lines"

by Andreas Boesl

Module: check_mk Branch: master Commit: 8506be75e51b27104a3d9e7e3b5ced207cb3d150 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8506be75e51b27… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 19 15:59:50 2013 +0200 Revert "logwatch: fixed reclassification of solely informational lines" This reverts commit c9c6f77a80d09f78942852321c83d5479c18ccae. --- ChangeLog | 1 - checks/logwatch | 1 - 2 files changed, 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42fb6d3..9348809 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,7 +97,6 @@ by the check plugin * agent_vsphere: completely rewritten, now considerably faster vCenter is still queried by old version - * logwatch: fixed reclassification of solely informational lines Notifications: diff --git a/checks/logwatch b/checks/logwatch index e21c553..1669bf2 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -121,7 +121,6 @@ def logwatch_level_name(level): def logwatch_level_worst(worst, level): if level == 'O': return max(worst, 0) - elif level == 'I': return max(worst, 0) elif level == 'W': return max(worst, 1) elif level == 'u': return max(worst, 1) elif level == 'C': return max(worst, 2)

11 years, 2 months

Check_MK Git: check_mk: Fixed syntax error - seems like copy/paste problem

by Lars Michelsen

Module: check_mk Branch: master Commit: 50a005f1632678dee624dbec8a3a220bcd5af533 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50a005f1632678… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 19 09:57:18 2013 +0200 Fixed syntax error - seems like copy/paste problem --- web/htdocs/wato.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 90d82bc..bf21f0e 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -60,10 +60,6 @@ Boston, MA 02110-1301 USA. border-left-style: none; border-radius: 4px 0px 0px 0px; } -.wato table.data td { - html.write('</div>') - /* border-style: dashed; */ -} .wato table.data td.select { text-align: center;

11 years, 2 months

Check_MK Git: check_mk: logwatch: fixed reclassification of solely informational lines

by Andreas Boesl

Module: check_mk Branch: master Commit: c9c6f77a80d09f78942852321c83d5479c18ccae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9c6f77a80d09f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 19 13:34:08 2013 +0200 logwatch: fixed reclassification of solely informational lines --- ChangeLog | 1 + checks/logwatch | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9348809..42fb6d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,7 @@ by the check plugin * agent_vsphere: completely rewritten, now considerably faster vCenter is still queried by old version + * logwatch: fixed reclassification of solely informational lines Notifications: diff --git a/checks/logwatch b/checks/logwatch index 1669bf2..e21c553 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -121,6 +121,7 @@ def logwatch_level_name(level): def logwatch_level_worst(worst, level): if level == 'O': return max(worst, 0) + elif level == 'I': return max(worst, 0) elif level == 'W': return max(worst, 1) elif level == 'u': return max(worst, 1) elif level == 'C': return max(worst, 2)

11 years, 2 months

Check_MK Git: check_mk: etherbox check: fixed exception in scan function

by Andreas Boesl

Module: check_mk Branch: master Commit: 2f1292a88799399e626fa77349f69a3ec41fe81b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f1292a8879939… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Sep 19 11:01:46 2013 +0200 etherbox check: fixed exception in scan function --- checks/etherbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/etherbox b/checks/etherbox index 45dcfe7..5129ba8 100644 --- a/checks/etherbox +++ b/checks/etherbox @@ -65,7 +65,7 @@ def etherbox_get_sensor(item, item_type, info): raise Exception("Sensor not found") def etherbox_scan(oid): - return oid(".1.3.6.1.4.1.14848.2.1.1.1.0").startswith("Version"), + return oid(".1.3.6.1.4.1.14848.2.1.1.1.0").startswith("Version") etherbox_info = [ ( ".1.3.6.1.4.1.14848.2.1.1.3", [ '' ]), # temperature unit

11 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2013