Checkmk git commits September 2015

checkmk-commits@lists.checkmk.com

8 participants
275 discussions

Check_MK Git: check_mk: Fixed incorrect frequency and temperature readings on janitza umg 604 devices

by Sebastian Herbord

Module: check_mk Branch: master Commit: 725c3cbc3e6bc561520fda52712c7e7215c0ad44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=725c3cbc3e6bc5… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Sep 28 10:33:06 2015 +0200 Fixed incorrect frequency and temperature readings on janitza umg 604 devices These changes account for the differences in snmp tree layout between different janitza devices. In the process, the frequenzy and temperature checks were turned into subchecks. --- checkman/{janitza_umg_inphase => janitza_umg} | 0 checkman/{janitza_umg_freq => janitza_umg.freq} | 0 checkman/{janitza_umg_temp => janitza_umg.temp} | 0 checks/janitza_umg | 196 +++++++++++++++++++++++ checks/janitza_umg_freq | 66 -------- checks/janitza_umg_inphase | 100 ------------ checks/janitza_umg_temp | 59 ------- 7 files changed, 196 insertions(+), 225 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=725c3cbc3e…

8 years, 11 months

Check_MK Git: check_mk: check_ftp: added missing man page

by Mathias Kettner

Module: check_mk Branch: master Commit: 20b51587e2a921daf4b3ce968491312869996fdd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20b51587e2a921… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 28 09:26:13 2015 +0200 check_ftp: added missing man page --- checkman/check_ftp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/checkman/check_ftp b/checkman/check_ftp new file mode 100644 index 0000000..7f22074 --- /dev/null +++ b/checkman/check_ftp @@ -0,0 +1,15 @@ +title: FTP Server +agents: active +catalog: agentless +license: GPL +distribution: check_mk +description: + This performs an active check of an FTP server. It does this by connecting + to the server using the FTP control socket, looking for the welcome message + and justing sending {QUIT}. + + It can check response times against given thresholds. In fact internally it + uses the generic TCP connection check. + +perfdata: + The response time

8 years, 11 months

Check_MK Git: check_mk: Cleanup on download pages after moving systemd examples

by Mathias Kettner

Module: check_mk Branch: master Commit: b4a8ea56f025881f3838d49c1562a80aa2d2077c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4a8ea56f02588… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 28 09:20:06 2015 +0200 Cleanup on download pages after moving systemd examples --- 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 16b59e0..3cdd34f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -18640,13 +18640,13 @@ def mode_download_agents(phase): '' : _('Linux/Unix Agents'), '/plugins' : _('Linux/Unix Agents - Plugins'), '/cfg_examples' : _('Linux/Unix Agents - Example Configurations'), + '/cfg_examples/systemd' : _('Linux Agent - Example configuration using with systemd'), '/windows' : _('Windows Agent'), '/windows/plugins' : _('Windows Agent - Plugins'), '/windows/mrpe' : _('Windows Agent - MRPE Scripts'), '/windows/cfg_examples' : _('Windows Agent - Example Configurations'), '/z_os' : _('z/OS'), '/sap' : _('SAP R/3'), - '/systemd' : _('Linux Agent - Example configuration using with systemd'), } banned_paths = [

8 years, 11 months

Check_MK Git: check_mk: Fixed further RPM buiding problem after agent cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 7e1fc0656c1e72a8c7062846b425fdf8a9b3aa63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e1fc0656c1e72… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 28 09:16:38 2015 +0200 Fixed further RPM buiding problem after agent cleanup --- agents/cfg_examples/{ => systemd}/check_mk.socket | 0 agents/cfg_examples/{ => systemd}/check_mk@.service | 0 agents/check-mk-agent.spec | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/cfg_examples/check_mk.socket b/agents/cfg_examples/systemd/check_mk.socket similarity index 100% rename from agents/cfg_examples/check_mk.socket rename to agents/cfg_examples/systemd/check_mk.socket diff --git a/agents/cfg_examples/check_mk@.service b/agents/cfg_examples/systemd/check_mk@.service similarity index 100% rename from agents/cfg_examples/check_mk@.service rename to agents/cfg_examples/systemd/check_mk@.service diff --git a/agents/check-mk-agent.spec b/agents/check-mk-agent.spec index 54cdf86..ff7572b 100644 --- a/agents/check-mk-agent.spec +++ b/agents/check-mk-agent.spec @@ -54,8 +54,8 @@ mkdir -p $R/etc/xinetd.d install -m 644 cfg_examples/xinetd.conf $R/etc/xinetd.d/check_mk # Systemd mkdir -p $R/etc/systemd/system -install -m 644 systemd/check_mk\@.service $R/etc/systemd/system -install -m 644 systemd/check_mk.socket $R/etc/systemd/system +install -m 644 cfg_examples/systemd/check_mk\@.service $R/etc/systemd/system +install -m 644 cfg_examples/systemd/check_mk.socket $R/etc/systemd/system mkdir -p $R/etc/check_mk mkdir -p $R/usr/bin install -m 755 check_mk_agent.linux $R/usr/bin/check_mk_agent

8 years, 11 months

Check_MK Git: check_mk: Fix Problem of building Check_MK prepacked agent

by Mathias Kettner

Module: check_mk Branch: master Commit: 6dd3baee73c8345412107e6a75a4d49eb762d663 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6dd3baee73c834… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 28 09:10:42 2015 +0200 Fix Problem of building Check_MK prepacked agent --- agents/check-mk-agent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/check-mk-agent.spec b/agents/check-mk-agent.spec index 07dc10f..54cdf86 100644 --- a/agents/check-mk-agent.spec +++ b/agents/check-mk-agent.spec @@ -51,7 +51,7 @@ rm -rf $R # install agent # xinitd mkdir -p $R/etc/xinetd.d -install -m 644 xinetd.conf $R/etc/xinetd.d/check_mk +install -m 644 cfg_examples/xinetd.conf $R/etc/xinetd.d/check_mk # Systemd mkdir -p $R/etc/systemd/system install -m 644 systemd/check_mk\@.service $R/etc/systemd/system

8 years, 11 months

Check_MK Git: check_mk: changed name of oracle diva service name

by Sebastian Herbord

Module: check_mk Branch: master Commit: 32218b2d8002d869019e1715090392f5e8165524 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32218b2d8002d8… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Sep 28 08:27:26 2015 +0200 changed name of oracle diva service name --- checks/oracle_diva_csm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/oracle_diva_csm b/checks/oracle_diva_csm index c68f389..0d92a5b 100644 --- a/checks/oracle_diva_csm +++ b/checks/oracle_diva_csm @@ -78,7 +78,7 @@ def check_oracle_diva_csm_status(name, idx, item, params, info): check_info['oracle_diva_csm'] = { "check_function" : lambda item, params, info: check_oracle_diva_csm_status("Library", 0, item, params, info), "inventory_function" : lambda info: inventory_oracle_diva_csm_status("Library", 0, info), - "service_description" : "Status %s", + "service_description" : "DIVA Status %s", "snmp_info" : [ ( ".1.3.6.1.4.1.110901.1.2.1.1.1", [ '1', '2' ] ), # lib status ( ".1.3.6.1.4.1.110901.1.2.2.1.1", [ '3.1', '8.1' ] ), # drive status ( ".1.3.6.1.4.1.110901.1.3.1.1", [ '1', '4' ] ), # actor status

8 years, 11 months

Check_MK Git: check_mk: Edited bug 2352

by Sven Rueß

Module: check_mk Branch: master Commit: 0268f4938af21d3cb3eaabf318b7f0d2375d41af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0268f4938af21d… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Sat Sep 26 11:10:42 2015 +0200 Edited bug 2352 --- .bugs/2352 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.bugs/2352 b/.bugs/2352 index 3d1926f..0aa017d 100644 --- a/.bugs/2352 +++ b/.bugs/2352 @@ -5,6 +5,6 @@ Date: 2015-07-08 11:24:29 Targetversion: future Class: todo -Customer Polizei Niedersachen requests a better support for redundant network routes in our product. +Customer requests a better support for redundant network routes in our product. It shouldb be possible to configure the parents relationship and the fallback route. Errors and notifications -have to take care about the relation of the redundant network routes. \ No newline at end of file +have to take care about the relation of the redundant network routes.

8 years, 11 months

Check_MK Git: check_mk: Bug fuer Werk #2504

by Sven Rueß

Module: check_mk Branch: master Commit: 8e443f767cf13ad1765212e1260c607faab97712 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e443f767cf13a… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Sat Sep 26 10:39:16 2015 +0200 Bug fuer Werk #2504 --- .bugs/2355 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.bugs/2355 b/.bugs/2355 new file mode 100644 index 0000000..d7ca039 --- /dev/null +++ b/.bugs/2355 @@ -0,0 +1,9 @@ +Title: cups_queues: Agent liefer keine Daten mehr +Component: checks +State: open +Date: 2015-09-26 10:35:31 +Targetversion: 1.2.6 +Class: bug + +Werk #2504 macht eine Anpassung fuer apcupsd. Dies macht die Ausgabe fuer den normalen cups kaputt. +Lokal bei mir geht es nur mit pgrep cups. Die Anpassung mit pgrep -x cups bringt bei mir keine Ausgabe mehr.

8 years, 11 months

Check_MK Git: check_mk: #2431 FIX WATO Snapshots: Fixed broken performancedata backup

by Andreas Boesl

Module: check_mk Branch: master Commit: e4090745be5d672cbe98fc4ab2f94defd7cb991e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4090745be5d67… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Sep 25 15:05:46 2015 +0200 #2431 FIX WATO Snapshots: Fixed broken performancedata backup WATO was unable to import snapshots with included performance data. This error was a side effect of werk #2486. --- .werks/2431 | 10 ++++++++++ ChangeLog | 1 + web/plugins/wato/backup_domains.py | 15 +++++++++------ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.werks/2431 b/.werks/2431 new file mode 100644 index 0000000..488f547 --- /dev/null +++ b/.werks/2431 @@ -0,0 +1,10 @@ +Title: WATO Snapshots: Fixed broken performancedata backup +Level: 2 +Component: wato +Compatible: compat +Version: 1.2.7i3 +Date: 1443186252 +Class: fix + +WATO was unable to import snapshots with included performance data. +This error was a side effect of werk #2486. diff --git a/ChangeLog b/ChangeLog index 65b45c4..4843dc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -286,6 +286,7 @@ * 2610 FIX: Fixed host search showing results of not permitted folder * 2611 FIX: Fixed host view permission checks on host related pages... * 2599 FIX: Fix newly introduced fatal bug preventing creation of new hosts in WATO... + * 2431 FIX: WATO Snapshots: Fixed broken performancedata backup... Notifications: * 2478 Integrated notification plugin for mobile phone push messages via Pushover... diff --git a/web/plugins/wato/backup_domains.py b/web/plugins/wato/backup_domains.py index b625f1a..a1c9c3a 100644 --- a/web/plugins/wato/backup_domains.py +++ b/web/plugins/wato/backup_domains.py @@ -30,17 +30,20 @@ backup_domains = {} backup_perfdata_enabled = True def performancedata_restore(pre_restore = True): global backup_perfdata_enabled - site = default_site() + site = config.default_site() html.live.set_only_sites([site]) if pre_restore: data = html.live.query("GET status\nColumns: process_performance_data") - backup_perfdata_enabled = data[0][0] == 1 - # Return if perfdata is not activated - nothing to do.. - if not backup_perfdata_enabled: - return [] - elif not backup_perfdata_enabled: + if data: + backup_perfdata_enabled = data[0][0] == 1 + else: + backup_perfdata_enabled = None # Core is offline + + # Return if perfdata is not activated - nothing to do.. + if not backup_perfdata_enabled: # False or None return [] + command = pre_restore and "DISABLE_PERFORMANCE_DATA" or "ENABLE_PERFORMANCE_DATA" html.live.command("[%d] %s" % (int(time.time()), command), site) html.live.set_only_sites()

8 years, 11 months

Check_MK Git: check_mk: #2644 FIX Fix exception in executing actions or notifications when match groups contain non-ASCII characters

by Mathias Kettner

Module: check_mk Branch: master Commit: e45c54cc06ea284d4c18c5e8cb168d92d30ac278 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e45c54cc06ea28… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Sep 25 14:15:37 2015 +0200 #2644 FIX Fix exception in executing actions or notifications when match groups contain non-ASCII characters --- .werks/2644 | 10 ++++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 12 +++++++++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.werks/2644 b/.werks/2644 new file mode 100644 index 0000000..3cf9553 --- /dev/null +++ b/.werks/2644 @@ -0,0 +1,10 @@ +Title: Fix exception in executing actions or notifications when match groups contain non-ASCII characters +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1443183271 + + diff --git a/ChangeLog b/ChangeLog index fef64b8..65b45c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -315,6 +315,7 @@ * 2460 FIX: Slightly more robust SNMP trap translation... * 2534 FIX: Fixed implementation of skipping rule packs * 2614 FIX: Fixed exception when processing events with umlaut in names from history + * 2644 FIX: Fix exception in executing actions or notifications when match groups contain non-ASCII characters Livestatus: * 2493 FIX: Fixed wrong JSON format when using stats queries together with header columns... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 615ab2e..611862b 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -3360,11 +3360,17 @@ def substitute_event_tags(text, event): varname = key[6:] substs.append((varname, event.get(varname, defaultvalue))) + def to_string(v): + if type(v) in [ str, unicode ]: + return v + else: + return str(v) + for key, value in substs: if type(value) == tuple: - value = " ".join(map(str,value)) - elif type(value) not in [ str, unicode ]: - value = str(value) + value = " ".join(map(to_string, value)) + else: + value = to_string(value) text = text.replace('$%s$' % key.upper(), value) return text

8 years, 11 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2015