Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: #1935 WATO Web-API: Reduced number configurable role permissions

by Andreas Boesl

Module: check_mk Branch: master Commit: 6415d9a7df43c61e565996d64d3a3a0f1e87662c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6415d9a7df43c6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 4 15:46:08 2015 +0100 #1935 WATO Web-API: Reduced number configurable role permissions The WATO Web-API now has only one permission left (use API at all). The permission itself has been moved to WATO -> Access to Web-API. --- .werks/1935 | 10 +++++++++ ChangeLog | 1 + web/htdocs/webapi.py | 46 ++++++------------------------------------ web/plugins/webapi/webapi.py | 40 ------------------------------------ 4 files changed, 17 insertions(+), 80 deletions(-) diff --git a/.werks/1935 b/.werks/1935 new file mode 100644 index 0000000..1d3c0de --- /dev/null +++ b/.werks/1935 @@ -0,0 +1,10 @@ +Title: WATO Web-API: Reduced number configurable role permissions +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i1 +Date: 1423060960 +Class: feature + +The WATO Web-API now has only one permission left (use API at all). +The permission itself has been moved to WATO -> Access to Web-API. diff --git a/ChangeLog b/ChangeLog index 7a8e64d..6a5c58e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -184,6 +184,7 @@ * 1674 ibm_svc_license / other license checks: now able to configure limits... NOTE: Please refer to the migration notes! * 1934 WATO Web-API: Documentation is finally available... + * 1935 WATO Web-API: Reduced number configurable role permissions... * 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/webapi.py b/web/htdocs/webapi.py index 96e53aa..9d74ec5 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -50,36 +50,12 @@ def load_plugins(): # are loaded). loaded_with_language = current_language - config.declare_permission("webapi.api_allowed", _("API accessible"), - _("This permissions specifies if the role "\ - "is able to use web API functions at all"), + config.declare_permission("wato.api_allowed", _("Access to Web-API"), + _("This permissions specifies if the role "\ + "is able to use Web-API functions. It is only available "\ + "for automation users."), config.builtin_role_ids) - # Declare permissions for all api actions - config.declare_permission_section("webapi", _("Web API"), do_sort = True) - for name, settings in api_actions.items(): - full_description = "%s API function <tt>{site}/check_mk/webapi.py?action=%s</tt>" % (settings.get("description",""), name) - example_request = settings.get("example_request") - if example_request: - full_description += " " - if example_request[0]: - full_description += " Optional GET parameters <table>" - for entry in example_request[0]: - full_description += "<tr><td><tt>%s</tt></td><td>%s</td></tr>" % entry - full_description += "</table>" - if example_request[1]: - full_description += " Example request ( Json formatted POST parameter <tt>request=</tt> ): " - try: - import json - full_description += "<pre>%s</pre>" % json.dumps(example_request[1], sort_keys = True, indent = 2) - except: - full_description += "<pre>%s</pre>" % pprint.pformat(example_request[1]) - - config.declare_permission("webapi.%s" % name, - settings["title"], - full_description, - config.builtin_role_ids) - g_api = None def page_api(): @@ -89,14 +65,13 @@ def page_api(): if not config.user.get("automation_secret"): raise MKAuthException("The WATO API is only available for automation users") - config.need_permission("webapi.api_allowed") + config.need_permission("wato.use") + config.need_permission("wato.api_allowed") action = html.var('action') if action not in api_actions: raise MKUserError(None, "Unknown API action %s" % html.attrencode(action)) - config.need_permission("webapi.%s" % action) - # Create API instance g_api = API() @@ -128,19 +103,10 @@ def page_api(): if api_actions[action].get("locking", True): g_api.lock_wato() - if html.var("debug_webapi"): - if api_actions[action]["example_request"]: - example_request = api_actions[action]["example_request"] - for entry, description in example_request[0]: - key, value = entry.split("=") - html.set_var(key, value) - request_object = example_request[1] action_response = api_actions[action]["handler"](request_object) response = { "result_code": 0, "result": action_response } except Exception, e: - #import traceback - #html.debug(traceback.format_exc().replace("\n"," ")) response = { "result_code": 1, "result": str(e) } output_format = html.var("output_format", "json") diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index ce38c60..7a447d6 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -46,18 +46,6 @@ def action_add_host(request): api_actions["add_host"] = { "handler" : action_add_host, - "title" : _("Add a host to WATO"), - "description" : _("This webservice allows you to add a new host."), - "example_request" : ([("create_folders=1", _("If set to 1 (default) create non-existing folders"))], - { "attributes": { - "tag_criticality": "prod", - "tag_agent": "cmk-agent", - "alias": "Alias of testhost", - "ipaddress": "127.0.0.1", - }, - "folder": "server", - "hostname": "testhost" - }), "locking" : True, } @@ -77,17 +65,6 @@ def action_edit_host(request): api_actions["edit_host"] = { "handler" : action_edit_host, - "title" : _("Edit a host in WATO"), - "description" : _("Allows you to modify the host attributes in WATO, but can not change a hosts folder. "\ - "If you want to unset a host_tag specify it with <tt>tag_agent=False</tt>."), - "example_request" : ([], - { "attributes": { - "tag_agent": "snmp-only", - "site": "slave" - }, - "unset_attributes": ["tag_criticality"], - "hostname": "testhost" - }), "locking" : True, } @@ -108,10 +85,6 @@ def action_get_host(request): api_actions["get_host"] = { "handler" : action_get_host, - "title" : _("Get host data from WATO"), - "description" : _("Returns the host_attributes of the given hostname"), - "example_request" : ( [("effective_attributes=0", _("If set to 1 (default=0) also get attributes from parent folders"))], - { "hostname": "testhost" } ), "locking" : False, } @@ -127,10 +100,6 @@ def action_delete_host(request): api_actions["delete_host"] = { "handler" : action_delete_host, - "title" : _("Delete host in WATO"), - "description" : _("Deletes the given hostname in WATO"), - "example_request" : ( [], - { "hostname": "testhost" } ), "locking" : True, } @@ -148,10 +117,6 @@ def action_discover_services(request): api_actions["discover_services"] = { "handler" : action_discover_services, - "title" : _("Host service discovery"), - "description" : _("Starts a service discovery for the given hostname."), - "example_request" : ( [("mode=new",_("Available modes: new, remove, fixall, refresh"))], - { "hostname": "testhost" } ), "locking" : True, } @@ -169,11 +134,6 @@ def action_activate_changes(request): api_actions["activate_changes"] = { "handler" : action_activate_changes, - "title" : _("Activate changes"), - "description" : _("Activates changes. The user still needs the required permissions to do so."), - "example_request" : ( [("allow_foreign_changes=0", _("If set to 1 (default=0) proceed if there are foreign changes")), - ("mode=dirty", _("Available modes: dirty (only dirty sites), all (all sites), specific (use sites set in request)"))], - { "sites": ["slave", "localsite"] }), "locking" : True, }

9 years, 4 months

Check_MK Git: check_mk: #1934 WATO Web-API: Documentation is finally available

by Andreas Boesl

Module: check_mk Branch: master Commit: 1e0f471359f584f103c434f5fcb609dbe469994c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e0f471359f584… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 4 15:25:54 2015 +0100 #1934 WATO Web-API: Documentation is finally available If you want to manage WATO hosts without a graphical user interface you might have a look at <a href="http://mathias-kettner.com/checkmk_wato_webapi.html">this</a> documentation. --- .werks/1934 | 11 +++++++++++ ChangeLog | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/1934 b/.werks/1934 new file mode 100644 index 0000000..60886d2 --- /dev/null +++ b/.werks/1934 @@ -0,0 +1,11 @@ +Title: WATO Web-API: Documentation is finally available +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.7i1 +Date: 1423059355 +Class: feature + +If you want to manage WATO hosts without a graphical user interface +you might have a look at <a href="http://mathias-kettner.com/checkmk_wato_webapi.html">this</a> +documentation. diff --git a/ChangeLog b/ChangeLog index ecda0ef..7a8e64d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -183,6 +183,7 @@ * 1868 "Successfully created the host" message is also shown on host diagnose page now * 1674 ibm_svc_license / other license checks: now able to configure limits... NOTE: Please refer to the migration notes! + * 1934 WATO Web-API: Documentation is finally available... * 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

9 years, 4 months

Check_MK Git: check_mk: The host/ service type icon can now be disabled by rule

by Lars Michelsen

Module: check_mk Branch: master Commit: 1ada6b897ed10932979e00a66a43f836c10c8d18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ada6b897ed109… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 2 15:33:48 2015 +0100 The host/service type icon can now be disabled by rule --- web/plugins/views/painters.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index cbcb475..3b9cc21 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -227,7 +227,9 @@ def paint_type_icon(what, row): if icon.get('type', 'icon') == 'type_icon': try: result = icon['paint'](what, row, tags, custom_vars) - if result is not None: + if result == "": + break # Explicitly disabled. Don't show an icon + elif result is not None: if type(result) in [str,unicode]: result = result, what == 'service' and row['service_description'] or row['host_name']

9 years, 4 months

Check_MK Git: check_mk: #1975 FIX check_bi_aggr: Ignoring proxy settings from environment now

by Lars Michelsen

Module: check_mk Branch: master Commit: 61c8b1573d5ff863b27224b6632978c2dcdb44a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61c8b1573d5ff8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 4 15:12:44 2015 +0100 #1975 FIX check_bi_aggr: Ignoring proxy settings from environment now --- .werks/1975 | 10 ++++++++++ ChangeLog | 3 ++- doc/treasures/active_checks/check_bi_aggr | 5 ++++- web/plugins/wato/active_checks.py | 4 +++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.werks/1975 b/.werks/1975 new file mode 100644 index 0000000..fe568ce --- /dev/null +++ b/.werks/1975 @@ -0,0 +1,10 @@ +Title: check_bi_aggr: Ignoring proxy settings from environment now +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1423059135 + + diff --git a/ChangeLog b/ChangeLog index 30b68a6..ecda0ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -71,9 +71,9 @@ * 1219 synology_disks, synology_fans, synology_info, synology_raid, synology_status, synology_update: Multiple Synology NAS Checks * 1968 qlogic_fcport, qlogic_sanbox, qlogic_sanbox_fabric_element: Supporting SAN Switch Module for IBM BladeCenter(R) now * 1220 if,if64: Discovery can now be based on port description... - * 1860 df and other filesystem checks: process total fs size as perfdata... * 1930 Windows agent: now able to unpack plugins.cap file (created by Check_MK agent bakery)... * 1933 esx_vsphere_objects: now able to set a different alert level when the host/vm reports 'unknown'... + * 1860 df and other filesystem checks: process total fs size as perfdata... * 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... @@ -141,6 +141,7 @@ NOTE: Please refer to the migration notes! * 1931 FIX: agent_vsphere: no longer crashes when host has no license information * 1932 FIX: check_http: Check SSL Certificate: did not work when SNI Option was set... + * 1975 FIX: check_bi_aggr: Ignoring proxy settings from environment now Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/doc/treasures/active_checks/check_bi_aggr b/doc/treasures/active_checks/check_bi_aggr index 668b961..7e686cb 100755 --- a/doc/treasures/active_checks/check_bi_aggr +++ b/doc/treasures/active_checks/check_bi_aggr @@ -26,6 +26,9 @@ import sys, getopt, urllib2, traceback +# tell urllib2 not to honour "http(s)_proxy" env variables +urllib2.getproxies = lambda: {} + def usage(): sys.stderr.write(""" USAGE: check_bi_aggr -b <BASE_URL> -a <AGGR_NAME> -u <USER> -s <SECRET> @@ -130,7 +133,7 @@ except urllib2.socket.timeout: sys.stdout.write('ERROR: Socket timeout while opening URL: %s\n' % (url)) sys.exit(3) except urllib2.URLError: - sys.stdout.write("UNKNOWN: Nagios not available.\n") + sys.stdout.write("UNKNOWN: Core not available.\n") sys.exit(3) except Exception, e: sys.stdout.write('ERROR: Exception while opening URL (%s): %s\n' % diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 1488d43..52f63fe 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -1388,7 +1388,9 @@ register_rule(group, ), TextAscii( title = _("Aggregation Name"), - help = _("The name of the aggregation to fetch. It will be added to the service description."), + help = _("The name of the aggregation to fetch. It will be added to the service description. You can use " + "macros like <tt>$HOSTADDRESS$</tt> and <tt>$HOSTNAME$</tt> within this parameter to make them be replaced by " + "the hosts values."), allow_empty = False ), TextAscii(

9 years, 4 months

Check_MK Git: check_mk: Fixed exception in several Perf-O-Meters

by Mathias Kettner

Module: check_mk Branch: master Commit: 7e3121b7773133869c2a1203546c5282b31b6819 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e3121b7773133… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 4 13:39:04 2015 +0100 Fixed exception in several Perf-O-Meters --- web/htdocs/metrics.py | 10 +++++----- web/plugins/metrics/check_mk.py | 2 +- web/plugins/views/perfometer.py | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index 28c3a44..3941cce 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -25,8 +25,8 @@ # Boston, MA 02110-1301 USA. # Frequently used variable names an terms -# perf_data_string: Raw performance data as sent by the core, e.g "foor=17M;1;2;4;5" -# perf_data: Split performance data, e.g. [("foo", "17", "M", "1", "2", "4", "5")] +# perf_data_string: Raw performance data as sent by the core, e.g "foor=17M;1;2;4;5" +# perf_data: Split performance data, e.g. [("foo", "17", "M", "1", "2", "4", "5")] # translated_metrics: Completely parsed and translated into metrics, e.g. { "foo" : { "value" : 17.0, "unit" : { "render" : ... }, ... } } @@ -160,10 +160,10 @@ def translate_metrics(check_command, perf_data): # e.g. "fs_used(%)" -> 17.5 # e.g. "fs_used:max(%)" -> 100.0 def evaluate(expression, translated_metrics): - if ',' in expression: - return evaluate_rpn(expression, translated_metrics) - else: + if type(expression) in (float, int) or "," not in expression: return evaluate_literal(expression, translated_metrics) + else: + return evaluate_rpn(expression, translated_metrics) rpn_operators = { "+" : lambda a, b: (a + b), diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 24e1fa0..cd86fbd 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -311,7 +311,7 @@ check_metrics["check_mk-lparstat_aix.cpu_util"] = { "wait" : { " # | Definition of Perf-O-Meters | # '----------------------------------------------------------------------' -perfometer_info.append(("stacked", ( ["execution_time"], 90.0))) +perfometer_info.append(("stacked", ( ["execution_time"], 90.0, None))) perfometer_info.append(("logarithmic", ( "load1", 4.0, 2.0))) perfometer_info.append(("logarithmic", ( "temp", 40.0, 1.2))) perfometer_info.append(("logarithmic", ( "ctxt", 1000.0, 2.0))) diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py index e364d86..50c9cbf 100644 --- a/web/plugins/views/perfometer.py +++ b/web/plugins/views/perfometer.py @@ -150,7 +150,8 @@ def paint_perfometer(row): title, h = perf_painter(row, check_command, perf_data) # Test code for optically detecting old-style Perf-O-Meters - title = '{ ' + title + ' }' + if config.debug: + title = '{ ' + title + ' }' except Exception, e: if config.debug:

9 years, 4 months

Check_MK Git: check_mk: Fixed some english texts

by Mathias Kettner

