Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

#3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller

by Simon Betz

Module: check_mk Branch: master Commit: 3192c796a7da745355830f5f4f904f8d020d8f0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3192c796a7da74… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Feb 15 08:57:17 2016 +0100 #3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller --- .werks/3183 | 9 +++++++++ ChangeLog | 1 + checkman/aruba_wlc_aps | 23 +++++++++++++++++++++++ inventory/aruba_wlc_aps | 24 ++++++++++++------------ web/plugins/views/inventory.py | 3 ++- 5 files changed, 47 insertions(+), 13 deletions(-) diff --git a/.werks/3183 b/.werks/3183 new file mode 100644 index 0000000..08bf22d --- /dev/null +++ b/.werks/3183 @@ -0,0 +1,9 @@ +Title: aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1455522993 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 15d62b1..c80ab72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.2.9i1: Checks & Agents: + * 3183 aruba_wlc_aps: new check which monitors the provisioned accesspoints of an Aruba Network WLAN Controller * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... Event Console: diff --git a/checkman/aruba_wlc_aps b/checkman/aruba_wlc_aps new file mode 100644 index 0000000..a7532be --- /dev/null +++ b/checkman/aruba_wlc_aps @@ -0,0 +1,23 @@ +title: Aruba Networks Wireless LAN Controller (WLC): Connected WLAN Accesspoints +agents: snmp +catalog: hw/network/aruba +license: GPL +distribution: check_mk +description: + This check automatically detects all provisioned accesspoints of an + Aruba Networks WLAN Controller which are up. + Moreover the check reports the accesspoint group and system location if available. + If an accesspoint goes down, the checks triggers a CRITICAL state. + If the accespoint is inactive, the check reports a WARN state. + If both cases appear then the worst case will be reported. + Otherwise the check is OK. + +item: + The accesspoint name. + +perfdata: + No performance data. + +inventory: + One service for each access point is created. + diff --git a/inventory/aruba_wlc_aps b/inventory/aruba_wlc_aps index 75ab750..eb3443d 100644 --- a/inventory/aruba_wlc_aps +++ b/inventory/aruba_wlc_aps @@ -25,13 +25,6 @@ # Boston, MA 02110-1301 USA. -# .1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1.3.0.36.108.192.2.186 ALA-AP 2.1.1 --> WLSX-WLAN-MIB::wlanAPName.'.$l...' -# .1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1.4.0.36.108.192.2.186 ALA-Office --> WLSX-WLAN-MIB::wlanAPGroupName.'.$l...' -# .1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1.5.0.36.108.192.2.186 .1.3.6.1.4.1.14823.1.2.34 --> WLSX-WLAN-MIB::wlanAPModel.'.$l...' -# .1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1.6.0.36.108.192.2.186 AL0000642 --> WLSX-WLAN-MIB::wlanAPSerialNumber.'.$l...' -# .1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1.32.0.36.108.192.2.186 --> WLSX-WLAN-MIB::wlanAPSysLocation.'.$l...' - - def inv_aruba_wlc_aps(info): map_ap_products = { "1" : "a50", "2" : "a52", "3" : "a60", "4" : "a61", "5" : "a70", @@ -52,21 +45,28 @@ def inv_aruba_wlc_aps(info): "76" : "ap205H", "9999" : "undefined", } node = inv_tree("networking.wlan.controller.accesspoints:") - for ap_name, ap_gr_name, ap_model, ap_serial_nr, ap_sys_loc in info: + for ap_name, ap_status, ap_unprovisioned, ap_ip, ap_group, \ + ap_model, ap_serial, ap_sysloc in info: node.append({ + "ip_addr" : ap_ip, "name" : ap_name, - "group" : ap_gr_name, + "group" : ap_group, "model" : map_ap_products.get(ap_model.split(".")[-1], "unknown"), - "serial" : ap_serial_nr, - "sys_location" : ap_sys_loc, + "serial" : ap_serial, + "sys_location" : ap_sysloc, }) return node inv_info['aruba_wlc_aps'] = { 'inv_function' : inv_aruba_wlc_aps, - "snmp_info" : ( ".1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1",[ + # If you make changes here in snmp_info, don't forget to make + # these changes in the related check plugin, too. + "snmp_info" : ( ".1.3.6.1.4.1.14823.2.2.1.5.2.1.4.1", [ "3", # wlanAPName + "19", # wlanAPStatus + "22", # wlanAPUnprovisioned + "2", # wlanAPIpAddress "4", # wlanAPGroupName "5", # wlanAPModel "6", # wlanAPSerialNumber diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 02674d0..05fe92a 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -666,9 +666,10 @@ inventory_displayhints.update({ ".networking.wlan" : { "title" : _("WLAN") }, ".networking.wlan.controller" : { "title" : _("Controller") }, - ".networking.wlan.controller.accesspoints:" : { "title" : _("Access Points"), "keyorder" : ["name", "group", "model", "serial", "sys_location"], "render" : render_inv_dicttable }, + ".networking.wlan.controller.accesspoints:" : { "title" : _("Access Points"), "keyorder" : ["name", "group", "ip_addr", "model", "serial", "sys_location"], "render" : render_inv_dicttable }, ".networking.wlan.controller.accesspoints:*.name" : { "title" : _("Name") }, ".networking.wlan.controller.accesspoints:*.group" : { "title" : _("Group") }, + ".networking.wlan.controller.accesspoints:*.ip_addr" : { "title" : _("IP Address") }, ".networking.wlan.controller.accesspoints:*.model" : { "title" : _("Model") }, ".networking.wlan.controller.accesspoints:*.serial" : { "title" : _("Serial Number") }, ".networking.wlan.controller.accesspoints:*.sys_location" : { "title" : _("System Location") },

