Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64359 discussions

Check_MK Git: check_mk: Fix .f12 compile helper

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ef21fcdc6ee06538187bae8813595ae003d0a42d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef21fcdc6ee065… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 27 13:05:34 2012 +0200 Fix .f12 compile helper --- checks/.f12 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/.f12 b/checks/.f12 index a057d96..1aedc3d 100644 --- a/checks/.f12 +++ b/checks/.f12 @@ -1,2 +1,2 @@ -sudo cp -v * /omd/versions/default/share/check_mk/checks +sudo install -m 644 * /omd/versions/default/share/check_mk/checks

12 years, 2 months

Check_MK Git: check_mk: FIX: Do not except on vanished check type

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1fbb70f717b9707189f1578f4b8062a46b86092a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1fbb70f717b970… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 27 12:58:05 2012 +0200 FIX: Do not except on vanished check type --- checks/cmctc_lcp | 236 ++++++++++++++++++++++++++++++++++++ modules/check_mk.py | 3 + web/plugins/perfometer/check_mk.py | 39 +++++- 3 files changed, 273 insertions(+), 5 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1fbb70f717…

12 years, 2 months

Check_MK Git: check_mk: Add performance data to f5_bigip_temp

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f12a0c725d0c9bbed685ed3437a5467ed7ec129b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f12a0c725d0c9b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 27 13:06:12 2012 +0200 Add performance data to f5_bigip_temp --- ChangeLog | 1 + checks/f5_bigip_temp | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c795a07..9076b4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * vms_system.ios: new check for total direct/buffered IOs on OpenVMS * vms_system.procs: new check for number of processes on OpenVMS * FIX: mssql agent: Added compatibility code for MSSQL 9 + * f5_bigip_temp: add performance data WATO: * Added permission to control the "clone host" feature in WATO diff --git a/checks/f5_bigip_temp b/checks/f5_bigip_temp index 866d9ea..939e12d 100644 --- a/checks/f5_bigip_temp +++ b/checks/f5_bigip_temp @@ -69,12 +69,13 @@ def check_f5_bigip_temp(item, params, info): if item == sensor[0]: tmpdiff = sensor[1] - sensor[2] msgtxt = " - Temperature is %dC" % (sensor[1]) + perfdata = [ ("temp", sensor[1]) ] if 5 >= tmpdiff: - return (0, "OK" + msgtxt) + return (0, "OK" + msgtxt, perfdata) elif tmpdiff > 15: - return (2, "CRIT" + msgtxt + "(!!)") + return (2, "CRIT" + msgtxt + "(!!)", perfdata) elif tmpdiff > 10: - return (1, "WARN" + msgtxt + "(!)") + return (1, "WARN" + msgtxt + "(!)", perfdata) else: return (3, "UNKNOWN - unable to read temperature")

12 years, 2 months

