Checkmk git commits January 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: lnx_thermal: Minor code cleanup.

by Konstantin Büttner

Module: check_mk Branch: master Commit: 50b095cc67dc4e5a64cf0d6808fe3dfeab9cc149 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50b095cc67dc4e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jan 15 14:20:09 2015 +0100 lnx_thermal: Minor code cleanup. --- checks/lnx_thermal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/lnx_thermal b/checks/lnx_thermal index 529fe3b..b2c8322 100644 --- a/checks/lnx_thermal +++ b/checks/lnx_thermal @@ -38,7 +38,7 @@ def inventory_lnx_thermal(info): return [ (l[0].replace('thermal_zone', ''), None) for l in info ] -def check_lnx_thermal(item, params, info): +def check_lnx_thermal(item, _no_params, info): for line in info: if line[0].replace('thermal_zone', '') == item: # ['thermal_zone0', 'enabled', 'acpitz', '51000', '90000', 'critical', '79000', 'passive']

9 years, 8 months

Check_MK Git: check_mk: #1815 Dashboard: Sidebar snapins can now be added as dashlets to dashboards

by Lars Michelsen

Module: check_mk Branch: master Commit: ec167be61ef982c6ae3c668fa1c0fe055ae3c3cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec167be61ef982… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jan 15 13:50:07 2015 +0100 #1815 Dashboard: Sidebar snapins can now be added as dashlets to dashboards It is now possible to add sidebar snapins to dashboards using the dashboard editor. Simply go to edit mode of a dashboard, then add a new dashlet of the type "Sidebar Snapin". In the following dialog you can choose one from all available snapins. --- .werks/1815 | 12 +++++ ChangeLog | 1 + web/htdocs/dashboard.py | 8 ++- web/htdocs/images/dashlet_snapin.png | Bin 0 -> 3190 bytes web/htdocs/sidebar.py | 7 ++- web/plugins/dashboard/dashlets.py | 97 +++++++++++++++++++++++++++++++++- 6 files changed, 120 insertions(+), 5 deletions(-) diff --git a/.werks/1815 b/.werks/1815 new file mode 100644 index 0000000..0f7f72d --- /dev/null +++ b/.werks/1815 @@ -0,0 +1,12 @@ +Title: Dashboard: Sidebar snapins can now be added as dashlets to dashboards +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i1 +Date: 1421326059 +Class: feature + +It is now possible to add sidebar snapins to dashboards using the dashboard +editor. Simply go to edit mode of a dashboard, then add a new dashlet of +the type "Sidebar Snapin". In the following dialog you can choose one from +all available snapins. diff --git a/ChangeLog b/ChangeLog index 7f7401b..bf0a7fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,7 @@ * 1210 New Downtime Filter for comments... * 1811 Added new filter for regex based filtering of contacts to log based views... * 1667 Sidebar snapin 'Tree of Folders' and 'WATO folder' filter now available on slave sites... + * 1815 Dashboard: Sidebar snapins can now be added as dashlets to dashboards... * 1781 FIX: Fix broken grouping by host/service group in availability * 1783 FIX: Finish the view "History of Scheduled Downtimes"... * 1206 FIX: Hostname not longer shown as column in host views diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 106d1e8..cab9dff 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -567,7 +567,11 @@ def render_dashlet(name, board, nr, dashlet, wato_folder, add_url_vars): html.write('<div class="%s" id="dashlet_%d">' % (' '.join(classes), nr)) - title = dashlet.get('title', dashlet_type.get('title')) + # Get the title of the dashlet type (might be dynamically defined) + title = dashlet_type.get('title') + if dashlet_type.get('title_func'): + title = dashlet_type.get('title_func')(dashlet) + title = dashlet.get('title', title) if title and dashlet.get('show_title'): url = dashlet.get("title_url", None) if url: @@ -609,7 +613,7 @@ def render_dashlet(name, board, nr, dashlet, wato_folder, add_url_vars): url = 'about:blank' # Fix of iPad >:-P - html.write('<div style="width: 100%; height: 100%; -webkit-overflow-scrolling:touch; overflow: hidden;">') + html.write('<div style="width: 100%; height: 100%; -webkit-overflow-scrolling:touch;">') html.write('<iframe id="dashlet_iframe_%d" allowTransparency="true" frameborder="0" width="100%%" ' 'height="100%%" src="%s"> </iframe>' % (nr, url)) html.write('</div>') diff --git a/web/htdocs/images/dashlet_snapin.png b/web/htdocs/images/dashlet_snapin.png new file mode 100644 index 0000000..19c2f23 Binary files /dev/null and b/web/htdocs/images/dashlet_snapin.png differ diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 793dac0..17fa617 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -267,12 +267,15 @@ def page_side(): html.body_end() -def render_snapin(name, state): - snapin = sidebar_snapins.get(name) +def render_snapin_styles(snapin): styles = snapin.get("styles") if styles: html.write("<style>\n%s\n</style>\n" % styles) +def render_snapin(name, state): + snapin = sidebar_snapins.get(name) + render_snapin_styles(snapin) + html.write("<div id=\"snapin_container_%s\" class=snapin>\n" % name) if state == "closed": style = ' style="display:none"' diff --git a/web/plugins/dashboard/dashlets.py b/web/plugins/dashboard/dashlets.py index 367fb36..28d0640 100644 --- a/web/plugins/dashboard/dashlets.py +++ b/web/plugins/dashboard/dashlets.py @@ -560,7 +560,7 @@ def dashlet_view_handle_input(ident, dashlet): dashlet_types["view"] = { "title" : _("View"), "sort_index" : 10, - "description" : _("Displays a the content of a Multisite view."), + "description" : _("Displays the content of a Multisite view."), "size" : (40, 20), "iframe_render" : dashlet_view, "allowed" : config.builtin_role_ids, @@ -615,3 +615,98 @@ dashlet_types["url"] = { "opt_params" : ['url', 'urlfunc'], "validate_params" : dashlet_url_validate, } + +#. +# .--Snapin--------------------------------------------------------------. +# | ____ _ | +# | / ___| _ __ __ _ _ __ (_)_ __ | +# | \___ \| '_ \ / _` | '_ \| | '_ \ | +# | ___) | | | | (_| | |_) | | | | | | +# | |____/|_| |_|\__,_| .__/|_|_| |_| | +# | |_| | +# +----------------------------------------------------------------------+ +# | Render sidebar snapins within the dashboard | +# '----------------------------------------------------------------------' + +def dashlet_snapin(nr, dashlet): + import sidebar # FIXME: HACK, clean this up somehow + snapin = sidebar.sidebar_snapins.get(dashlet['snapin']) + if not snapin: + raise MKUserError(None, _('The configured snapin does not exist.')) + + dashlet_type = dashlet_types[dashlet['type']] + + overflow = '' + scroll_x, scroll_y = dashlet_type.get("iframe_scroll", (False, False)) + if not scroll_x: + overflow += 'overflow-x: hidden;\n' + else: + overflow += 'overflow-x: auto;\n' + if not scroll_y: + overflow += 'overflow-y: hidden;\n' + else: + overflow += 'overflow-y: auto;\n' + + html.set_browser_reload(dashlet_type['refresh']) + html.html_head(_('Snapin Dashlet'), javascripts=['sidebar'], stylesheets=['sidebar', 'status']) + html.write('''<style> +#side_content { + height: auto; + top: 0; + padding-top: 4px; + padding-left: 4px; +} +div.snapin:last-child { + margin-bottom: 0; +} +div.snapin div.content { + background-image: none; + background-color: #508AA1; +} +div.snapin { + margin: 0; + padding: 0; +} +body.side { + %s +} +</style>''' % overflow) + html.write('<body class="side">\n') + html.write('<div id="check_mk_sidebar">\n') + html.write('<div id="side_content">\n') + html.write("<div id=\"snapin_container_%s\" class=snapin>\n" % dashlet['snapin']) + html.write("<div id=\"snapin_%s\" class=\"content\">\n" % (dashlet['snapin'])) + sidebar.render_snapin_styles(snapin) + snapin['render']() + html.write('</div>\n') + html.write('</div>\n') + html.write('</div>\n') + html.write('</div>\n') + html.body_end() + +def dashlet_snapin_get_snapins(): + import sidebar # FIXME: HACK, clean this up somehow + return sorted([ (k, v['title']) for k, v in sidebar.sidebar_snapins.items() ], key=lambda x: x[1]) + +def dashlet_snapin_title(dashlet): + import sidebar # FIXME: HACK, clean this up somehow + return sidebar.sidebar_snapins[dashlet['snapin']]['title'] + +dashlet_types["snapin"] = { + "title" : _("Sidebar Snapin"), + "title_func" : dashlet_snapin_title, + "sort_index" : 55, + "description" : _("Displays a sidebar snapin."), + "size" : (27, 20), + "iframe_render" : dashlet_snapin, + "iframe_scroll" : (False, True), + "allowed" : config.builtin_role_ids, + "refresh" : 30, + "parameters" : [ + ('snapin', DropdownChoice( + title = _('Snapin'), + help = _('Choose the snapin you like to show.'), + choices = dashlet_snapin_get_snapins, + )), + ], +}

