Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

adapted solaris_prtdiag for different outputs

by Simon Betz

Module: check_mk Branch: master Commit: d82fbfb6d217714335897c95b9259cf691ee2e26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d82fbfb6d21771… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 29 11:51:55 2015 +0100 adapted solaris_prtdiag for different outputs --- inventory/solaris_prtdiag | 50 ++++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/inventory/solaris_prtdiag b/inventory/solaris_prtdiag index 4742124..4c951a0 100644 --- a/inventory/solaris_prtdiag +++ b/inventory/solaris_prtdiag @@ -111,24 +111,46 @@ def inv_solaris_prtdiag(info): # 'System Configuration: SUN MICROSYSTEMS SUN FIRE X4270 SERVER' # 'System Configuration: Sun Microsystems SUN FIRE X4450' node = inv_tree("hardware.system.") - system_info = line[0].split(':', 1)[1].rstrip('\'') + system_info = line[0].split(":", 1)[1].strip().replace("SERVER", "").replace("Server", "") - # Fields are separated by double spaces for some outputs - if " " in system_info: - system_info_list = system_info.split(" ") - elif system_info.startswith(" Oracle Corporation") and len(system_info) > 20: - system_info_list = system_info[1:19], system_info[20:] + if "sun microsystems" in system_info.lower(): + vendor = "Sun Microsystems" + index = 2 + elif "oracle corporation" in system_info.lower(): + vendor = "Oracle Corporation" + index = 2 + elif "supermicro" in system_info.lower(): + vendor = "Supermirco" + index = 1 + elif "vmware, inc." in system_info.lower(): + vendor = "VMWare, Inc." + index = 2 + elif "hp" in system_info.lower(): + vendor = "HP" + index = 1 else: - system_info_list = system_info.split() + vendor = system_info.split(" ")[0] + index = 1 - node["vendor"] = system_info_list[0] - node["product"] = system_info_list[1] + system_info = " ".join(system_info.split(" ")[index:]).strip() + node["vendor"] = vendor + + if "sun fire" in system_info.lower(): + index = 3 + elif "sun4u" in system_info.lower() or \ + "proliant" in system_info.lower(): + index = 2 + elif "vmware" in system_info.lower(): + index = 3 + else: + index = 1 + + node["product"] = " ".join(system_info.split(" ")[:index]) + family = " ".join(system_info.split(" ")[index:]) + + if family: + node["family"] = "%s-series" % family[0].upper() - product_list = node["product"].split() - if product_list[-1].startswith('T'): - node["family"] = "T-series" - elif product_list[-2].startswith('M'): - node["family"] = "M-series" inv_info['solaris_prtdiag'] = { "inv_function" : inv_solaris_prtdiag,

8 years, 8 months

Exclude various tag files from version control.

by Sven Panne

Module: check_mk Branch: master Commit: 9f447ad96bec2e5a106282acd6c7eb8bf60c3898 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f447ad96bec2e… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Oct 28 13:35:59 2015 +0100 Exclude various tag files from version control. --- livestatus/.gitignore | 25 +++++++++++++++---------- livestatus/src/.gitignore | 11 +++++++---- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/livestatus/.gitignore b/livestatus/.gitignore index c89642d..4d7a84c 100644 --- a/livestatus/.gitignore +++ b/livestatus/.gitignore @@ -1,17 +1,22 @@ -Makefile.in -autom4te.cache/ -configure aclocal.m4 -Makefile +autom4te.cache/ +compile config.h config.h.in config.log config.status -src/Makefile -src/unixcat -stamp-h1 +configure .cproject -src/.cproject -.project +cscope.files Debug -compile +GPATH +GRTAGS +GSYMS +GTAGS +ID +Makefile +Makefile.in +.project +stamp-h1 +tags +TAGS diff --git a/livestatus/src/.gitignore b/livestatus/src/.gitignore index 219b25c..431d451 100644 --- a/livestatus/src/.gitignore +++ b/livestatus/src/.gitignore @@ -1,7 +1,10 @@ -*.o *.a -*.la +.cproject .deps -*.so -Makefile.in +*.la livecheck +Makefile +Makefile.in +*.o +*.so +unixcat

8 years, 8 months

Updated bug entries #0855

by Bastian Kuhn