Check_MK Git: check_mk: cmctc_lcp.*: added new checks for Rittal CMC-TC LCP

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 89b922b7661ec65e6f4c21d787b4120819ac5556 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89b922b7661ec6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 27 13:15:28 2012 +0200 cmctc_lcp.*: added new checks for Rittal CMC-TC LCP --- ChangeLog | 1 + checkman/cmctc_lcp.blower | 19 +++++++++++++++++++ checkman/cmctc_lcp.blowergrade | 16 ++++++++++++++++ checkman/cmctc_lcp.flow | 19 +++++++++++++++++++ checkman/cmctc_lcp.regulator | 19 +++++++++++++++++++ checkman/cmctc_lcp.temp | 23 +++++++++++++++++++++++ 6 files changed, 97 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2982234..e6c5927 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * FIX: mssql agent: Added compatibility code for MSSQL 9 * f5_bigip_temp: add performance data * added perf-o-meters for a lot of temperature checks + * cmctc_lcp.*: added new checks for Rittal CMC-TC LCP WATO: * Added permission to control the "clone host" feature in WATO diff --git a/checkman/cmctc_lcp.blower b/checkman/cmctc_lcp.blower new file mode 100644 index 0000000..c56255d --- /dev/null +++ b/checkman/cmctc_lcp.blower @@ -0,0 +1,19 @@ +title: Rittal CMC-TC LCP Blowers +agents: snmp +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + Check the state of blowers of a Rittal CMC-TC LCP. + +item: + A descriptive name of the sensor, followed by " - ", followed by + the combination of IO unit number (3-6) and sensors index (1-4). + Example: {"3.2"} for first IO unit and second sensor. + +perfdata: + One variable: the current rotation speed of the blower in RPM + +inventory: + All available blowers sensors are automatically inventorized. + diff --git a/checkman/cmctc_lcp.blowergrade b/checkman/cmctc_lcp.blowergrade new file mode 100644 index 0000000..d7d05b1 --- /dev/null +++ b/checkman/cmctc_lcp.blowergrade @@ -0,0 +1,16 @@ +title: Rittal CMC-TC LCP Blower total state +agents: snmp +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + Check the state of blowers of a Rittal CMC-TC LCP. + +item: + A descriptive name of the sensor, followed by " - ", followed by + the combination of IO unit number (3-6) and sensors index (1-4). + Example: {"3.2"} for first IO unit and second sensor. + +inventory: + One check per LCP will be created + diff --git a/checkman/cmctc_lcp.flow b/checkman/cmctc_lcp.flow new file mode 100644 index 0000000..de346c3 --- /dev/null +++ b/checkman/cmctc_lcp.flow @@ -0,0 +1,19 @@ +title: Rittal CMC-TC LCP Water flow +agents: snmp +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + Check the speed of the water flow of a Rittal CMC-TC LCP. + +item: + A descriptive name of the sensor, followed by " - ", followed by + the combination of IO unit number (3-6) and sensors index (1-4). + Example: {"3.2"} for first IO unit and second sensor. + +perfdata: + One variable: the current flow in liters per second + +inventory: + One check per LCP will be generated. + diff --git a/checkman/cmctc_lcp.regulator b/checkman/cmctc_lcp.regulator new file mode 100644 index 0000000..81ae101 --- /dev/null +++ b/checkman/cmctc_lcp.regulator @@ -0,0 +1,19 @@ +title: Rittal CMC-TC LCP Regulator +agents: snmp +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + Check the percentage of the regular of a Rittal CMC-TC LCP. + +item: + A descriptive name of the sensor, followed by " - ", followed by + the combination of IO unit number (3-6) and sensors index (1-4). + Example: {"3.2"} for first IO unit and second sensor. + +perfdata: + One variable: the current percentage of the regulator + +inventory: + One check per LCP will be generated. + diff --git a/checkman/cmctc_lcp.temp b/checkman/cmctc_lcp.temp new file mode 100644 index 0000000..b896b0d --- /dev/null +++ b/checkman/cmctc_lcp.temp @@ -0,0 +1,23 @@ +title: Rittal CMC-TC LCP Temperature sensors +agents: snmp +author: Mathias Kettner <mk(a)mathias-kettner.de> +license: GPL +distribution: check_mk +description: + This check polls the state of temperature sensors of a Rittal LCP. + +item: + A descriptive name of the sensor, followed by " - ", followed by + the combination of IO unit number (3-6) and sensors index (1-4). + Example: {"3.2"} for first IO unit and second sensor. + +perfdata: + One variable: the current temperature in degrees celsius. + +inventory: + All available temperature sensors are automatically inventorized. + +[parameters] +warn(int): Optional warning level for the temperature. If you use no + parameters, then the builtin state will be used (this is the default). +crit(int): Critical level for the temperature.

12 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4ea971c013be1fb80e01e6eada24ed7f63ffdde8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ea971c013be1f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 27 13:17:16 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk Conflicts: ChangeLog checks/f5_bigip_temp ---

12 years, 2 months