9 years, 8 months

Check_MK Git: check_mk: #1814 FIX agent_ibmsvc: Fixed missing executable flag

by Lars Michelsen

Module: check_mk Branch: master Commit: de9cb7866ac3012ffd5589f7eeca234ee61b94b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de9cb7866ac301… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 14 15:24:22 2015 +0100 #1814 FIX agent_ibmsvc: Fixed missing executable flag --- .werks/1814 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/1814 b/.werks/1814 new file mode 100644 index 0000000..fb3088e --- /dev/null +++ b/.werks/1814 @@ -0,0 +1,10 @@ +Title: agent_ibmsvc: Fixed missing executable flag +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1421245444 + + diff --git a/ChangeLog b/ChangeLog index 77e1ac2..7f7401b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ * 1209 FIX: livestatus_status: Check handles cluster using in cluster now * 1809 FIX: cisco_temp_perf: Fixed exception when no temperature threshold provided by device * 1812 FIX: juniper_screenos_mem: Fixed too large memory reported (byte <> kbyte mixup) + * 1814 FIX: agent_ibmsvc: Fixed missing executable flag Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/agents/special/agent_ibmsvc b/agents/special/agent_ibmsvc old mode 100644 new mode 100755

9 years, 8 months

Check_MK Git: check_mk: #1813 FIX Fixed bug in event console rule editor when no contact groups configured

