Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

Win-agent: use strongly typed enums, part 3

by Jukka Aro

Module: check_mk Branch: master Commit: 4ce27781846d3af69629cfc0138d7930b1622461 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ce27781846d3a… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Mar 23 16:11:52 2018 +0100 Win-agent: use strongly typed enums, part 3 Convert file_encoding in SectionLogwatch.*. --- agents/windows/build_version | 2 +- agents/windows/sections/SectionLogwatch.cc | 16 ++++++++-------- agents/windows/sections/SectionLogwatch.h | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 7127a37..3771b21 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3204 +3206 diff --git a/agents/windows/sections/SectionLogwatch.cc b/agents/windows/sections/SectionLogwatch.cc index f9cd456..9d44b5f 100644 --- a/agents/windows/sections/SectionLogwatch.cc +++ b/agents/windows/sections/SectionLogwatch.cc @@ -67,7 +67,7 @@ file_encoding determine_encoding(const logwatch_textfile &textfile) { ifstream ifs(textfile.paths.front(), ifstream::in | ifstream::binary); if (ifs.fail()) { - return UNDEF; + return file_encoding::UNDEF; } std::array<char, 2> bytes; @@ -75,24 +75,24 @@ file_encoding determine_encoding(const logwatch_textfile &textfile) { if (ifs.read(bytes.data(), bytes.size()) && static_cast<unsigned char>(bytes[0]) == 0xFF && static_cast<unsigned char>(bytes[1]) == 0xFE) { - return UNICODE; + return file_encoding::UNICODE; } else { - return DEFAULT; + return file_encoding::DEFAULT; } } ifstream open_logfile(logwatch_textfile &textfile) { ifstream result; - if ((textfile.encoding == UNDEF) || (textfile.offset == 0)) { + if ((textfile.encoding == file_encoding::UNDEF) || (textfile.offset == 0)) { textfile.encoding = determine_encoding(textfile); } - if (textfile.encoding == UNDEF) { + if (textfile.encoding == file_encoding::UNDEF) { result.setstate(std::ios_base::badbit); } else { auto mode = ifstream::in; - if (textfile.encoding == UNICODE) { + if (textfile.encoding == file_encoding::UNICODE) { mode |= ifstream::binary; } result.open(textfile.paths.front(), mode); @@ -103,7 +103,7 @@ ifstream open_logfile(logwatch_textfile &textfile) { uint64_t logfile_offset(const logwatch_textfile &textfile) { uint64_t offset = textfile.offset; - if ((offset == 0) && (textfile.encoding == UNICODE)) { + if ((offset == 0) && (textfile.encoding == file_encoding::UNICODE)) { offset = 2; } return offset; @@ -425,7 +425,7 @@ SectionLogwatch::ProcessTextfileResponse SectionLogwatch::processTextfile( // Necessary as reading UTF-16 file sets some fail bit(s) at the end. file.clear(); file.seekg(logfile_offset(textfile)); - if (textfile.encoding == UNICODE) + if (textfile.encoding == file_encoding::UNICODE) return processTextfileUnicode(file, textfile, out, write_output); else return processTextfileDefault(file, textfile, out, write_output); diff --git a/agents/windows/sections/SectionLogwatch.h b/agents/windows/sections/SectionLogwatch.h index d6e7d91..bf63762 100644 --- a/agents/windows/sections/SectionLogwatch.h +++ b/agents/windows/sections/SectionLogwatch.h @@ -31,7 +31,7 @@ typedef struct _BY_HANDLE_FILE_INFORMATION BY_HANDLE_FILE_INFORMATION; -enum file_encoding { +enum class file_encoding { UNDEF, DEFAULT, UNICODE, @@ -81,7 +81,7 @@ struct logwatch_textfile { bool missing{false}; // file no longer exists bool nocontext; // do not report ignored lines bool rotated; // assume the logfile is a rotating log - file_encoding encoding{UNDEF}; + file_encoding encoding{file_encoding::UNDEF}; std::reference_wrapper<const condition_patterns_t> patterns; // glob patterns applying for this file };

6 years, 3 months

by Sven Panne

Module: check_mk Branch: master Commit: 41c27134eeb3ba38c576b66afd9748974769bbc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41c27134eeb3ba… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Mar 23 15:08:20 2018 +0100 Load EC rule-related config files in a fixed order. Change-Id: Ib974f5064fdb760ab327731ad3a6caabf298fee2 --- cmk/ec/export.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/cmk/ec/export.py b/cmk/ec/export.py index 958a92c..23863bd 100644 --- a/cmk/ec/export.py +++ b/cmk/ec/export.py @@ -218,10 +218,8 @@ def load_rule_packs(): "rule_packs": [], "mkp_rule_packs": {} } # type: Dict[str, Any] - - rules_file = rule_pack_dir() / "rules.mk" - if rules_file.is_file(): - cmk.store.load_mk_file(str(rules_file), context) + for path in [rule_pack_dir() / "rules.mk"] + sorted(mkp_rule_pack_dir().glob('*.mk')): + cmk.store.load_mk_file(str(path), context) # Convert some data fields into a new format for rule in context["rules"]: @@ -235,9 +233,6 @@ def load_rule_packs(): context["rule_packs"] = [ cmk.ec.defaults.default_rule_pack(context["rules"])] - for file_ in mkp_rule_pack_dir().glob('*.mk'): - cmk.store.load_mk_file(str(file_), context) - bind_to_rule_pack_proxies(context['rule_packs'], context['mkp_rule_packs']) return context['rules'], context['rule_packs']

6 years, 3 months

Inline a few functions into their only calls site.

by Sven Panne

Module: check_mk Branch: master Commit: 883b49607e9e1cccb78e8225a5bbebefcfcae2bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=883b49607e9e1c… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Mar 23 13:42:05 2018 +0100 Inline a few functions into their only calls site. This is actually simpler and opens up more simplifications/improvements. Change-Id: I4e7dbeec3aa82257afb0304795b6b501dcee27f8 --- cmk/ec/export.py | 61 ++++++++++++++++++++------------------------------------ 1 file changed, 22 insertions(+), 39 deletions(-) diff --git a/cmk/ec/export.py b/cmk/ec/export.py index 82e45ea..958a92c 100644 --- a/cmk/ec/export.py +++ b/cmk/ec/export.py @@ -176,42 +176,6 @@ def mkp_rule_pack_dir(): return _default_settings().paths.mkp_rule_pack_dir.value -def _read_rule_packs(context): - # type: (Dict[str, Any]) -> None - """ - Read rule packs from rules.mk into the variable context. - Context has to be a dict with the keys rules and rule_packs. - """ - rules_file = rule_pack_dir() / "rules.mk" - if rules_file.is_file(): - cmk.store.load_mk_file(str(rules_file), context) - - # Convert some data fields into a new format - for rule in context["rules"]: - if "livetime" in rule: - livetime = rule["livetime"] - if not isinstance(livetime, tuple): - rule["livetime"] = (livetime, ["open"]) - - # Convert old plain rules into a list of one rule pack - if context["rules"] and not context["rule_packs"]: - context["rule_packs"] = [ - cmk.ec.defaults.default_rule_pack(context["rules"])] - - -def _read_exported_rule_packs(context): - # type: (Dict[str, Any]) -> Dict[str, Any] - """ - Read exported rule packs into the variable context. The exported - rule packs may already be part of an MKP. Context has to be a - dict with the key mkp_rule_packs. - """ - for file_ in mkp_rule_pack_dir().glob('*.mk'): - cmk.store.load_mk_file(str(file_), context) - - return context - - def remove_exported_rule_pack(id_): # type: (str) -> None """ @@ -239,6 +203,8 @@ def bind_to_rule_pack_proxies(rule_packs, mkp_rule_packs): % rule_pack.id_) +# NOTE: This is the *only* place which can introduce legacy rules. Can we avoid +# that and put it directly into the default rule pack? def load_rule_packs(): # type: () -> Tuple[Any, Any] """ @@ -251,10 +217,27 @@ def load_rule_packs(): "rules": [], "rule_packs": [], "mkp_rule_packs": {} - } + } # type: Dict[str, Any] + + rules_file = rule_pack_dir() / "rules.mk" + if rules_file.is_file(): + cmk.store.load_mk_file(str(rules_file), context) + + # Convert some data fields into a new format + for rule in context["rules"]: + if "livetime" in rule: + livetime = rule["livetime"] + if not isinstance(livetime, tuple): + rule["livetime"] = (livetime, ["open"]) + + # Convert old plain rules into a list of one rule pack + if context["rules"] and not context["rule_packs"]: + context["rule_packs"] = [ + cmk.ec.defaults.default_rule_pack(context["rules"])] + + for file_ in mkp_rule_pack_dir().glob('*.mk'): + cmk.store.load_mk_file(str(file_), context) - _read_rule_packs(context) - _read_exported_rule_packs(context) bind_to_rule_pack_proxies(context['rule_packs'], context['mkp_rule_packs']) return context['rules'], context['rule_packs']

6 years, 3 months

Win-agent: use strongly typed enums, part 2

by Jukka Aro

Module: check_mk Branch: master Commit: 45c2db5776e5fa11852c22fffbd6152d8f5c428c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=45c2db5776e5fa… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Mar 23 14:14:55 2018 +0100 Win-agent: use strongly typed enums, part 2 Convert Crypto::KeyLength. --- agents/windows/Crypto.cc | 14 +++++++------- agents/windows/Crypto.h | 4 ++-- agents/windows/build_version | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/agents/windows/Crypto.cc b/agents/windows/Crypto.cc index 8a65498..a2dc827 100644 --- a/agents/windows/Crypto.cc +++ b/agents/windows/Crypto.cc @@ -8,7 +8,7 @@ Crypto::Crypto(const WinApiAdaptor &winapi) : _algorithm(DEFAULT_ALGORITHM), _winapi(winapi) { _provider = initContext(); - _key = genKey(KEY_LEN_DEFAULT); + _key = genKey(KeyLength::KEY_LEN_DEFAULT); configureKey(); } @@ -105,8 +105,9 @@ void Crypto::releaseContext() { _winapi.CryptReleaseContext(_provider, 0); } HCRYPTKEY Crypto::genKey(KeyLength key_length) const { HCRYPTKEY result; - if (!_winapi.CryptGenKey(_provider, _algorithm, - key_length | CRYPT_EXPORTABLE, &result)) { + if (!_winapi.CryptGenKey( + _provider, _algorithm, + static_cast<unsigned>(key_length) | CRYPT_EXPORTABLE, &result)) { throw std::runtime_error(get_win_error_as_string(_winapi)); } @@ -184,10 +185,9 @@ void Crypto::deriveOpenSSLKey(const std::string &password, KeyLength key_length, size_t key_offset = 0; size_t iv_offset = 0; - int key_size = key_length; - if (key_size == 0) { - key_size = keySize(_algorithm) / 8; - } + auto key_size = (key_length == KeyLength::KEY_LEN_DEFAULT) + ? keySize(_algorithm) / 8 + : static_cast<size_t>(key_length); std::vector<BYTE> key(key_size); std::vector<BYTE> iv; diff --git a/agents/windows/Crypto.h b/agents/windows/Crypto.h index 816b453..beccf2b 100644 --- a/agents/windows/Crypto.h +++ b/agents/windows/Crypto.h @@ -14,7 +14,7 @@ class Crypto { static const ALG_ID DEFAULT_ALGORITHM = CALG_AES_256; static const ALG_ID HASH_ALGORITHM = CALG_MD5; - enum KeyLength { + enum class KeyLength { KEY_LEN_DEFAULT = 0, KEY_LEN_128 = 128, KEY_LEN_192 = 192, @@ -28,7 +28,7 @@ public: explicit Crypto(const WinApiAdaptor &winapi); Crypto(const std::string &password, const WinApiAdaptor &winapi, - KeyLength key_length = KEY_LEN_DEFAULT); + KeyLength key_length = KeyLength::KEY_LEN_DEFAULT); Crypto(const BYTE *key, DWORD key_size, const WinApiAdaptor &winapi); diff --git a/agents/windows/build_version b/agents/windows/build_version index 78f6630..7127a37 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3202 +3204

6 years, 3 months

Win-agent: use strongly typed enums, part 1

by Jukka Aro

Module: check_mk Branch: master Commit: 1718b82374ecb78854b658f874a3e897d8bc080a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1718b82374ecb7… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Mar 23 13:55:35 2018 +0100 Win-agent: use strongly typed enums, part 1 Convert EventLogRecordVista::WinEventLevel. --- agents/windows/EventLogVista.cc | 4 ++-- agents/windows/build_version | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/windows/EventLogVista.cc b/agents/windows/EventLogVista.cc index 09c87cc..769c9c7 100644 --- a/agents/windows/EventLogVista.cc +++ b/agents/windows/EventLogVista.cc @@ -35,7 +35,7 @@ ///////////////////////////////////////////////////////////// class EventLogRecordVista : public IEventLogRecord { - enum WinEventLevel { + enum class WinEventLevel { Audit = 0, Critical = 1, Error = 2, @@ -133,7 +133,7 @@ public: virtual Level level() const override { const EVT_VARIANT *values = reinterpret_cast<const EVT_VARIANT *>(&_buffer[0]); - switch (values[4].ByteVal) { + switch (static_cast<WinEventLevel>(values[4].ByteVal)) { case WinEventLevel::Error: case WinEventLevel::Critical: return Level::Error; diff --git a/agents/windows/build_version b/agents/windows/build_version index a6981b3..78f6630 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3200 +3202

6 years, 3 months

another update for WK5796

by Andreas Boesl

Module: check_mk Branch: master Commit: 50e1f9864390e1221cf96e1c4c47053fb6d2f7c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50e1f9864390e1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 23 12:17:33 2018 +0100 another update for WK5796 Change-Id: Icd8ac63e63bd9942a4904e1bf350e1db5081df10 --- cmk_base/item_state.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/item_state.py b/cmk_base/item_state.py index e5ad95e..d610bed 100644 --- a/cmk_base/item_state.py +++ b/cmk_base/item_state.py @@ -80,7 +80,7 @@ class CachedItemStates(object): def reset(self): # The actual cached data self._item_states = {} - self._item_state_prefix = None + self._item_state_prefix = () self._last_mtime = None # timestamp of last modification self._removed_item_state_keys = [] self._updated_item_states = {}

6 years, 3 months

Normalize quotes in Win-agent integration tests

by Jukka Aro

Module: check_mk Branch: master Commit: bc6b915a9f1ca93d14be3eb7dbcc2d3482d187cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc6b915a9f1ca9… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri Mar 23 11:50:25 2018 +0100 Normalize quotes in Win-agent integration tests --- agents/windows/it/conftest.py | 2 +- agents/windows/it/lock.py | 4 ++-- agents/windows/it/remote.py | 26 +++++++++++----------- agents/windows/it/test_agent_start_parameters.py | 20 ++++++++--------- agents/windows/it/test_section_check_mk.py | 8 +++---- agents/windows/it/test_section_df.py | 4 ++-- agents/windows/it/test_section_dotnet_clrmemory.py | 4 ++-- agents/windows/it/test_section_eventlog.py | 24 ++++++++++---------- agents/windows/it/test_section_logfiles.py | 14 ++++++------ agents/windows/it/test_section_mem.py | 4 ++-- agents/windows/it/test_section_mrpe.py | 8 +++---- .../windows/it/test_section_openhardwaremonitor.py | 4 ++-- agents/windows/it/test_section_plugin_group.py | 12 +++++----- agents/windows/it/test_section_ps.py | 8 +++---- agents/windows/it/test_section_services.py | 4 ++-- agents/windows/it/test_section_spool.py | 6 ++--- agents/windows/it/test_section_systemtime.py | 4 ++-- agents/windows/it/test_section_uptime.py | 4 ++-- agents/windows/it/test_section_winperf.py | 4 ++-- agents/windows/it/test_section_wmi_cpuload.py | 4 ++-- agents/windows/it/test_section_wmi_webservices.py | 4 ++-- 21 files changed, 86 insertions(+), 86 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bc6b915a9f…

6 years, 3 months

update for WK5796: incorret parameter naming

by Andreas Boesl

Module: check_mk Branch: master Commit: 3772ceea0fbf6915da030a80a91784ee8a1f838b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3772ceea0fbf69… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Mar 23 11:55:39 2018 +0100 update for WK5796: incorret parameter naming Change-Id: I0c379172c24d5056558c604200b7d70d7ae1b2f3 --- cmk_base/item_state.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk_base/item_state.py b/cmk_base/item_state.py index 3e224d0..e5ad95e 100644 --- a/cmk_base/item_state.py +++ b/cmk_base/item_state.py @@ -161,7 +161,7 @@ class CachedItemStates(object): def set_item_state_prefix(self, args): - self._item_prefix = args + self._item_state_prefix = args def get_item_state(self, user_key, default=None): @@ -174,7 +174,7 @@ class CachedItemStates(object): def get_unique_item_state_key(self, user_key): - return self._item_prefix + (user_key,) + return self._item_state_prefix + (user_key,) _cached_item_states = CachedItemStates()

6 years, 3 months

Restrict visibility a bit.

by Sven Panne

Module: check_mk Branch: master Commit: 866786ac8e78946fa65c9469a97efde2f8175ddd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=866786ac8e7894… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Mar 23 11:32:43 2018 +0100 Restrict visibility a bit. Change-Id: I5b49955310f80f457f30d61bb00acc5f84586ac1 --- cmk/ec/export.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmk/ec/export.py b/cmk/ec/export.py index 287678f..82e45ea 100644 --- a/cmk/ec/export.py +++ b/cmk/ec/export.py @@ -176,7 +176,7 @@ def mkp_rule_pack_dir(): return _default_settings().paths.mkp_rule_pack_dir.value -def read_rule_packs(context): +def _read_rule_packs(context): # type: (Dict[str, Any]) -> None """ Read rule packs from rules.mk into the variable context. @@ -199,7 +199,7 @@ def read_rule_packs(context): cmk.ec.defaults.default_rule_pack(context["rules"])] -def read_exported_rule_packs(context): +def _read_exported_rule_packs(context): # type: (Dict[str, Any]) -> Dict[str, Any] """ Read exported rule packs into the variable context. The exported @@ -221,6 +221,7 @@ def remove_exported_rule_pack(id_): export_file.unlink() +# Only called from cmk.ec.main.load_configuration. def bind_to_rule_pack_proxies(rule_packs, mkp_rule_packs): # type: (Any, Any) -> None """ @@ -252,8 +253,8 @@ def load_rule_packs(): "mkp_rule_packs": {} } - read_rule_packs(context) - read_exported_rule_packs(context) + _read_rule_packs(context) + _read_exported_rule_packs(context) bind_to_rule_pack_proxies(context['rule_packs'], context['mkp_rule_packs']) return context['rules'], context['rule_packs']

6 years, 3 months

5796 FIX Fixed race condition in counter computation if a host uses real time checks

by Andreas Boesl

Module: check_mk Branch: master Commit: 995e167a29f84659b97561843c5806dea6f669ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=995e167a29f846… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 20 16:53:24 2018 +0100 5796 FIX Fixed race condition in counter computation if a host uses real time checks There was a risk that the counter data for the Check_MK checks could get lost or reset to an earlier state, when the host received regular updates through the realtime check mechanism. This has been fixed. As a side effect, the counter data is now only saved back to disk when there were actual changes. Change-Id: I4e6cac0527fbecbc35e3e1209bbc802bc7163b27 --- .werks/5796 | 13 ++++ cmk_base/item_state.py | 162 ++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 141 insertions(+), 34 deletions(-) diff --git a/.werks/5796 b/.werks/5796 new file mode 100644 index 0000000..06aa130 --- /dev/null +++ b/.werks/5796 @@ -0,0 +1,13 @@ +Title: Fixed race condition in counter computation if a host uses real time checks +Level: 1 +Component: checks +Compatible: compat +Edition: cee +Version: 1.5.0i4 +Date: 1521798371 +Class: fix + +There was a risk that the counter data for the Check_MK checks could get lost or reset +to an earlier state, when the host received regular updates through the realtime check mechanism. +This has been fixed. As a side effect, the counter data is now only saved back to disk when there were +actual changes. diff --git a/cmk_base/item_state.py b/cmk_base/item_state.py index c997d0b..3e224d0 100644 --- a/cmk_base/item_state.py +++ b/cmk_base/item_state.py @@ -31,7 +31,7 @@ tation of rates from two succeeding counter values. This is done via the helper function get_rate(). Averaging is another example and done by get_average(). -While a host is being checked this memory is kept in g_item_state. +While a host is being checked this memory is kept in _cached_item_states. That is a dictionary. The keys are unique to one check type and item. The value is free form. @@ -44,6 +44,7 @@ import os import traceback import cmk.paths +import cmk.store from cmk.exceptions import MKGeneralException # Constants for counters @@ -51,10 +52,8 @@ SKIP = None RAISE = False ZERO = 0.0 -g_item_state = {} # storing counters of one host -g_last_counter_wrap = None # -g_item_state_prefix = () -g_suppress_on_wrap = True # Suppress check on wrap (raise an exception) +g_last_counter_wrap = None # +g_suppress_on_wrap = True # Suppress check on wrap (raise an exception) # e.g. do not suppress this check on check_mk -nv @@ -66,23 +65,126 @@ class MKCounterWrapped(Exception): return self.reason +class CachedItemStates(object): + def __init__(self): + super(CachedItemStates, self).__init__() + self.reset() + + + def clear_all_item_states(self): + removed_item_state_keys = self._item_states.keys() + self.reset() + self._removed_item_state_keys = removed_item_state_keys + + + def reset(self): + # The actual cached data + self._item_states = {} + self._item_state_prefix = None + self._last_mtime = None # timestamp of last modification + self._removed_item_state_keys = [] + self._updated_item_states = {} + + + def load(self, hostname): + filename = cmk.paths.counters_dir + "/" + hostname + try: + # TODO: refactoring. put these two values into a named tuple + self._item_states = cmk.store.load_data_from_file(filename, default={}, lock=True) + self._last_mtime = os.stat(filename).st_mtime + finally: + cmk.store.release_lock(filename) + + + # TODO: self._last_mtime needs be updated accordingly after the save_data_to_file operation + # right now, the current mechanism is sufficient enough, since the save() function is only + # called as the final operation, just before the lifecycle of the CachedItemState ends + def save(self, hostname): + """ The job of the save function is to update the item state on disk. + It simply returns, if it detects that the data wasn't changed at all since the last loading + If the data on disk has been changed in the meantime, the cached data is updated from disk. + Afterwards only the actual modifications (update/remove) are applied to the updated cached + data before it is written back to disk. + """ + filename = cmk.paths.counters_dir + "/" + hostname + if not self._removed_item_state_keys and not self._updated_item_states: + return + + try: + if not os.path.exists(cmk.paths.counters_dir): + os.makedirs(cmk.paths.counters_dir) + + cmk.store.aquire_lock(filename) + last_mtime = os.stat(filename).st_mtime + if last_mtime != self._last_mtime: + self._item_states = cmk.store.load_data_from_file(filename, default={}) + + # Remove obsolete keys + for key in self._removed_item_state_keys: + try: + del self._item_states[key] + except KeyError: + pass + + # Add updated keys + self._item_states.update(self._updated_item_states) + + cmk.store.save_data_to_file(filename, self._item_states, pretty=False) + except Exception, e: + raise MKGeneralException("Cannot write to %s: %s" % (filename, traceback.format_exc())) + finally: + cmk.store.release_lock(filename) + + + def clear_item_state(self, user_key): + key = self.get_unique_item_state_key(user_key) + self.remove_full_key(key) + + + def clear_item_states_by_full_keys(self, full_keys): + for key in full_keys: + self.remove_full_key(key) + + + def remove_full_key(self, full_key): + try: + self._removed_item_state_keys.append(full_key) + del self._item_states[full_key] + except KeyError: + pass + + + def set_item_state(self, user_key, state): + key = self.get_unique_item_state_key(user_key) + self._item_states[key] = state + self._updated_item_states[key] = state + + + def set_item_state_prefix(self, args): + self._item_prefix = args + + + def get_item_state(self, user_key, default=None): + key = self.get_unique_item_state_key(user_key) + return self._item_states.get(key, default) + + + def get_all_item_states(self): + return self._item_states + + + def get_unique_item_state_key(self, user_key): + return self._item_prefix + (user_key,) + +_cached_item_states = CachedItemStates() + def load(hostname): - global g_item_state - filename = cmk.paths.counters_dir + "/" + hostname - try: - g_item_state = eval(file(filename).read()) - except: - g_item_state = {} + _cached_item_states.reset() + _cached_item_states.load(hostname) def save(hostname): - filename = cmk.paths.counters_dir + "/" + hostname - try: - if not os.path.exists(cmk.paths.counters_dir): - os.makedirs(cmk.paths.counters_dir) - file(filename, "w").write("%r\n" % g_item_state) - except Exception, e: - raise MKGeneralException("Cannot write to %s: %s" % (filename, traceback.format_exc())) + _cached_item_states.save(hostname) def set_item_state(user_key, state): @@ -90,7 +192,7 @@ def set_item_state(user_key, state): The user_key is the identifier of the stored value and needs to be unique per service.""" - g_item_state[_unique_item_state_key(user_key)] = state + _cached_item_states.set_item_state(user_key, state) def get_item_state(user_key, default=None): @@ -98,12 +200,12 @@ def get_item_state(user_key, default=None): Returns None or the given default value in case there is currently no such item stored.""" - return g_item_state.get(_unique_item_state_key(user_key), default) + return _cached_item_states.get_item_state(user_key, default) def get_all_item_states(): """Returns all stored items of the host that is currently being checked.""" - return g_item_state + return _cached_item_states.get_all_item_states() def clear_item_state(user_key): @@ -112,9 +214,7 @@ def clear_item_state(user_key): In case the given item does not exist, the function returns without modification.""" - key = _unique_item_state_key(user_key) - if key in g_item_state: - del g_item_state[key] + _cached_item_states.clear_item_state(user_key) def clear_item_states_by_full_keys(full_keys): @@ -124,26 +224,20 @@ def clear_item_states_by_full_keys(full_keys): names specified with set_item_state(). For checks this is normally (<check_plugin_name>, <item>, <user_key>). """ - for key in full_keys: - try: - del g_item_state[key] - except KeyError: - pass + _cached_item_states.clear_item_states_by_full_keys(full_keys) def cleanup_item_states(): """Clears all stored items of the host that is currently being checked.""" - global g_item_state - g_item_state = {} + _cached_item_states.clear_all_item_states() def set_item_state_prefix(*args): - global g_item_state_prefix - g_item_state_prefix = args + _cached_item_states.set_item_state_prefix(args) def _unique_item_state_key(user_key): - return g_item_state_prefix + (user_key,) + _cached_item_states.get_unique_item_state_key(user_key) def continue_on_counter_wrap():

6 years, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018