Checkmk git commits November 2014

checkmk-commits@lists.checkmk.com

6 participants
232 discussions

Check_MK Git: check_mk: Fixed exception with old tuple check_info based checks since last week

by Lars Michelsen

Module: check_mk Branch: master Commit: 617582b14086ca7934066c71d727eb30bb622edc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=617582b14086ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 10 10:46:24 2014 +0100 Fixed exception with old tuple check_info based checks since last week --- modules/check_mk_base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 8f56a98..c372517 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1111,6 +1111,7 @@ def convert_check_info(): snmp_scan_functions.get(basename)), "default_levels_variable" : check_default_levels.get(check_type), "node_info" : False, + "parse_function" : None, } else: # Check does already use new API. Make sure that all keys are present,

9 years, 7 months

Check_MK Git: check_mk: Remove useless shebang

by Mathias Kettner

Module: check_mk Branch: master Commit: fffeafe89cb3e28a0a90d27dfbfcbdee95f18927 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fffeafe89cb3e2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 10 09:58:51 2014 +0100 Remove useless shebang --- web/plugins/pages/mobile.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/plugins/pages/mobile.py b/web/plugins/pages/mobile.py index c36e93e..3302fa4 100644 --- a/web/plugins/pages/mobile.py +++ b/web/plugins/pages/mobile.py @@ -24,8 +24,6 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -#!/usr/bin/python - import mobile pagehandlers.update({

9 years, 7 months

Check_MK Git: check_mk: Disabled sorting in hosttag table

by Lars Michelsen

Module: check_mk Branch: master Commit: 28457a295900ca5e21d3a811a719cbbcc88f9f90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28457a295900ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 7 14:37:36 2014 +0100 Disabled sorting in hosttag table --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 568c902..bbd6390 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12670,7 +12670,7 @@ def mode_hosttags(phase): "such as <i>disable notifications for all hosts with the tags " "<b>Network device</b> and <b>Test</b></i>.")), empty_text = _("You haven't defined any tag groups yet."), - searchable = False) + searchable = False, sortable = False) if hosttags: for nr, entry in enumerate(hosttags):

9 years, 8 months

Check_MK Git: check_mk: Disabled sorting for notification rules

by Lars Michelsen

Module: check_mk Branch: master Commit: edee5b9240ee078fca8dd9280ed0d8967da0920d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=edee5b9240ee07… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 7 14:39:45 2014 +0100 Disabled sorting for notification rules --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index bbd6390..2ce241d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8841,7 +8841,7 @@ def mode_notifications(phase): backlog = [] if backlog: - table.begin(table_id = "backlog", title = _("Recent notifications (for analysis)")) + table.begin(table_id = "backlog", title = _("Recent notifications (for analysis)"), sortable=False) for nr, entry in enumerate(backlog): table.row() table.cell(css="buttons")

9 years, 8 months

Check_MK Git: check_mk: Fixed problem with tables which are sortable, but not searchable

by Lars Michelsen

Module: check_mk Branch: master Commit: eef613c787977e77e9054ad252dd249e8795bf10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eef613c787977e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 7 14:21:42 2014 +0100 Fixed problem with tables which are sortable, but not searchable --- web/htdocs/table.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/table.py b/web/htdocs/table.py index c0192e2..aef3a6d 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -322,7 +322,7 @@ def end(): html.write("</td>\n") html.write("</tr>\n") - if actions_enabled and search_term and not rows and not do_csv: + if table["searchable"] and search_term and not rows and not do_csv: html.write('<tr class="data odd0 no_match"><td colspan=%d>%s</td></tr>' % (num_cols, _('Found no matching rows. Please try another search term.')))

9 years, 8 months

Check_MK Git: check_mk: added command line opption to analyze Inline-SNMP statistics

by Lars Michelsen

Module: check_mk Branch: master Commit: 858fb0a9b08b9ed1e81cef1124ac5ff414509a33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=858fb0a9b08b9e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 7 13:58:25 2014 +0100 added command line opption to analyze Inline-SNMP statistics --- modules/check_mk.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index a766b8c..a54e153 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4743,6 +4743,7 @@ def usage(): cmk -i, --inventory [HOST1 HOST2...] Do a HW/SW-Inventory of some ar all hosts cmk --inventory-as-check HOST Do HW/SW-Inventory, behave like check plugin cmk -A, --bake-agents [-f] [H1 H2..] Bake agents for hosts (not in all versions) + cmk --show-snmp-stats Analyzes recorded Inline SNMP statistics cmk -V, --version print version cmk -h, --help print this help @@ -4859,6 +4860,10 @@ NOTES: already exists. Note: baking agents is only contained in the subscription version of Check_MK. + --show-snmp-stats analyzes and shows a summary of the Inline SNMP + statistics which might have been recorded on your system before. + Note: This is only contained in the subscription version of Check_MK. + --convert-rrds converts the internal structure of existing RRDs to the new structure as configured via the rulesets cmc_host_rrd_config and cmc_service_rrd_config. If you do not specify hosts, then all @@ -5969,7 +5974,7 @@ if __name__ == "__main__": long_options = [ "help", "version", "verbose", "compile", "debug", "interactive", "list-checks", "list-hosts", "list-tag", "no-tcp", "cache", "flush", "package", "localize", "donate", "snmpwalk", "oid=", "extraoid=", - "snmptranslate", "bake-agents", "force", + "snmptranslate", "bake-agents", "force", "show-snmp-stats", "usewalk", "scan-parents", "procs=", "automation=", "notify", "snmpget=", "profile", "keepalive", "keepalive-fd=", "create-rrd", "convert-rrds", "split-rrds", @@ -6195,7 +6200,12 @@ if __name__ == "__main__": hostnames = None do_bake_agents(hostnames) done = True - + elif o in [ '--show-snmp-stats' ]: + if 'do_show_snmp_stats' not in globals(): + sys.stderr.write("Handling of SNMP statistics is not implemented in your version of Check_MK. Sorry.\n") + sys.exit(1) + do_show_snmp_stats() + done = True except MKGeneralException, e: sys.stderr.write("%s\n" % e)

9 years, 8 months

Check_MK Git: check_mk: Wato: Changed edit_dashboard form to post

by Bastian Kuhn

Module: check_mk Branch: master Commit: 97b2aa227eb01b8da676f6c6c6715baf2ac7f899 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97b2aa227eb01b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Nov 7 13:45:24 2014 +0100 Wato: Changed edit_dashboard form to post --- web/htdocs/dashboard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index ad5fcdb..20abdf6 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -925,7 +925,7 @@ def page_edit_dashlet(): html.write("<div class=error>%s</div>\n" % e.message) html.add_user_error(e.varname, e.message) - html.begin_form("dashlet") + html.begin_form("dashlet", method="POST") vs_general.render_input("general", dashlet) if vs_type:

9 years, 8 months

Check_MK Git: check_mk: #1495 Most WATO tables can now be sorted ( where useful)

by Lars Michelsen

Module: check_mk Branch: master Commit: 8925bab1c1834b20daa1e83e725b055e77466744 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8925bab1c1834b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 7 12:10:32 2014 +0100 #1495 Most WATO tables can now be sorted (where useful) Most of the data tables in WATO can now be used. Some of the tables which have a defined order, like the rules within a ruleset can not be sorted using the new sort mechanism. At the moment the host table is not sortable, but this will be added soon. --- .werks/1495 | 14 ++++++ ChangeLog | 1 + mkeventd/web/plugins/wato/mkeventd.py | 2 +- web/htdocs/lib.py | 2 +- web/htdocs/pages.css | 3 ++ web/htdocs/table.py | 84 ++++++++++++++++++++++++--------- web/htdocs/wato.py | 6 +-- 7 files changed, 84 insertions(+), 28 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8925bab1c1…

9 years, 8 months

Check_MK Git: check_mk: #1494 FIX Fixed error in NagVis Maps snapin when some users had no contact groups assigned

by Lars Michelsen

Module: check_mk Branch: master Commit: 438f086fb17757061ff1fe7a5003b78b7c6c31bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=438f086fb17757… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 7 10:40:00 2014 +0100 #1494 FIX Fixed error in NagVis Maps snapin when some users had no contact groups assigned --- .werks/1494 | 10 ++++++++++ ChangeLog | 1 + web/plugins/userdb/hook_auth.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1494 b/.werks/1494 new file mode 100644 index 0000000..708bb2c --- /dev/null +++ b/.werks/1494 @@ -0,0 +1,10 @@ +Title: Fixed error in NagVis Maps snapin when some users had no contact groups assigned +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1415353168 + + diff --git a/ChangeLog b/ChangeLog index bcc24d6..1d10f66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ * 1487 FIX: Fixed exception in Web GUI "Internal error:: name 'Filter' is not defined" in manual setups (using setup.py)... * 1488 FIX: Fixed wrong information showing up on "Host Group" and "Service Group" views... * 1433 FIX: Quicksearch: no longer shows an invalid search result when looking for multiple hosts... + * 1494 FIX: Fixed error in NagVis Maps snapin when some users had no contact groups assigned WATO: * 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog diff --git a/web/plugins/userdb/hook_auth.py b/web/plugins/userdb/hook_auth.py index 0f2f70f..fc34447 100644 --- a/web/plugins/userdb/hook_auth.py +++ b/web/plugins/userdb/hook_auth.py @@ -142,7 +142,7 @@ function user_roles($username) { function user_groups($username) { global $mk_users; - if(!isset($mk_users[$username])) + if(!isset($mk_users[$username]) || !isset($mk_users[$username]['contactgroups'])) return array(); else return $mk_users[$username]['contactgroups'];

9 years, 8 months

Check_MK Git: check_mk: domino_info: service discovery of the check now works for windows and linux hosts the notes server is running on

by Goetz Golla

Module: check_mk Branch: master Commit: f2bcee490f0959a97914d2e2b33258d1724f1a35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2bcee490f0959… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Nov 7 09:36:51 2014 +0100 domino_info: service discovery of the check now works for windows and linux hosts the notes server is running on --- checks/domino_info | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/checks/domino_info b/checks/domino_info index 8754b0a..ed89b9e 100644 --- a/checks/domino_info +++ b/checks/domino_info @@ -64,7 +64,8 @@ check_info['domino_info'] = { "inventory_function" : inventory_domino_info, "has_perfdata" : False, "service_description" : "Domino Info", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.311.1.1.3.1.2", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.311.1.1.3") or \ + oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.8072.3.1.10"), "snmp_info" : [ [ ".1.3.6.1.4.1.334.72.2", [ 2 ] ], # lnNotesServerState [ ".1.3.6.1.4.1.334.72.1.1.4", [ 8 ] ], # lnMailDomain

9 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2014