by Lars Michelsen

Module: check_mk Branch: master Commit: 44127526c2c954a6a62a9e3a38576f9a8982977b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44127526c2c954… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 14 14:53:14 2015 +0100 #1813 FIX Fixed bug in event console rule editor when no contact groups configured --- .werks/1813 | 10 ++++++++++ ChangeLog | 3 ++- web/htdocs/valuespec.py | 3 --- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.werks/1813 b/.werks/1813 new file mode 100644 index 0000000..3b12ad6 --- /dev/null +++ b/.werks/1813 @@ -0,0 +1,10 @@ +Title: Fixed bug in event console rule editor when no contact groups configured +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1421243568 + + diff --git a/ChangeLog b/ChangeLog index 75f5ec1..77e1ac2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,7 +31,7 @@ * 1807 check_mail: Added new check to check IMAP/POP3 login (incl. forwarding of mails to event console)... * 1841 fileinfo, fileinfo.groups: new parameter for selecting ranges of the time of the day... * 1668 Interface groups: Can create groups out of interface item names... - * 1669 mrpe script check_16bit_program.exe: Monitors 16 bit programs... + * 1669 mrpe program check_16bit_program.cc: Monitors 16 bit programs on windows... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... @@ -112,6 +112,7 @@ Event Console: * 1839 FIX: Fix exception when notifying EC alert into monitoring for traps (because PID is missing) + * 1813 FIX: Fixed bug in event console rule editor when no contact groups configured 1.2.6b1: diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 6f5b4ee..fe35b9e 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2938,9 +2938,6 @@ class ElementSelection(ValueSpec): self.load_elements() if len(self._elements) > 0: return self._elements.keys()[0] - else: - raise MKUserError(None, - _("There are not defined any elements for this selection yet.")) def render_input(self, varprefix, value): self.load_elements()