Module: check_mk Branch: master Commit: a9e1a4c62b2acc822baa2157ffc2f48051a06b38 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9e1a4c62b2acc… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Oct 29 09:19:55 2015 +0100 Updated bug entries #0855 --- .bugs/855 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/855 b/.bugs/855 new file mode 100644 index 0000000..c934747 --- /dev/null +++ b/.bugs/855 @@ -0,0 +1,8 @@ +Title: PDF Export, Host down is red instead of blue in the timeline table +Component: multisite +State: open +Date: 2015-10-29 09:18:23 +Targetversion: 1.2.7 +Class: bug + +Everywere the color for host down is a dark blue. Only in the PDF file, it's a red

8 years, 8 months

deleted pnp template for winperf_processor as it interferes with auto-generated templates

by Sebastian Herbord

Module: check_mk Branch: master Commit: 3cbe151be8836b344bd8bfe7e7dfa93e88be7c47 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cbe151be8836b… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Oct 29 09:02:37 2015 +0100 deleted pnp template for winperf_processor as it interferes with auto-generated templates --- pnp-templates/check_mk-winperf_processor.util.php | 99 --------------------- 1 file changed, 99 deletions(-) diff --git a/pnp-templates/check_mk-winperf_processor.util.php b/pnp-templates/check_mk-winperf_processor.util.php deleted file mode 100644 index d9d232b..0000000 --- a/pnp-templates/check_mk-winperf_processor.util.php +++ /dev/null @@ -1,99 +0,0 @@ -<?php -# +------------------------------------------------------------------+ -# | ____ _ _ __ __ _ __ | -# | / ___| |__ ___ ___| | __ | \/ | |/ / | -# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | -# | | |___| | | | __/ (__| < | | | | . \ | -# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | -# | | -# | Copyright Mathias Kettner 2014 mk(a)mathias-kettner.de | -# +------------------------------------------------------------------+ -# -# This file is part of Check_MK. -# The official homepage is at http://mathias-kettner.de/check_mk. -# -# check_mk is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation in version 2. check_mk is distributed -# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- -# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. See the GNU General Public License for more de- -# ails. You should have received a copy of the GNU General Public -# License along with GNU Make; see the file COPYING. If not, write -# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, -# Boston, MA 02110-1301 USA. - -# Do not depend on numbers, use names -$RRD = array(); -foreach ($NAME as $i => $n) { - $RRD[$n] = "$RRDFILE[$i]:$DS[$i]:MAX"; - $RRD_AVG[$n] = "$RRDFILE[$i]:$DS[$i]:AVERAGE"; - $WARN[$n] = $WARN[$i]; - $CRIT[$n] = $CRIT[$i]; - $MIN[$n] = $MIN[$i]; - $MAX[$n] = $MAX[$i]; -} - -$num_threads = $MAX[1]; -$warnthreads = $WARN[1] * $num_threads / 100.0; -$critthreads = $CRIT[1] * $num_threads / 100.0; -$rightscale = 100.0 / $num_threads; - -$opt[1] = "--vertical-label 'Used CPU threads' --right-axis $rightscale:0 --right-axis-format '%4.1lf%%' --right-axis-label 'Utilization %' -l0 -ru $num_threads --title \"CPU Utilization for $hostname ($num_threads CPU threads)\" "; - -$def[1] = "DEF:perc=$RRD_AVG[util] " - . "CDEF:util=perc,$num_threads,*,100,/ " - . "DEF:userperc=$RRD_AVG[user] " - . "CDEF:user=userperc,$num_threads,*,100,/ " - . "CDEF:privileged=util,user,- " - . "CDEF:privilegedperc=privileged,$num_threads,/,100,* " - ; - -$def[1] .= "HRULE:$MAX[util]#0040d0:\"$num_threads CPU Threads\\n\" " - ; - -$def[1] .= "LINE:util#50b01a:\"Utilization\: \" " - . "GPRINT:perc:LAST:\"%4.1lf%%\" " - . "GPRINT:util:LAST:\"(%3.1lf Threads) \" " - . "GPRINT:perc:MIN:\"min\: %4.1lf%%,\t\" " - . "GPRINT:util:MIN:\"(%4.1lf), \" " - . "GPRINT:perc:MAX:\"max\: %4.1lf%%\" " - . "GPRINT:util:MAX:\"(%4.1lf)\\n\" " - - . "AREA:privileged#f03020:\"Privileged perc\:\" " - . "GPRINT:privilegedperc:LAST:\"%4.1lf%%\" " - . "GPRINT:privileged:LAST:\"(%3.1lf Threads) \" " - . "GPRINT:privilegedperc:MIN:\"min\: %4.1lf%%,\t\" " - . "GPRINT:privileged:MIN:\"(%4.1lf), \" " - . "GPRINT:privilegedperc:MAX:\"max\: %4.1lf%%\" " - . "GPRINT:privileged:MAX:\"(%4.1lf)\\n\" " - - . "AREA:user#6060f0:\"User perc\: \":STACK " - . "GPRINT:userperc:LAST:\"%4.1lf%%\" " - . "GPRINT:user:LAST:\"(%3.1lf Threads) \" " - . "GPRINT:userperc:MIN:\"min\: %4.1lf%%,\t\" " - . "GPRINT:user:MIN:\"(%4.1lf), \" " - . "GPRINT:userperc:MAX:\"max\: %4.1lf%%\" " - . "GPRINT:user:MAX:\"(%4.1lf)\\n\" " - ; - - -if (isset($RRD_AVG["avg"])) { - $def[1] .= "DEF:aperc=$RRD_AVG[avg] ". - "CDEF:avg=aperc,$num_threads,*,100,/ ". - "LINE:avg#004000:\"Averaged\: \" ". - "GPRINT:aperc:LAST:\"%.1lf%%,\" ". - "GPRINT:aperc:MIN:\"min\: %.1lf%%,\" ". - "GPRINT:aperc:MAX:\"max\: %.1lf%%\\n\" ". - ""; -} - -if ($WARN['util']) { - $def[1] .= "HRULE:$warnthreads#fff000:\"Warn at $WARN[util]% \" " - . "HRULE:$critthreads#ff0000:\"Critical at $CRIT[util]%\\n\" "; -} -else { - $def[1] .= "COMMENT:\"\\n\" "; -} - -?>