Check_MK Git: check_mk: added perf-o-meters for a lot of temperature checks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 74e418ce3371bac03eb7e3564db35a09be4bc076 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74e418ce3371ba… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 27 13:06:49 2012 +0200 added perf-o-meters for a lot of temperature checks --- ChangeLog | 1 + web/plugins/perfometer/check_mk.py | 19 +++++++++++++++---- web/plugins/wato/check_parameters.py | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9076b4a..2982234 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * vms_system.procs: new check for number of processes on OpenVMS * FIX: mssql agent: Added compatibility code for MSSQL 9 * f5_bigip_temp: add performance data + * added perf-o-meters for a lot of temperature checks WATO: * Added permission to control the "clone host" feature in WATO diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 7b9557f..43c719e 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -184,7 +184,7 @@ perfometers["check_mk-ntp"] = perfometer_check_mk_ntp perfometers["check_mk-ntp.time"] = perfometer_check_mk_ntp perfometers["check_mk-systemtime"] = lambda r, c, p: perfometer_check_mk_ntp(r, c, p, "s") -def perfometer_temperature(row, check_command, perf_data): +def perfometer_ipmi_sensors(row, check_command, perf_data): state = row["service_state"] color = { 0: "#39f", 1: "#ff2", 2: "#f22", 3: "#fa2" }[state] value = float(perf_data[0][1]) @@ -213,7 +213,7 @@ def perfometer_temperature(row, check_command, perf_data): unit = "" return (u"%d%s" % (int(value), unit)), h -perfometers["check_mk-ipmi_sensors"] = perfometer_temperature +perfometers["check_mk-ipmi_sensors"] = perfometer_ipmi_sensors def perfometer_temperature(row, check_command, perf_data): state = row["service_state"] @@ -222,8 +222,6 @@ def perfometer_temperature(row, check_command, perf_data): crit = savefloat(perf_data[0][4]) return "%d°C" % int(value), perfometer_logarithmic(value, 40, 1.2, color) - -# Also all checks dealing with temperature can use this perfometer perfometers["check_mk-nvidia.temp"] = perfometer_temperature perfometers["check_mk-cisco_temp_sensor"] = perfometer_temperature perfometers["check_mk-cisco_temp_perf"] = perfometer_temperature @@ -235,6 +233,19 @@ perfometers["check_mk-hp_proliant_temp"] = perfometer_temperature perfometers["check_mk-akcp_sensor_temp"] = perfometer_temperature perfometers["check_mk-fsc_temp"] = perfometer_temperature +def perfometer_blower(row, check_command, perf_data): + rpm = saveint(perf_data[0][1]) + perc = rpm / 10000.0 * 100.0 + return "%d RPM" % rpm, perfometer_logarithmic(rpm, 2000, 1.5, "#88c") + +perfometers["check_mk-cmctc_lcp.blower"] = perfometer_blower + +def perfometer_lcp_regulator(row, check_command, perf_data): + value = saveint(perf_data[0][1]) + return "%d%%" % value, perfometer_linear(value, "#8c8") + +perfometers["check_mk-cmctc_lcp.regulator"] = perfometer_lcp_regulator + def perfometer_bandwidth(in_bytes, out_bytes, in_bw, out_bw): txt = [] have_bw = True diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 68ee915..9a66d11 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1522,8 +1522,8 @@ checkgroups.append(( "for monitoring the temperature of a datacenter. An example " "is the webthem from W&T."), elements = [ - Integer(title = "warning at", unit = u"°C"), - Integer(title = "critical at", unit = u"°C"), + Integer(title = "warning at", unit = u"°C", default_value = 26), + Integer(title = "critical at", unit = u"°C", default_value = 30), ]), TextAscii( title = _("Sensor ID"),

12 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cda88c5c511a59ac1de2becb549e76a50d3426c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cda88c5c511a59… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jul 27 12:40:38 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 2 months