9 years, 8 months

Check_MK Git: check_mk: hwg_temp: Moved handling of device unit to temperature.include

by Konstantin Büttner

Module: check_mk Branch: master Commit: 2dc97896409d4530fb9f415219210f1324a4c33a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dc97896409d45… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 14 14:45:07 2015 +0100 hwg_temp: Moved handling of device unit to temperature.include --- checks/hwg_temp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/checks/hwg_temp b/checks/hwg_temp index c8ffe66..d84931f 100644 --- a/checks/hwg_temp +++ b/checks/hwg_temp @@ -43,28 +43,20 @@ def check_hwg_temp(item, params, info): "5" : "Alarm High", } - unit_text = { - "0" : "unknown", - "1" : "°C", - "2" : "°F", - "3" : "°K", - "4" : "%", - } - # Nomenclature in this check: sensorstatus is what the device sends, state is what the check returns. for index, descr, sensorstatus, current, unit in info: if index == item: tempval = float(current) if unit == "2": - temp = fahrenheit_to_celsius(tempval) + dev_unit = "f" elif unit == "3": - temp = tempval - 273.15 + dev_unit = "k" elif unit == "4": return else: - temp = tempval + dev_unit = "c" - state, infotext, perfdata = check_temperature(temp, params) + state, infotext, perfdata = check_temperature(tempval, params, dev_unit) if descr: infotext += " (%s)" % descr yield state, infotext, perfdata

9 years, 8 months

Check_MK Git: check_mk: #1669 mrpe program check_16bit_program.cc: Monitors 16 bit programs on windows

by Andreas Boesl

