Checkmk git commits June 2016

checkmk-commits@lists.checkmk.com

8 participants
185 discussions

3543 mk_inotify: new plugin to monitor file system operations (linux)

by Andreas Boesl

Module: check_mk Branch: master Commit: 25d22b337b8f5ece85953e8eaf37e0079b5d79ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25d22b337b8f5e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jun 13 14:24:11 2016 +0200 3543 mk_inotify: new plugin to monitor file system operations (linux) This plugin allows you to check the age of the last file operation on configurable files and folders. You can check the age of the files or folders last <tt>create</tt>, <tt>open</tt>, <tt>delete</tt>, <tt>modify</tt> and <tt>access</tt> operation. --- .werks/3543 | 15 ++ ChangeLog | 1 + agents/cfg_examples/mk_inotify.cfg | 24 +++ agents/plugins/mk_inotify | 344 ++++++++++++++++++++++++++++++++++ checkman/inotify | 17 ++ checks/inotify | 130 +++++++++++++ web/plugins/wato/check_parameters.py | 38 ++++ 7 files changed, 569 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=25d22b337b…

8 years

fixed exception introduced in werk 3141

by Sebastian Herbord

Module: check_mk Branch: master Commit: 049db68360f08be26e4986753dbc2a1aa702ccd7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=049db68360f08b… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Jun 13 15:25:41 2016 +0200 fixed exception introduced in werk 3141 --- web/htdocs/notifications.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/web/htdocs/notifications.py b/web/htdocs/notifications.py index 2fdad25..26d1da9 100644 --- a/web/htdocs/notifications.py +++ b/web/htdocs/notifications.py @@ -28,6 +28,7 @@ from ast import literal_eval import config import defaults import lib +import errno g_acknowledgement_path = defaults.var_dir + "/acknowledged_notifications.mk" g_acknowledgement_time = None @@ -50,12 +51,16 @@ def acknowledged_time(): def load_acknowledgements(): global g_acknowledgement_time - with open(g_acknowledgement_path, "r") as f: - content = f.read().strip() - if content: - g_acknowledgement_time = literal_eval(content) - - return [] + try: + with open(g_acknowledgement_path, "r") as f: + content = f.read().strip() + if content: + g_acknowledgement_time = literal_eval(content) + except IOError, e: + if e.errno == errno.ENOENT: + g_acknowledgement_time = 0 + else: + raise def render_page_confirm(acktime, prev_url): html.set_render_headfoot(False)

8 years

3636 FIX juniper_fru: fixed present state handling

by Simon Betz

