Checkmk git commits May 2015

checkmk-commits@lists.checkmk.com

7 participants
200 discussions

Check_MK Git: check_mk: Reserved 20 Werk IDS

by Andreas Boesl

Module: check_mk Branch: master Commit: 57b9c39947492d3f52b5777824947cfe6c167472 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57b9c39947492d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu May 7 14:31:26 2015 +0200 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index b54ebd4..cc6f0ac 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2263 +2283

9 years, 1 month

Check_MK Git: check_mk: Fixed graph icon on high res screens

by Lars Michelsen

Module: check_mk Branch: master Commit: 1d267aabfd5a7684d5b108dbb6f98542988445f0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d267aabfd5a76… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 7 13:56:15 2015 +0200 Fixed graph icon on high res screens --- web/htdocs/js/checkmk.js | 1 + web/htdocs/pages.css | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index d95bbb7..f531836 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -748,6 +748,7 @@ function create_graph(data, params) { var visualadd = document.createElement('a'); visualadd.title = data['add_txt']; visualadd.className = 'popup_trigger'; + visualadd.innerHTML = '<img src="images/icon_menu.png" class="icon">'; visualadd.onclick = function(host, service, view, source) { return function(event) { toggle_popup(event, this, 'add_visual', 'add_visual', diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 7a9ee4b..356ec8a 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -1121,10 +1121,14 @@ div.pnp_graph a.popup_trigger { display: block; width: 20px; height: 20px; - background-image: url(images/button_menu_lo.png); } div.pnp_graph a.popup_trigger:hover { - background-image: url(images/button_menu_hi.png); cursor: pointer; } + +tr.data td.pnpgraph div.pnp_graph > a.popup_trigger > img.icon { + border: none; + box-shadow: none; + margin: 0; +}

9 years, 1 month

Check_MK Git: check_mk: #2250 Added download page for shipped agents and plugins

by Lars Michelsen

Module: check_mk Branch: master Commit: 6215222f3b2244100d596dc202bd9c27ee4b0a1b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6215222f3b2244… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 7 12:48:55 2015 +0200 #2250 Added download page for shipped agents and plugins It is now possible to download the Check_MK agents and plugins shipped with your version directly from the WEB GUI. The page <i>Monitoring Agents</i> can be opened from the Configuration snapin. This page has been added only to the Check_MK Raw edition. The Enterprise Edition has the agent bakery which offers a lot of more features like generating customized agents. --- .werks/2250 | 17 +++++ ChangeLog | 1 + web/htdocs/images/icon_download_agents.png | Bin 0 -> 3383 bytes web/plugins/wato/agents.py | 110 ++++++++++++++++++++++++++++ 4 files changed, 128 insertions(+) diff --git a/.werks/2250 b/.werks/2250 new file mode 100644 index 0000000..b231626 --- /dev/null +++ b/.werks/2250 @@ -0,0 +1,17 @@ +Title: Added download page for shipped agents and plugins +Level: 1 +Component: wato +Class: feature +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1430995542 + +It is now possible to download the Check_MK agents and plugins +shipped with your version directly from the WEB GUI. The page +<i>Monitoring Agents</i> can be opened from the Configuration +snapin. + +This page has been added only to the Check_MK Raw edition. The +Enterprise Edition has the agent bakery which offers a lot of +more features like generating customized agents. diff --git a/ChangeLog b/ChangeLog index cd28fca..c70a930 100644 --- a/ChangeLog +++ b/ChangeLog @@ -440,6 +440,7 @@ * 1951 check_http: now able to configure warning and critical limit for certificate age... * 2136 Unify headers of Host/Service rules, EC rules and notification rules... * 2176 One custom icon or action can be configured per process/service... + * 2250 Added download page for shipped agents and plugins... * 1761 FIX: Ruleset search is now consistent for host & serviceparameters and manual checks * 1765 FIX: Fixed bug when generating nagvis backends while having sites with livestatus proxy configured... * 1789 FIX: Fix preview of passive checks in WATO list of services diff --git a/web/htdocs/images/icon_download_agents.png b/web/htdocs/images/icon_download_agents.png new file mode 100644 index 0000000..c8a65a7 Binary files /dev/null and b/web/htdocs/images/icon_download_agents.png differ diff --git a/web/plugins/wato/agents.py b/web/plugins/wato/agents.py new file mode 100644 index 0000000..f6c5018 --- /dev/null +++ b/web/plugins/wato/agents.py @@ -0,0 +1,110 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + +import glob + +def download_table(title, paths): + forms.header(title) + forms.container() + for path in paths: + os_path = path + relpath = path.replace(defaults.agents_dir+'/', '') + filename = path.split('/')[-1] + + size_kb = os.stat(os_path).st_size / 1024.0 + + # FIXME: Rename classes etc. to something generic + html.write('<div class="ruleset"><div class="text" style="width:250px;">') + html.write('<a href="agents/%s">%s</a>' % (relpath, filename)) + html.write('<span class=dots>%s</span></div>' % ("." * 100)) + html.write('<div class="rulecount" style="width:30px;">%d KB</div>' % size_kb) + html.write('</div></div>') + forms.end() + +def mode_download_agents(phase): + if phase == "title": + return _("Monitoring Agents") + + elif phase == "buttons": + global_buttons() + return + + elif phase == "action": + return + + html.write('<div class="rulesets">') + packed = glob.glob(defaults.agents_dir + "/*.deb") \ + + glob.glob(defaults.agents_dir + "/*.rpm") \ + + glob.glob(defaults.agents_dir + "/windows/c*.msi") + + download_table(_("Packed Agents"), packed) + + titles = { + '' : _('Linux / Unix Agents'), + '/plugins' : _('Linux / Unix Plugins'), + '/windows' : _('Windows Agent'), + '/windows/plugins' : _('Windows Plugins'), + '/windows/mrpe' : _('Windows MRPE Scripts'), + '/cfg_examples' : _('Example Configurations'), + '/z_os' : _('z/OS'), + '/sap' : _('SAP'), + '/special' : _('Special Agents'), + } + + others = [] + for root, dirs, files in os.walk(defaults.agents_dir): + file_paths = [] + relpath = root.split('agents')[1] + title = titles.get(relpath, relpath) + for filename in files: + path = root + '/' + filename + if path not in packed and 'deprecated' not in path: + file_paths.append(path) + + others.append((title, file_paths)) + + others.sort() + + for title, file_paths in others: + if file_paths: + download_table(title, sorted(file_paths)) + html.write('</div>') + +# Don't do anything when the agent bakery exists. Otherwise register +# a simple download page for the default agents +if "agents" not in modes: + modules.append( + ("download_agents", _("Monitoring Agents"), "download_agents", "download_agents", + _("Downloads the Check_MK monitoring agents")) + ) + + modes["download_agents"] = (["download_agents"], mode_download_agents) + + config.declare_permission("wato.download_agents", + _("Monitoring Agents"), + _("Download the default Check_MK monitoring agents for Linux, i" + "Windows and other operating systems."), + [ "admin", "user", "guest" ])

9 years, 1 month

Check_MK Git: check_mk: apt: Minor fix in case of no avail. updates

by Bastian Kuhn

Module: check_mk Branch: master Commit: 030602626927ea3e278a9e1c5dad732a4ff3a120 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=030602626927ea… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu May 7 10:17:40 2015 +0200 apt: Minor fix in case of no avail. updates --- checks/apt | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/apt b/checks/apt index f452e1b..3dc2da7 100644 --- a/checks/apt +++ b/checks/apt @@ -58,6 +58,7 @@ def check_apt(_no_item, params, info): else: updates.append(packet) + state = 0 if updates: state = params["normal"] yield state, "%d normal updates" % len(updates), [ ("normal_updates", len(updates)) ]

9 years, 1 month

Check_MK Git: check_mk: #2249 Builtin icon visibility can now be configured

by Lars Michelsen

Module: check_mk Branch: master Commit: 12c582b6dc881ca4d2f21381d897fe3c643bcda0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12c582b6dc881c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 7 10:07:14 2015 +0200 #2249 Builtin icon visibility can now be configured Using the new global setting "Builtin icon visibility" it is now possible to configure the visibility of the builtin icons in views. You can change whether or not the single icons are displayed in the popup menu or directly in the cell and change the sorting of the icons. --- .werks/2249 | 12 +++ ChangeLog | 1 + web/plugins/config/builtin.py | 3 + web/plugins/icons/builtin.py | 133 ++++++++++++++++------------ web/plugins/icons/inventory.py | 8 +- web/plugins/icons/wato.py | 10 +-- web/plugins/views/painters.py | 39 ++++++-- web/plugins/wato/check_mk_configuration.py | 52 +++++++++++ 8 files changed, 187 insertions(+), 71 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=12c582b6dc…

9 years, 1 month

Check_MK Git: check_mk: Windows Agent: use current dir as agent dir for adhoc and test mode

by Mathias Kettner

Module: check_mk Branch: master Commit: 53258fcc7d0b40ed74b65054660dc09eadc0b29b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53258fcc7d0b40… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 6 16:26:07 2015 +0200 Windows Agent: use current dir as agent dir for adhoc and test mode --- agents/windows/check_mk_agent.cc | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index d63704a..80de70d 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -4099,7 +4099,6 @@ bool handle_mrpe_config_variable(char *var, char *value) "Format: SERVICEDESC COMMANDLINE\r\n"); return false; } - fprintf(stderr, "CMD: [%s]\r\n", command_line); mrpe_entry* tmp_entry = new mrpe_entry(); memset(tmp_entry, 0, sizeof(mrpe_entry)); @@ -4785,13 +4784,17 @@ void show_version() printf("Check_MK_Agent version %s\n", check_mk_version); } -void get_agent_dir(char *buffer, int size) +void get_agent_dir(char *buffer, int size, bool use_cwd) { buffer[0] = 0; HKEY key; - DWORD ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, - "SYSTEM\\CurrentControlSet\\Services\\check_mk_agent", 0, KEY_READ, &key); + DWORD ret = -1; + + if (!use_cwd) + ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, + "SYSTEM\\CurrentControlSet\\Services\\check_mk_agent", 0, KEY_READ, &key); + if (ret == ERROR_SUCCESS) { DWORD dsize = size; @@ -4823,11 +4826,11 @@ void get_agent_dir(char *buffer, int size) } -void determine_directories() +void determine_directories(bool use_cwd) { // Determine directories once and forever getcwd(g_current_directory, sizeof(g_current_directory)); - get_agent_dir(g_agent_directory, sizeof(g_agent_directory)); + get_agent_dir(g_agent_directory, sizeof(g_agent_directory), use_cwd); snprintf(g_plugins_dir, sizeof(g_plugins_dir), "%s\\plugins", g_agent_directory); snprintf(g_local_dir, sizeof(g_local_dir), "%s\\local", g_agent_directory); snprintf(g_spool_dir, sizeof(g_spool_dir), "%s\\spool", g_agent_directory); @@ -5024,7 +5027,10 @@ int main(int argc, char **argv) osv.dwOSVersionInfoSize = sizeof(osv); GetVersionEx(&osv); - determine_directories(); + if (!strcmp(argv[1], "adhoc") || !strcmp(argv[1], "test")) + determine_directories(true /* use working dir */); + else + determine_directories(false /* use registered dir */); read_config_file(); SetConsoleCtrlHandler((PHANDLER_ROUTINE)ctrl_handler, TRUE);

9 years, 1 month

Check_MK Git: check_mk: bluenet_meter: Fix syntax error in discovery function

by Mathias Kettner

Module: check_mk Branch: master Commit: 01f7a937c25bce3e61dee485055f7880e98acbc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01f7a937c25bce… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 6 15:54:54 2015 +0200 bluenet_meter: Fix syntax error in discovery function --- checks/bluenet_meter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/bluenet_meter b/checks/bluenet_meter index b2c83b4..329c548 100644 --- a/checks/bluenet_meter +++ b/checks/bluenet_meter @@ -52,6 +52,6 @@ check_info["bluenet_meter"] = { 8, # e3lpmUrms 9, # e3lpmIrms ]), - "snmp_scan_function" : lambda o6d: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.21695.1", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.21695.1", "includes" : ["elphase.include"], }

9 years, 1 month

Check_MK Git: check_mk: Internal restructuration of availability - step 3

by Mathias Kettner

Module: check_mk Branch: master Commit: 14de55f813e4f64bc52cb97aea554b1fd1180de1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14de55f813e4f6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 5 15:36:38 2015 +0200 Internal restructuration of availability - step 3 --- web/htdocs/availability.py | 357 +++++++++++++++++++- web/plugins/views/availability.py | 668 +++++++++---------------------------- 2 files changed, 504 insertions(+), 521 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=14de55f813…

9 years, 1 month

Check_MK Git: check_mk: Internal restructuration of availability - step 4

by Mathias Kettner

Module: check_mk Branch: master Commit: 77d6eeec4576549f1211eb8f3ad5be98046c3552 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77d6eeec457654… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 6 14:49:54 2015 +0200 Internal restructuration of availability - step 4 --- web/htdocs/availability.py | 992 +++++++++++++++++++++++++++++++++- web/htdocs/js/checkmk.js | 7 +- web/htdocs/lib.py | 13 + web/htdocs/views.py | 2 +- web/plugins/views/availability.py | 1069 ++++++++----------------------------- web/plugins/views/sorters.py | 12 - 6 files changed, 1221 insertions(+), 874 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=77d6eeec45…

9 years, 1 month

Check_MK Git: check_mk: Readded missing icon image icon

by Lars Michelsen

Module: check_mk Branch: master Commit: eac98f269b546b42c2d41624ecaae85e3bdd6d75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eac98f269b546b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 6 11:31:04 2015 +0200 Readded missing icon image icon --- web/plugins/icons/builtin.py | 26 ++++++++++++++++++++++++++ web/plugins/wato/check_mk_configuration.py | 22 ++++++++++++---------- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index b7c0da0..5d7ebf6 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -96,6 +96,32 @@ multisite_icons.append({ }) #. +# .--Icon-Image----------------------------------------------------------. +# | ___ ___ | +# | |_ _|___ ___ _ __ |_ _|_ __ ___ __ _ __ _ ___ | +# | | |/ __/ _ \| '_ \ _____| || '_ ` _ \ / _` |/ _` |/ _ \ | +# | | | (_| (_) | | | |_____| || | | | | | (_| | (_| | __/ | +# | |___\___\___/|_| |_| |___|_| |_| |_|\__,_|\__, |\___| | +# | |___/ | +# +----------------------------------------------------------------------+ +# | | +# '----------------------------------------------------------------------' + +def paint_icon_image(what, row, tags, custom_vars): + img = row[what + '_icon_image'] + if img: + if img.endswith('.png'): + img = img[:-4] + return html.render_icon(img) + +multisite_icons.append({ + 'columns': [ 'icon_image' ], + 'paint': paint_icon_image, + 'toplevel': True, + 'sort_index': 25, +}) + +#. # .--Reschedule----------------------------------------------------------. # | ____ _ _ _ | # | | _ \ ___ ___ ___| |__ ___ __| |_ _| | ___ | diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 74d89db..51ed32f 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2193,14 +2193,17 @@ register_rule(group, register_rule(group, "extra_host_conf:icon_image", - IconSelector( - title = _("Icon image for hosts in status GUI"), - help = _("You can assign icons to hosts for the status GUI. " - "Put your images into <tt>%s</tt>. ") % - ( defaults.omd_root - and defaults.omd_root + "/local/share/check_mk/web/htdocs/images/icons" - or defaults.web_dir + "/htdocs/images/icons" ), - )) + Transform( + IconSelector( + title = _("Icon image for hosts in status GUI"), + help = _("You can assign icons to hosts for the status GUI. " + "Put your images into <tt>%s</tt>. ") % + ( defaults.omd_root + and defaults.omd_root + "/local/share/check_mk/web/htdocs/images/icons" + or defaults.web_dir + "/htdocs/images/icons" ), + ), + forth = lambda v: v.endswith('.png') and v[:-4] or v, + )) register_rule(group, @@ -2214,8 +2217,7 @@ register_rule(group, and defaults.omd_root + "/local/share/check_mk/web/htdocs/images/icons" or defaults.web_dir + "/htdocs/images/icons" ), ), - forth = lambda v: v and v[:-4] or v, - back = lambda v: v and v+'.png' or v, + forth = lambda v: v.endswith('.png') and v[:-4] or v, ), itemtype = "service")

9 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2015