8 years, 8 months

added gb

by Sebastian Herbord

Module: check_mk Branch: master Commit: 450702916022ed9a7940ab855c78134eafbcc87d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=450702916022ed… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Oct 29 09:08:20 2015 +0100 added gb --- .bugs/2365 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2365 b/.bugs/2365 new file mode 100644 index 0000000..d5eab13 --- /dev/null +++ b/.bugs/2365 @@ -0,0 +1,8 @@ +Title: generated pnp templates don't support placeholders +Component: multisite +State: open +Date: 2015-10-29 09:05:03 +Targetversion: 1.2.7 +Class: bug + +If a template for the new graphing system contains a placeholder (i.e. %(util:max@count)), that placeholder is resolved fine in new graphs but not in the generated pnp templates.

8 years, 8 months

Reserved 10 bug IDS

by Simon Betz

Module: check_mk Branch: master Commit: 0e945c0fcbcf9629d2244f2de75af83d656bf7f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e945c0fcbcf96… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 29 08:49:37 2015 +0100 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index bb74fd5..a0198be 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2390 +2400

8 years, 8 months

new git bug

by Simon Betz

Module: check_mk Branch: master Commit: 3bb027ebbba6ae5ea8ff6beaed7a679d9856c822 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bb027ebbba6ae… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Oct 29 08:52:33 2015 +0100 new git bug --- .bugs/2390 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2390 b/.bugs/2390 new file mode 100644 index 0000000..a0ca37f --- /dev/null +++ b/.bugs/2390 @@ -0,0 +1,9 @@ +Title: Dashboards: Make a copy of a dashlet +Component: multisite +State: open +Date: 2015-10-29 08:49:42 +Targetversion: future +Class: feature + +Avoiding hundred of clicks it would be nice to be able to make a copy of an existing dashlet, e.g. +performance graphs.

8 years, 8 months

Fixed broken icon css classes after yesterdays cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: 3923075f1aca9bff94bc9d9dcfe3e87413019c32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3923075f1aca9b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 28 20:23:16 2015 +0100 Fixed broken icon css classes after yesterdays cleanups --- web/htdocs/htmllib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 8a8dc92..15d506d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -399,7 +399,7 @@ class html: align = middle and ' align=absmiddle' or '' title = help and ' title="%s"' % self.attrencode(help) or "" id = id and ' id="%s"' % id or '' - cssclass = cssclass and ' ' + cssclass + cssclass = cssclass and (" " + cssclass) or "" return '<img src="%s" class="icon%s"%s%s%s />' % \ (self.detect_icon_path(icon_name), cssclass, align, title, id)

8 years, 8 months

Fixed rendering inactive togglebuttons

by Lars Michelsen