Module: check_mk Branch: master Commit: d161aa0ae1dfd997a616f90fd86064b0ba875324 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d161aa0ae1dfd9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Jun 13 14:21:33 2016 +0200 3636 FIX juniper_fru: fixed present state handling --- .werks/3636 | 10 ++++++++++ ChangeLog | 2 +- checks/juniper_fru | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/3636 b/.werks/3636 new file mode 100644 index 0000000..c35430a --- /dev/null +++ b/.werks/3636 @@ -0,0 +1,10 @@ +Title: juniper_fru: fixed present state handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1465820463 + + diff --git a/ChangeLog b/ChangeLog index dcf1a4f..ed8c775 100644 --- a/ChangeLog +++ b/ChangeLog @@ -266,6 +266,7 @@ * 3643 FIX: Fixed check_mkevents active check.... * 3635 FIX: get_average: fixed overflow error * 3653 FIX: fileinfo.groups: Fixed UNKNOWN shown in WATO discovery when configured as manual check + * 3636 FIX: juniper_fru: fixed present state handling Multisite: * 3187 notification view: new filter for log command via regex @@ -431,7 +432,6 @@ * 3583 FIX: Fixed loosing some services after saving services in WATO... * 3588 FIX: BI aggregation: Fixed folding of tag groups in aggregation rules using host/service searches * 3620 FIX: Do not longer put SNMP MIB files into WATO snapshots... - * 3542 FIX: WATO Web API: fixed exception when WATO Git is activated... Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/checks/juniper_fru b/checks/juniper_fru index f8f7f1a..645e294 100644 --- a/checks/juniper_fru +++ b/checks/juniper_fru @@ -111,7 +111,7 @@ def check_juniper_fru(item, _no_params, parsed): map_fru_state = { "1" : (3, "unknown"), "2" : (2, "empty"), - "3" : (0, "present"), + "3" : (1, "present"), "4" : (0, "ready"), "5" : (0, "announce online"), "6" : (0, "online"),

8 years

3542 FIX WATO Web API: fixed exception when WATO Git is activated

by Andreas Boesl

Module: check_mk Branch: master Commit: 1eb9b174a2a988bba8058b0f78b8d552ff95df93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1eb9b174a2a988… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Jun 13 10:39:46 2016 +0200 3542 FIX WATO Web API: fixed exception when WATO Git is activated --- .werks/3542 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 10 +++++----- web/htdocs/watolib.py | 7 +++++++ web/htdocs/webapi.py | 4 ++++ 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/.werks/3542 b/.werks/3542 new file mode 100644 index 0000000..9cf2e28 --- /dev/null +++ b/.werks/3542 @@ -0,0 +1,10 @@ +Title: WATO Web API: fixed exception when WATO Git is activated +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.9i1 +Date: 1465807142 +Class: fix + +The Web API was unusable with activated WATO Git. + diff --git a/ChangeLog b/ChangeLog index 8c84965..dcf1a4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -431,6 +431,7 @@ * 3583 FIX: Fixed loosing some services after saving services in WATO... * 3588 FIX: BI aggregation: Fixed folding of tag groups in aggregation rules using host/service searches * 3620 FIX: Do not longer put SNMP MIB files into WATO snapshots... + * 3542 FIX: WATO Web API: fixed exception when WATO Git is activated... Notifications: * 3263 Notifications: allow users to restrict by their contact groups... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 279fdbb..a5338bd5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -103,12 +103,8 @@ wato_styles = [ "pages", "wato", "status" ] def init_wato_datastructures(): - if config.wato_use_git: - prepare_git_commit() - create_sample_config() # if called for the very first time! - declare_host_tag_attributes() # create attributes out of tag definitions - declare_site_attribute() # create attribute for distributed WATO + init_watolib_datastructures() #. @@ -14164,6 +14160,10 @@ def create_sample_config(): or os.path.exists(wato_root_dir + "global.mk"): return + # Just in case. If any of the following functions try to write Git messages + if config.wato_use_git: + prepare_git_commit() + # Global configuration settings save_configuration_settings( { diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index dc1f1dd..64ecd27 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -92,6 +92,13 @@ def initialize_before_loading_plugins(): global backup_domains backup_domains = {} +def init_watolib_datastructures(): + if config.wato_use_git: + prepare_git_commit() + + declare_host_tag_attributes() # create attributes out of tag definitions + declare_site_attribute() # create attribute for distributed WATO + #. # .--Constants-----------------------------------------------------------. # | ____ _ _ | diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py index 200c110..422d321 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -65,10 +65,14 @@ def page_api(): config.need_permission("wato.use") config.need_permission("wato.api_allowed") + action = html.var('action') if action not in api_actions: raise MKUserError(None, "Unknown API action %s" % html.attrencode(action)) + # Initialize host and site attributes + init_watolib_datastructures() + # Prepare request_object # Most of the time the request is given as json # However, the plugin may have an own mechanism to interpret the request

8 years

fixed missing include

by Sebastian Herbord

Module: check_mk Branch: master Commit: 1823c029b9c74cc6f9f62c6bf4c797af29d733cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1823c029b9c74c… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Jun 13 10:13:15 2016 +0200 fixed missing include --- livestatus/src/strutil.h | 1 + 1 file changed, 1 insertion(+) diff --git a/livestatus/src/strutil.h b/livestatus/src/strutil.h index f16a91f..ddad0b8 100644 --- a/livestatus/src/strutil.h +++ b/livestatus/src/strutil.h @@ -26,6 +26,7 @@ #define strutil_h #include "config.h" // IWYU pragma: keep +#include <stdbool.h> #ifdef __cplusplus extern "C" {

8 years

3141 added user interfaces and permissions to view and acknowledge failed notifications

by Sebastian Herbord

Module: check_mk Branch: master Commit: 806df73e078dbfb88bee034c22a882afcf0dbbd8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=806df73e078dbf… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Jun 13 10:01:38 2016 +0200 3141 added user interfaces and permissions to view and acknowledge failed notifications --- .werks/3141 | 9 ++++ ChangeLog | 1 + web/htdocs/default_permissions.py | 6 +++ web/htdocs/lib.py | 3 ++ web/htdocs/notifications.py | 92 +++++++++++++++++++++++++++++++++++++ web/plugins/dashboard/builtin.py | 9 ++++ web/plugins/dashboard/dashlets.py | 82 +++++++++++++++++++++++++++++++++ web/plugins/pages/shipped.py | 2 + web/plugins/sidebar/shipped.py | 38 +++++++++++++++ web/plugins/views/builtin.py | 63 +++++++++++++++++++++++++ web/plugins/views/commands.py | 35 ++++++++++++++ 11 files changed, 340 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=806df73e07…

8 years

Fetched livestatus from downstream.

by Sebastian Herbord

Module: check_mk Branch: master Commit: 132568a59c1538e964fbe30ee6e3ced470616dec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=132568a59c1538… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Jun 13 09:56:50 2016 +0200 Fetched livestatus from downstream. --- livestatus/src/LogEntry.cc | 425 +++++++++++++++++++------------------------- livestatus/src/LogEntry.h | 35 +++- livestatus/src/strutil.cc | 14 ++ livestatus/src/strutil.h | 1 + 4 files changed, 225 insertions(+), 250 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=132568a59c…

8 years

3621 Automatically create /var/lib/check_mk_agent/ spool in prebuilt agent packages

by Mathias Kettner

Module: check_mk Branch: master Commit: 45430a393292a9fdebf5d952379258d4d8eaf532 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45430a393292a9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jun 13 08:47:40 2016 +0200 3621 Automatically create /var/lib/check_mk_agent/spool in prebuilt agent packages --- .werks/3621 | 9 +++++++++ ChangeLog | 1 + agents/check-mk-agent-1.4.0i1-1.noarch.rpm | Bin 28690 -> 24876 bytes agents/check-mk-agent.spec | 1 + agents/check-mk-agent_1.4.0i1-1_all.deb | Bin 20512 -> 20784 bytes 5 files changed, 11 insertions(+) diff --git a/.werks/3621 b/.werks/3621 new file mode 100644 index 0000000..25998de --- /dev/null +++ b/.werks/3621 @@ -0,0 +1,9 @@ +Title: Automatically create /var/lib/check_mk_agent/spool in prebuilt agent packages +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1465800430 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 8f594e9..b655bb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -99,6 +99,7 @@ * 3631 cisco_fru_powerusage: new check which monitors the current and power of Cisco Core Switches which support the CISCO-ENTITY-FRU-CONTROL MIB * 3632 oracle_performance: new check which displays some statistics of ORACLE DBs... * 3634 check_sql: upload/content field for longer queries is now available + * 3621 Automatically create /var/lib/check_mk_agent/spool in prebuilt agent packages * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/agents/check-mk-agent-1.4.0i1-1.noarch.rpm b/agents/check-mk-agent-1.4.0i1-1.noarch.rpm index 6b872ad..b27490d 100644 Binary files a/agents/check-mk-agent-1.4.0i1-1.noarch.rpm and b/agents/check-mk-agent-1.4.0i1-1.noarch.rpm differ diff --git a/agents/check-mk-agent.spec b/agents/check-mk-agent.spec index 4526fe0..cd81e8c 100644 --- a/agents/check-mk-agent.spec +++ b/agents/check-mk-agent.spec @@ -66,6 +66,7 @@ mkdir -p $R/usr/lib/check_mk_agent/plugins mkdir -p $R/usr/lib/check_mk_agent/local mkdir -p $R/var/lib/check_mk_agent mkdir -p $R/var/lib/check_mk_agent/job +mkdir -p $R/var/lib/check_mk_agent/spool %clean rm -rf $RPM_BUILD_ROOT diff --git a/agents/check-mk-agent_1.4.0i1-1_all.deb b/agents/check-mk-agent_1.4.0i1-1_all.deb index 9eeda0f..26629d1 100644 Binary files a/agents/check-mk-agent_1.4.0i1-1_all.deb and b/agents/check-mk-agent_1.4.0i1-1_all.deb differ

8 years

Revert "Testcommit"

by Lars Michelsen

Module: check_mk Branch: master Commit: a32506eb7e3db9f19ff596971cf48c128806c7c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a32506eb7e3db9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 10 19:29:26 2016 +0200 Revert "Testcommit" This reverts commit 2fd4ec6a7608032ddcc22a8f543fa3b72cd93d41. --- modules/check_mk.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 5553bf0..67840ef 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -51,8 +51,6 @@ import cmk.tty as tty # These variable will be substituted at 'make dist' time check_mk_version = '(inofficial)' -TRKN@R:KN@KR: - # .--Prelude-------------------------------------------------------------. # | ____ _ _ | # | | _ \ _ __ ___| |_ _ __| | ___ |

8 years

Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 2fd4ec6a7608032ddcc22a8f543fa3b72cd93d41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fd4ec6a760803… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jun 10 19:26:22 2016 +0200 Testcommit --- modules/check_mk.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index 67840ef..5553bf0 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -51,6 +51,8 @@ import cmk.tty as tty # These variable will be substituted at 'make dist' time check_mk_version = '(inofficial)' +TRKN@R:KN@KR: + # .--Prelude-------------------------------------------------------------. # | ____ _ _ | # | | _ \ _ __ ___| |_ _ __| | ___ |

8 years

← Newer
1
...
6
7
8
9
10
11
12
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2016