lists.checkmk.com
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
List overview
Download
Checkmk git commits
February 2013
----- 2024 -----
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
checkmk-commits@lists.checkmk.com
3 participants
346 discussions
Start a n
N
ew thread
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
1
0
0
0
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
1
0
0
0
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
1
0
0
0
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
1
0
0
0
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
1
0
0
0
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
1
0
0
0
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
1
0
0
0
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
1
0
0
0
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
1
0
0
0
Check_MK Git: check_mk: oracle_tablespaces: removed testing code
by Lars Michelsen
Module: check_mk Branch: master Commit: a7c9fe881e409aee56a84ba953ad77290a2be234 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7c9fe881e409a…
Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Feb 14 13:55:36 2013 +0100 oracle_tablespaces: removed testing code --- checks/oracle_tablespaces | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index f37b3b4..3e26213 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -97,7 +97,6 @@ def get_tablespace_levels_in_bytes(size_bytes, params): magic = params.get("magic") # Use tablespace size dependent dynamic levels or static levels - size_bytes = 1031 * 1024 * 1024 * 1024 if type(params.get("levels")) == tuple: warn, crit = params.get("levels") else:
11 years, 7 months
1
0
0
0
← Newer
1
...
11
12
13
14
15
16
17
...
35
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
Results per page:
10
25
50
100
200