Checkmk git commits July 2016

checkmk-commits@lists.checkmk.com

10 participants
213 discussions

3644 Fixed 'source' column in 'comments' table.

by Sven Panne

Module: check_mk Branch: master Commit: 26541941c65e7fecb68fca6b96f042f148d9d173 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=26541941c65e7f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 21 17:47:20 2016 +0200 3644 Fixed 'source' column in 'comments' table. --- .werks/3644 | 10 ++++++++++ ChangeLog | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/3644 b/.werks/3644 new file mode 100644 index 0000000..9d3eebd --- /dev/null +++ b/.werks/3644 @@ -0,0 +1,10 @@ +Title: Fixed 'source' column in 'comments' table. +Level: 1 +Component: livestatus +Class: feature +Compatible: compat +State: unknown +Version: 1.4.0i1 +Date: 1469116021 + + diff --git a/ChangeLog b/ChangeLog index d948592..b13f3a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -558,6 +558,7 @@ * 3589 FIX: Fixed processing of RFC 5424 syslog messages Livestatus: + * 3644 Fixed 'source' column in 'comments' table. * 3233 FIX: Fixed shutdown of Nagios core with Livestatus module... * 3235 FIX: Unbreak COMMAND handling...

8 years, 2 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: 1b58c602ded194ad283eca2bbc8708435fb67704 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1b58c602ded194… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jul 21 17:44:17 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/AttributelistColumn.cc | 2 +- livestatus/src/ContactgroupsColumn.cc | 17 ++----- livestatus/src/ContactsColumn.cc | 4 +- livestatus/src/CountAggregator.cc | 2 +- livestatus/src/DownCommColumn.cc | 10 ++-- livestatus/src/GlobalCountersColumn.cc | 2 +- livestatus/src/HostgroupsColumn.cc | 10 ++-- livestatus/src/HostlistColumn.cc | 4 +- livestatus/src/IntAggregator.cc | 6 +-- livestatus/src/IntColumn.cc | 2 +- livestatus/src/LogEntry.cc | 43 ++++++++++++++-- livestatus/src/LogEntry.h | 17 ++++--- livestatus/src/OffsetTimeColumn.cc | 4 +- livestatus/src/Query.cc | 40 ++++++--------- livestatus/src/Query.h | 5 +- livestatus/src/Renderer.cc | 22 ++------ livestatus/src/Renderer.h | 87 ++++++++++++++++---------------- livestatus/src/RendererCSV.cc | 32 +++--------- livestatus/src/RendererCSV.h | 13 +---- livestatus/src/RendererJSON.cc | 21 ++------ livestatus/src/RendererPython.cc | 19 ++----- livestatus/src/ServicegroupsColumn.cc | 11 ++-- livestatus/src/ServicelistColumn.cc | 20 ++++---- livestatus/src/TableDownComm.cc | 2 +- livestatus/src/TableLog.cc | 1 + livestatus/src/TimePointerColumn.cc | 4 +- 26 files changed, 172 insertions(+), 228 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1b58c602de…

8 years, 2 months

mkbackup: Added hostname to key download file name

by Lars Michelsen

Module: check_mk Branch: master Commit: dc77874282555d54bd72b35f4dc4f7c8ffade127 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc77874282555d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 21 15:26:35 2016 +0200 mkbackup: Added hostname to key download file name --- 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 f44ae87..c7d3ddb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5803,7 +5803,7 @@ class ModeBackupUploadKey(SiteBackupKeypairStore, backup.PageBackupUploadKey, Wa class ModeBackupDownloadKey(SiteBackupKeypairStore, backup.PageBackupDownloadKey, WatoMode): def _file_name(self, key_id, key): - return "Check_MK-backup_key-%s.pem" % defaults.omd_site + return "Check_MK-%s-%s-backup_key-%s.pem" % (backup.hostname(), defaults.omd_site, key_id) class ModeBackupRestore(backup.PageBackupRestore, WatoMode):

8 years, 2 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 1ed973b787df48aebd5cb5f522bef3c2c77e8d50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ed973b787df48… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 21 12:57:24 2016 +0200 Reserved 20 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index afb7f11..0877ca9 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3716 +3736

8 years, 2 months

ipmi: Make parse function explicit

by Konstantin Büttner

Module: check_mk Branch: master Commit: fea8329d785c8e43ee5d950e2f9acae5e8bb42f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fea8329d785c8e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Jul 21 08:46:48 2016 +0200 ipmi: Make parse function explicit --- checks/ipmi | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/checks/ipmi b/checks/ipmi index 3c574c8..cb18678 100644 --- a/checks/ipmi +++ b/checks/ipmi @@ -160,8 +160,7 @@ def parse_ipmi(info): return parsed -def inventory_ipmi(info): - parsed = parse_ipmi(info) +def inventory_ipmi(parsed): summarize = True rules = host_extra_conf(g_hostname, inventory_ipmi_rules) if rules: @@ -178,8 +177,7 @@ def inventory_ipmi(info): yield "Summary", None -def check_ipmi(item, params, info): - parsed = parse_ipmi(info) +def check_ipmi(item, params, parsed): if item == "Summary": return check_ipmi_summarized(parsed, params) else: @@ -296,6 +294,7 @@ check_config_variables.append("ipmi_ignored_sensors") check_info["ipmi"] = { + 'parse_function' : parse_ipmi, 'inventory_function' : inventory_ipmi, 'check_function' : check_ipmi, 'service_description' : 'IPMI Sensor %s',

8 years, 2 months

Fetched Livestatus from upstream. Added missing files to build.

by Sven Panne

Module: check_mk Branch: master Commit: 83805f9b8fbe43dd2bc781c1aca94b8f266eedfe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83805f9b8fbe43… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 20 15:31:34 2016 +0200 Fetched Livestatus from upstream. Added missing files to build. --- livestatus/src/BlobColumn.cc | 7 ++++-- livestatus/src/CustomVarsDictColumn.cc | 13 ++--------- livestatus/src/CustomVarsDictColumn.h | 2 +- livestatus/src/CustomVarsNamesColumn.cc | 3 +-- livestatus/src/CustomVarsNamesColumn.h | 2 +- livestatus/src/CustomVarsValuesColumn.cc | 5 ++--- livestatus/src/CustomVarsValuesColumn.h | 2 +- livestatus/src/DownCommColumn.cc | 4 ++-- livestatus/src/DowntimeOrComment.cc | 2 -- livestatus/src/LogwatchListColumn.cc | 17 +++++--------- livestatus/src/Makefile.am | 3 +++ livestatus/src/OffsetStringMacroColumn.cc | 2 +- livestatus/src/PerfdataAggregator.cc | 2 +- livestatus/src/Query.cc | 12 +++------- livestatus/src/Renderer.cc | 23 +++++++++---------- livestatus/src/Renderer.h | 35 +++++++++-------------------- livestatus/src/RendererCSV.cc | 14 +++--------- livestatus/src/RendererCSV.h | 4 ++-- livestatus/src/RendererJSON.cc | 19 +++++----------- livestatus/src/RendererJSON.h | 4 ++-- livestatus/src/RendererPython.cc | 19 +++++----------- livestatus/src/RendererPython.h | 4 ++-- livestatus/src/ServicelistColumn.cc | 4 +++- livestatus/src/StringColumn.cc | 2 +- livestatus/src/TableEventConsole.h | 2 +- 25 files changed, 76 insertions(+), 130 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=83805f9b8f…

8 years, 2 months

mkbackup: Fixed loading of backup info files

by Lars Michelsen

Module: check_mk Branch: master Commit: 129cde5d1b169fa2b83e10d9d1593ce8743b286d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=129cde5d1b169f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 20 15:26:31 2016 +0200 mkbackup: Fixed loading of backup info files --- bin/mkbackup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mkbackup b/bin/mkbackup index fcb13c6..c705f80 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -264,7 +264,7 @@ def load_config(): # TODO: Duplicate code with htdocs/backup.py def load_backup_info(path): - info = eval(file(path).read()) + info = json.load(file(path)) # Load the backup_id from the second right path component. This is the # base directory of the mkbackup.info file. The user might have moved

8 years, 2 months

Fixed wrong variable name

by Lars Michelsen

Module: check_mk Branch: master Commit: 1c5e9bd0b93037a4bf36d10f5e66fb82ef26642a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1c5e9bd0b93037… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 20 14:11:55 2016 +0200 Fixed wrong variable name --- web/htdocs/valuespec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index ef8f5ea..b9fd8a9 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3459,7 +3459,7 @@ class PasswordFromStore(Alternative): if value.startswith("store:"): # couldn't check user permission before, but now I can - self.__may_use_password(val, varprefix) + self.__may_use_password(value, varprefix) mvs.validate_value(value, varprefix)

8 years, 2 months

Fetched Livestatus from upstream.

by Sven Panne

Module: check_mk Branch: master Commit: e09f9016a72aeb87f901414edd549a6c86148aea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e09f9016a72aeb… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jul 20 14:02:51 2016 +0200 Fetched Livestatus from upstream. --- livestatus/src/DownCommColumn.cc | 4 ++-- livestatus/src/DowntimeOrComment.cc | 9 +++------ livestatus/src/DowntimeOrComment.h | 5 +++-- livestatus/src/TableDownComm.cc | 10 +++++----- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/livestatus/src/DownCommColumn.cc b/livestatus/src/DownCommColumn.cc index abcbcec..aaef2f6 100644 --- a/livestatus/src/DownCommColumn.cc +++ b/livestatus/src/DownCommColumn.cc @@ -47,8 +47,8 @@ void DownCommColumn::output(void *row, Renderer::Row &r, if (_with_info) { Renderer::Sublist s(l); s.outputUnsignedLong(id); - s.outputString(dt->_author_name); - s.outputString(dt->_comment); + s.outputCPPString(dt->_author_name); + s.outputCPPString(dt->_comment); if (_with_extra_info && !_is_downtime) { s.outputInteger( static_cast<Comment *>(dt)->_entry_type); diff --git a/livestatus/src/DowntimeOrComment.cc b/livestatus/src/DowntimeOrComment.cc index 583fb35..30435f1 100644 --- a/livestatus/src/DowntimeOrComment.cc +++ b/livestatus/src/DowntimeOrComment.cc @@ -30,8 +30,8 @@ DowntimeOrComment::DowntimeOrComment(nebstruct_downtime_struct *dt, unsigned long id) : _type(dt->downtime_type) , _entry_time(dt->entry_time) - , _author_name(strdup(dt->author_name)) - , _comment(strdup(dt->comment_data)) + , _author_name(dt->author_name) + , _comment(dt->comment_data) , _id(id) { _host = find_host(dt->host_name); if (dt->service_description != nullptr) { @@ -43,10 +43,7 @@ DowntimeOrComment::DowntimeOrComment(nebstruct_downtime_struct *dt, } } -DowntimeOrComment::~DowntimeOrComment() { - free(_author_name); - free(_comment); -} +DowntimeOrComment::~DowntimeOrComment() = default; Downtime::Downtime(nebstruct_downtime_struct *dt) : DowntimeOrComment(dt, dt->downtime_id) diff --git a/livestatus/src/DowntimeOrComment.h b/livestatus/src/DowntimeOrComment.h index 7f5a065..6c7ea11 100644 --- a/livestatus/src/DowntimeOrComment.h +++ b/livestatus/src/DowntimeOrComment.h @@ -27,6 +27,7 @@ #include "config.h" // IWYU pragma: keep #include <time.h> +#include <string> #include "nagios.h" // IWYU pragma: keep /* The structs for downtime and comment are so similar, that @@ -84,8 +85,8 @@ public: host *_host; service *_service; time_t _entry_time; - char *_author_name; - char *_comment; + std::string _author_name; + std::string _comment; unsigned long _id; int _is_service; diff --git a/livestatus/src/TableDownComm.cc b/livestatus/src/TableDownComm.cc index 0bd8281..2504050 100644 --- a/livestatus/src/TableDownComm.cc +++ b/livestatus/src/TableDownComm.cc @@ -28,7 +28,7 @@ #include "DowntimeOrComment.h" #include "DowntimesOrComments.h" // IWYU pragma: keep #include "OffsetIntColumn.h" -#include "OffsetStringColumn.h" +#include "OffsetSStringColumn.h" #include "OffsetTimeColumn.h" #include "Query.h" #include "TableHosts.h" @@ -43,15 +43,15 @@ TableDownComm::TableDownComm(bool is_downtime, : _is_downtime(is_downtime) , _holder(is_downtime ? downtimes_holder : comments_holder) { DowntimeOrComment *ref = nullptr; - addColumn(new OffsetStringColumn( + addColumn(new OffsetSStringColumn( "author", is_downtime ? "The contact that scheduled the downtime" : "The contact that entered the comment", reinterpret_cast<char *>(&(ref->_author_name)) - reinterpret_cast<char *>(ref))); addColumn( - new OffsetStringColumn("comment", "A comment text", - reinterpret_cast<char *>(&(ref->_comment)) - - reinterpret_cast<char *>(ref))); + new OffsetSStringColumn("comment", "A comment text", + reinterpret_cast<char *>(&(ref->_comment)) - + reinterpret_cast<char *>(ref))); addColumn(new OffsetIntColumn( "id", is_downtime ? "The id of the downtime" : "The id of the comment", reinterpret_cast<char *>(&(ref->_id)) - reinterpret_cast<char *>(ref)));

8 years, 2 months

Intermediate cleanups of password store

by Lars Michelsen

Module: check_mk Branch: master Commit: b8b22cb7ed6106c9adb31370d831aacda6109242 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8b22cb7ed6106… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 20 14:00:41 2016 +0200 Intermediate cleanups of password store --- checks/check_http | 11 ++-------- checks/check_mail | 2 +- checks/check_mail_loop | 4 ++-- checks/check_mailboxes | 6 ++++-- checks/check_sql | 4 ++-- lib/passwordstore.py | 21 +++++++++++++++++++ modules/check_mk_base.py | 1 + web/htdocs/valuespec.py | 37 +++++++++++++++++++++------------ web/plugins/userdb/user_attributes.py | 2 +- web/plugins/wato/active_checks.py | 8 +++---- 10 files changed, 62 insertions(+), 34 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b8b22cb7ed…

8 years, 2 months

← Newer
1
...
7
8
9
10
11
12
13
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2016