Module: check_mk Branch: master Commit: 3bbe9028148026f398e6cc53600ebaba82dedab7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bbe9028148026… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 28 20:16:12 2015 +0100 Fixed rendering inactive togglebuttons --- web/htdocs/images/togglebutton_check_down_lo.png | Bin 653 -> 602 bytes web/htdocs/views.py | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/images/togglebutton_check_down_lo.png b/web/htdocs/images/togglebutton_check_down_lo.png index ba24f0a..730161e 100644 Binary files a/web/htdocs/images/togglebutton_check_down_lo.png and b/web/htdocs/images/togglebutton_check_down_lo.png differ diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 0cd270d..ad9d264 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1444,6 +1444,7 @@ def view_optiondial(view, option, choices, help): def view_optiondial_off(option): html.write('<div class="optiondial off %s"></div>' % option) +# FIXME: Consolidate toggle rendering functions def toggler(id, icon, help, onclick, value, hidden = False): html.begin_context_buttons() # just to be sure hide = hidden and ' style="display:none"' or '' @@ -1471,12 +1472,14 @@ def ajax_set_viewoption(): vo[view_name][option] = value config.save_user_file("viewoptions", vo) +# FIXME: Consolidate toggle rendering functions def togglebutton_off(id, icon, hidden = False): html.begin_context_buttons() hide = hidden and ' style="display:none"' or '' html.write('<div id="%s_off" class="togglebutton off %s"%s>' - '<img src="images/icon_%s.png"></div>' % (id, icon, icon, hide)) + '<img src="images/icon_%s.png"></div>' % (id, icon, hide, icon)) +# FIXME: Consolidate toggle rendering functions def togglebutton(id, isopen, icon, help, hidden = False): html.begin_context_buttons() if isopen:

8 years, 8 months

Updated checkbox and togglebutton images

by Lars Michelsen

Module: check_mk Branch: master Commit: cb12f9be71e992718466253286794b4b6721fef7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb12f9be71e992… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Oct 28 20:12:33 2015 +0100 Updated checkbox and togglebutton images --- web/htdocs/images/icon_checkbox.png | Bin 1264 -> 1313 bytes web/htdocs/images/togglebutton_check_down_hi.png | Bin 658 -> 653 bytes web/htdocs/images/togglebutton_check_down_lo.png | Bin 602 -> 653 bytes web/htdocs/images/togglebutton_check_hi.png | Bin 609 -> 675 bytes web/htdocs/images/togglebutton_check_lo.png | Bin 661 -> 653 bytes web/htdocs/pages.css | 4 ++++ 6 files changed, 4 insertions(+) diff --git a/web/htdocs/images/icon_checkbox.png b/web/htdocs/images/icon_checkbox.png index 4a5eaa7..fc34bc5 100644 Binary files a/web/htdocs/images/icon_checkbox.png and b/web/htdocs/images/icon_checkbox.png differ diff --git a/web/htdocs/images/togglebutton_check_down_hi.png b/web/htdocs/images/togglebutton_check_down_hi.png index 578ccb2..37c2950 100644 Binary files a/web/htdocs/images/togglebutton_check_down_hi.png and b/web/htdocs/images/togglebutton_check_down_hi.png differ diff --git a/web/htdocs/images/togglebutton_check_down_lo.png b/web/htdocs/images/togglebutton_check_down_lo.png index abfd683..ba24f0a 100644 Binary files a/web/htdocs/images/togglebutton_check_down_lo.png and b/web/htdocs/images/togglebutton_check_down_lo.png differ diff --git a/web/htdocs/images/togglebutton_check_hi.png b/web/htdocs/images/togglebutton_check_hi.png index e840267..61a83b5 100644 Binary files a/web/htdocs/images/togglebutton_check_hi.png and b/web/htdocs/images/togglebutton_check_hi.png differ diff --git a/web/htdocs/images/togglebutton_check_lo.png b/web/htdocs/images/togglebutton_check_lo.png index 56abf32..22388b6 100644 Binary files a/web/htdocs/images/togglebutton_check_lo.png and b/web/htdocs/images/togglebutton_check_lo.png differ diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 92aa287..271d841 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -859,6 +859,10 @@ div.togglebutton.checkbox.down img { left: 5px; } +div.togglebutton.checkbox img { + left: 4px; +} + div.togglebutton { background-image: url("images/togglebutton_lo.png"); } div.togglebutton:hover { background-image: url("images/togglebutton_hi.png"); } div.togglebutton.down { background-image: url("images/togglebutton_down_lo.png"); }

8 years, 8 months

← Newer
1
2
3
4
5
6
7
8
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2015