8 years, 7 months

clang-formatted

by Sven Panne

Module: check_mk Branch: master Commit: 3647fd40fcd7512e058e9aa69dd0d7254071f81f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3647fd40fcd751… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Feb 15 07:54:44 2016 +0100 clang-formatted --- agents/windows/Configuration.cc | 2 +- agents/windows/EventLog.cc | 7 +--- agents/windows/EventLog.h | 9 ++--- agents/windows/ExternalCmd.cc | 17 +++----- agents/windows/ExternalCmd.h | 6 +-- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.unversioned.exe | Bin 909824 -> 909824 bytes agents/windows/check_mk_agent.cc | 45 +++++++++++----------- agents/windows/check_mk_agent.msi | Bin 2006016 -> 2006016 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 835584 -> 835584 bytes agents/windows/install_agent-64.exe | Bin 418340 -> 418338 bytes agents/windows/install_agent.exe | Bin 408685 -> 408688 bytes 12 files changed, 36 insertions(+), 52 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3647fd40fc…

8 years, 7 months

re-added livestatus connection cleanup after request finished

by Lars Michelsen

Module: check_mk Branch: master Commit: af5670b857245e2e123e86ec495403c406c5926a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af5670b857245e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 12 17:24:00 2016 +0100 re-added livestatus connection cleanup after request finished --- web/htdocs/index.py | 3 +++ web/htdocs/sites.py | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 25bd189..b125d6f 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -27,6 +27,7 @@ from mod_python import apache import sys, os, pprint, __builtin__ import i18n +import sites import livestatus import modules import defaults, config, login @@ -167,6 +168,7 @@ def handler(req, fields = None, is_profiling = False): (apache.SERVER_RETURN, apache.HTTP_UNAUTHORIZED), (apache.SERVER_RETURN, apache.HTTP_MOVED_TEMPORARILY)): release_all_locks() + sites.disconnect() html.finalize(is_error=True) raise @@ -184,6 +186,7 @@ def handler(req, fields = None, is_profiling = False): response_code = apache.OK release_all_locks() + sites.disconnect() html.finalize() return response_code diff --git a/web/htdocs/sites.py b/web/htdocs/sites.py index 08d19ee..9b1b784 100644 --- a/web/htdocs/sites.py +++ b/web/htdocs/sites.py @@ -169,6 +169,12 @@ def set_livestatus_auth(): _live.set_auth_domain('read') +def disconnect(): + global _live, _site_status + _live = None + _site_status = None + + def status_host_state_name(shs): if shs == None: return "dead"

8 years, 7 months

Refactored livestatus code out of global html object (moved to dedicated " sites" module)

by Lars Michelsen

Module: check_mk Branch: master Commit: 2bc1004dd54d37b12970272b3db8a3edfbffd9ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2bc1004dd54d37… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 12 17:20:33 2016 +0100 Refactored livestatus code out of global html object (moved to dedicated "sites" module) --- mkeventd/web/plugins/views/mkeventd.py | 23 +-- web/htdocs/actions.py | 11 +- web/htdocs/availability.py | 23 +-- web/htdocs/bi.py | 37 ++--- web/htdocs/crash_reporting.py | 7 +- web/htdocs/guitester.py | 15 +- web/htdocs/html_mod_python.py | 133 ------------------ web/htdocs/logwatch.py | 8 +- web/htdocs/main.py | 6 - web/htdocs/metrics.py | 21 ++- web/htdocs/prediction.py | 3 +- web/htdocs/sidebar.py | 41 ++++-- web/htdocs/sites.py | 211 ++++++++++++++++++++++++++++ web/htdocs/views.py | 33 ++--- web/htdocs/wato.py | 82 ++++++----- web/htdocs/watolib.py | 5 +- web/plugins/dashboard/dashlets.py | 16 ++- web/plugins/icons/builtin.py | 16 +-- web/plugins/pages/shipped.py | 2 +- web/plugins/sidebar/shipped.py | 56 ++++---- web/plugins/sidebar/wato.py | 6 +- web/plugins/userdb/ldap.py | 3 +- web/plugins/views/commands.py | 6 +- web/plugins/views/inventory.py | 14 +- web/plugins/views/painters.py | 7 +- web/plugins/visuals/filters.py | 11 +- web/plugins/visuals/wato.py | 3 +- web/plugins/wato/backup_domains.py | 8 +- web/plugins/wato/check_mk_configuration.py | 2 +- 29 files changed, 457 insertions(+), 352 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2bc1004dd5…

8 years, 7 months

#3073 FIX windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory

by Sebastian Herbord

Module: check_mk Branch: master Commit: b13fa5f5d202850813bacb2c88794387dde3067b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b13fa5f5d20285… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Feb 12 16:15:25 2016 +0100 #3073 FIX windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory contrary to how it was documented, mrpe scripts with relative paths were expected in the directory relative to the current working directory, which would usually be c:\windows\system32 In addition, it was not possible to include spaces in the script path which made it very difficult to reference mrpe scripts in c:\program files... This has now been fixed and mrpe configuration should now work as documented. --- .werks/3073 | 16 ++ ChangeLog | 3 + agents/windows/CONTENTS | 2 + agents/windows/Configuration.cc | 12 +- agents/windows/ExternalCmd.cc | 158 +++++++++++++ agents/windows/ExternalCmd.h | 62 +++++ agents/windows/Makefile | 8 +- agents/windows/OHMMonitor.cc | 2 +- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 908288 -> 909824 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 908288 -> 909824 bytes agents/windows/check_mk_agent.cc | 267 ++++++++++------------ agents/windows/check_mk_agent.exe | Bin 832000 -> 835584 bytes agents/windows/check_mk_agent.msi | Bin 2000896 -> 2006016 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 832000 -> 835584 bytes agents/windows/install_agent-64.exe | Bin 417017 -> 418340 bytes agents/windows/install_agent.exe | Bin 407478 -> 408685 bytes agents/windows/stringutil.cc | 3 +- agents/windows/stringutil.h | 2 +- agents/windows/types.h | 4 + 20 files changed, 380 insertions(+), 161 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b13fa5f5d2…

8 years, 7 months

added vendor

by Simon Betz

Module: check_mk Branch: master Commit: f76cabbefc9235d6226c29e01f0194d0059f8dfc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f76cabbefc9235… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 12 15:56:21 2016 +0100 added vendor --- modules/catalog.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/catalog.py b/modules/catalog.py index afadccb..4f03bcb 100644 --- a/modules/catalog.py +++ b/modules/catalog.py @@ -53,6 +53,7 @@ manpage_catalog_titles = { "adva" : "ADVA Optical Networking", "alcatel" : "Alcatel", "arris" : "ARRIS", + "aruba" : "Aruba Networks", "avaya" : "Avaya", "avm" : "AVM", "bintec" : "Bintec",

8 years, 7 months

updated manpage

by Simon Betz

Module: check_mk Branch: master Commit: 56706e11ac4c49e639ccbab847fea2c25011924b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56706e11ac4c49… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 12 15:54:11 2016 +0100 updated manpage --- checkman/aruba_wlc_clients | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checkman/aruba_wlc_clients b/checkman/aruba_wlc_clients index 0ddf9b8..7c5003c 100644 --- a/checkman/aruba_wlc_clients +++ b/checkman/aruba_wlc_clients @@ -1,4 +1,4 @@ -title: Aruba Wireless LAN Controller (WLC): Number of Wifi connections +title: Aruba Networks Wireless LAN Controller (WLC): Number of Wifi connections agents: snmp catalog: hw/network/aruba license: GPL

8 years, 7 months

#3058 FIX Event Console is now allowing non loadable MIB modules on startup

by Lars Michelsen

Module: check_mk Branch: master Commit: e3fa4f4be342c7322dcb5fce797ed44c888db370 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e3fa4f4be342c7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 12 14:37:15 2016 +0100 #3058 FIX Event Console is now allowing non loadable MIB modules on startup This case of a MIB module processing error it is now logging the issue and proceeding without any loaded MIB module. --- .werks/3058 | 11 +++++++++++ ChangeLog | 2 ++ mkeventd/bin/mkeventd | 32 +++++++++++++++++++------------- 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/.werks/3058 b/.werks/3058 new file mode 100644 index 0000000..6d4497b --- /dev/null +++ b/.werks/3058 @@ -0,0 +1,11 @@ +Title: Event Console is now allowing non loadable MIB modules on startup +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455284199 + +This case of a MIB module processing error it is now logging the issue and +proceeding without any loaded MIB module. diff --git a/ChangeLog b/ChangeLog index 3b60cf6..56f7fda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ 1.2.9i1: + Event Console: + * 3058 FIX: Event Console is now allowing non loadable MIB modules on startup... 1.2.8b1: diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index f61a6b2..7e0f138 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1151,24 +1151,30 @@ class EventServer: return os.open(g_pipe_path, os.O_RDWR | os.O_NONBLOCK) def load_mibs(self): - builder = MibBuilder() # manages python MIB modules + try: + builder = MibBuilder() # manages python MIB modules - # load MIBs from our compiled MIB and default MIB paths - builder.setMibSources(*[DirMibSource(g_compiled_mibs_dir)] - + list(builder.getMibSources())) + # load MIBs from our compiled MIB and default MIB paths + builder.setMibSources(*[DirMibSource(g_compiled_mibs_dir)] + + list(builder.getMibSources())) - # Indicate we wish to load DESCRIPTION and other texts from MIBs - builder.loadTexts = True + # Indicate we wish to load DESCRIPTION and other texts from MIBs + builder.loadTexts = True - # This loads all or specified pysnmp MIBs into memory - builder.loadModules() + # This loads all or specified pysnmp MIBs into memory + builder.loadModules() - loaded_mib_module_names = builder.mibSymbols.keys() - log('Loaded %d SNMP MIB modules' % len(loaded_mib_module_names)) - verbose('Found modules: %s' % (', '.join(loaded_mib_module_names))) + loaded_mib_module_names = builder.mibSymbols.keys() + log('Loaded %d SNMP MIB modules' % len(loaded_mib_module_names)) + verbose('Found modules: %s' % (', '.join(loaded_mib_module_names))) - # This object maintains various indices built from MIBs data - self._mib_resolver = MibViewController(builder) + # This object maintains various indices built from MIBs data + self._mib_resolver = MibViewController(builder) + except SmiError, e: + if opt_debug: + raise + log("Exception while loading MIB modules. Proceeding without modules!") + log("Exception: %s" % e) # Format time difference seconds into approximated # human readable value

8 years, 7 months

We need know the state values for CMC compilation.

by Sven Panne

Module: check_mk Branch: master Commit: f6c3f2b7949104c7ba99fcc151fc0b58109b9948 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f6c3f2b7949104… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 12 11:52:40 2016 +0100 We need know the state values for CMC compilation. --- livestatus/src/TableStateHistory.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index ee0f79a..acc696b 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -50,6 +50,10 @@ #include "Host.h" #include "Service.h" #include "Timeperiod.h" +#define STATE_OK 0 +#define STATE_WARNING 1 +#define STATE_CRITICAL 2 +#define STATE_UNKNOWN 3 #else #include "auth.h" #endif

8 years, 7 months

wato gitignore minor readability formating

by Lars Michelsen

Module: check_mk Branch: master Commit: 611d7d791111e767ab611bd723f37c235d7bec68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=611d7d791111e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 12 11:49:30 2016 +0100 wato gitignore minor readability formating --- ChangeLog | 1 + web/htdocs/watolib.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa5b267..3b60cf6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 1.2.9i1: + 1.2.8b1: Core & Setup: * 2771 Errors in Check_MK configuration do not prevent the core from being restarted anymore... diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 75e915d..453f743 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4247,10 +4247,18 @@ def do_git_commit(): git_command(["config", "user.name", "check_mk"]) # Make sure that .gitignore-files are present and uptodate - file(defaults.default_config_dir + "/.gitignore", "w").write("*\n!*.d\n!.gitignore\n*swp\n*.mk.new\n") + file(defaults.default_config_dir + "/.gitignore", "w").write( + "*\n" + "!*.d\n" + "!.gitignore\n" + "*swp\n" + "*.mk.new\n") for subdir in os.listdir(defaults.default_config_dir): if subdir.endswith(".d"): - file(defaults.default_config_dir + "/" + subdir + "/.gitignore", "w").write("*\n!wato\n!wato/*\n") + file(defaults.default_config_dir + "/" + subdir + "/.gitignore", "w").write( + "*\n" + "!wato\n" + "!wato/*\n") git_command(["add", ".gitignore", "*.d/wato"]) git_command(["commit", "--untracked-files=no", "--author", author, "-m", shell_quote(_("Initialized GIT for Check_MK"))])

8 years, 7 months

← Newer
1
...
13
14
15
16
17
18
19
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016