Module: check_mk Branch: master Commit: a5fa85d83550dbc1505307bf7991e9344b3bb03e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5fa85d83550db… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jan 14 14:27:30 2015 +0100 #1669 mrpe program check_16bit_program.cc: Monitors 16 bit programs on windows --- .werks/1669 | 24 +++++++++ ChangeLog | 1 + doc/treasures/check_16bit_program.cc | 97 ++++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+) diff --git a/.werks/1669 b/.werks/1669 new file mode 100644 index 0000000..0c3af50 --- /dev/null +++ b/.werks/1669 @@ -0,0 +1,24 @@ +Title: mrpe program check_16bit_program.cc: Monitors 16 bit programs on windows +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1421241371 +Class: feature + +This script is only available as source code in the check_mk git repository under +<tt>doc/treasures/check_16bit_program.cc</tt>. +It should be configured as mrpe script in the check_mk.ini. +For example: + +<tt>check = Pump_Program C:\test\check_16bit_program.exe petro3003.exe</tt> + +On success it returns with exit code 0 and +"{program} is running. Path of executable: {Path of program}" + +On failure it returns with exit code 2 and +"{program} not running" + +Note: 16 Bit programs in windows are actually not real processes. They are executed +as separate threads in processes named ntvdm.exe. + diff --git a/ChangeLog b/ChangeLog index 09d6432..c3cd7aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ * 1807 check_mail: Added new check to check IMAP/POP3 login (incl. forwarding of mails to event console)... * 1841 fileinfo, fileinfo.groups: new parameter for selecting ranges of the time of the day... * 1668 Interface groups: Can create groups out of interface item names... + * 1669 mrpe script check_16bit_program.exe: Monitors 16 bit programs... * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/doc/treasures/check_16bit_program.cc b/doc/treasures/check_16bit_program.cc new file mode 100644 index 0000000..8de61cb --- /dev/null +++ b/doc/treasures/check_16bit_program.cc @@ -0,0 +1,97 @@ +// This program enumerates all 16-bit tasks on the system and tries +// to find the program name specified by the first argument + +// Can be included as mrpe script + +// On success it returns with exit code 0 +// {program} is running. Path of executable: {Path of program} + +// On failure it returns with exit code 2 +// {program} not running. + +// Note: It seems that the 16 Bit program threads runnning inside ntvdm.exe +// are always uppercase. Because of this fact the program name is +// internally converted to uppercase. + + +#include <stdafx.h> +#include <windows.h> +#include <stdio.h> +#include <iostream> +#include <string> +#include <vdmdbg.h> + +using namespace std; + +BOOL WINAPI ProcessVDMs( DWORD, DWORD, LPARAM ); +BOOL WINAPI ProcessTasks( DWORD, WORD, WORD, PSZ, PSZ, LPARAM ); + +#pragma comment( lib, "vdmdbg.lib" ) + +void usage() { + printf("Usage: check_16bit_process.exe {program}"); +} + +string program_to_check; + +void main(int argc, char* argv[]) +{ + if (argc != 2) { + usage(); + exit(1); + } + + program_to_check = string(argv[1]); + for (unsigned int k = 0; k < program_to_check.length(); k++) + program_to_check[k] = toupper(program_to_check[k]); + + // Enumerate VDMs + VDMEnumProcessWOW( + (PROCESSENUMPROC)ProcessVDMs, + (LPARAM)NULL + ); + + printf("%s is not running", program_to_check.c_str()); + exit(2); +} + +BOOL WINAPI ProcessVDMs( DWORD dwProcessId, DWORD dwAttrib, + LPARAM t ) +{ + // Might be useful some day + // printf("\nProcess ID: %d\n", dwProcessId); + + // Use process ID of VDM to enumerate through its tasks + VDMEnumTaskWOWEx( + dwProcessId, + (TASKENUMPROCEX)ProcessTasks, + (LPARAM)NULL + ); + + // Keep enumerating + return FALSE; +} + +BOOL WINAPI ProcessTasks( DWORD dwThreadId, WORD hMod16, WORD hTask16, + PSZ pszModName, PSZ pszFileName, LPARAM lParam ) +{ + //Task's information + //Might be useful some day + //printf("Thread ID: %d\n", dwThreadId); + //printf("Module handle: %d\n", hMod16); + //printf("Task handle: %d\n", hTask16); + //printf("Module Name: %s\n", pszModName); + //printf("File Name: %s\n", pszFileName); + + string thread_filename = string(pszFileName); + if (0 == thread_filename.compare(thread_filename.length() - program_to_check.length(), + program_to_check.length(), program_to_check)) { + printf("%s is running. Path of executable: %s", program_to_check.c_str(), thread_filename.c_str()); + exit(0); + } + + + // Keep enumerating + return FALSE; +} +

9 years, 8 months

Check_MK Git: check_mk: rpm/deb packages are not built during "make dist" anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 070155b5f0cd71cc4d51f799bbb5a7a18285f630 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=070155b5f0cd71… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 14 14:15:06 2015 +0100 rpm/deb packages are not built during "make dist" anymore --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index ea72c82..baadd20 100644 --- a/Makefile +++ b/Makefile @@ -98,7 +98,6 @@ dist: mk-livestatus mk-eventd cp multisite.mk multisite.mk-$(VERSION) tar czf $(DISTNAME)/conf.tar.gz $(TAROPTS) main.mk-$(VERSION) multisite.mk-$(VERSION) rm -f main.mk-$(VERSION) multisite.mk-$(VERSION) - $(MAKE) -C agents packages tar czf $(DISTNAME)/agents.tar.gz $(TAROPTS) -C agents \ --exclude "msibuild" \ --exclude "build_version" \

9 years, 8 months

Check_MK Git: check_mk: #1812 FIX juniper_screenos_mem: Fixed too large memory reported (byte <> kbyte mixup)

by Lars Michelsen

Module: check_mk Branch: master Commit: f6c1d965bfb432c13724db0eeb540544095f17af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6c1d965bfb432… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 14 13:19:38 2015 +0100 #1812 FIX juniper_screenos_mem: Fixed too large memory reported (byte <> kbyte mixup) --- .werks/1812 | 9 +++++++++ ChangeLog | 1 + checks/juniper_screenos_mem | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/1812 b/.werks/1812 new file mode 100644 index 0000000..074edff --- /dev/null +++ b/.werks/1812 @@ -0,0 +1,9 @@ +Title: juniper_screenos_mem: Fixed too large memory reported (byte <> kbyte mixup) +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1421237757 + diff --git a/ChangeLog b/ChangeLog index 09d6432..791787c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,6 +62,7 @@ * 1848 FIX: df: title of pnp graphs for filesystem checks fixed... * 1209 FIX: livestatus_status: Check handles cluster using in cluster now * 1809 FIX: cisco_temp_perf: Fixed exception when no temperature threshold provided by device + * 1812 FIX: juniper_screenos_mem: Fixed too large memory reported (byte <> kbyte mixup) Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/juniper_screenos_mem b/checks/juniper_screenos_mem index 46444ee..b2dbd5b 100644 --- a/checks/juniper_screenos_mem +++ b/checks/juniper_screenos_mem @@ -27,7 +27,7 @@ def parse_juniper_screenos_mem(info): new_info = [] for used, free in info: - new_info.append([used, int(used)+int(free)]) + new_info.append([int(used)/1024, (int(used)+int(free))/1024]) return new_info check_info["juniper_screenos_mem"] = {

9 years, 8 months

Check_MK Git: check_mk: Fixed livestatus .f12 script

by Lars Michelsen

Module: check_mk Branch: master Commit: 804cf07af0c897a62e42fd877bc12dd35b3084d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=804cf07af0c897… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 14 11:30:22 2015 +0100 Fixed livestatus .f12 script --- livestatus/.f12 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/livestatus/.f12 b/livestatus/.f12 index 226b05c..0c22846 100755 --- a/livestatus/.f12 +++ b/livestatus/.f12 @@ -4,8 +4,7 @@ SITE=${SITE:-$(omd sites --bare | head -n 1)} set -e if [ ! -f configure ]; then - automake --add-missing - aclocal && autoheader && automake -a && autoconf + aclocal && autoheader && automake --add-missing && autoconf fi if [ ! -f Makefile ]; then

9 years, 8 months

Check_MK Git: check_mk: f5_bigip_chassis_temp, f5_bigip_cpu_temp: Small bugfix concerning default levels

by Konstantin Büttner

Module: check_mk Branch: master Commit: fe080401254d46e3acec18ac94db06adca8ed7dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe080401254d46… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 14 10:46:52 2015 +0100 f5_bigip_chassis_temp, f5_bigip_cpu_temp: Small bugfix concerning default levels --- checks/f5_bigip_chassis_temp | 2 +- checks/f5_bigip_cpu_temp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/f5_bigip_chassis_temp b/checks/f5_bigip_chassis_temp index c98aa7d..6af659b 100644 --- a/checks/f5_bigip_chassis_temp +++ b/checks/f5_bigip_chassis_temp @@ -29,7 +29,7 @@ f5_bigip_chassis_temp_default_params = (35, 40) def inventory_f5_bigip_chassis_temp(info): for line in info: - yield line[0], f5_bigip_chassis_temp_default_params + yield line[0], "f5_bigip_chassis_temp_default_params" diff --git a/checks/f5_bigip_cpu_temp b/checks/f5_bigip_cpu_temp index 3e03a3d..5a962df 100644 --- a/checks/f5_bigip_cpu_temp +++ b/checks/f5_bigip_cpu_temp @@ -30,7 +30,7 @@ f5_bigip_cpu_temp_default_params = (60, 80) def inventory_f5_bigip_cpu_temp(info): for line in info: - yield line[0], f5_bigip_cpu_temp_default_params + yield line[0], "f5_bigip_cpu_temp_default_params"

9 years, 8 months

← Newer
1
...
21
22
23
24
25
26
27
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2015