Checkmk git commits July 2016

checkmk-commits@lists.checkmk.com

10 participants
213 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: 44f7a15721ab2bf1da0f8b649db9f1e27baa0c9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44f7a15721ab2b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 28 13:25:43 2016 +0200 Store passwords as plain non-MK file --- modules/check_mk.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index b6a3143..e095faa 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3440,11 +3440,11 @@ def verify_cluster_address_family(hostname): def write_stored_passwords(): - formated = "" + content = "" for ident, pw in stored_passwords.items(): - formated += "%s:%s\n" % (ident, pw["password"]) + content += "%s:%s\n" % (ident, pw["password"]) - store.save_mk_file(var_dir + "/stored_passwords.mk", formated) + store.save_file(var_dir + "/stored_passwords", content) def get_cluster_nodes_for_config(hostname):

8 years, 2 months

New lib function save_file() without MK header

by Mathias Kettner

Module: check_mk Branch: master Commit: ebe678b265aefec212200671dcb46fdfec265163 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebe678b265aefe… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Jul 28 13:25:18 2016 +0200 New lib function save_file() without MK header --- lib/store.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/store.py b/lib/store.py index 1885d36..dea4bce 100644 --- a/lib/store.py +++ b/lib/store.py @@ -168,20 +168,25 @@ def load_from_mk_file(path, key, default, **kwargs): return load_mk_file(path, {key: default}, **kwargs)[key] +def save_mk_file(path, mk_content): + content = "# Written by Check_MK store (%s)\n\n" % \ + time.strftime("%Y-%m-%d %H:%M:%S") + content += mk_content + content += "\n" + save_file(path, content) + + # Saving assumes a locked destination file (usually done by loading code) # Then the new file is written to a temporary file and moved to the target path -def save_mk_file(path, formated): +def save_file(path, content, mode=0660): try: tmp_path = None with tempfile.NamedTemporaryFile("w", dir=os.path.dirname(path), prefix=os.path.basename(path)+".new", delete=False) as tmp: tmp_path = tmp.name - - os.chmod(tmp_path, 0660) - tmp.write("# Written by Check_MK store (%s)\n\n" % time.strftime("%Y-%m-%d %H:%M:%S")) - tmp.write(formated) - tmp.write("\n") + os.chmod(tmp_path, mode) + tmp.write(content) os.rename(tmp_path, path)

8 years, 2 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: 2627c10310405f392df3b113e1a4ea2865535f68 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2627c10310405f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 28 13:16:46 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/StringUtils.cc | 2 +- livestatus/src/TableHostgroups.cc | 4 +--- livestatus/src/TableHosts.cc | 12 ++++++----- livestatus/src/TableServicegroups.cc | 4 +--- livestatus/src/TableServices.cc | 39 +++++++++++++++++----------------- 5 files changed, 30 insertions(+), 31 deletions(-) diff --git a/livestatus/src/StringUtils.cc b/livestatus/src/StringUtils.cc index 5d5f42a..bb19f0c 100644 --- a/livestatus/src/StringUtils.cc +++ b/livestatus/src/StringUtils.cc @@ -63,7 +63,7 @@ string strip(const string &str, const string &chars) { } std::pair<string, string> nextField(const string &str, const string &chars) { - auto s = lstrip(str); + auto s = lstrip(str, chars); auto pos = s.find_first_of(chars); return pos == string::npos ? make_pair(s, "") : make_pair(s.substr(0, pos), s.substr(pos + 1)); diff --git a/livestatus/src/TableHostgroups.cc b/livestatus/src/TableHostgroups.cc index 3eb42ca..5950adf 100644 --- a/livestatus/src/TableHostgroups.cc +++ b/livestatus/src/TableHostgroups.cc @@ -178,12 +178,10 @@ void TableHostgroups::addColumns(Table *table, string prefix, } void TableHostgroups::answerQuery(Query *query) { - hostgroup *hg = hostgroup_list; - while (hg != nullptr) { + for (hostgroup *hg = hostgroup_list; hg != nullptr; hg = hg->next) { if (!query->processDataset(hg)) { break; } - hg = hg->next; } } diff --git a/livestatus/src/TableHosts.cc b/livestatus/src/TableHosts.cc index 541cd08..4e1c429 100644 --- a/livestatus/src/TableHosts.cc +++ b/livestatus/src/TableHosts.cc @@ -697,11 +697,13 @@ void TableHosts::addColumns(Table *table, string prefix, int indirect_offset, void TableHosts::answerQuery(Query *query) { // do we know the host group? if (const string *value = query->findValueForIndexing("groups")) { - hostgroup *hgroup = find_hostgroup(const_cast<char *>(value->c_str())); - for (hostsmember *mem = hgroup->members; mem != nullptr; - mem = mem->next) { - if (!query->processDataset(mem->host_ptr)) { - break; + if (hostgroup *hg = + find_hostgroup(const_cast<char *>(value->c_str()))) { + for (hostsmember *mem = hg->members; mem != nullptr; + mem = mem->next) { + if (!query->processDataset(mem->host_ptr)) { + break; + } } } return; diff --git a/livestatus/src/TableServicegroups.cc b/livestatus/src/TableServicegroups.cc index b7478e6..e1f0a12 100644 --- a/livestatus/src/TableServicegroups.cc +++ b/livestatus/src/TableServicegroups.cc @@ -128,12 +128,10 @@ void TableServicegroups::addColumns(Table *table, string prefix, } void TableServicegroups::answerQuery(Query *query) { - servicegroup *sg = servicegroup_list; - while (sg != nullptr) { + for (servicegroup *sg = servicegroup_list; sg != nullptr; sg = sg->next) { if (!query->processDataset(sg)) { break; } - sg = sg->next; } } diff --git a/livestatus/src/TableServices.cc b/livestatus/src/TableServices.cc index 458a90a..3c514b1 100644 --- a/livestatus/src/TableServices.cc +++ b/livestatus/src/TableServices.cc @@ -489,25 +489,25 @@ void TableServices::answerQuery(Query *query) { // do we know the host? if (const string *value = query->findValueForIndexing("host_name")) { // Older Nagios headers are not const-correct... :-P - host *host = find_host(const_cast<char *>(value->c_str())); - if (host == nullptr) { - return; - } - for (servicesmember *m = host->services; m != nullptr; m = m->next) { - if (!query->processDataset(m->service_ptr)) { - break; + if (host *host = find_host(const_cast<char *>(value->c_str()))) { + for (servicesmember *m = host->services; m != nullptr; + m = m->next) { + if (!query->processDataset(m->service_ptr)) { + break; + } } + return; } - return; } // do we know the service group? if (const string *name = query->findValueForIndexing("groups")) { - servicegroup *sgroup = - find_servicegroup(const_cast<char *>(name->c_str())); - for (servicesmember *m = sgroup->members; m != nullptr; m = m->next) { - if (!query->processDataset(m->service_ptr)) { - break; + if (servicegroup *sg = + find_servicegroup(const_cast<char *>(name->c_str()))) { + for (servicesmember *m = sg->members; m != nullptr; m = m->next) { + if (!query->processDataset(m->service_ptr)) { + break; + } } } return; @@ -515,12 +515,13 @@ void TableServices::answerQuery(Query *query) { // do we know the host group? if (const string *name = query->findValueForIndexing("host_groups")) { - hostgroup *hgroup = find_hostgroup(const_cast<char *>(name->c_str())); - for (hostsmember *m = hgroup->members; m != nullptr; m = m->next) { - for (servicesmember *smem = m->host_ptr->services; smem != nullptr; - smem = smem->next) { - if (!query->processDataset(smem->service_ptr)) { - break; + if (hostgroup *hg = find_hostgroup(const_cast<char *>(name->c_str()))) { + for (hostsmember *m = hg->members; m != nullptr; m = m->next) { + for (servicesmember *smem = m->host_ptr->services; + smem != nullptr; smem = smem->next) { + if (!query->processDataset(smem->service_ptr)) { + break; + } } } }

8 years, 2 months

pwstore: Admins have now full access to all passwords

by Lars Michelsen

Module: check_mk Branch: master Commit: c14a31965e4a313b3eeb79d316859951140386f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c14a31965e4a31… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 27 17:05:14 2016 +0200 pwstore: Admins have now full access to all passwords --- web/htdocs/wato.py | 56 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 9 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a7668da..b44880d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15210,11 +15210,17 @@ class PasswordStore(object): def _owned_passwords(self): + if config.may("wato.edit_all_passwords"): + return self._load() + user_groups = userdb.contactgroups_of_user(config.user_id) return dict([ (k, v) for k, v in self._load().items() if v["owned_by"] in user_groups ]) def usable_passwords(self): + if config.may("wato.edit_all_passwords"): + return self._load() + user_groups = userdb.contactgroups_of_user(config.user_id) passwords = self._owned_passwords() @@ -15290,7 +15296,12 @@ class ModePasswords(WatoMode, PasswordStore): html.icon_button(delete_url, _("Delete this password"), "delete") table.cell(_("Title"), html.attrencode(password["title"])) - table.cell(_("Owned by"), html.attrencode(contact_group_alias(password["owned_by"]))) + table.cell(_("Editable by")) + if password["owned_by"] == None: + html.write(_("Administrators (having the permission " + "\"Write access to all passwords\")")) + else: + html.write(html.attrencode(contact_group_alias(password["owned_by"]))) table.cell(_("Shared with")) if not password["shared_with"]: html.write(_("Not shared")) @@ -15349,6 +15360,17 @@ class ModeEditPassword(WatoMode, PasswordStore): )), ] + if config.may("wato.edit_all_passwords"): + admin_element = [ + FixedValue(None, + title = _("Administrators"), + totext = _("Administrators (having the permission " + "\"Write access to all passwords\")"), + ) + ] + else: + admin_element = [] + return Dictionary( title = _("Password"), elements = ident_attr + [ @@ -15362,14 +15384,24 @@ class ModeEditPassword(WatoMode, PasswordStore): allow_empty = False, hidden = True, )), - ("owned_by", DropdownChoice( - title = _("Owned by"), + ("owned_by", Alternative( + title = _("Editable by"), help = _("Each password is owned by a group of users which are able to edit, " "delete and use existing passwords."), - choices = lambda: self.__contact_group_choices(only_own=True), - invalid_choice = "complain", - empty_text = _("You need to be member of at least one contact group to be able to " - "create a password."), + style = "dropdown", + elements = admin_element + [ + DropdownChoice( + title = _("Members of the contact group:"), + choices = lambda: self.__contact_group_choices(only_own=True), + invalid_choice = "complain", + empty_text = _("You need to be member of at least one contact group to be able to " + "create a password."), + invalid_choice_title = _("Group not existant or not member"), + invalid_choice_error = _("The choosen group is either not existant " + "anymore or you are not a member of this " + "group. Please choose another one."), + ), + ] )), ("shared_with", DualListChoice( title = _("Share with"), @@ -16694,15 +16726,21 @@ def load_plugins(force): _("This permission is needed for the module <i>Passwords</i>."), [ "admin", "user" ]) + config.declare_permission("wato.edit_all_passwords", + _("Write access to all passwords"), + _("Without this permission, users can only edit passwords which are shared with a contact " + "group they are member of. This permission grants full access to all passwords."), + [ "admin" ]) + config.declare_permission("wato.see_all_folders", _("Read access to all hosts and folders"), - _("Users without this permissions can only see folders with a contact group they are in. "), + _("Users without this permissions can only see folders with a contact group they are in."), [ "admin" ]) config.declare_permission("wato.all_folders", _("Write access to all hosts and folders"), _("Without this permission, operations on folders can only be done by users that are members of " - "one of the folders contact groups. This permission grants full access to all folders and hosts. "), + "one of the folders contact groups. This permission grants full access to all folders and hosts."), [ "admin" ]) config.declare_permission("wato.hosttags",

8 years, 2 months

Started cleaning up the htmllib a bit by simple grouping methods together

by Lars Michelsen

Module: check_mk Branch: master Commit: 4e7fe6170200f21dbc99a7e26840b8a4bebe8514 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4e7fe6170200f2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 28 10:57:13 2016 +0200 Started cleaning up the htmllib a bit by simple grouping methods together --- web/htdocs/htmllib.py | 2403 ++++++++++++++++++++++------------------- web/htdocs/watolib.py | 14 +- web/plugins/views/painters.py | 3 +- 3 files changed, 1303 insertions(+), 1117 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4e7fe61702…

8 years, 2 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: 08daa8688058fb9895128fb01255a89e556b12b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08daa8688058fb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 27 16:54:19 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/StringUtils.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/livestatus/src/StringUtils.cc b/livestatus/src/StringUtils.cc index 7bbd59d..5d5f42a 100644 --- a/livestatus/src/StringUtils.cc +++ b/livestatus/src/StringUtils.cc @@ -57,6 +57,7 @@ string rstrip(const string &str, const string &chars) { return pos == string::npos ? "" : str.substr(0, pos + 1); } +// cppcheck-suppress unusedFunction string strip(const string &str, const string &chars) { return rstrip(lstrip(str, chars), chars); }

8 years, 2 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: dd12443cd2fb1f12efdf1bc32dfc6d6d1d362ff8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd12443cd2fb1f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 27 16:41:45 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/Aggregator.h | 2 +- livestatus/src/AttributelistColumn.cc | 4 +- livestatus/src/AttributelistColumn.h | 4 +- livestatus/src/BlobColumn.cc | 3 +- livestatus/src/BlobColumn.h | 4 +- livestatus/src/Column.h | 4 +- livestatus/src/ContactgroupsColumn.cc | 4 +- livestatus/src/ContactgroupsColumn.h | 4 +- livestatus/src/ContactsColumn.cc | 4 +- livestatus/src/ContactsColumn.h | 4 +- livestatus/src/CountAggregator.cc | 2 +- livestatus/src/CountAggregator.h | 4 +- livestatus/src/CustomVarsDictColumn.cc | 4 +- livestatus/src/CustomVarsDictColumn.h | 4 +- livestatus/src/CustomVarsNamesColumn.cc | 4 +- livestatus/src/CustomVarsNamesColumn.h | 4 +- livestatus/src/CustomVarsValuesColumn.cc | 4 +- livestatus/src/CustomVarsValuesColumn.h | 4 +- livestatus/src/DoubleAggregator.cc | 2 +- livestatus/src/DoubleAggregator.h | 4 +- livestatus/src/DoubleColumn.cc | 2 +- livestatus/src/DoubleColumn.h | 4 +- livestatus/src/DownCommColumn.cc | 6 +- livestatus/src/DownCommColumn.h | 4 +- livestatus/src/EmptyColumn.cc | 2 +- livestatus/src/EmptyColumn.h | 4 +- livestatus/src/GlobalCountersColumn.cc | 2 +- livestatus/src/GlobalCountersColumn.h | 4 +- livestatus/src/HostgroupsColumn.cc | 4 +- livestatus/src/HostgroupsColumn.h | 4 +- livestatus/src/HostlistColumn.cc | 6 +- livestatus/src/HostlistColumn.h | 4 +- livestatus/src/IntAggregator.cc | 2 +- livestatus/src/IntAggregator.h | 4 +- livestatus/src/IntColumn.cc | 2 +- livestatus/src/IntColumn.h | 4 +- livestatus/src/LogwatchListColumn.cc | 4 +- livestatus/src/LogwatchListColumn.h | 4 +- livestatus/src/MetricsColumn.cc | 4 +- livestatus/src/MetricsColumn.h | 4 +- livestatus/src/NullColumn.cc | 2 +- livestatus/src/NullColumn.h | 4 +- livestatus/src/OffsetStringMacroColumn.cc | 2 +- livestatus/src/OffsetStringMacroColumn.h | 4 +- livestatus/src/OffsetTimeColumn.cc | 2 +- livestatus/src/OffsetTimeColumn.h | 4 +- livestatus/src/PerfdataAggregator.cc | 2 +- livestatus/src/PerfdataAggregator.h | 4 +- livestatus/src/Query.cc | 16 +- livestatus/src/Query.h | 6 +- livestatus/src/Renderer.cc | 51 ++-- livestatus/src/Renderer.h | 369 ++++++++++++++-------------- livestatus/src/RendererCSV.cc | 8 +- livestatus/src/RendererCSV.h | 8 +- livestatus/src/RendererJSON.cc | 5 +- livestatus/src/RendererJSON.h | 1 - livestatus/src/RendererPython.cc | 7 +- livestatus/src/RendererPython.h | 1 - livestatus/src/ServicegroupsColumn.cc | 4 +- livestatus/src/ServicegroupsColumn.h | 4 +- livestatus/src/ServicelistColumn.cc | 7 +- livestatus/src/ServicelistColumn.h | 4 +- livestatus/src/StringColumn.cc | 2 +- livestatus/src/StringColumn.h | 4 +- livestatus/src/StringUtils.cc | 24 +- livestatus/src/StringUtils.h | 18 +- livestatus/src/Table.cc | 2 +- livestatus/src/Table.h | 2 +- livestatus/src/TableContactgroups.cc | 4 +- livestatus/src/TableContactgroups.h | 2 +- livestatus/src/TableContacts.cc | 4 +- livestatus/src/TableContacts.h | 2 +- livestatus/src/TableEventConsole.h | 4 +- livestatus/src/TableHostgroups.cc | 4 +- livestatus/src/TableHostgroups.h | 2 +- livestatus/src/TableHosts.cc | 4 +- livestatus/src/TableHosts.h | 2 +- livestatus/src/TableHostsByGroup.cc | 4 +- livestatus/src/TableHostsByGroup.h | 2 +- livestatus/src/TableServicegroups.cc | 4 +- livestatus/src/TableServicegroups.h | 2 +- livestatus/src/TableServices.cc | 2 +- livestatus/src/TableServices.h | 2 +- livestatus/src/TableServicesByGroup.cc | 2 +- livestatus/src/TableServicesByGroup.h | 2 +- livestatus/src/TableServicesByHostGroup.cc | 2 +- livestatus/src/TableServicesByHostGroup.h | 2 +- livestatus/src/TimePointerColumn.cc | 3 +- livestatus/src/TimePointerColumn.h | 4 +- livestatus/src/WorldNagios.cc | 35 ++- livestatus/src/WorldNagios.h | 3 +- 91 files changed, 419 insertions(+), 392 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dd12443cd2…

8 years, 2 months

pwstore: minor cleanups

by Lars Michelsen

Module: check_mk Branch: master Commit: ced940babc9612bab2570ed2f279fd27f68f9dec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ced940babc9612… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 27 16:20:07 2016 +0200 pwstore: minor cleanups --- web/htdocs/wato.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c469f7c..a7668da 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15231,7 +15231,7 @@ class PasswordStore(object): class ModePasswords(WatoMode, PasswordStore): def title(self): - return _("Manage passwords") + return _("Passwords") def buttons(self): @@ -15355,6 +15355,7 @@ class ModeEditPassword(WatoMode, PasswordStore): ("title", TextUnicode( title = _("Title"), allow_empty = False, + size = 64, )), ("password", PasswordSpec( title = _("Password"),

8 years, 2 months

Added own version info to lib

by Lars Michelsen

Module: check_mk Branch: master Commit: 4543625bdbe1ffc56eec19978c06862762806b9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4543625bdbe1ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 27 16:09:37 2016 +0200 Added own version info to lib --- Makefile | 2 +- lib/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3d50bbd..a34081b 100644 --- a/Makefile +++ b/Makefile @@ -210,7 +210,7 @@ setversion: sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' livestatus/configure.ac ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' bin/mkeventd bin/mkbackup ; \ - sed -i 's/^__version__ = ".*"$/__version__ = "$(NEW_VERSION)"/' lib/__init__.py ; \ + sed -i 's/^__version__ = ".*"$$/__version__ = "$(NEW_VERSION)"/' lib/__init__.py ; \ sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/' scripts/setup.sh ; \ echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files $(MAKE) -C agents NEW_VERSION=$(NEW_VERSION) setversion diff --git a/lib/__init__.py b/lib/__init__.py index 04a4dff..03ea453 100644 --- a/lib/__init__.py +++ b/lib/__init__.py @@ -29,4 +29,4 @@ This library is currently handled as internal module of Check_MK and does not offer stable APIs. The code may change at any time.""" -__version__ = "(inofficial)" +__version__ = "1.4.0i1"

8 years, 2 months

Removed defaults module usage from lib

by Lars Michelsen

Module: check_mk Branch: master Commit: f40b6e5e22b6b8dee1cc237acdb95b983ce0bb9e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f40b6e5e22b6b8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 27 16:07:38 2016 +0200 Removed defaults module usage from lib --- Makefile | 2 ++ lib/__init__.py | 2 ++ lib/crash_reporting.py | 10 +++++----- modules/check_mk_base.py | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 8db40d2..3d50bbd 100644 --- a/Makefile +++ b/Makefile @@ -200,6 +200,7 @@ version: -o "$$(head -c 12 /etc/issue)" = "Ubuntu 14.04" \ -o "$$(head -c 12 /etc/issue)" = "Ubuntu 15.04" \ -o "$$(head -c 12 /etc/issue)" = "Ubuntu 15.10" \ + -o "$$(head -c 12 /etc/issue)" = "Ubuntu 16.04" \ -o "$$(head -c 20 /etc/issue)" = "Debian GNU/Linux 6.0" ] \ || { echo 'You are not on the reference system!' ; exit 1; } @newversion=$$(dialog --stdout --inputbox "New Version:" 0 0 "$(VERSION)") ; \ @@ -209,6 +210,7 @@ setversion: sed -ri 's/^(VERSION[[:space:]]*:?= *).*/\1'"$(NEW_VERSION)/" Makefile ; \ sed -i 's/^AC_INIT.*/AC_INIT([MK Livestatus], ['"$(NEW_VERSION)"'], [mk(a)mathias-kettner.de])/' livestatus/configure.ac ; \ sed -i 's/^VERSION=".*/VERSION="$(NEW_VERSION)"/' bin/mkeventd bin/mkbackup ; \ + sed -i 's/^__version__ = ".*"$/__version__ = "$(NEW_VERSION)"/' lib/__init__.py ; \ sed -i 's/^VERSION=.*/VERSION='"$(NEW_VERSION)"'/' scripts/setup.sh ; \ echo 'check-mk_$(NEW_VERSION)-1_all.deb net optional' > debian/files $(MAKE) -C agents NEW_VERSION=$(NEW_VERSION) setversion diff --git a/lib/__init__.py b/lib/__init__.py index 1a9ed1d..04a4dff 100644 --- a/lib/__init__.py +++ b/lib/__init__.py @@ -28,3 +28,5 @@ This library is currently handled as internal module of Check_MK and does not offer stable APIs. The code may change at any time.""" + +__version__ = "(inofficial)" diff --git a/lib/crash_reporting.py b/lib/crash_reporting.py index 7c5f651..df57533 100644 --- a/lib/crash_reporting.py +++ b/lib/crash_reporting.py @@ -30,6 +30,7 @@ developers for analyzing the crashes.""" import base64 import inspect +import os import pprint import sys import time @@ -40,6 +41,7 @@ try: except ImportError: import json +from . import __version__ # The default JSON encoder raises an exception when detecting unknown types. For the crash # reporting it is totally ok to have some string representations of the objects. @@ -61,12 +63,11 @@ def create_crash_info(crash_type, details = None): exc_type, exc_value, exc_traceback = sys.exc_info() - import defaults # TODO: defaults in lib? Clean this up! return { "crash_type" : crash_type, "time" : time.time(), "os" : get_os_info(), - "version" : defaults.check_mk_version, + "version" : __version__, "python_version": sys.version, "python_paths" : sys.path, "exc_type" : exc_type.__name__, @@ -78,9 +79,8 @@ def create_crash_info(crash_type, details = None): def get_os_info(): - import defaults # TODO: defaults in lib? Clean this up! - if defaults.omd_root: - return file(defaults.omd_root+"/share/omd/distro.info").readline().split("=", 1)[1].strip() + if "OMD_ROOT" in os.environ: + return file(os.environ["OMD_ROOT"]+"/share/omd/distro.info").readline().split("=", 1)[1].strip() elif os.path.exists("/etc/redhat-release"): return file("/etc/redhat-release").readline().strip() elif os.path.exists("/etc/SuSE-release"): diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 151bc16..81c89a3 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1595,7 +1595,7 @@ def create_crash_dump_info_file(crash_dir, hostname, check_type, item, params, d "inline_snmp" : is_inline_snmp_host(hostname), "manual_check" : is_manual_check(hostname, check_type, item), }) - file(crash_dir+"/crash.info", "w").write(crash_info_to_string(crash_info)+"\n") + file(crash_dir+"/crash.info", "w").write(crash_reporting.crash_info_to_string(crash_info)+"\n") def write_crash_dump_snmp_info(crash_dir, hostname, check_type):

8 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2016