Module: check_mk Branch: master Commit: 0097dd594c0fa86d0c2d2b0ae53db4bf9547833a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0097dd594c0fa8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 4 11:52:57 2015 +0100 Fixed some english texts --- web/htdocs/wato.py | 6 +++--- web/plugins/wato/check_parameters.py | 16 ++++++++-------- web/plugins/wato/mknotifyd.py | 2 +- web/plugins/wato/notifications.py | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ab78876..a6f93fd 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8375,9 +8375,9 @@ def vs_notification_rule(userid = None): ), ( "match_contactgroups", GroupChoice("contact", - title = _("Match Contact Groups (cmc only)"), - help = _("The host/ service must be in one of the selected contact groups. Only works with Check_MK Microcore. " \ - "If you don't use the CMC, that filter will not apply"), + title = _("Match Contact Groups (CMC only)"), + help = _("The host/service must be in one of the selected contact groups. This only works with Check_MK Micro Core. " \ + "If you don't use the CMC that filter will not apply"), allow_empty = False, ) ), diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 637c6f6..470ae3b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3721,22 +3721,22 @@ register_check_parameters( ( "apply_lag", Tuple( title = _("Apply Lag Maximum Time"), - help = _( "The maximum limit for the apply lag in v$dataguard_stats."), + help = _( "The maximum limit for the apply lag in <tt>v$dataguard_stats</tt>."), elements = [ Age(title = _("Warning at"),), Age(title = _("Critical at"),)])), ( "apply_lag_min", Tuple( title = _("Apply Lag Minimum Time"), - help = _( "The minimum limit for the apply lag in v$dataguard_stats. " - "This is only usable when Maximum Time has beend configured. "), + help = _( "The minimum limit for the apply lag in <tt>v$dataguard_stats</tt>. " + "This is only useful if also Apply Lag Maximum Time has been configured."), elements = [ Age(title = _("Warning at"),), Age(title = _("Critical at"),)])), ( "transport_lag", Tuple( title = _("Transport Lag"), - help = _( "The limit for the transport lag in v$dataguard_stats."), + help = _( "The limit for the transport lag in <tt>v$dataguard_stats</tt>"), elements = [ Age(title = _("Warning at"),), Age(title = _("Critical at"),)])), @@ -7598,7 +7598,7 @@ register_check_parameters( elements = [ Integer( title = _("Maximum age"), - help = _("Maximum accepted age of the reported data in seconds."), + help = _("Maximum accepted age of the reported data in seconds"), unit = _("seconds"), default_value = 60, ), @@ -7607,7 +7607,7 @@ register_check_parameters( allow_empty = False ), title = _("Expected DC"), - help = _("The hostname of the expected distinguished controller of the cluster."), + help = _("The hostname of the expected distinguished controller of the cluster"), ), Optional( Integer( @@ -7615,14 +7615,14 @@ register_check_parameters( default_value = 2 ), title = _("Number of Nodes"), - help = _("The expected number of nodes in the cluster."), + help = _("The expected number of nodes in the cluster"), ), Optional( Integer( min_value = 0, ), title = _("Number of Resources"), - help = _("The expected number of resources in the cluster."), + help = _("The expected number of resources in the cluster"), ), ] ), diff --git a/web/plugins/wato/mknotifyd.py b/web/plugins/wato/mknotifyd.py index ed5cc6a..4cb780c 100644 --- a/web/plugins/wato/mknotifyd.py +++ b/web/plugins/wato/mknotifyd.py @@ -45,7 +45,7 @@ if mknotifyd_enabled: help = _("The option will make notifications handled asynchronously. For each notification a spool " "file will be created and later processes by the notification spooler. This avoids a hanging " "core in case of notifications that need very long to execute. It also enables a retry in " - "case of failed notifications. Please not that this is not useful if you only use notification " + "case of failed notifications. Please note that this is not useful if you only use notification " "methods that have their own spooling (like email or SMS tools)."), default_value = False), domain = "check_mk" diff --git a/web/plugins/wato/notifications.py b/web/plugins/wato/notifications.py index d821fee..ed62b1b 100644 --- a/web/plugins/wato/notifications.py +++ b/web/plugins/wato/notifications.py @@ -189,7 +189,7 @@ register_notification_parameters("mkeventd", ( "facility", DropdownChoice( title = _("Syslog Facility to use"), - help = _("The notifications will be converted into syslog message with " + help = _("The notifications will be converted into syslog messages with " "the facility that you choose here. In the Event Console you can " "later create a rule matching this facility."), choices = syslog_facilities,

9 years, 4 months

Check_MK Git: check_mk: A few experiments with the new metrics

by Mathias Kettner

Module: check_mk Branch: master Commit: 7dd33b87cc64437f94d7d1029a7326f124166786 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7dd33b87cc6443… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 4 10:00:23 2015 +0100 A few experiments with the new metrics --- web/htdocs/metrics.py | 55 ++++++++++++++++++++++++----------- web/plugins/metrics/check_mk.py | 61 +++++++++++++++++++++++++++++++++------ web/plugins/views/perfometer.py | 50 +++++++++++++++++++++----------- 3 files changed, 123 insertions(+), 43 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7dd33b87cc…

9 years, 4 months

Check_MK Git: check_mk: FIX: reserved space in df checks now has the correct unit MB

by Goetz Golla

Module: check_mk Branch: master Commit: cf70697b2f6dd16f5d187e6c3e976d6326178031 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cf70697b2f6dd1… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Feb 3 18:26:03 2015 +0100 FIX: reserved space in df checks now has the correct unit MB --- checks/df.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/df.include b/checks/df.include index 921e126..79ee7fe 100644 --- a/checks/df.include +++ b/checks/df.include @@ -340,7 +340,7 @@ def df_check_filesystem_single(hostname, mountpoint, size_mb, avail_mb, reserved if reserved_mb > 0 and params["show_reserved"]: reserved_perc = 100.0 * float(reserved_mb) / size_mb - infotext += ", therein reserved for root: %.1f%% (%.2f GB)" % (reserved_perc, reserved_mb) + infotext += ", therein reserved for root: %.1f%% (%.2f MB)" % (reserved_perc, reserved_mb) perfdata.append(("reserved", reserved_mb)) # Trends. The trends are computed in two steps. In the first step we

9 years, 4 months

Check_MK Git: check_mk: #1860 df and other filesystem checks:

by Goetz Golla

process total fs size as perfdata Message-ID: <54d101ca.PN716HMBM2MJIM73%gg(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: f6aa51ca381fb724ada14ba386e9e4afd8dee64d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6aa51ca381fb7… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Feb 3 18:12:52 2015 +0100 #1860 df and other filesystem checks: process total fs size as perfdata Since the total size of a filesystem may change we store the total size as additional performance data and plot it with rrdtools like the used space. As a consequence another rrd database file is created for every filesystem, and slightly more disk space will be used for the rrd data of your site. --- .werks/1860 | 13 +++++++++++++ ChangeLog | 1 + checks/df.include | 1 + pnp-templates/check_mk-df.php | 22 +++++++++++++--------- 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/.werks/1860 b/.werks/1860 new file mode 100644 index 0000000..6495038 --- /dev/null +++ b/.werks/1860 @@ -0,0 +1,13 @@ +Title: df and other filesystem checks: process total fs size as perfdata +Level: 2 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1422983316 +Class: feature + + +Since the total size of a filesystem may change we store the total size +as additional performance data and plot it with rrdtools like the used space. +As a consequence another rrd database file is created for every filesystem, +and slightly more disk space will be used for the rrd data of your site. diff --git a/ChangeLog b/ChangeLog index 6ca25b2..b6f1e91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ * 1219 synology_disks, synology_fans, synology_info, synology_raid, synology_status, synology_update: Multiple Synology NAS Checks * 1968 qlogic_fcport, qlogic_sanbox, qlogic_sanbox_fabric_element: Supporting SAN Switch Module for IBM BladeCenter(R) now * 1220 if,if64: Discovery can now be based on port description... + * 1860 df and other filesystem checks: process total fs size as perfdata... * 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/checks/df.include b/checks/df.include index b48a5eb..921e126 100644 --- a/checks/df.include +++ b/checks/df.include @@ -309,6 +309,7 @@ def df_check_filesystem_single(hostname, mountpoint, size_mb, avail_mb, reserved # TODO: In some future version use a fixed name as perf variable perf_var = mountpoint.replace(" ", "_") perfdata = [(perf_var, str(used_mb) + 'MB', warn_mb, crit_mb, 0, size_mb)] + perfdata.append(('fs_size', str(size_mb) + 'MB')) if size_gb < 10240: infotext = "%.1f%% used (%.2f of %.2f GB)" % (used_perc, used_mb / 1024.0, size_gb) diff --git a/pnp-templates/check_mk-df.php b/pnp-templates/check_mk-df.php index d936251..1e4126a 100644 --- a/pnp-templates/check_mk-df.php +++ b/pnp-templates/check_mk-df.php @@ -66,25 +66,30 @@ $opt[1] = "--vertical-label GB -l 0 -u $maxgb --title '$hostname: Filesystem $fs # First graph show current filesystem usage. If there is a "reserved" RRD # then substract that and show as extra area +$def[1] = "DEF:mb=$RRDFILE[1]:$DS[1]:MAX "; if (isset($RRD['reserved'])) { - $def[1] = "DEF:mb=$RRDFILE[1]:$DS[1]:MAX "; $def[1] .= "DEF:reserved=$RRD[reserved] "; $def[1] .= "CDEF:used=mb,reserved,- "; $def[1] .= "CDEF:var1=used,1024,/ "; - $def[1] .= "AREA:var1#00ffc6:\"used space on $fsname\\n\" "; + $def[1] .= "AREA:var1#00ffc6:\"used space on $fsname\" "; $def[1] .= "CDEF:reserved_gb=reserved,1024,/ "; - $def[1] .= "AREA:reserved_gb#48b79e:\"reserved for root\\n\" "; - + $def[1] .= "AREA:reserved_gb#B748B2:\"reserved for root\\n\" "; } -else -{ -# - $def[1] = "DEF:mb=$RRDFILE[1]:$DS[1]:MAX "; +else { $def[1] .= "CDEF:var1=mb,1024,/ "; $def[1] .= "AREA:var1#00ffc6:\"used space on $fsname\\n\" "; } +# Optional size of fs plotted +if(isset($RRD['fs_size'])) { + $def[1] .= "DEF:size_plotted_mb=".$RRD['fs_size']." "; + $def[1] .= "CDEF:size_plotted_gb=size_plotted_mb,1024,/ "; + $def[1] .= "LINE:size_plotted_gb#003300:\"Size $sizegb GB \" "; +} else { + $def[1] .= "HRULE:$maxgb#003300:\"Size ($sizegb GB) \" "; +} + # Optional uncommitted usage e.g. for esx hosts if (isset($RRD['uncommitted'])) { $def[1] .= "DEF:uncommitted_mb=".$RRD['uncommitted']." "; @@ -95,7 +100,6 @@ else { $def[1] .= "CDEF:total_gb=var1 "; } -$def[1] .= "HRULE:$maxgb#003300:\"Size ($sizegb GB) \" "; $def[1] .= "HRULE:$warngb#ffff00:\"Warning at $warngbtxt GB \" "; $def[1] .= "HRULE:$critgb#ff0000:\"Critical at $critgbtxt GB \\n\" "; $def[1] .= "GPRINT:var1:LAST:\"current\: %6.2lf GB\" ";

9 years, 4 months

Check_MK Git: check_mk: resurrected deleted check_mk-df.php

by Andreas Boesl

Module: check_mk Branch: master Commit: 2bff7f6642cca1ecebedacb707adece35567cf70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2bff7f6642cca1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 3 12:57:23 2015 +0100 resurrected deleted check_mk-df.php --- pnp-templates/check_mk-df.php | 179 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 179 insertions(+) diff --git a/pnp-templates/check_mk-df.php b/pnp-templates/check_mk-df.php new file mode 100644 index 0000000..d936251 --- /dev/null +++ b/pnp-templates/check_mk-df.php @@ -0,0 +1,179 @@ +<?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. + +setlocale(LC_ALL, "POSIX"); + +// Make data sources available via names +$RRD = array(); +foreach ($NAME as $i => $n) { + $RRD[$n] = "$RRDFILE[$i]:$DS[$i]:MAX"; + $RRD_MIN[$n] = "$RRDFILE[$i]:$DS[$i]:MIN"; + $RRD_AVG[$n] = "$RRDFILE[$i]:$DS[$i]:AVERAGE"; + $WARN[$n] = $WARN[$i]; + $CRIT[$n] = $CRIT[$i]; + $MIN[$n] = $MIN[$i]; + $MAX[$n] = $MAX[$i]; + $ACT[$n] = $ACT[$i]; +} + +# RRDtool Options +#$servicedes=$NAGIOS_SERVICEDESC + +if (substr($servicedesc, 0, 3) == 'fs_') { + $fsname = str_replace("_", "/", substr($servicedesc,3)); +} else { + $fsname = str_replace("_", "/", substr($servicedesc,11)); +} + +$fstitle = $fsname; + +# Hack for windows: replace C// with C:\ +if (strlen($fsname) == 3 && substr($fsname, 1, 2) == '//') { + $fsname = $fsname[0] . "\:\\\\"; + $fstitle = $fsname[0] . ":\\"; +} + +$sizegb = sprintf("%.1f", $MAX[1] / 1024.0); +$maxgb = $MAX[1] / 1024.0; +$warngb = $WARN[1] / 1024.0; +$critgb = $CRIT[1] / 1024.0; +$warngbtxt = sprintf("%.1f", $warngb); +$critgbtxt = sprintf("%.1f", $critgb); + +$opt[1] = "--vertical-label GB -l 0 -u $maxgb --title '$hostname: Filesystem $fstitle ($sizegb GB)' "; + +# First graph show current filesystem usage. If there is a "reserved" RRD +# then substract that and show as extra area +if (isset($RRD['reserved'])) +{ + $def[1] = "DEF:mb=$RRDFILE[1]:$DS[1]:MAX "; + $def[1] .= "DEF:reserved=$RRD[reserved] "; + $def[1] .= "CDEF:used=mb,reserved,- "; + $def[1] .= "CDEF:var1=used,1024,/ "; + $def[1] .= "AREA:var1#00ffc6:\"used space on $fsname\\n\" "; + $def[1] .= "CDEF:reserved_gb=reserved,1024,/ "; + $def[1] .= "AREA:reserved_gb#48b79e:\"reserved for root\\n\" "; + +} +else +{ +# + $def[1] = "DEF:mb=$RRDFILE[1]:$DS[1]:MAX "; + $def[1] .= "CDEF:var1=mb,1024,/ "; + $def[1] .= "AREA:var1#00ffc6:\"used space on $fsname\\n\" "; +} + +# Optional uncommitted usage e.g. for esx hosts +if (isset($RRD['uncommitted'])) { + $def[1] .= "DEF:uncommitted_mb=".$RRD['uncommitted']." "; + $def[1] .= "CDEF:uncommitted_gb=uncommitted_mb,1024,/ "; + $def[1] .= "CDEF:total_gb=uncommitted_gb,var1,+ "; +} +else { + $def[1] .= "CDEF:total_gb=var1 "; +} + +$def[1] .= "HRULE:$maxgb#003300:\"Size ($sizegb GB) \" "; +$def[1] .= "HRULE:$warngb#ffff00:\"Warning at $warngbtxt GB \" "; +$def[1] .= "HRULE:$critgb#ff0000:\"Critical at $critgbtxt GB \\n\" "; +$def[1] .= "GPRINT:var1:LAST:\"current\: %6.2lf GB\" "; +$def[1] .= "GPRINT:var1:MAX:\"max\: %6.2lf GB \" "; +$def[1] .= "GPRINT:var1:AVERAGE:\"avg\: %6.2lf GB\\n\" "; + +if(isset($RRD['uncommitted'])) { + $def[1] .= "AREA:uncommitted_gb#eeccff:\"Uncommited\":STACK "; + $def[1] .= "GPRINT:uncommitted_gb:MAX:\"%6.2lf GB\l\" "; +} + +$def[1] .= "LINE1:total_gb#226600 "; + +# Second graph is optional and shows trend. The MAX field +# of the third variable contains (size of the filesystem in MB +# / range in hours). From that we can compute the configured range. +if (isset($RRD['growth'])) { + $size_mb_per_hours = floatval($MAX['trend']); // this is size_mb / range(hours) + $size_mb = floatval($MAX[1]); + $hours = 1.0 / ($size_mb_per_hours / $size_mb); + $range = sprintf("%.0fh", $hours); + + // Current growth / shrinking. This value is give as MB / 24 hours. + // Note: This has changed in 1.1.13i3. Prior it was MB / trend_range! + $opt[2] = "--vertical-label '+/- MB / 24h' -l -1 -u 1 -X0 --title '$hostname: Growth of $fstitle' "; + $def[2] = "DEF:growth_max=${RRD['growth']} "; + $def[2] .= "DEF:growth_min=${RRD_MIN['growth']} "; + $def[2] .= "DEF:trend=${RRD_AVG['trend']} "; + $def[2] .= "CDEF:growth_pos=growth_max,0,MAX "; + $def[2] .= "CDEF:growth_neg=growth_min,0,MIN "; + $def[2] .= "CDEF:growth_minabs=0,growth_min,- "; + $def[2] .= "CDEF:growth=growth_minabs,growth_max,MAX "; + $def[2] .= "HRULE:0#c0c0c0 "; + $def[2] .= "AREA:growth_pos#3060f0:\"Grow\" "; + $def[2] .= "AREA:growth_neg#30f060:\"Shrink \" "; + $def[2] .= "GPRINT:growth:LAST:\"Current\: %+9.2lfMB / 24h\" "; + $def[2] .= "GPRINT:growth:MAX:\"Max\: %+9.2lfMB / 24h\\n\" "; + + // Trend + $opt[3] = "--vertical-label '+/- MB / 24h' -l -1 -u 1 -X0 --title '$hostname: Trend for $fstitle' "; + $def[3] = "DEF:trend=${RRD_AVG['trend']} "; + $def[3] .= "HRULE:0#c0c0c0 "; + $def[3] .= "LINE1:trend#000000:\"Trend\:\" "; + $def[3] .= "GPRINT:trend:LAST:\"%+7.2lf MB/24h\" "; + if ($WARN['trend']) { + $warn_mb = sprintf("%.2fMB", $WARN['trend'] * $hours / 24.0); + $def[3] .= "LINE1:${WARN['trend']}#ffff00:\"Warn\: $warn_mb / $range\" "; + } + if ($CRIT['trend']) { + $crit_mb = sprintf("%.2fMB", $CRIT['trend'] * $hours / 24.0); + $def[3] .= "LINE1:${CRIT['trend']}#ff0000:\"Crit\: $crit_mb / $range\" "; + } + $def[3] .= "COMMENT:\"\\n\" "; +} + +if (isset($RRD['trend_hoursleft'])) { + // Trend + $opt[4] = "--vertical-label 'Days left' -l -1 -u 365 -X0 --title '$hostname: Days left for $fstitle' "; + $def[4] = "DEF:hours_left=${RRD_AVG['trend_hoursleft']} "; + $def[4] .= "DEF:hours_left_min=${RRD_MIN['trend_hoursleft']} "; + // negative hours indicate no growth + // the dataset hours_left_isneg stores this info for each point as True/False + $def[4] .= "CDEF:hours_left_isneg=hours_left_min,-1,EQ "; + $def[4] .= "CDEF:hours_left_unmon=hours_left_min,400,0,IF "; + $def[4] .= "CDEF:days_left=hours_left,24,/ "; + $def[4] .= "CDEF:days_left_cap=days_left,400,MIN "; + // Convert negative points to 400 (y-axis cap) + $def[4] .= "CDEF:days_left_cap_positive=hours_left_isneg,400,days_left_cap,IF "; + // The AREA has a rendering problem. Points are too far to the right + $def[4] .= "AREA:hours_left_unmon#AA2200: "; + + $def[4] .= "AREA:days_left_cap_positive#22AA44:\"Days left\:\" "; + if ($ACT[4] == -1) + { + $def[4] .= "COMMENT:\"Not growing\" "; + } + else { + $def[4] .= "GPRINT:days_left:LAST:\"%7.2lf days\" "; + } +} +?>

9 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2015