Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64477 discussions

Check_MK Git: check_mk: adapted title of fjdarye* check manpages for better readable catalog

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 026aa4b9c2092b86f5cbe721192e22ea046b0f56 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=026aa4b9c2092b… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Jul 29 14:43:21 2013 +0200 adapted title of fjdarye* check manpages for better readable catalog --- checkman/fjdarye100_cadaps | 2 +- checkman/fjdarye100_cmods | 2 +- checkman/fjdarye100_cmods_mem | 2 +- checkman/fjdarye100_conencs | 2 +- checkman/fjdarye100_cpsus | 2 +- checkman/fjdarye100_devencs | 2 +- checkman/fjdarye100_disks | 2 +- checkman/fjdarye100_disks.summary | 2 +- checkman/fjdarye100_rluns | 2 +- checkman/fjdarye100_sum | 2 +- checkman/fjdarye100_syscaps | 2 +- checkman/fjdarye60_cadaps | 2 +- checkman/fjdarye60_cmods | 2 +- checkman/fjdarye60_cmods_flash | 2 +- checkman/fjdarye60_cmods_mem | 2 +- checkman/fjdarye60_conencs | 2 +- checkman/fjdarye60_devencs | 2 +- checkman/fjdarye60_disks | 2 +- checkman/fjdarye60_disks.summary | 2 +- checkman/fjdarye60_expanders | 2 +- checkman/fjdarye60_inletthmls | 2 +- checkman/fjdarye60_psus | 2 +- checkman/fjdarye60_rluns | 2 +- checkman/fjdarye60_sum | 2 +- checkman/fjdarye60_syscaps | 2 +- checkman/fjdarye60_thmls | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/checkman/fjdarye100_cadaps b/checkman/fjdarye100_cadaps index 624ee8e..dcf21eb 100644 --- a/checkman/fjdarye100_cadaps +++ b/checkman/fjdarye100_cadaps @@ -1,4 +1,4 @@ -title: Channel adapters on Fujitsu ETERNUS DX80 S2 storage systems +title: Fujitsu ETERNUS DX80 S2 storage systems: Channel adapters agents: snmp catalog: hw/storagehw/fujitsu license: GPLv2 diff --git a/checkman/fjdarye100_cmods b/checkman/fjdarye100_cmods index f534194..f042511 100644 --- a/checkman/fjdarye100_cmods +++ b/checkman/fjdarye100_cmods @@ -1,4 +1,4 @@ -title: Channel modules on Fujitsu ETERNUS DX80 S2 storage systems +title: Fujitsu ETERNUS DX80 S2 storage systems: Channel modules agents: snmp catalog: hw/storagehw/fujitsu license: GPLv2 diff --git a/checkman/fjdarye100_cmods_mem b/checkman/fjdarye100_cmods_mem index f91e665..918d1f7 100644 --- a/checkman/fjdarye100_cmods_mem +++ b/checkman/fjdarye100_cmods_mem @@ -1,4 +1,4 @@ -title: Channel modules on Fujitsu ETERNUS DX80 S2 storage systems +title: Fujitsu ETERNUS DX80 S2 storage systems: Channel modules agents: snmp catalog: hw/storagehw/fujitsu license: GPLv2 diff --git a/checkman/fjdarye100_conencs b/checkman/fjdarye100_conencs index a87f50e..d8e59d4 100644 --- a/checkman/fjdarye100_conencs +++ b/checkman/fjdarye100_conencs @@ -1,4 +1,4 @@ -title: Controller enclosures on Fujitsu ETERNUS DX80 S2 storage systems +title: Fujitsu ETERNUS DX80 S2 storage systems: Controller enclosures agents: snmp catalog: hw/storagehw/fujitsu license: GPLv2 diff --git a/checkman/fjdarye100_cpsus b/checkman/fjdarye100_cpsus index 9c354a2..d3e3080 100644 --- a/checkman/fjdarye100_cpsus +++ b/checkman/fjdarye100_cpsus @@ -1,4 +1,4 @@ -title: Power supply units mounted on CE on Fujitsu ETERNUS DX80 S2 storage systems +title: Fujitsu ETERNUS DX80 S2 storage systems: Power supply units mounted on CE agents: snmp catalog: hw/storagehw/fujitsu license: GPLv2 diff --git a/checkman/fjdarye100_devencs b/checkman/fjdarye100_devencs index 016f91a..bd7b36d 100644 --- a/checkman/fjdarye100_devencs +++ b/checkman/fjdarye100_devencs @@ -1,4 +1,4 @@ -title: Device enclosures on Fujitsu ETERNUS DX80 S2 storage systems +title: Fujitsu ETERNUS DX80 S2 storage systems: Device enclosures agents: snmp catalog: hw/storagehw/fujitsu license: GPLv2 diff --git a/checkman/fjdarye100_disks b/checkman/fjdarye100_disks index f403a36..6658087 100644 --- a/checkman/fjdarye100_disks +++ b/checkman/fjdarye100_disks @@ -1,4 +1,4 @@ -title: Disks in Fujitsu ETERNUS DX80 S2 storage systems +title: Fujitsu ETERNUS DX80 S2 storage systems: Disks agents: snmp catalog: hw/storagehw/fujitsu license: GPLv2 diff --git a/checkman/fjdarye100_disks.summary b/checkman/fjdarye100_disks.summary index ca55400..489cd53 100644 --- a/checkman/fjdarye100_disks.summary +++ b/checkman/fjdarye100_disks.summary @@ -1,4 +1,4 @@ -title: Summarized status of all disks in Fujitsu ETERNUS DX80 S2 storage systems +title: Fujitsu ETERNUS DX80 S2 storage systems: Summarized status of all disks agents: snmp catalog: hw/storagehw/fujitsu license: GPLv2 diff --git a/checkman/fjdarye100_rluns b/checkman/fjdarye100_rluns index 2be5e25..f4c0f20 100644 --- a/checkman/fjdarye100_rluns +++ b/checkman/fjdarye100_rluns @@ -1,4 +1,4 @@ -title: RLUNs in Fujitsu ETERNUS DX80 S2 storage systems +title: Fujitsu ETERNUS DX80 S2 storage systems: RLUNs agents: snmp catalog: hw/storagehw/fujitsu license: GPLv2 diff --git a/checkman/fjdarye100_sum b/checkman/fjdarye100_sum index 45642e1..81d2bbe 100644 --- a/checkman/fjdarye100_sum +++ b/checkman/fjdarye100_sum @@ -1,4 +1,4 @@ -title: Summary status of Fujitsu ETERNUS DX80 S2 storage systems +title: Fujitsu ETERNUS DX80 S2 storage systems: Summary status agents: snmp catalog: hw/storagehw/fujitsu license: GPLv2 diff --git a/checkman/fjdarye100_syscaps b/checkman/fjdarye100_syscaps index dfc82c3..75d51f6 100644 --- a/checkman/fjdarye100_syscaps +++ b/checkman/fjdarye100_syscaps @@ -1,4 +1,4 @@ -title: System capacitor units on Fujitsu ETERNUS DX80 S2 storage systems +title: Fujitsu ETERNUS DX80 S2 storage systems: System capacitor units agents: snmp catalog: hw/storagehw/fujitsu license: GPLv2 diff --git a/checkman/fjdarye60_cadaps b/checkman/fjdarye60_cadaps index 06653a3..34691f2 100644 --- a/checkman/fjdarye60_cadaps +++ b/checkman/fjdarye60_cadaps @@ -1,4 +1,4 @@ -title: Status of channel adapters on Fujitsu ETERNUS DX storage systems +title: Fujitsu ETERNUS DX storage systems: Status of channel adapters agents: snmp catalog: hw/storagehw/fujitsu license: GPL diff --git a/checkman/fjdarye60_cmods b/checkman/fjdarye60_cmods index 8fc73c1..e91222f 100644 --- a/checkman/fjdarye60_cmods +++ b/checkman/fjdarye60_cmods @@ -1,4 +1,4 @@ -title: Channel modules on Fujitsu ETERNUS DX storage systems +title: Fujitsu ETERNUS DX storage systems: Channel modules agents: snmp catalog: hw/storagehw/fujitsu license: GPL diff --git a/checkman/fjdarye60_cmods_flash b/checkman/fjdarye60_cmods_flash index 95161e9..a49825b 100644 --- a/checkman/fjdarye60_cmods_flash +++ b/checkman/fjdarye60_cmods_flash @@ -1,4 +1,4 @@ -title: Flash of channel modules on Fujitsu ETERNUS DX storage systems +title: Fujitsu ETERNUS DX storage systems: Flash of channel modules agents: snmp catalog: hw/storagehw/fujitsu license: GPL diff --git a/checkman/fjdarye60_cmods_mem b/checkman/fjdarye60_cmods_mem index 4eabe96..b7d9faa 100644 --- a/checkman/fjdarye60_cmods_mem +++ b/checkman/fjdarye60_cmods_mem @@ -1,4 +1,4 @@ -title: Channel modules on Fujitsu ETERNUS DX storage systems +title: Fujitsu ETERNUS DX storage systems: Channel modules agents: snmp catalog: hw/storagehw/fujitsu license: GPL diff --git a/checkman/fjdarye60_conencs b/checkman/fjdarye60_conencs index f95eb1f..b566f02 100644 --- a/checkman/fjdarye60_conencs +++ b/checkman/fjdarye60_conencs @@ -1,4 +1,4 @@ -title: Controller enclosures on Fujitsu ETERNUS DX storage systems +title: Fujitsu ETERNUS DX storage systems: Controller enclosures agents: snmp catalog: hw/storagehw/fujitsu license: GPL diff --git a/checkman/fjdarye60_devencs b/checkman/fjdarye60_devencs index 01a24b7..c5615d8 100644 --- a/checkman/fjdarye60_devencs +++ b/checkman/fjdarye60_devencs @@ -1,4 +1,4 @@ -title: Device enclosures on Fujitsu ETERNUS DX storage systems +title: Fujitsu ETERNUS DX storage systems: Device enclosures agents: snmp catalog: hw/storagehw/fujitsu license: GPL diff --git a/checkman/fjdarye60_disks b/checkman/fjdarye60_disks index 2e847e4..199385e 100644 --- a/checkman/fjdarye60_disks +++ b/checkman/fjdarye60_disks @@ -1,4 +1,4 @@ -title: Disks in Fujitsu ETERNUS DX storage systems +title: Fujitsu ETERNUS DX storage systems: Disks agents: snmp catalog: hw/storagehw/fujitsu license: GPL diff --git a/checkman/fjdarye60_disks.summary b/checkman/fjdarye60_disks.summary index b4582f4..c2c66fb 100644 --- a/checkman/fjdarye60_disks.summary +++ b/checkman/fjdarye60_disks.summary @@ -1,4 +1,4 @@ -title: Summarized status of all disks in Fujitsu ETERNUS DX storage systems +title: Fujitsu ETERNUS DX storage systems: Summarized status agents: snmp catalog: hw/storagehw/fujitsu license: GPL diff --git a/checkman/fjdarye60_expanders b/checkman/fjdarye60_expanders index e86218e..22ccf1e 100644 --- a/checkman/fjdarye60_expanders +++ b/checkman/fjdarye60_expanders @@ -1,4 +1,4 @@ -title: Expanders on Fujitsu ETERNUS DX storage systems +title: Fujitsu ETERNUS DX storage systems: Expanders agents: snmp catalog: hw/storagehw/fujitsu license: GPL diff --git a/checkman/fjdarye60_inletthmls b/checkman/fjdarye60_inletthmls index ca1df7f..4f98bb4 100644 --- a/checkman/fjdarye60_inletthmls +++ b/checkman/fjdarye60_inletthmls @@ -1,4 +1,4 @@ -title: Inlet thermal sensors on Fujitsu ETERNUS DX storage systems +title: Fujitsu ETERNUS DX storage systems: Inlet thermal sensors agents: snmp catalog: hw/storagehw/fujitsu license: GPL diff --git a/checkman/fjdarye60_psus b/checkman/fjdarye60_psus index d5e6a2a..ddbd65d 100644 --- a/checkman/fjdarye60_psus +++ b/checkman/fjdarye60_psus @@ -1,4 +1,4 @@ -title: Power supply units on Fujitsu ETERNUS DX storage systems +title: Fujitsu ETERNUS DX storage systems: Power supply units agents: snmp catalog: hw/storagehw/fujitsu license: GPL diff --git a/checkman/fjdarye60_rluns b/checkman/fjdarye60_rluns index 4367f1c..0c2d8f1 100644 --- a/checkman/fjdarye60_rluns +++ b/checkman/fjdarye60_rluns @@ -1,4 +1,4 @@ -title: RLUNs in Fujitsu ETERNUS DX storage systems +title: Fujitsu ETERNUS DX storage systems: RLUNs agents: snmp catalog: hw/storagehw/fujitsu license: GPL diff --git a/checkman/fjdarye60_sum b/checkman/fjdarye60_sum index 5e0d11b..ae786b1 100644 --- a/checkman/fjdarye60_sum +++ b/checkman/fjdarye60_sum @@ -1,4 +1,4 @@ -title: Summary status of Fujitsu ETERNUS DX storage systems +title: Fujitsu ETERNUS DX storage systems: Summary status agents: snmp catalog: hw/storagehw/fujitsu license: GPL diff --git a/checkman/fjdarye60_syscaps b/checkman/fjdarye60_syscaps index 69b0c48..0b600d1 100644 --- a/checkman/fjdarye60_syscaps +++ b/checkman/fjdarye60_syscaps @@ -1,4 +1,4 @@ -title: System capacitor units on Fujitsu ETERNUS DX storage systems +title: Fujitsu ETERNUS DX storage systems: System capacitor units agents: snmp catalog: hw/storagehw/fujitsu license: GPL diff --git a/checkman/fjdarye60_thmls b/checkman/fjdarye60_thmls index e7b0f9c..10221e9 100644 --- a/checkman/fjdarye60_thmls +++ b/checkman/fjdarye60_thmls @@ -1,4 +1,4 @@ -title: Thermal sensors on Fujitsu ETERNUS DX storage systems +title: Fujitsu ETERNUS DX storage systems: Thermal sensors agents: snmp catalog: hw/storagehw/fujitsu license: GPL

11 years, 2 months

Check_MK Git: check_mk: added missing catalog: entry in few check manpages

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 992ef5ad468e42975583fea680428fc702a4ecd3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=992ef5ad468e42… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Jul 29 14:01:04 2013 +0200 added missing catalog: entry in few check manpages --- checkman/j4p_performance.app_sess | 1 + checkman/j4p_performance.app_state | 1 + checkman/j4p_performance.serv_req | 1 + 3 files changed, 3 insertions(+) diff --git a/checkman/j4p_performance.app_sess b/checkman/j4p_performance.app_sess index a27fc34..10881d9 100644 --- a/checkman/j4p_performance.app_sess +++ b/checkman/j4p_performance.app_sess @@ -1,5 +1,6 @@ title: J4P Performance: Sessions - DEPRECATED agents: linux +catalog: app/java license: GPL distribution: check_mk description: diff --git a/checkman/j4p_performance.app_state b/checkman/j4p_performance.app_state index e6666f5..c826293 100644 --- a/checkman/j4p_performance.app_state +++ b/checkman/j4p_performance.app_state @@ -1,5 +1,6 @@ title: J4P Performance: Application status - DEPRECATED agents: linux +catalog: app/java license: GPL distribution: check_mk description: diff --git a/checkman/j4p_performance.serv_req b/checkman/j4p_performance.serv_req index 843b9ee..c423970 100644 --- a/checkman/j4p_performance.serv_req +++ b/checkman/j4p_performance.serv_req @@ -1,5 +1,6 @@ title: J4P Performance: Requests - DEPRECATED agents: linux +catalog: app/java license: GPL distribution: check_mk description:

11 years, 2 months

Check_MK Git: check_mk: new check manpages for more checks...

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 16ef3e1ceb2fabc7a91b408eda92c178890cbc31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16ef3e1ceb2fab… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Jul 29 12:13:43 2013 +0200 new check manpages for more checks... --- checkman/blade_bx_load | 2 +- checkman/blade_bx_powerfan | 2 +- checkman/blade_bx_powermod | 2 +- checkman/blade_bx_temp | 2 +- checkman/jar_signature | 18 ++++++++++- checkman/jolokia_metrics.serv_req | 60 ++++++++++++++++--------------------- checkman/netapp_cpu | 23 +++++++++++++- checkman/netapp_fcpio | 37 +++++++++++++++++++++-- checkman/oracle_asm_diskgroup | 31 ++++++++++++++++++- 9 files changed, 134 insertions(+), 43 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=16ef3e1ceb…

11 years, 2 months

Check_MK Git: check_mk: New filter for current notification number

by Mathias Kettner

Module: check_mk Branch: master Commit: a9a45eb29962c1d6002df28879a0868befec4d04 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9a45eb29962c1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 29 11:47:54 2013 +0200 New filter for current notification number --- ChangeLog | 7 ++++--- web/plugins/dashboard/builtin.py | 2 +- web/plugins/views/builtin.py | 9 +++++++-- web/plugins/views/filters.py | 37 +++++++++++++++++++++++++++++++++++-- web/plugins/views/painters.py | 4 ++-- 5 files changed, 49 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5423ebb..cf9864c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,12 +96,13 @@ * Editing localized strings (like the title) is now optional when cloning views or editing cloned views. If not edited, the views inherit the localized strings from their ancestors + * Added simple problems Dashboard + * New filter and column painter for current notification number (escalations) * FIX: better error message in case of exception in SNMP handling * FIX: Inventory screen: Now shows custom checks * FIX: Fixed locking problem of multisite pages related to user loading/saving * FIX: Fixed wrong default settings of view filters in localized multisite * FIX: line wrapping of logwatch entries - * Add: Added simple problems Dashboard WATO: * Allow to configure check-/retry_interval in second precision @@ -111,8 +112,8 @@ * Custom user attributes can now be managed using WATO * FIX: do validation of check items in rule editor * FIX: More consistent handling of folderpath select in rule editor - * Add: Require unique alias names in between the following elements: - Host/Service/Contact Groups, Timeperiods and Roles + * Require unique alias names in between the following elements: + Host/Service/Contact Groups, Timeperiods and Roles Notifications: * Flexible Notification can now filter service levels diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index c474b2f..92d4a0c 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -88,7 +88,7 @@ if defaults.omd_site: } builtin_dashboards["simple_problems"] = { - "title" : _("Problems Dashboard"), + "title" : _("Host & Services Problems"), "dashlets" : [ { "title" : _("Host Problems (unhandled)"), diff --git a/web/plugins/views/builtin.py b/web/plugins/views/builtin.py index 6dd78a2..013674e 100644 --- a/web/plugins/views/builtin.py +++ b/web/plugins/views/builtin.py @@ -893,6 +893,7 @@ multisite_builtin_views.update({ ('host_plugin_output', None), ('host_perf_data', None), ('host_attempt', None), + ('host_notification_number', None), ('host_check_interval', None), ('host_check_type', None), ('host_state_age', None), @@ -992,7 +993,8 @@ multisite_builtin_views.update({ 'opthost_contactgroup', 'host_check_command', 'host_address', - ], + 'host_notif_number', + ], 'sorters': [], 'title': _('Host search'), 'topic': _('Hosts')}, @@ -1067,7 +1069,9 @@ multisite_builtin_views.update({ 'svc_last_state_change', 'svc_last_check', 'siteopt', - 'aggr_service_used'], + 'aggr_service_used', + 'svc_notif_number', + ], 'sorters': [('site', False), ('site_host', False), ('svcdescr', False)], @@ -1102,6 +1106,7 @@ multisite_builtin_views.update({ ('svc_check_command', None), ('svc_check_interval', None), ('svc_attempt', None), + ('svc_notification_number', None), ('svc_check_type', None), ('svc_state_age', None), ('svc_check_age', None), diff --git a/web/plugins/views/filters.py b/web/plugins/views/filters.py index 0a1cdc8..321870b 100644 --- a/web/plugins/views/filters.py +++ b/web/plugins/views/filters.py @@ -351,8 +351,8 @@ declare_filter(132, FilterNagiosFlag("host", "host_active_checks_enabled", declare_filter(133, FilterNagiosFlag("host", "host_notifications_enabled", _("Host notifications enabled"))) declare_filter(230, FilterNagiosFlag("service", "service_acknowledged", _("Problem acknowledged"))) declare_filter(231, FilterNagiosFlag("service", "service_in_notification_period", _("Service in notif. per."))) -declare_filter(232, FilterNagiosFlag("service", "service_active_checks_enabled", _("Active checks enabled"))) -declare_filter(233, FilterNagiosFlag("service", "service_notifications_enabled", _("Notifications enabled"))) +declare_filter(233, FilterNagiosFlag("service", "service_active_checks_enabled", _("Active checks enabled"))) +declare_filter(234, FilterNagiosFlag("service", "service_notifications_enabled", _("Notifications enabled"))) declare_filter(236, FilterNagiosFlag("service", "service_is_flapping", _("Flapping"))) declare_filter(231, FilterNagiosFlag("service", "service_scheduled_downtime_depth", _("Service in downtime"))) declare_filter(132, FilterNagiosFlag("host", "host_scheduled_downtime_depth", _("Host in downtime"))) @@ -396,6 +396,39 @@ class FilterSite(Filter): declare_filter(500, FilterSite("siteopt", False), _("Optional selection of a site")) declare_filter(501, FilterSite("site", True), _("Selection of site is enforced, use this filter for joining")) +# name: internal id of filter +# title: user displayed title of the filter +# info: usually either "host" or "service" +# column: a livestatus column of type int or float +class FilterNumberRange(Filter): # type is int + def __init__(self, name, title, info, column): + self.column = column + varnames = [ name + "_from", name + "_until" ] + Filter.__init__(self, name, title, info, varnames, []) + + def display(self): + html.write(_("From:") + " ") + html.text_input(self.htmlvars[0], style="width: 80px;") + html.write("   " + _("To:") + " ") + html.text_input(self.htmlvars[1], style="width: 80px;") + + def filter(self, tablename): + lql = "" + for i, op in [ (0, ">="), (1, "<=") ]: + try: + txt = html.var(self.htmlvars[i]) + int(txt.strip()) + lql += "Filter: %s %s %s\n" % (self.column, op, txt.strip()) + except: + pass + return lql + + +declare_filter(232, FilterNumberRange("host_notif_number", _("Current Host Notification Number"), "host", "current_notification_number")) +declare_filter(232, FilterNumberRange("svc_notif_number", _("Current Service Notification Number"), "service", "current_notification_number")) + + + # Filter for setting time ranges, e.g. on last_state_change and last_check # Variante eins: # age [ ] seconds [ ] minutes [ ] hours [ ] days diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index f2b6969..bd297af 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -515,7 +515,7 @@ multisite_painters['svc_notification_number'] = { "title" : _("Service notification number"), "short" : _("N#"), "columns" : [ "service_current_notification_number" ], - "paint" : lambda row: ("count", row["service_current_notification_number"]), + "paint" : lambda row: ("", row["service_current_notification_number"]), } @@ -922,7 +922,7 @@ multisite_painters['host_notification_number'] = { "title" : _("Host notification number"), "short" : _("N#"), "columns" : [ "host_current_notification_number" ], - "paint" : lambda row: ("count", saveint(row["host_current_notification_number"])), + "paint" : lambda row: ("", saveint(row["host_current_notification_number"])), } multisite_painters["host_flapping"] = {

11 years, 2 months

Check_MK Git: check_mk: initial version of check manpage for plesk_backups

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 3f9a233dd0c9e59a23d94fe17181e0c97d03a514 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3f9a233dd0c9e5… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jul 26 13:56:56 2013 +0200 initial version of check manpage for plesk_backups --- checkman/plesk_backups | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/checkman/plesk_backups b/checkman/plesk_backups index f29238e..b7f4b8d 100644 --- a/checkman/plesk_backups +++ b/checkman/plesk_backups @@ -1,4 +1,4 @@ -title: FTP backup spaces of Plesk domains +title: FTP backups of Plesk domains agents: linux catalog: app/Plesk license: GPL @@ -8,11 +8,47 @@ description: manage multiple independent webspace instances including domains and so on. - Plugin: plesk_backup (war das bei plesk_domains auch erwähnt)? + This check checks the FTP backups and backup space of Plesk domains. - BERND SCHREIBT DEN REST. + To make this check work you need to install the agent plugin + {plesk_backups} on the host wich runs Plesk in the + directory {/usr/lib/check_mk_agent/plugins}. + +item: + The domain name of the domain backuped. + +examples: + # set up a check for a plesk backup + # warn if backup is elder than 1 day (86400 sec) + # and crit if elder than 2 days + # warn if Maximum size of all files on backup space is > 70 MB + # (73400320 Bytes) and crit if > 80 MB + # warn also if no backup is configured or no backup can be found + static_checks['plesk_backups'] = [ + ( ('plesk_backups', + 'Backup example.com', + { 'backup_age': (86400, 172800), + 'total_size': (73400320, 83886080), + 'no_backup_configured_state': 1, + 'no_backup_found_state': 1 + }), + [], ['localhost1'] + ), + ] + +perfdata: + Three values: + last backup size in bytes, + last backup age in seconds and + total size of all backups in bytes inventory: - One check per system is created if the {plesk_domains} agent plugin - is installed and working (it outputs the {<<<plesk_domains>>>} section). + One check per plesk domain is created if the {plesk_backups} agent plugin + is installed and working (it outputs the {<<<plesk_backups>>>} section). + +[parameters] +backup_age(int, int): if the age of the backup (in seconds) is elder than the first value, return {WARN} state, if elder than the second one, return {CRIT} state +total_size(int, int): if the total size of all backups on the backup space (in bytes) is larger than than the first value, return {WARN} state, if larger than the second one, return {CRIT} state +no_backup_configured_state(int): the numeric state that should be returned if no backup is configured ( 0 = {OK}, 1 = {WARN}, 2 = {CRIT} ) +no_backup_found_state(int): the numeric state that should be returned if no backup can be found ( 0 = {OK}, 1 = {WARN}, 2 = {CRIT} )

11 years, 2 months

Check_MK Git: check_mk: initial version of check manpage for more statgrab_*

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 8247fd0b8eea59cc73eb5b0584580236b038f301 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8247fd0b8eea59… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jul 26 13:03:21 2013 +0200 initial version of check manpage for more statgrab_* --- checkman/statgrab_disk | 4 ++-- checkman/statgrab_net.link | 16 ++++++++++++---- checkman/statgrab_net.params | 32 +++++++++++++++++++++++--------- 3 files changed, 37 insertions(+), 15 deletions(-) diff --git a/checkman/statgrab_disk b/checkman/statgrab_disk index c4e0c33..4fba301 100644 --- a/checkman/statgrab_disk +++ b/checkman/statgrab_disk @@ -19,8 +19,8 @@ item: examples: # adding one service for Disk IO read and one for Disk IO write checks += [ - ('statgrab', 'statgrab_disk', 'read', None), - ('statgrab', 'statgrab_disk', 'write', None), + ('host1', 'statgrab_disk', 'read', None), + ('host1', 'statgrab_disk', 'write', None), ] perfdata: diff --git a/checkman/statgrab_net.link b/checkman/statgrab_net.link index 3e7d618..5c73f69 100644 --- a/checkman/statgrab_net.link +++ b/checkman/statgrab_net.link @@ -4,22 +4,30 @@ catalog: os/network license: GPL distribution: check_mk description: - BERND, FIXME: where does it get target state from? - Checks the link state for an interface and compares it to it's target state. Returns {OK} if link state is equal to the target state. - Returns {WARN} if the link is UP and the target state is UNUSED. + Returns {WARN} if the link is UP and the target state is NO LINK. - Returns {CRIT} if the state is NO LINK and the target state is UP. + Returns {CRIT} if the current state is NO LINK and the target state is UP. Make sure you have the statgrab binary available on the monitored machine. Under HP-UX you also need to activate the hpux_statgrab agent plugin. +examples: + # target state for interface bge0 on host1 is NO LINK + checks += [ + ('host1', 'statgrab_net.link', 'bge0', False) + ] + item: The interface name as defined in the operating system. inventory: Creates one check for each network interface. + When running inventory on a machine, the current state of an interface is + assumed to be the target state. +[parameters] +targetstate(bool): {true} for target state UP, {false} for target state NO LINK. diff --git a/checkman/statgrab_net.params b/checkman/statgrab_net.params index eaad10f..2bb60dc 100644 --- a/checkman/statgrab_net.params +++ b/checkman/statgrab_net.params @@ -4,16 +4,30 @@ catalog: os/network license: GPL distribution: check_mk description: - This check measures the CPU utilization during the last check - cycle. A level can be set only on {wait} (disk wait). + Checks the settings for speed and duplex of a network interface and compares + them to their target state. - BERND: Hinweis auf statgrab-Plugin (HP) bzw. statgrab-Befehl (beide). + Returns {OK} if they are equal and {CRIT} if not. -perfdata: - Three variables: The percentage of time spent in {user}, {system} and {wait} - (disk wait). The idle time can be computed by substracting those three values - from 100%. The user value contains also {nice}. + Make sure you have the statgrab binary available on the monitored + machine. Under HP-UX you also need to activate the hpux_statgrab agent plugin. + +examples: + # target settings for interface bge0 on host1 are a speed of 1000Mb/s + # and Unknown for the duplex state + checks += [ + ('host1', 'statgrab_net.params', 'bge0', ('1000Mb/s', 'Unknown')) + ] + +item: + The interface name as defined in the operating system. inventory: - One check per host is created if the agent contains a {statgrab_cpu} - section containing cpu information. + Creates one check for each network interface. + When running inventory on a machine, the current settings for speed and duplex + of an interface are assumed to be the target states. + +[parameters] +targetstate(string, string): the target state for interface speed and the + target duplex state +

11 years, 2 months

Check_MK Git: check_mk: initial version of check manpage for statgrab_*, added section agentless in check catalog

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 51dbd05f5472478a02e26f155e48481c178de416 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51dbd05f547247… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri Jul 26 12:00:39 2013 +0200 initial version of check manpage for statgrab_*, added section agentless in check catalog --- checkman/statgrab_disk | 28 ++++++++++++++++------- checkman/statgrab_mem | 52 ++++++++++++++++++++++++++++++++++-------- checkman/statgrab_net.ctr | 26 ++++++++++++--------- checkman/statgrab_net.link | 26 +++++++++++++-------- checkman/statgrab_net.params | 2 +- doc/drafts/LIESMICH.Katalog | 2 ++ 6 files changed, 97 insertions(+), 39 deletions(-) diff --git a/checkman/statgrab_disk b/checkman/statgrab_disk index 968e27f..c4e0c33 100644 --- a/checkman/statgrab_disk +++ b/checkman/statgrab_disk @@ -4,16 +4,28 @@ catalog: os/kernel license: GPL distribution: check_mk description: - This check measures the CPU utilization during the last check - cycle. A level can be set only on {wait} (disk wait). + Reports Disk IO for read and Disk IO for write in Bytes/s during the last check + cycle. - BERND: Hinweis auf statgrab-Plugin (HP) bzw. statgrab-Befehl (beide). + The check always returns {OK} state. + + Make sure you have the statgrab binary available on the monitored + machine. Under HP-UX you also need to activate the hpux_statgrab agent plugin. + +item: + {read} for Disk IO read and + {write} for Disk IO write + +examples: + # adding one service for Disk IO read and one for Disk IO write + checks += [ + ('statgrab', 'statgrab_disk', 'read', None), + ('statgrab', 'statgrab_disk', 'write', None), + ] perfdata: - Three variables: The percentage of time spent in {user}, {system} and {wait} - (disk wait). The idle time can be computed by substracting those three values - from 100%. The user value contains also {nice}. + One value per Check: Disk IO in Bytes/s inventory: - One check per host is created if the agent contains a {statgrab_cpu} - section containing cpu information. + Finds two checks on every machine with statgrab: Disk IO read and + Disk IO write diff --git a/checkman/statgrab_mem b/checkman/statgrab_mem index 4224e7d..cd486ff 100644 --- a/checkman/statgrab_mem +++ b/checkman/statgrab_mem @@ -1,19 +1,53 @@ -title: Memory (RAM) and Swap usage +title: Usage of physical and virtual RAM agents: hpux, solaris catalog: os/kernel license: GPL distribution: check_mk description: - This check measures the CPU utilization during the last check - cycle. A level can be set only on {wait} (disk wait). + This check measures the current usage of physical RAM and + virtual memory used by processes. You can define a warning + and critical level for the usage of virtual memory, + {not} for the usage of RAM. - BERND: Hinweis auf statgrab-Plugin (HP) bzw. statgrab-Befehl (beide). + Check_mk lets you define levels in percentage of + the physically installed RAM or as absolute + values in MB. The default levels + are at 150% and 200%. That means that this check + gets critical if the memory used by processes + is twice the size of your RAM. + + See check manpage for {mem.used} too. + + Make sure you have the statgrab binary available on the monitored + machine. Under HP-UX you also need to activate the hpux_statgrab agent plugin. + +examples: + # Change default levels from 150%/200% to 100%/150%: + memused_default_levels = (100.0, 150.0) + checks += [ + # make explicit check for hosts with tag "solaris" + ( ["solaris"], ALL_HOSTS, "statgrab_mem", None, (80.0, 100.0) ), + # use absolute levels at 8GB / 12GB for some other hosts + ( ["host12","host34"], "statgrab_mem", None, (8192, 12288) ) + ] perfdata: - Three variables: The percentage of time spent in {user}, {system} and {wait} - (disk wait). The idle time can be computed by substracting those three values - from 100%. The user value contains also {nice}. + Two values: The RAM used in MB (without Caches) and the swap space used + in MB. inventory: - One check per host is created if the agent contains a {statgrab_cpu} - section containing cpu information. + Finds one service on every machine with statgrab: The memory used. + +[parameters] +warning (int or float): the percentage of virtual memory used + by processes at which {WARN} state is triggered. If the + level is defined as an integer value then it is interpreted + as an absolute value in megabytes. +critical (int or float): the percentage or absolute value + at which {CRIT} state is triggered + +[configuration] +memused_default_levels (float, float): Levels used by + all checks that are created by inventory. If not set they + have defaults of (150.0, 200.0) + diff --git a/checkman/statgrab_net.ctr b/checkman/statgrab_net.ctr index c2158d7..3b938f7 100644 --- a/checkman/statgrab_net.ctr +++ b/checkman/statgrab_net.ctr @@ -1,20 +1,24 @@ -title: Network Interfaces: Counters +title: Network Interfaces: Traffic agents: hpux, solaris -catalog: os/kernel +catalog: os/network license: GPL distribution: check_mk description: - This check measures the CPU utilization during the last check - cycle. A level can be set only on {wait} (disk wait). + Reports the network traffic for an interface during the last check + cycle for direction IN and OUT. - BERND: Hinweis auf statgrab-Plugin (HP) bzw. statgrab-Befehl (beide). - Title to be improved + Make sure you have the statgrab binary available on the monitored + machine. Under HP-UX you also need to activate the hpux_statgrab agent plugin. + +item: + The interface name as defined in the operating system. perfdata: - Three variables: The percentage of time spent in {user}, {system} and {wait} - (disk wait). The idle time can be computed by substracting those three values - from 100%. The user value contains also {nice}. + Seven values are delivered, the differences of the counters during the last check + cycle for {rx_bytes}, {tx_bytes}, {rx_packets}, {tx_packets}, {rx_errors}, + {tx_errors}, {tx_collisions} inventory: - One check per host is created if the agent contains a {statgrab_cpu} - section containing cpu information. + Creates one check for each network interface. + + diff --git a/checkman/statgrab_net.link b/checkman/statgrab_net.link index 84bf0a5..3e7d618 100644 --- a/checkman/statgrab_net.link +++ b/checkman/statgrab_net.link @@ -1,19 +1,25 @@ title: Network Interfaces: Link status agents: hpux, solaris -catalog: os/kernel +catalog: os/network license: GPL distribution: check_mk description: - This check measures the CPU utilization during the last check - cycle. A level can be set only on {wait} (disk wait). + BERND, FIXME: where does it get target state from? - BERND: Hinweis auf statgrab-Plugin (HP) bzw. statgrab-Befehl (beide). + Checks the link state for an interface and compares it to it's target state. -perfdata: - Three variables: The percentage of time spent in {user}, {system} and {wait} - (disk wait). The idle time can be computed by substracting those three values - from 100%. The user value contains also {nice}. + Returns {OK} if link state is equal to the target state. + + Returns {WARN} if the link is UP and the target state is UNUSED. + + Returns {CRIT} if the state is NO LINK and the target state is UP. + + Make sure you have the statgrab binary available on the monitored + machine. Under HP-UX you also need to activate the hpux_statgrab agent plugin. + +item: + The interface name as defined in the operating system. inventory: - One check per host is created if the agent contains a {statgrab_cpu} - section containing cpu information. + Creates one check for each network interface. + diff --git a/checkman/statgrab_net.params b/checkman/statgrab_net.params index 799335d..eaad10f 100644 --- a/checkman/statgrab_net.params +++ b/checkman/statgrab_net.params @@ -1,6 +1,6 @@ title: Network Interfaces: Speed and Duplex agents: hpux, solaris -catalog: os/kernel +catalog: os/network license: GPL distribution: check_mk description: diff --git a/doc/drafts/LIESMICH.Katalog b/doc/drafts/LIESMICH.Katalog index 86a6816..bf39c34 100644 --- a/doc/drafts/LIESMICH.Katalog +++ b/doc/drafts/LIESMICH.Katalog @@ -52,3 +52,5 @@ hw SNMP-Agent auf Betriebssystem für HW generic (mrpe, local, ...) + +agentless "Networking checks without agent"

11 years, 2 months

Check_MK Git: check_mk: view editor: it is now possible to edit localized views without destroying localized strings like titles

by Lars Michelsen

Module: check_mk Branch: master Commit: a6f856ad2b4c28be68ec28af3f856de45f13eab0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6f856ad2b4c28… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 26 10:49:18 2013 +0200 view editor: it is now possible to edit localized views without destroying localized strings like titles --- ChangeLog | 3 + web/htdocs/valuespec.py | 59 ++++++++++++++++++- web/htdocs/views.py | 146 ++++++++++++++++++++++++++++++++++------------- 3 files changed, 165 insertions(+), 43 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a6f856ad2b…

11 years, 2 months

Check_MK Git: check_mk: user attributes: Using default values to prevent exceptions

by Lars Michelsen

Module: check_mk Branch: master Commit: 3581e7d302bdbba8f7ef654f4d469633b758c95e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3581e7d302bdbb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 25 10:11:06 2013 +0200 user attributes: Using default values to prevent exceptions --- web/htdocs/userdb.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 64c82e9..0a1db01 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -544,8 +544,8 @@ def declare_custom_user_attrs(): vs = globals()[attr['type']](title = attr['title'], help = attr['help']) declare_user_attribute(attr['name'], vs, user_editable = attr['user_editable'], - show_in_table = attr['show_in_table'], - topic = attr['topic'], + show_in_table = attr.get('show_in_table', False), + topic = attr.get('topic', 'personal'), ) # .----------------------------------------------------------------------.

11 years, 2 months

Check_MK Git: check_mk: LDAP: Configuring multiple servers is now possible

by Lars Michelsen

Module: check_mk Branch: master Commit: 19df067d0c38cc06cd733a2192c5e1f2bc0abacd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19df067d0c38cc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 25 09:24:33 2013 +0200 LDAP: Configuring multiple servers is now possible --- ChangeLog | 2 ++ web/plugins/userdb/ldap.py | 49 +++++++++++++++------------- web/plugins/wato/check_mk_configuration.py | 11 ++++++- 3 files changed, 39 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index b92bf12..797f3bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,8 @@ Display current date in dashboard * LDAP: Using asynchronous searches / added optional support for paginated searches (Can be enabled in connection settings) + * LDAP: It is now possible to provide multiple failover servers, which are + tried when the primary ldap server fails * Added option to enable browser scrollbar to the multisite sidebar (only via "sidebar_show_scrollbar = True" in multisite.mk * Added option to disable automatic userdb synchronizations in multisite diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 60f6aae..37b707a 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -100,13 +100,13 @@ class MKLDAPException(MKGeneralException): ldap_connection = None -def ldap_uri(): +def ldap_uri(server): if 'use_ssl' in config.ldap_connection: uri = 'ldaps://' else: uri = 'ldap://' - return uri + '%s:%d' % (config.ldap_connection['server'], config.ldap_connection['port']) + return uri + '%s:%d' % (server, config.ldap_connection['port']) def ldap_connect(): global ldap_connection, ldap_connection_options @@ -135,30 +135,35 @@ def ldap_connect(): 'LDAP User Settings</a>.')) try: - ldap_connection = ldap.ldapobject.ReconnectLDAPObject(ldap_uri()) - ldap_connection.protocol_version = config.ldap_connection['version'] - ldap_connection.network_timeout = config.ldap_connection.get('connect_timeout', 2.0) - - # When using the domain top level as base-dn, the subtree search stumbles with referral objects. - # whatever. We simply disable them here when using active directory. Hope this fixes all problems. - if config.ldap_connection['type'] == 'ad': - ldap_connection.set_option(ldap.OPT_REFERRALS, 0) - - ldap_default_bind() + servers = [ config.ldap_connection['server'] ] + if config.ldap_connection.get('failover_servers'): + servers += config.ldap_connection.get('failover_servers') + + errors = [] + for server in servers: + try: + uri = ldap_uri(server) + ldap_connection = ldap.ldapobject.ReconnectLDAPObject(uri) + ldap_connection.protocol_version = config.ldap_connection['version'] + ldap_connection.network_timeout = config.ldap_connection.get('connect_timeout', 2.0) + + # When using the domain top level as base-dn, the subtree search stumbles with referral objects. + # whatever. We simply disable them here when using active directory. Hope this fixes all problems. + if config.ldap_connection['type'] == 'ad': + ldap_connection.set_option(ldap.OPT_REFERRALS, 0) + + ldap_default_bind() + except (ldap.SERVER_DOWN, ldap.TIMEOUT, ldap.LOCAL_ERROR, ldap.LDAPError), e: + ldap_connection = None + errors.append('%s: %s' % (uri, e[0].get('info', e[0].get('desc', '')))) + + if ldap_connection is None: + raise MKLDAPException(_('The LDAP connector is unable to connect to the LDAP server.\n%s') % + ('<br />\n'.join(errors))) # on success, store the connection options the connection has been made with ldap_connection_options = config.ldap_connection - except ldap.SERVER_DOWN, e: - msg = e[0].get('info', e[0].get('desc', '')) - ldap_connection = None # Invalidate connection on failure - raise MKLDAPException(_('The LDAP connector is unable to connect to the LDAP server (%s).') % msg) - - except ldap.LDAPError, e: - html.write(repr(e)) - ldap_connection = None # Invalidate connection on failure - raise MKLDAPException(e) - except Exception: ldap_connection = None # Invalidate connection on failure raise diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 6f8a5c6..550dd0a 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -445,6 +445,15 @@ register_configvar(group, "resolvable hostname."), allow_empty = False, )), + ('failover_servers', ListOfStrings( + title = _('Failover Servers'), + help = _('When the connection to the first server fails with connect specific errors ' + 'like timeouts or some other network related problems, the connect mechanism ' + 'will try to use this server instead of the server configured above. If you ' + 'use persistent connections (default), the connection is being used until the ' + 'LDAP is not reachable or the local webserver is restarted.'), + allow_empty = False, + )), ("port", Integer( title = _("TCP Port"), help = _("This variable allows to specify the TCP port to " @@ -525,7 +534,7 @@ register_configvar(group, default_value = 5, )), ], - optional_keys = ['no_persistent', 'use_ssl', 'bind', 'page_size', 'response_timeout'], + optional_keys = ['no_persistent', 'use_ssl', 'bind', 'page_size', 'response_timeout', 'failover_servers'], ), domain = "multisite", )

11 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits