Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: Removed link to check_mk portal

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4338b74598e3a0169c70b80ff9acbfc0823918ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4338b74598e3a0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 15 09:11:40 2012 +0200 Removed link to check_mk portal --- multisite.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/multisite.mk b/multisite.mk index 95d285e..0222aed 100644 --- a/multisite.mk +++ b/multisite.mk @@ -66,10 +66,10 @@ custom_links['user'] = custom_links['guest'] + [ # The admins yet get further links custom_links['admin'] = custom_links['user'] + [ ( "Support", False, [ - ( "Mathias Kettner", "http://mathias-kettner.de/" ), - ( "Check_MK Mailinglists", "http://mathias-kettner.de/check_mk_lists.html" ), - ( "Check_MK Portal (inofficial)", "http://check-mk-portal.org/"), - ( "Nagios Portal (German)", "http://nagios-portal.org"), + ( "Mathias Kettner", "http://mathias-kettner.de/" ), + ( "Check_MK Mailinglists", "http://mathias-kettner.de/check_mk_lists.html" ), + ( "Check_MK Exchange (inofficial)", "http://exchange.check-mk.org/" ), + ( "Nagios Portal (German)", "http://nagios-portal.org"), ]) ]

12 years, 4 months

Check_MK Git: check_mk: Better styling of add-snapin page

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 510b809ac8f9e3f60c1819f6850b3a62dbfd673c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=510b809ac8f9e3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 14 18:49:13 2012 +0200 Better styling of add-snapin page --- web/htdocs/sidebar.css | 17 ++++++++++++++--- web/htdocs/sidebar.py | 6 +++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index be43f85..6c710cc 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -360,8 +360,8 @@ div#snapinDragIndicator { div.add_snapin div.snapinadder { padding: 8px 2px 14px 2px; - background-color: #9bc; - -moz-border-radius: 8px; + background-color: #478; + border-radius: 5px; border-bottom: 1px solid #9ab; border-right: 1px solid #89a; height: 220px; @@ -369,9 +369,20 @@ div.add_snapin div.snapinadder { margin-right: 10px; margin-bottom: 10px; float: left; + box-shadow: 1px 1px 5px #000; + border-style: solid; + border-width: 1px; + border-color: #9bc #245 #245 #9bc; } +div.add_snapin div.snapinadder:hover { + background-color: #69a; + box-shadow: 0px 0px 10px #fff; + border-color: #fff; /* #9bc #9bc #fff; */ + position: relative; +} + div.add_snapin div.snapinadder div.description { - color: #369; + color: #fff; padding: 10px; } div.add_snapin div.snapin_preview div.clickshield { diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 097bd40..52015f3 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -346,9 +346,9 @@ def page_add_snapin(): description = snapin.get("description", "") transid = html.fresh_transid() url = 'sidebar_add_snapin.py?name=%s&_transid=%s&pos=top' % (name, transid) - html.write('<div class=snapinadder onmouseover="this.style.background=\'#cde\'; this.style.cursor=\'pointer\';" ' - 'onmouseout="this.style.background=\'#9bc\' "' - 'onmousedown="window.location.href=\'%s\';return false;">' % url) + html.write('<div class=snapinadder ' + 'onmouseover="this.style.cursor=\'pointer\';" ' + 'onmousedown="window.location.href=\'%s\'; return false;">' % url) html.write("<div class=snapin_preview>") html.write("<div class=clickshield></div>")

12 years, 4 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: 191767ca8e3cd7e2f6edde63996259b3223c301e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=191767ca8e3cd7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue May 15 09:11:43 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0749

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 18d1995ea9c74197164281513cadf1f55f74c94e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18d1995ea9c741… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 14 19:05:29 2012 +0200 Updated bug entries #0749 --- .bugs/749 | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/.bugs/749 b/.bugs/749 new file mode 100644 index 0000000..e6d6107 --- /dev/null +++ b/.bugs/749 @@ -0,0 +1,19 @@ +Title: Multisite setup with cookie based login garbles PNP webservice +Component: multisite +State: open +Date: 2012-05-14 19:02:05 +Targetversion: 1.2.0 +Class: bug + +If you use cookie based authentication and a multisite setup and if the +auth.secret is not replicated - so that your login does not automatically +work for the remote site, then two nasty things happen: + +1. If you hover over the PNP icon will show the login screen in place where +the PNP hover graphs should appear - and also garble styles. + +2. If you click on the details of a remote service (i.e. a view with a +remote PNP graph embedded), then Chrome will go into an endless loop +again and again loading the page. This must have to do something with +the PNP webservice returning HTML code that will somehow redirect to +the login page.

12 years, 4 months

Check_MK Git: check_mk: Little optical change in Tactical Overview

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cafa0ce8f2a380a45e4029a06382bb9c1311b635 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cafa0ce8f2a380… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 14 17:45:33 2012 +0200 Little optical change in Tactical Overview --- web/plugins/sidebar/shipped.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index b896407..54d6ea5 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -573,6 +573,9 @@ table.tacticaloverview td { height: 14px; /* box-shadow: 1px 0px 1px #386068; */ } +table.tacticaloverview td.prob { + box-shadow: 0px 0px 4px #ffd000; +} table.tacticaloverview a { display: block; margin-right: 2px; } """ % snapin_width }

12 years, 4 months

Check_MK Git: check_mk: Removed obsolete author information from snapins

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6452fafa12bff2cd8f17f5172b82f77d103e6b6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6452fafa12bff2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 14 18:47:46 2012 +0200 Removed obsolete author information from snapins --- web/plugins/sidebar/bi.py | 1 - web/plugins/sidebar/nagvis_maps.py | 1 - web/plugins/sidebar/search.py | 1 - web/plugins/sidebar/shipped.py | 17 ----------------- web/plugins/sidebar/wato.py | 3 --- 5 files changed, 0 insertions(+), 23 deletions(-) diff --git a/web/plugins/sidebar/bi.py b/web/plugins/sidebar/bi.py index 2fa4a4e..f044c5f 100644 --- a/web/plugins/sidebar/bi.py +++ b/web/plugins/sidebar/bi.py @@ -45,7 +45,6 @@ def render_bi_groups(): sidebar_snapins["biaggr_groups"] = { "title" : _("BI Aggregation Groups"), "description" : _("A direct link to all groups of BI aggregations"), - "author" : "Mathias Kettner", "render" : render_bi_groups, "allowed" : [ "admin", "user", "guest" ] } diff --git a/web/plugins/sidebar/nagvis_maps.py b/web/plugins/sidebar/nagvis_maps.py index 47eb398..f225797 100644 --- a/web/plugins/sidebar/nagvis_maps.py +++ b/web/plugins/sidebar/nagvis_maps.py @@ -41,7 +41,6 @@ sidebar_snapins["nagvis_maps"] = { "description": _("List of available NagVis maps. This only works with NagVis 1.5 and above. " \ "At the moment it is neccessarry to authenticate with NagVis first by opening " \ "a NagVis map in the browser. After this the maplist should be filled."), - "author": "Lars Michelsen", "render": render_nagvis_maps, "allowed": [ "user", "admin", "guest" ], "refresh": 30, diff --git a/web/plugins/sidebar/search.py b/web/plugins/sidebar/search.py index 88e2bce..3e6ba44 100644 --- a/web/plugins/sidebar/search.py +++ b/web/plugins/sidebar/search.py @@ -92,7 +92,6 @@ def render_searchform(): sidebar_snapins["search"] = { "title": _("Quicksearch"), "description": _("Interactive search field for direct access to hosts"), - "author": "Lars Michelsen", "render": render_searchform, "restart": True, "allowed": [ "user", "admin", "guest" ], diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 54d6ea5..96d577a 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -55,7 +55,6 @@ def render_about(): sidebar_snapins["about"] = { "title" : _("About Check_MK"), "description" : _("Version information and Links to Documentation, Homepage and Download of Check_MK"), - "author" : "Mathias Kettner", "render" : render_about, "allowed" : [ "admin", "user", "guest" ], } @@ -132,7 +131,6 @@ def render_views(): sidebar_snapins["views"] = { "title" : _("Views"), "description" : _("Links to all views"), - "author" : "Mathias Kettner", "render" : render_views, "allowed" : [ "user", "admin", "guest" ], } @@ -165,7 +163,6 @@ def render_groups(what): sidebar_snapins["hostgroups"] = { "title" : _("Hostgroups"), "description" : _("Directs links to all host groups"), - "author" : "Mathias Kettner", "render" : lambda: render_groups("host"), "restart": True, "allowed" : [ "user", "admin", "guest" ] @@ -173,7 +170,6 @@ sidebar_snapins["hostgroups"] = { sidebar_snapins["servicegroups"] = { "title" : _("Servicegroups"), "description" : _("Direct links to all service groups"), - "author" : "Mathias Kettner", "render" : lambda: render_groups("service"), "restart": True, "allowed" : [ "user", "admin", "guest" ] @@ -251,7 +247,6 @@ snapin_allhosts_styles = """ sidebar_snapins["hosts"] = { "title" : _("All hosts"), "description" : _("A summary state of each host with a link to the view showing its services"), - "author" : "Mathias Kettner", "render" : lambda: render_hosts("hosts"), "allowed" : [ "user", "admin", "guest" ], "refresh" : 60, @@ -262,7 +257,6 @@ sidebar_snapins["hosts"] = { sidebar_snapins["summary_hosts"] = { "title" : _("Summary hosts"), "description" : _("A summary state of all summary hosts (summary hosts hold aggregated service states and are a feature of Check_MK)"), - "author" : "Mathias Kettner", "render" : lambda: render_hosts("summary"), "allowed" : [ "user", "admin", "guest" ], "refresh" : 60, @@ -273,7 +267,6 @@ sidebar_snapins["summary_hosts"] = { sidebar_snapins["problem_hosts"] = { "title" : _("Problem hosts"), "description" : _("A summary state of all hosts that have problem, with links to problems of those hosts"), - "author" : "Mathias Kettner", "render" : lambda: render_hosts("problems"), "allowed" : [ "user", "admin", "guest" ], "refresh" : 60, @@ -359,7 +352,6 @@ def render_hostmatrix(): sidebar_snapins["hostmatrix"] = { "title" : _("Host Matrix"), "description" : _("A matrix showing a colored square for each host"), - "author" : "Mathias Kettner", "render" : render_hostmatrix, "allowed" : [ "user", "admin", "guest" ], "refresh" : 10, @@ -430,7 +422,6 @@ def render_sitestatus(): sidebar_snapins["sitestatus"] = { "title" : _("Site status"), "description" : _("Connection state of each site and button for enabling and disabling the site connection"), - "author" : "Mathias Kettner", "render" : render_sitestatus, "allowed" : [ "user", "admin" ], "refresh" : 90, @@ -536,7 +527,6 @@ def render_tactical_overview(): sidebar_snapins["tactical_overview"] = { "title" : _("Tactical Overview"), "description" : _("The total number of hosts and service with and without problems"), - "author" : "Mathias Kettner", "refresh" : 10, "render" : render_tactical_overview, "allowed" : [ "user", "admin", "guest" ], @@ -625,7 +615,6 @@ def render_performance(): sidebar_snapins["performance"] = { "title" : _("Server performance"), "description" : _("Live monitor of the overall performance of all monitoring servers"), - "author" : "Mathias Kettner", "refresh" : 15, "render" : render_performance, "allowed" : [ "admin", ], @@ -799,7 +788,6 @@ sidebar_snapins["speedometer"] = { "the scheduled check rate. If the Speed-O-Meter shows a speed " "of 100 percent, then all checks are being executed in exactly " "the rate that is configured (via check_interval)"), - "author" : "Mathias Kettner", "render" : render_speedometer, "allowed" : [ "admin", ], "styles" : """ @@ -840,7 +828,6 @@ def render_current_time(): sidebar_snapins["time"] = { "title" : _("Server time"), "description" : _("A large clock showing the current time of the web server"), - "author" : "Mathias Kettner", "refresh" : 30, "render" : render_current_time, "allowed" : [ "user", "admin", "guest", ], @@ -923,7 +910,6 @@ def render_nagios(): sidebar_snapins["nagios_legacy"] = { "title" : _("Old Nagios GUI"), "description" : _("The classical sidebar of Nagios 3.2.0 with links to your local Nagios instance (no multi site support)"), - "author" : "Mathias Kettner", "render" : render_nagios, "allowed" : [ "user", "admin", "guest", ], } @@ -970,7 +956,6 @@ def render_master_control(): sidebar_snapins["master_control"] = { "title" : _("Master control"), "description" : _("Buttons for switching globally states such as enabling checks and notifications"), - "author" : "Mathias Kettner", "render" : render_master_control, "allowed" : [ "admin", ], "styles" : """ @@ -1130,7 +1115,6 @@ def ajax_add_bookmark(): sidebar_snapins["bookmarks"] = { "title" : _("Bookmarks"), "description" : _("A simple and yet practical snapin allowing to create bookmarks to views and other content in the main frame"), - "author" : "Mathias Kettner", "render" : render_bookmarks, "allowed": [ "user", "admin", "guest" ], "styles" : """ @@ -1202,7 +1186,6 @@ def render_custom_links(): sidebar_snapins["custom_links"] = { "title" : _("Custom Links"), "description" : _("This snapin contains custom links which can be configured via the configuration variable <tt>custom_links</tt> in <tt>multisite.mk</tt>"), - "author" : "Mathias Kettner", "render" : render_custom_links, "allowed" : [ "user", "admin", "guest" ], "styles" : """ diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index e052a41..47c69ed 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -54,7 +54,6 @@ def render_wato(): sidebar_snapins["admin"] = { "title" : _("WATO · Configuration"), "description" : _("Direct access to WATO - the web administration GUI of Check_MK"), - "author" : "Mathias Kettner", "render" : render_wato, "refresh" : 60, # refresh pending changes, if other user modifies something "allowed" : [ "admin", "user" ], @@ -80,7 +79,6 @@ sidebar_snapins["wato"] = { "title" : _("Hosts"), "description" : _("A foldable tree showing all your WATO folders and files - " "allowing you to navigate in the tree while using views or being in WATO"), - "author" : "Mathias Kettner", "render" : render_wato_folders, "allowed" : [ "admin", "user", "guest" ], } @@ -222,7 +220,6 @@ def render_tree_folder(f): sidebar_snapins['wato_foldertree'] = { 'title' : _('Foldertree'), 'description' : _('This snapin shows the folders defined in WATO. It can be used to open views filtered by the WATO folder.'), - 'author' : 'Lars Michelsen', 'render' : render_wato_foldertree, 'allowed' : [ 'admin', 'user', 'guest' ], 'styles' : """

12 years, 4 months

Check_MK Git: check_mk: Added automation_commands to make automations pluginable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 91f3ab1ea28cbb3feba6fd01dc69da81c77debd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91f3ab1ea28cbb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 14 11:34:38 2012 +0200 Added automation_commands to make automations pluginable --- ChangeLog | 1 + web/htdocs/wato.py | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c537cf4..193a0b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * Sidebar snapin: show pending changes * New rule for configuring custom_checks - allowing to run arbitrary active checks even if not yet formalized (like HTTP and TCP) + * Added automation_commands to make automations pluginable * FIX: fix parent scan on single site installations * FIX: fix folder visibility permission handling * FIX: honor folder-permissions when creating, deleting diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8e96ce8..0ab2280 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7214,6 +7214,7 @@ def our_site_id(): return site_id return None +automation_commands = {} def page_automation(): secret = html.var("secret") @@ -7232,8 +7233,13 @@ def page_automation(): indata = mk_eval(html.var("indata")) result = check_mk_local_automation(cmk_command, args, indata) html.write(repr(result)) + elif command == "push-snapshot": html.write(repr(automation_push_snapshot())) + + elif command in automation_commands: + html.write(repr(automation_commands[command]())) + else: raise MKGeneralException(_("Invalid automation command."))

12 years, 4 months

Check_MK Git: check_mk: Added readme about jololia and weblogic

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 78954e5636dc13f6fd70ee8bfe8e92798f091d67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78954e5636dc13… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon May 14 09:45:16 2012 +0200 Added readme about jololia and weblogic --- doc/agents/README.jolokia_on_weblogic | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/doc/agents/README.jolokia_on_weblogic b/doc/agents/README.jolokia_on_weblogic new file mode 100644 index 0000000..25619e5 --- /dev/null +++ b/doc/agents/README.jolokia_on_weblogic @@ -0,0 +1,26 @@ +How to deploy the Jolokia agent on a Weblogic server +Version here: 12.1.1.0 (12c) + +1. Log into the weblogic admin console +2. Click on "Deployments" and then "Install" +3. Click on "upload your file(s)" and upload the WAR file + from jolokia.org (e.g. jolokia-war.1.0.3.war) +4. [Next] +5. Check and maybe modify the installation path +6. Install this deployment as an application +7. Available targets: select Servers where to install and [Next] +8. Optional settings: leave everything at defaults and hit [Next] +9. on the next page ("Review"): [Finish] +10. Now change the context root: Got to "Configuration" and + fill in "/j4p" into the field "Context Root" and save + +If everything went right, then you should be able to get +some basic JSON information via the following URL: + +http://NAME:PORT/j4p + +The output should look like: + +{"timestamp":123123123,"status":200, ....} + +

12 years, 4 months

Check_MK Git: check_mk: Fixed sidebar styling

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3bc80134bdfa8330af9652ae1b95193a70c268d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bc80134bdfa83… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 13 14:49:43 2012 +0200 Fixed sidebar styling --- web/htdocs/js/sidebar.js | 6 ------ web/htdocs/sidebar.css | 18 ++++++++++++++---- web/htdocs/sidebar.py | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 7000dff..d624d49 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -172,12 +172,6 @@ function snapinDrag(event) { var line = document.createElement('div'); line.setAttribute('id', 'snapinDragIndicator'); - line.style.height = '3px'; - line.style.lineHeight = '1px'; - line.style.fontSize = '1px'; - line.style.width = '250px'; - line.style.backgroundColor = '#fff'; - line.style.margin = '1px 0px 0px 5px'; var o = getSnapinTargetPos(); if (o != null) { snapinAddBefore(o.parentNode, o, line); diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index aa5ad81..be43f85 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -84,8 +84,7 @@ body.side { height: 500px; overflow: hidden; color: #000000; - padding-top: 60px; - padding-bottom: 8px; + padding-top: 55px; } /* The footer of the sidebar */ @@ -293,9 +292,9 @@ div.snapin div.footnotelink a { border-style: solid; background-color: #497e95; border-color: #86a9b8 #22404d #22414d #86a9b8; - box-shadow: 0 0 0.5px #444444; + box-shadow: 0 0 1.5px #000; font-size: 7pt; - border-radius: 4px; + border-radius: 5px; padding: 2px 6px; margin-left: 5px; } @@ -335,6 +334,17 @@ div.statebullet { box-shadow: 0px 0px 1px #123a4a; } +div#snapinDragIndicator { + height: 2px; + line-height: 1px; + font-size: 1px; + width: 249px; + background-color: #fff; + margin: 0px 0px 0px 10px; + border-radius: 3px; + box-shadow: 0px 0px 5px #ffffff; +} + /*-------------------------------------------------------------------------. | _ _ _ _ | diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 7453d5f..097bd40 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -167,7 +167,7 @@ def page_side(): restart = sidebar_snapins.get(name, {}).get('restart', False) if restart: restart_snapins.append(name) - html.write('<br></div>') + html.write('</div>') sidebar_foot() html.write('</div>')

12 years, 4 months

Check_MK Git: check_mk: Finished formalization of check_ldap

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b812ad97d5664852279507db616333dd9d450777 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b812ad97d56648… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun May 13 12:10:29 2012 +0200 Finished formalization of check_ldap --- ChangeLog | 1 + checks/check_ldap | 63 +++++++++++++++++++++++++++++++++++++ web/plugins/wato/active_checks.py | 4 ++ 3 files changed, 68 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09215ae..c537cf4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ * FIX: Logwatch: fixed missing linebreak during reclassifing lines of logfiles * FIX: Logwatch: Logwatch services in rules configured using WATO must be given as item, not as whole service name + * New active check via WATO: check_ldap BI: * FIX: make rotating folding arrows black (white was not visible) diff --git a/checks/check_ldap b/checks/check_ldap new file mode 100644 index 0000000..8f46f8c --- /dev/null +++ b/checks/check_ldap @@ -0,0 +1,63 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 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. + +def check_ldap_arguments(params): + name, basedn, settings = params + args = ' -b %s' % quote_shell_string(basedn) + + if "response_time" in settings: + args += ' -w %f -c %f' % ( + settings["response_time"][0]/1000.0, + settings["response_time"][1]/1000.0) + + if "timeout" in settings: + args += ' -t %d' % settings["timeout"] + + if "attribute" in settings: + args += ' -a %s' % quote_shell_string(settings["attribute"]) + + if "authentication" in settings: + binddn, password = settings["authentication"] + args += ' -D %s -P %s' % ( + quote_shell_string(binddn), + quote_shell_string(password)) + + if "port" in settings: + args += ' -p %d' % settings["port"] + + if settings.get("ssl"): + args += ' --ssl' + + return args + + +active_check_info['ldap'] = { + "command_line" : '$USER1$/check_ldap -H $HOSTADDRESS$ $ARG1$', + "argument_function" : check_ldap_arguments, + "service_description" : lambda args: "LDAP " + args[0], + "has_perfdata" : True, +} + diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 0308db4..ea82ea6 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -391,6 +391,10 @@ register_rule(group, "Nagios plugins in order to try the response of an LDAP " "server."), elements = [ + TextUnicode( + title = _("Name"), + help = _("The service description will be <b>LDAP</b> plus this name"), + allow_empty = False), TextAscii( title = _("Base DN"), help = _("LDAP base, e.g. ou=Development, o=Mathias Kettner GmbH, c=de"),

12 years, 4 months

← Newer
1
...
27
28
29
30
31
32
33
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012