Check_MK Git: check_mk: Added perfdata for f5_bigip_temp check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 446234036cc5ccd7158a0abf1dee7ca8a43b3f3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=446234036cc5cc… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jul 27 09:31:30 2012 +0200 Added perfdata for f5_bigip_temp check --- checks/f5_bigip_temp | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/checks/f5_bigip_temp b/checks/f5_bigip_temp index 866d9ea..42748d4 100644 --- a/checks/f5_bigip_temp +++ b/checks/f5_bigip_temp @@ -69,12 +69,13 @@ def check_f5_bigip_temp(item, params, info): if item == sensor[0]: tmpdiff = sensor[1] - sensor[2] msgtxt = " - Temperature is %dC" % (sensor[1]) + perf = [ ('temp', sensor[1])] if 5 >= tmpdiff: - return (0, "OK" + msgtxt) + return (0, "OK" + msgtxt, perf) elif tmpdiff > 15: - return (2, "CRIT" + msgtxt + "(!!)") + return (2, "CRIT" + msgtxt + "(!!)", perf) elif tmpdiff > 10: - return (1, "WARN" + msgtxt + "(!)") + return (1, "WARN" + msgtxt + "(!)", perf) else: return (3, "UNKNOWN - unable to read temperature") @@ -88,7 +89,7 @@ snmp_info["f5_bigip_temp"] = \ (".1.3.6.1.4.1.3375.2.1.3.1.2.1", [ 1, 2 ]), ] -check_info["f5_bigip_temp"] = (check_f5_bigip_temp, "Temperature %s", 0, inventory_f5_bigip_temp ) +check_info["f5_bigip_temp"] = (check_f5_bigip_temp, "Temperature %s", 1, inventory_f5_bigip_temp ) # Get ID and Speed from the CPU and chassis fan tables

12 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: aeb3f916517a5d08a30d4a9ddbd88cc3de605ae3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aeb3f916517a5d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 27 11:42:35 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 2 months

Check_MK Git: check_mk: Added css class="dashboard_<name>" to the dashboard div for easier

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4dc042204b19f70e62c2b25c75a2596744308bd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4dc042204b19f7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 27 11:42:14 2012 +0200 Added css class="dashboard_<name>" to the dashboard div for easier customization of the dashboard style of a special dashboard --- .bugs/702 | 8 ++++++++ .bugs/703 | 8 ++++++++ ChangeLog | 2 ++ web/htdocs/dashboard.py | 2 +- 4 files changed, 19 insertions(+), 1 deletions(-) diff --git a/.bugs/702 b/.bugs/702 new file mode 100644 index 0000000..1fcb715 --- /dev/null +++ b/.bugs/702 @@ -0,0 +1,8 @@ +Title: dashlet_pnpgraph is missing parameter "view" +Component: multisite +State: open +Date: 2012-07-27 10:26:30 +Targetversion: 1.2.0 +Class: bug + +The view parameter is always set to 0. diff --git a/.bugs/703 b/.bugs/703 new file mode 100644 index 0000000..df1f45f --- /dev/null +++ b/.bugs/703 @@ -0,0 +1,8 @@ +Title: Dasboard misses iframefunc capability +Component: multisite +State: open +Date: 2012-07-27 10:27:06 +Targetversion: 1.2.0 +Class: feature + +Analog to urlfunc there should be a iframefunc to be able to create dynamic iframe based dashlets. diff --git a/ChangeLog b/ChangeLog index b990f66..e7c96ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,8 @@ * Great speed up of rule compilation in large environments Multisite: + * Added css class="dashboard_<name>" to the dashboard div for easier + customization of the dashboard style of a special dashboard * FIX: fixed localization of general permissions * FIX: show multisite warning messages even after page reload * FIX: fix bug in Age ValueSpec: days had been ignored diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index b93b980..b070a2e 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -123,7 +123,7 @@ def render_dashboard(name): title = wato.api.get_folder_title(wato_folder) + " - " + title html.header(title, javascripts=["dashboard"], stylesheets=["pages", "dashboard", "status", "views"]) - html.write("<div id=dashboard>\n") # Container of all dashlets + html.write("<div id=dashboard class=\"dashboard_%s\">\n" % name) # Container of all dashlets refresh_dashlets = [] # Dashlets with automatic refresh, for Javascript for nr, dashlet in enumerate(board["dashlets"]):

12 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits