Checkmk git commits November 2013

checkmk-commits@lists.checkmk.com

6 participants
274 discussions

Check_MK Git: check_mk: fixed merge conflicts in Changelog

by Bastian Kuhn

Module: check_mk Branch: master Commit: 05ca29e07177d580950ef6379f90f2fdcbd69fc4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05ca29e07177d5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Nov 26 21:44:24 2013 +0100 fixed merge conflicts in Changelog ---

10 years, 9 months

Check_MK Git: check_mk: apc_inrow_airflow, apc_inrow_fanspeed,

by Bastian Kuhn

apc_inrow_temp: New checks for APC inrow devices Message-ID: <5295082f.fG6NAnadtZkRjehP%bk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 849b3195110e5ae9ad67e967190425c1d6e979ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=849b3195110e5a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Nov 26 21:41:59 2013 +0100 apc_inrow_airflow, apc_inrow_fanspeed, apc_inrow_temp: New checks for APC inrow devices --- .werks/98 | 8 +++ ChangeLog | 2 +- checkman/apc_inrow_airflow | 16 ++++++ checkman/apc_inrow_fanspeed | 11 ++++ checkman/apc_inrow_temp | 17 ++++++ checkman/apc_mod_pdu_modules | 13 +++++ checks/apc_inrow_airflow | 65 ++++++++++++++++++++++ checks/apc_inrow_fanspeed | 41 ++++++++++++++ checks/apc_inrow_temp | 102 ++++++++++++++++++++++++++++++++++ checks/apc_mod_pdu_modules | 68 +++++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 21 +++++++ web/plugins/wato/check_parameters.py | 30 ++++++++++ 12 files changed, 393 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=849b319511…

10 years, 9 months

Check_MK Git: check_mk: apc_mod_pdu_modules: New check for APC Modular Power Distribution Unit

by Bastian Kuhn

Module: check_mk Branch: master Commit: 3254f6ad95da7758b49f56683fe75a525b3c3a51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3254f6ad95da77… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Nov 26 21:43:11 2013 +0100 apc_mod_pdu_modules: New check for APC Modular Power Distribution Unit --- .werks/99 | 8 ++++++++ ChangeLog | 1 + 2 files changed, 9 insertions(+) diff --git a/.werks/99 b/.werks/99 new file mode 100644 index 0000000..9eda0a6 --- /dev/null +++ b/.werks/99 @@ -0,0 +1,8 @@ +Title: apc_mod_pdu_modules: New check for APC Modular Power Distribution Unit +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1385498530 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 8ff21c8..aedaf3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * 0038 casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power: New checks for casa Cable Modem Termination Systems... * 0097 arc_raid_status: New check for Areca RAID controllers * 0098 apc_inrow_airflow, apc_inrow_fanspeed, apc_inrow_temp: New checks for APC inrow devices + * 0099 apc_mod_pdu_modules: New check for APC Modular Power Distribution Unit * 0024 FIX: cisco_wlc: removed check configuration parameter ap_model... * 0065 FIX: veeam_client: check behaviour improved when backup is in progress * 0066 FIX: veeam_jobs: check behaviour improved when backup is in progress

10 years, 9 months

Check_MK Git: check_mk: livedump: new option to include contact_groups instead of contacts when dumping configuration

by Götz Golla

