Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64415 discussions

Check_MK Git: check_mk: FIX: Fixed date parsing code ignoring the seconds value in several checks ( ad_replication, cups_queues, heartbeat_crm, mssql_backup, smbios_sel)

by Lars Michelsen

Module: check_mk Branch: master Commit: 9ad83fc73146044581b18bd7095a128ac49de4a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ad83fc7314604… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 15 15:02:31 2013 +0100 FIX: Fixed date parsing code ignoring the seconds value in several checks (ad_replication, cups_queues, heartbeat_crm, mssql_backup, smbios_sel) --- ChangeLog | 4 ++++ checks/ad_replication | 2 +- checks/cups_queues | 2 +- checks/heartbeat_crm | 2 +- checks/mssql_backup | 2 +- checks/smbios_sel | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e314a58..80ec012 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,10 @@ * Add: Monitoring of ESX (VMware) Hosts 1.2.2b3 + Checks & Agents: + * FIX: Fixed date parsing code ignoring the seconds value in several checks + (ad_replication, cups_queues, heartbeat_crm, mssql_backup, smbios_sel) + Multisite: * FIX: Removed uuid module dependency to be compatible to python < 2.5 * FIX: remove Javascript debug popup from multi-string input fields diff --git a/checks/ad_replication b/checks/ad_replication index af0f004..08a24e4 100644 --- a/checks/ad_replication +++ b/checks/ad_replication @@ -44,7 +44,7 @@ def parse_ad_replication_dates(s): if s == '0' or s == '(never)': return None else: - return datetime.datetime(*time.strptime(s, '%Y-%m-%d %H:%M:%S')[0:5]) + return datetime.datetime(*time.strptime(s, '%Y-%m-%d %H:%M:%S')[:6]) def parse_ad_replication_info(info): lines = [] diff --git a/checks/cups_queues b/checks/cups_queues index 24724b0..827b0bf 100644 --- a/checks/cups_queues +++ b/checks/cups_queues @@ -82,7 +82,7 @@ def check_cups_queues(item, params, info): elif line[0].startswith(item+'-'): # This is a queue item count the number of items and check the max age numJobs += 1 - dt = datetime.datetime(*time.strptime(' '.join(line[3:]), '%a %b %d %H:%M:%S %Y')[0:5]) + dt = datetime.datetime(*time.strptime(' '.join(line[3:]), '%a %b %d %H:%M:%S %Y')[:6]) if dt < oldest: oldest = dt diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index 90d3351..032b56c 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -95,7 +95,7 @@ def check_heartbeat_crm(item, params, info): # Check the freshness of the crm_mon output and terminate with CRITICAL # when too old information are found - dt = int(datetime.datetime(*time.strptime(lastUpdated, '%a %b %d %H:%M:%S %Y')[0:5]).strftime("%s")) + dt = int(datetime.datetime(*time.strptime(lastUpdated, '%a %b %d %H:%M:%S %Y')[:6]).strftime("%s")) now = time.time() delta = now - dt if delta > param_max_age: diff --git a/checks/mssql_backup b/checks/mssql_backup index 9b966f0..20de1ed 100644 --- a/checks/mssql_backup +++ b/checks/mssql_backup @@ -40,7 +40,7 @@ def check_mssql_backup(item, params, info): for line in info: inst, tablespace, last_backup_date, last_backup_time = line if item == inst + ' ' + tablespace: - dt = datetime.datetime(*time.strptime(last_backup_date + ' ' + last_backup_time, '%Y-%m-%d %H:%M:%S')[0:5]) + dt = datetime.datetime(*time.strptime(last_backup_date + ' ' + last_backup_time, '%Y-%m-%d %H:%M:%S')[:6]) state = 0 # Would be so nice to use delta.total_seconds(). But we must care about python < 2.7 diff --git a/checks/smbios_sel b/checks/smbios_sel index 862d8fc..98d36c7 100644 --- a/checks/smbios_sel +++ b/checks/smbios_sel @@ -143,7 +143,7 @@ def check_smbios_sel(_no_item, _no_params, info): sum_status = smbios_sel_msg_types[type][1] # Save the date when the current entry is newer - dt = datetime.datetime(*time.strptime(isodate, "%Y-%m-%d %H:%M:%S")[0:5]) + dt = datetime.datetime(*time.strptime(isodate, "%Y-%m-%d %H:%M:%S")[:6]) if smbios_sel_msg_types[type][3] == None or smbios_sel_msg_types[type][3] < dt: smbios_sel_msg_types[type][3] = dt; else:

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: de60bb631a6116b9711df1fdd8d5babb32632f48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de60bb631a6116… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 15 13:52:49 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk Conflicts: ChangeLog ---