Module: check_mk Branch: master Commit: 36e300da0aef81eb4f7f5abc4bd6b744923321d9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36e300da0aef81… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Nov 26 18:12:56 2013 +0100 livedump: new option to include contact_groups instead of contacts when dumping configuration --- .werks/71 | 8 ++++++ ChangeLog | 1 + doc/treasures/livedump/livedump | 56 ++++++++++++++++++++++++++------------- 3 files changed, 47 insertions(+), 18 deletions(-) diff --git a/.werks/71 b/.werks/71 new file mode 100644 index 0000000..19c3d59 --- /dev/null +++ b/.werks/71 @@ -0,0 +1,8 @@ +Title: livedump: new option to include contact_groups instead of contacts when dumping configuration +Level: 1 +Component: multisite +Version: 1.2.3i7 +Date: 1385485919 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 1542298..f223fc7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ * 0050 New concept of favorite hosts and services plus matching filters and views... * 0211 GUI Notify: Added notify method "popup" to really create popup windows... * 0215 Added option to make HTML escape in plugin outputs configurable... + * 0071 livedump: new option to include contact_groups instead of contacts when dumping configuration * 0043 FIX: LDAP: Improved error reporting during synchronisation... * 0044 FIX: LDAP: Fixed error with empty groups during non nested group sync... * 0045 FIX: LDAP: Fixed error when synchronizing non nested groups to roles... diff --git a/doc/treasures/livedump/livedump b/doc/treasures/livedump/livedump index ad391cc..337b7c4 100755 --- a/doc/treasures/livedump/livedump +++ b/doc/treasures/livedump/livedump @@ -96,30 +96,44 @@ def livedump_config(): encode_row(row) check_commands.add(row["check_command"]) row["contactsstring"] = (",".join(row["contacts"])).encode("utf-8") - + row["contact_groups"] = (",".join(row["contact_groups"])).encode("utf-8") # Dump host config query = \ "GET hosts\n" \ "Columns: name alias address groups check_command " \ - "max_check_attempts contacts\n" + \ + "max_check_attempts contacts contact_groups\n" + \ opt_host_headers + \ opt_host_only_headers for row in g_connection.query_table_assoc(query): prepare_row(row) row["groupstring"] = ",".join(row["groups"]) - sys.stdout.write( - "define host {\n" - " use livedump-host\n" - " host_name %(name)s\n" - " alias %(alias)s\n" - " address %(address)s\n" - " host_groups %(groupstring)s\n" - " contacts %(contactsstring)s\n" - " check_command %(check_command)s\n" - " max_check_attempts %(max_check_attempts)d\n" - "}\n\n" - % row) + if opt_groups: + sys.stdout.write( + "define host {\n" + " use livedump-host\n" + " host_name %(name)s\n" + " alias %(alias)s\n" + " address %(address)s\n" + " host_groups %(groupstring)s\n" + " contact_groups %(contact_groups)s\n" + " check_command %(check_command)s\n" + " max_check_attempts %(max_check_attempts)d\n" + "}\n\n" + % row) + else: + sys.stdout.write( + "define host {\n" + " use livedump-host\n" + " host_name %(name)s\n" + " alias %(alias)s\n" + " address %(address)s\n" + " host_groups %(groupstring)s\n" + " contacts %(contactsstring)s\n" + " check_command %(check_command)s\n" + " max_check_attempts %(max_check_attempts)d\n" + "}\n\n" + % row) # Dump service config query = \ @@ -212,6 +226,9 @@ output=%(plugin_output)s|%(perf_data)s def omd_root(): return os.getenv("OMD_ROOT") +def omd_site(): + return os.getenv("OMD_SITE") + def verbose(x): if opt_verbose: sys.stderr.write("%s\n" % x) @@ -259,10 +276,11 @@ def print_version(): # | Main entry point, getopt, etc. | # '----------------------------------------------------------------------' -short_options = 'hVvc:H:S:O:TCM' +short_options = 'hVvc:H:S:O:TCMG' long_options = [ "help", "version", "verbose", "debug", "socket=", "host-header=", "host-only-header=", "service-header=", - "dump-templates", "config", "state", "mark-mode" ] + "dump-templates", "config", "state", "mark-mode", + "include-groups" ] opt_verbose = False opt_debug = False @@ -272,6 +290,7 @@ opt_host_headers = "" opt_host_only_headers = "" opt_service_headers = "" opt_dump_templates = False +opt_groups = False try: opts, args = getopt.getopt(sys.argv[1:], short_options, long_options) @@ -306,7 +325,8 @@ for o,a in opts: opt_dump_templates = True elif o in [ '-M', '--mark-mode' ]: opt_mark_mode = True - + elif o in [ '-G', '--include-groups' ]: + opt_groups = True # Main modes try: @@ -314,7 +334,7 @@ try: for o, a in opts: if o in [ '-C', '--config' ]: if opt_mark_mode: - print "config" + print "config", omd_site() livedump_config() sys.exit(0) if opt_mark_mode:

10 years, 9 months

Check_MK Git: check_mk: cmciii_lcp_airin cmciii_lcp_airout cmciii_lcp_fans cmciii_lcp_waterflow cmciii_lcp_waterin cmciii_lcp_waterout : new checks for the Rittal CMC-III LCP device

by Götz Golla

Module: check_mk Branch: master Commit: 35803959fe9e4bc68299a2941f7d352a8363da7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=35803959fe9e4b… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Nov 26 17:40:07 2013 +0100 cmciii_lcp_airin cmciii_lcp_airout cmciii_lcp_fans cmciii_lcp_waterflow cmciii_lcp_waterin cmciii_lcp_waterout: new checks for the Rittal CMC-III LCP device --- .werks/70 | 8 ++++ ChangeLog | 1 + checkman/cmciii_lcp_airin | 24 +++++++++++ checkman/cmciii_lcp_airout | 24 +++++++++++ checkman/cmciii_lcp_fans | 23 ++++++++++ checkman/cmciii_lcp_waterflow | 21 +++++++++ checkman/cmciii_lcp_waterin | 22 ++++++++++ checkman/cmciii_lcp_waterout | 22 ++++++++++ checks/cmciii_lcp_airin | 95 +++++++++++++++++++++++++++++++++++++++++ checks/cmciii_lcp_airout | 65 ++++++++++++++++++++++++++++ checks/cmciii_lcp_fans | 63 +++++++++++++++++++++++++++ checks/cmciii_lcp_waterflow | 54 +++++++++++++++++++++++ checks/cmciii_lcp_waterin | 66 ++++++++++++++++++++++++++++ checks/cmciii_lcp_waterout | 66 ++++++++++++++++++++++++++++ 14 files changed, 554 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=35803959fe…

10 years, 9 months

Check_MK Git: check_mk: Improved online help for LDAP connections

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 4567ea332a7bbc6ad67535af3520a5ea112f988d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4567ea332a7bbc… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Nov 26 16:56:26 2013 +0100 Improved online help for LDAP connections When configuring LDAP synchronization in WATO, the online help is even more helpful now. Hints, examples and links have been added at multiple areas. --- .werks/82 | 9 ++++++ ChangeLog | 1 + web/htdocs/pages.css | 5 ++++ web/plugins/userdb/ldap.py | 16 ++++++---- web/plugins/wato/check_mk_configuration.py | 44 ++++++++++++++++------------ 5 files changed, 50 insertions(+), 25 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4567ea332a…

10 years, 9 months

Check_MK Git: check_mk: fixed formating error in mysql.sessions checkman

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 5935b3cee64e67003e88148536637a75d6ee0c2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5935b3cee64e67… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Nov 26 16:42:43 2013 +0100 fixed formating error in mysql.sessions checkman --- checkman/mysql.sessions | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/checkman/mysql.sessions b/checkman/mysql.sessions index 18da436..58c8a33 100644 --- a/checkman/mysql.sessions +++ b/checkman/mysql.sessions @@ -15,12 +15,10 @@ description: inventory: The check generates one item for the sessions connected to the MySQL daemon. +perfdata: + The check generates perfdata for the total and running sessions, and the + connection rate. [configuration] warn(int): number of sessions at which the check goes warn crit(int): number of sessions for a critical state - - -perfdata: - The check generates perfdata for the total and running sessions, and the - connection rate.

10 years, 9 months

Check_MK Git: check_mk: Fixed ChangeLog

by Mathias Kettner

Module: check_mk Branch: master Commit: ee92070fc0853ad3c956ef17a3b1fca57116589e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ee92070fc0853a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 26 16:17:06 2013 +0100 Fixed ChangeLog --- ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2a31f2a..5772c11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,7 +50,6 @@ WATO: * 0053 New rule for configuring the display_name of a service... * 0216 Supporting float values as SNMP timeout value now... - * 0235 module table.py: table headers are omitted if all header fields are empty... * 0048 FIX: Tests on host diagnose page are executed parallel now... * 0033 FIX: Fixed problem when saving settings in WATOs host diagnostic page... * 0205 FIX: NagVis related permissions of roles can be edited again...

10 years, 9 months

Check_MK Git: check_mk: Fixed typo in wato

by Bastian Kuhn

Module: check_mk Branch: master Commit: 1c27ee6ab3422ab27349b922a6ed9520978c1e8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c27ee6ab3422a… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Nov 26 13:58:56 2013 +0100 Fixed typo in wato --- 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 ff501fe..24c2aca 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3841,7 +3841,7 @@ def mode_changelog(phase): table += '</table>' c = wato_confirm(_("Confirm activating foreign changes"), '<img class=foreignchanges src="images/icon_foreign_changes.png">' + - _("There are some changes made by your collegues that you will " + _("There are some changes made by your colleagues that you will " "activate if you proceed:") + table + _("Do you really want to proceed?")) if c == False:

10 years, 9 months

Check_MK Git: check_mk: Fixed format error in werk

by Mathias Kettner

Module: check_mk Branch: master Commit: 84d409a30d57009c56f0e9bea103863c4159b838 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84d409a30d5700… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Nov 26 12:12:07 2013 +0100 Fixed format error in werk --- .werks/235 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/235 b/.werks/235 index 56617ff..3116457 100644 --- a/.werks/235 +++ b/.werks/235 @@ -5,7 +5,7 @@ Version: 1.2.3i7 Date: 1385120851 Class: feature -Html tables rendered with the help of the table module always displayed the <th> fields, +Html tables rendered with the help of the table module always displayed the <th> fields, even if none if this fields were filled. For example: C+:

10 years, 9 months

← Newer
1
2
3
4
5
6
7
8
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2013