11 years, 7 months

Check_MK Git: check_mk: Removed debug output - sorry

by Lars Michelsen

Module: check_mk Branch: master Commit: 811b8e963ff1d3bf14aae8b6e8aaace345a43007 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=811b8e963ff1d3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 15 13:50:48 2013 +0100 Removed debug output - sorry --- web/htdocs/js/checkmk.js | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 6829c9d..cf9fa15 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1548,8 +1548,6 @@ function list_of_strings_extend(oInput, j) { oDiv = oDiv.parentNode; var oContainer = oDiv.parentNode; - alert(oDiv.innerHTML); - var oNewDiv = document.createElement("DIV"); oNewDiv.innerHTML = oDiv.innerHTML.replace('"' + oldName + '"', '"' + newName + '"'); // IE7 does not have quotes in innerHTML, trying to workaround this here.

11 years, 7 months

Check_MK Git: check_mk: Updated changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: 4dcdb9e40c21eebfc414e1290a0288ae79f641a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4dcdb9e40c21ee… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 15 13:51:32 2013 +0100 Updated changelog --- ChangeLog | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1cb595..76d3ae3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,7 +11,9 @@ * Add: Monitoring of ESX (VMware) Hosts 1.2.2b3 - * Multisite: Removed uuid module dependency to be compatible to python < 2.5 + Multisite: + * FIX: Removed uuid module dependency to be compatible to python < 2.5 + * FIX: Removed debug output in WATO list of strings 1.2.2b2: Checks & Agents:

11 years, 7 months

Check_MK Git: check_mk: FIX: remove Javascript debug popup from multi-string input fields

by Mathias Kettner

Module: check_mk Branch: master Commit: 760ce79c6e91fd6a59b454f37d61bf977a3b007c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=760ce79c6e91fd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Feb 15 13:50:54 2013 +0100 FIX: remove Javascript debug popup from multi-string input fields --- ChangeLog | 4 +++- web/htdocs/js/checkmk.js | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1cb595..e314a58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,7 +11,9 @@ * Add: Monitoring of ESX (VMware) Hosts 1.2.2b3 - * Multisite: Removed uuid module dependency to be compatible to python < 2.5 + Multisite: + * FIX: Removed uuid module dependency to be compatible to python < 2.5 + * FIX: remove Javascript debug popup from multi-string input fields 1.2.2b2: Checks & Agents: diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 6829c9d..cf9fa15 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1548,8 +1548,6 @@ function list_of_strings_extend(oInput, j) { oDiv = oDiv.parentNode; var oContainer = oDiv.parentNode; - alert(oDiv.innerHTML); - var oNewDiv = document.createElement("DIV"); oNewDiv.innerHTML = oDiv.innerHTML.replace('"' + oldName + '"', '"' + newName + '"'); // IE7 does not have quotes in innerHTML, trying to workaround this here.

11 years, 7 months

Check_MK Git: check_mk: Multisite: Removed uuid module dependency to be compatible to python < 2.5

by Lars Michelsen

Module: check_mk Branch: master Commit: 2f5a7e69d788c3c0fabf78f6f95a56c1acbf1e57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f5a7e69d788c3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 15 13:46:49 2013 +0100 Multisite: Removed uuid module dependency to be compatible to python < 2.5 Conflicts: ChangeLog --- ChangeLog | 2 ++ web/htdocs/weblib.py | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dffdfac..9495170 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ * Add: Memory and Swap for Solaris Agent * Add: Monitoring of ESX (VMware) Hosts +1.2.2b3 + * Multisite: Removed uuid module dependency to be compatible to python < 2.5 1.2.2b2: Checks & Agents: diff --git a/web/htdocs/weblib.py b/web/htdocs/weblib.py index 3979f5a..bbe379e 100644 --- a/web/htdocs/weblib.py +++ b/web/htdocs/weblib.py @@ -90,7 +90,7 @@ def ajax_tree_openclose(): # | Saves and loads selected row information of the current user | # +----------------------------------------------------------------------+ -import uuid, os, time +import os, time from lib import make_nagios_directory def init_selection(): @@ -116,7 +116,8 @@ def cleanup_old_selections(): # Generates a selection id or uses the given one def selection_id(): if not html.has_var('selection'): - html.add_var('selection', str(uuid.uuid1())) # generate when not set + sel_id = file('/proc/sys/kernel/random/uuid').read().strip() + html.add_var('selection', sel_id) return html.var('selection') def get_rowselection(ident):

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: 5e214158abea06556a1aff7abbc33ab8eb8ffab3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e214158abea06… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 15 13:48:13 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Check_MK Git: check_mk: resolve merge conflict

by Andreas Boesl

Module: check_mk Branch: master Commit: 50a0f6b4a428a2082691d3f804e4fc2a58b14e53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50a0f6b4a428a2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Feb 15 11:05:26 2013 +0100 resolve merge conflict --- ChangeLog | 1 + web/htdocs/lib.py | 31 ++++++++++++++++++++++++------- web/plugins/views/painters.py | 14 -------------- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index dffdfac..c294a1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ WATO: * FIX: Fixed layout of rulelist table in IE* * FIX: Fixed adding explicit host names to rules in IE7 + * Add: Improved navigation convenience when plugin output contains [running on ... ] 1.2.2b1: Core: diff --git a/web/htdocs/lib.py b/web/htdocs/lib.py index a2a29c1..180c6a7 100644 --- a/web/htdocs/lib.py +++ b/web/htdocs/lib.py @@ -26,6 +26,7 @@ import grp, defaults, pprint, os, errno, gettext, marshal, fcntl, __builtin__ + nagios_state_names = { -1: "NODATA", 0: "OK", 1: "WARNING", 2: "CRITICAL", 3: "UNKNOWN", 4: "DEPENDENT" } nagios_short_state_names = { -1: "PEND", 0: "OK", 1: "WARN", 2: "CRIT", 3: "UNKN", 4: "DEP" } nagios_short_host_state_names = { 0: "UP", 1: "DOWN", 2: "UNREACH" } @@ -59,6 +60,7 @@ class MKInternalError(Exception): def __init__(self, msg): Exception.__init__(self, msg) + # Create directory owned by common group of Nagios and webserver, # and make it writable for the group def make_nagios_directory(path): @@ -117,6 +119,7 @@ def savefloat(f): return 0.0 + # Load all files below share/check_mk/web/plugins/WHAT into a # specified context (global variables). Also honors the # local-hierarchy for OMD @@ -216,17 +219,31 @@ warn_marker = '<b class="stmark state1">WARN</b>' crit_marker = '<b class="stmark state2">CRIT</b>' unknown_marker = '<b class="stmark state3">UNKN</b>' +def paint_host_list(site, hosts): + from htmllib import urlencode + h = "" + first = True + for host in hosts: + if first: + first = False + else: + h += ", " + link = "view.py?view_name=hoststatus&site=%s&host=%s" % (urlencode(site), urlencode(host)) + if html.var("display_options"): + link += "&display_options=%s" % html.var("display_options") + h += "<a href=\"%s\">%s</a></div>" % (link, host) + return "", h + def format_plugin_output(output, row = None): output = output.replace("(!)", warn_marker) \ .replace("(!!)", crit_marker) \ .replace("(?)", unknown_marker) - # TODO: reimplement, but considering correct paint_host_list call - #if row and "[running on" in output: - # a = output.index("[running on") - # e = output.index("]", a) - # hosts = output[a+12:e].replace(" ","").split(",") - # css, h = paint_host_list(row["site"], hosts) - # output = output[:a] + "running on " + h + output[e+1:] + if row and "[running on" in output: + a = output.index("[running on") + e = output.index("]", a) + hosts = output[a+12:e].replace(" ","").split(",") + css, h = paint_host_list(row["site"], hosts) + output = output[:a] + "running on " + h + output[e+1:] return output diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index b62f294..5e5a8de 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -1105,20 +1105,6 @@ multisite_painters["host_services"] = { "paint" : lambda row: paint_service_list(row, "host_services_with_state"), } -def paint_host_list(site, hosts): - h = "" - first = True - for host in hosts: - if first: - first = False - else: - h += ", " - link = "view.py?view_name=hoststatus&site=%s&host=%s" % (htmllib.urlencode(site), htmllib.urlencode(host)) - if html.var("display_options"): - link += "&display_options=%s" % html.var("display_options") - h += "<a href=\"%s\">%s</a></div>" % (link, host) - return "", h - multisite_painters["host_parents"] = { "title" : _("Host's parents"), "short" : _("Parents"),

11 years, 7 months

Check_MK Git: check_mk: Merge branch '1.2.2'

by Lars Michelsen

Module: check_mk Branch: master Commit: 27d0cd7c636d9546ac3ad658aa7e422dde1896d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=27d0cd7c636d95… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 13:55:45 2013 +0100 Merge branch '1.2.2' ---

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: deb24bf9f19d8929f3ee5246c47299aa2c597af2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=deb24bf9f19d89… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 13:55:49 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits