Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

by Andreas Boesl

Module: check_mk Branch: master Commit: 632ac903839f8a08af83087421556795418c6256 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=632ac903839f8a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 3 09:40:51 2016 +0100 fixed exception related to WK#2813 --- agents/special/agent_netapp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 4908a3d..b54e2b7 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -678,12 +678,12 @@ else: dict_reserved["size-total"] = volume.child_get_string("size-total") dict_reserved["percent-reserved"] = volume_snapshots_reserved.child_get_string("percent-reserved") dict_reserved["blocks-reserved"] = volume_snapshots_reserved.child_get_string("blocks-reserved") - snapshots_elements = volume_snapshots.child_get("snapshots") + volume_snapshots = server.invoke("snapshot-list-info", "target-name", name, "target-type", "volume") + snapshots_elements = volume_snapshots.child_get("snapshots") if snapshots_elements: - volume_snapshots = server.invoke("snapshot-list-info", "target-name", name, "target-type", "volume") print format_dict(dict_reserved, prefix = "volume_snapshot %s" % name, as_line = True) - print format_config(volume_snapshots.child_get("snapshots"), "volume_snapshot", name, + print format_config(snapshot_elements, "volume_snapshot", name, config_report = ["volume_snapshot", "percentage-of-total-blocks", "cumulative-total"])

8 years, 7 months

windows agent: fixed potential crash in mk_inventory.ps1 plugin

by Sebastian Herbord

Module: check_mk Branch: master Commit: 7d743604e49d5ff65302164e556bb32c6c332609 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d743604e49d5f… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Feb 3 09:13:03 2016 +0100 windows agent: fixed potential crash in mk_inventory.ps1 plugin --- agents/windows/plugins/deprecated/mk_inventory.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/plugins/deprecated/mk_inventory.ps1 b/agents/windows/plugins/deprecated/mk_inventory.ps1 index 160b0fd..c14e6d5 100644 --- a/agents/windows/plugins/deprecated/mk_inventory.ps1 +++ b/agents/windows/plugins/deprecated/mk_inventory.ps1 @@ -81,7 +81,7 @@ Get-WmiObject Win32_Product -ComputerName $name | foreach-object { write-host -s write-host "<<<win_reg_uninstall:sep(124):persist($until)>>>" $paths = @("HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall") foreach ($path in $paths) { - Get-ChildItem $path -Recurse | foreach-object { $path2 = $path+"\"+$_.PSChildName; get-ItemProperty -path $path2 | + Get-ChildItem $path | foreach-object { $path2 = $path+"\"+$_.PSChildName; get-ItemProperty -path $path2 | foreach-object { $Publisher = $_.Publisher -replace "`0", ""

8 years, 7 months

windows agent: updated list of files for "unpackaged agents"

by Sebastian Herbord

Module: check_mk Branch: master Commit: 346166a715cf3569d1488a25b1909098e3d60660 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=346166a715cf35… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Feb 3 09:02:35 2016 +0100 windows agent: updated list of files for "unpackaged agents" --- agents/windows/CONTENTS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/agents/windows/CONTENTS b/agents/windows/CONTENTS index 7a4e9e9..5252919 100644 --- a/agents/windows/CONTENTS +++ b/agents/windows/CONTENTS @@ -46,3 +46,6 @@ types.h (hide) wmiHelper.cc (hide) wmiHelper.h (hide) wmitest.cc (hide) +OHMMonitor.h (hide) +OHMMonitor.cc (hide) +.depend (hide)

8 years, 7 months

#3042 FIX Fixed configuring the sender of mails (Text and HTML mails)

by Lars Michelsen

Module: check_mk Branch: master Commit: 696466ae8fabb2ed3aa0ac7799aa0a77f7a27165 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=696466ae8fabb2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 2 15:16:11 2016 +0100 #3042 FIX Fixed configuring the sender of mails (Text and HTML mails) It is now really possible to configure the sender name and address of notifications using the rule based notifications. This was not completely working as sendmail was called with the wrong arguments (-f instead of -F). The from address can now be configured like this: Company Mointoring <monitoring(a)example.com> Tested with sendmail compatibility version from postfix. --- .werks/3042 | 19 +++++++++++++++++++ ChangeLog | 1 + notifications/asciimail | 2 +- notifications/mail | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.werks/3042 b/.werks/3042 new file mode 100644 index 0000000..ef26701 --- /dev/null +++ b/.werks/3042 @@ -0,0 +1,19 @@ +Title: Fixed configuring the sender of mails (Text and HTML mails) +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.7i4 +Date: 1454422472 +Class: fix + +It is now really possible to configure the sender name and address +of notifications using the rule based notifications. This was not +completely working as sendmail was called with the wrong arguments +(-f instead of -F). + +The from address can now be configured like this: + +Company Mointoring <monitoring(a)example.com> + +Tested with sendmail compatibility version from postfix. + diff --git a/ChangeLog b/ChangeLog index 7173abf..a72c685 100644 --- a/ChangeLog +++ b/ChangeLog @@ -338,6 +338,7 @@ * 2843 FIX: Hanging notification scripts could prevent all other notifications... * 2815 FIX: Notification scripts: Fixed missing environment variables... * 2821 FIX: WATO rule based notifications: Validate regular expression for service conditions... + * 3042 FIX: Fixed configuring the sender of mails (Text and HTML mails)... BI: * 2882 Reorganize BI configuration into packs, add contacts and permissions... diff --git a/notifications/asciimail b/notifications/asciimail index 8ae5a53..fab04f9 100755 --- a/notifications/asciimail +++ b/notifications/asciimail @@ -86,7 +86,7 @@ def build_mail(target, subject, from_address, reply_to, content_txt): def send_mail(m, target, from_address): cmd = ["/usr/sbin/sendmail"] if from_address: - cmd += ['-f', from_address] + cmd += ['-F', from_address] cmd += [ "-i", target.encode("utf-8")] p = subprocess.Popen(cmd, stdin = subprocess.PIPE) p.communicate(m.as_string()) diff --git a/notifications/mail b/notifications/mail index 6e47b16..677e20a 100755 --- a/notifications/mail +++ b/notifications/mail @@ -410,7 +410,7 @@ def multipart_mail(target, subject, from_address, reply_to, content_txt, content def send_mail(m, target, from_address): cmd = ["/usr/sbin/sendmail"] if from_address: - cmd += ['-f', from_address] + cmd += ['-F', from_address] cmd += [ "-i", target.encode("utf-8")] try: p = subprocess.Popen(cmd, stdin = subprocess.PIPE)

8 years, 7 months

Added helper function for graph designer

by Mathias Kettner

Module: check_mk Branch: master Commit: 1cb5de948cf5e09201ae876f3437fac83071d91f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cb5de948cf5e0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 2 18:12:27 2016 +0100 Added helper function for graph designer --- web/htdocs/pagetypes.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index 20d1907..8f454e2 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -555,6 +555,11 @@ class Overridable: return sorted(pages.values(), cmp = lambda a, b: cmp(a.title(), b.title())) + @classmethod + def page_choices(self): + return [(page.name(), page.title()) for page in self.pages()] + + # Find a page by name, implements shadowing and # publishing und overriding by admins @classmethod

8 years, 8 months

added default rows value in virtual host tree parameters for a better overview

by Simon Betz

Module: check_mk Branch: master Commit: 831fa20def2cf2385c71badce7f2f5d3d9a64a4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=831fa20def2cf2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 2 16:53:51 2016 +0100 added default rows value in virtual host tree parameters for a better overview --- web/plugins/wato/check_mk_configuration.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 5a7e0d1..93d39b2 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -298,6 +298,7 @@ register_configvar(group, allow_empty = False, custom_order = True, choices = virtual_host_tree_choices, + rows = 10, ) ] ),

8 years, 8 months

clang-tidy fixes for google-readability-todo check.

by Sven Panne

Module: check_mk Branch: master Commit: 850a657aba253aa7b6a3f34fe9dd76bd7d9afb09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=850a657aba253a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 2 16:36:24 2016 +0100 clang-tidy fixes for google-readability-todo check. Note that mentioning the user in the TODO doesn't mean that *this* user has to do the fix, it just means that the given user can be asked about the background of the TODO etc. --- livestatus/src/InputBuffer.cc | 2 +- livestatus/src/LogEntry.cc | 2 +- livestatus/src/Logfile.cc | 3 ++- livestatus/src/OutputBuffer.cc | 3 ++- livestatus/src/Store.cc | 2 +- livestatus/src/TableStateHistory.cc | 4 ++-- livestatus/src/TableTimeperiods.cc | 2 +- livestatus/src/pnp4nagios.cc | 2 +- 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/livestatus/src/InputBuffer.cc b/livestatus/src/InputBuffer.cc index dad51ab..2d148c8 100644 --- a/livestatus/src/InputBuffer.cc +++ b/livestatus/src/InputBuffer.cc @@ -41,7 +41,7 @@ extern int g_idle_timeout_msec; namespace { const size_t initial_buffer_size = 4096; -// TODO: Make this configurable? +// TODO(sp): Make this configurable? const size_t maximum_buffer_size = 500 * 1024 * 1024; const int read_timeout_usec = 200000; diff --git a/livestatus/src/LogEntry.cc b/livestatus/src/LogEntry.cc index 22cfd8a..f5c8385 100644 --- a/livestatus/src/LogEntry.cc +++ b/livestatus/src/LogEntry.cc @@ -310,7 +310,7 @@ bool LogEntry::handleExternalCommandEntry() { _logclass = LOGCLASS_COMMAND; char *scan = _text; _text = next_token(&scan, ':'); - return true; // TODO: join with host/service information? + return true; // TODO(mk): join with host/service information? /* Damit wir die restlichen Spalten ordentlich befuellen, braeuchten wir eine komplette Liste von allen external commands und deren Parameteraufbau. Oder gibt es hier auch eine bessere diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 8404734..9d946f5 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -46,7 +46,8 @@ using std::make_pair; extern unsigned long g_max_lines_per_logfile; -// TODO: We need the suppression pragma below because _readpos and _linebuffer +// TODO(sp): We need the suppression pragma below because _readpos and +// _linebuffer // is not initialized in the constructor. Just replace all this manual fiddling // with pointers, offsets, etc. with vector. diff --git a/livestatus/src/OutputBuffer.cc b/livestatus/src/OutputBuffer.cc index 261e4d1..eb199b1 100644 --- a/livestatus/src/OutputBuffer.cc +++ b/livestatus/src/OutputBuffer.cc @@ -72,7 +72,8 @@ void OutputBuffer::addBuffer(const char *buf, unsigned len) { _writepos += len; } -// TODO: All this code is highly error-prone due to overflow, failed allocations +// TODO(sp): All this code is highly error-prone due to overflow, failed +// allocations // etc. We should just use vector instead. void OutputBuffer::needSpace(unsigned len) { if (_writepos + len > _end) { diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index 94f4b8a..a83b5d6 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -35,7 +35,7 @@ #include "logger.h" #include "strutil.h" -// TODO: Remove this hack. +// TODO(sp): Remove this hack. #ifdef EXTERN #undef EXTERN #endif diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 7a2ff98..8ccbff1 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -831,8 +831,8 @@ int TableStateHistory::updateHostServiceState(Query *query, hs_state->_log_output = 0; else - // TODO: Do we really need to strdup? How are the lifetimes of entry - // and hs_state related? This is highly unclear. This strdup + // TODO(sp): Do we really need to strdup? How are the lifetimes of + // entry and hs_state related? This is highly unclear. This strdup // complicates things like hell, because HostServiceState owns // _log_output because of it. If this is really needed (hopefully // not), we should better change the type from a naked pointer to a diff --git a/livestatus/src/TableTimeperiods.cc b/livestatus/src/TableTimeperiods.cc index 58093aa..50fb76e 100644 --- a/livestatus/src/TableTimeperiods.cc +++ b/livestatus/src/TableTimeperiods.cc @@ -48,7 +48,7 @@ void TableTimeperiods::addColumns(Table *table, string prefix, table->addColumn(new OffsetTimeperiodColumn( prefix + "in", "Wether we are currently in this period (0/1)", -1, indirect_offset)); - // TODO: add days and exceptions + // TODO(mk): add days and exceptions } void TableTimeperiods::answerQuery(Query *query) { diff --git a/livestatus/src/pnp4nagios.cc b/livestatus/src/pnp4nagios.cc index 0f3abda..d37aed4 100644 --- a/livestatus/src/pnp4nagios.cc +++ b/livestatus/src/pnp4nagios.cc @@ -35,7 +35,7 @@ extern char* g_pnp_path; namespace { -// TODO: Move this to some kind of C++ string utility file. +// TODO(sp): Move this to some kind of C++ string utility file. string replace_all(const string& str, const string& chars, char replacement) { string result(str); size_t i = 0;

8 years, 8 months

Rebuild Windows stuff to make our commit hooks happy again.

by Sven Panne

Module: check_mk Branch: master Commit: 1e501d583e0aaaa9fc0be715c5dc293451fde76c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e501d583e0aaa… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 2 16:18:02 2016 +0100 Rebuild Windows stuff to make our commit hooks happy again. --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 6614119 -> 6614119 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 6614119 -> 6614119 bytes agents/windows/check_mk_agent.exe | Bin 5267330 -> 5267330 bytes agents/windows/check_mk_agent.msi | Bin 12224512 -> 12224512 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 5267330 -> 5267330 bytes agents/windows/install_agent-64.exe | Bin 1558570 -> 1558571 bytes agents/windows/install_agent.exe | Bin 1422548 -> 1422547 bytes 8 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 5fcff9f..ba3343d 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1156 +1158 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 530c0eb..fc62534 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 44eb1cf..590401f 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 5f7cdea..8cda0db 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 414aea5..c5764e7 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index e5c477e..25e4734 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 274d2f3..4e018d5 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 726b77e..1ed6f1c 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 8 months

clang-tidy fixes for readability-simplify-boolean-expr check.

by Sven Panne

Module: check_mk Branch: master Commit: 63aebea36f7be199590412e8d0e7efb5a2d4d99b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63aebea36f7be1… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 2 15:51:15 2016 +0100 clang-tidy fixes for readability-simplify-boolean-expr check. --- livestatus/src/IntColumnFilter.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livestatus/src/IntColumnFilter.cc b/livestatus/src/IntColumnFilter.cc index a048a52..7681c35 100644 --- a/livestatus/src/IntColumnFilter.cc +++ b/livestatus/src/IntColumnFilter.cc @@ -76,7 +76,7 @@ void IntColumnFilter::findIntLimits(const char *columnname, int *lower, /* [lower, upper[ is some interval. This filter might restrict that interval to a smaller interval. */ - int opref = _opid * (_negate != false ? -1 : 1); + int opref = _opid * (_negate ? -1 : 1); switch (opref) { case OP_EQUAL: if (ref_value >= *lower && ref_value < *upper) { @@ -128,7 +128,7 @@ bool IntColumnFilter::optimizeBitmask(const char *columnname, uint32_t *mask) { // by the filter. uint32_t bit = 1 << ref_value; - int opref = _opid * (_negate != false ? -1 : 1); + int opref = _opid * (_negate ? -1 : 1); switch (opref) { case OP_EQUAL: *mask &= bit; // bit must be set

8 years, 8 months

clang-tidy fixes for readability-container-size-empty check.

by Sven Panne

Module: check_mk Branch: master Commit: 814901e5f504e0d087e12f0689aa835cc33341ff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=814901e5f504e0… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 2 15:48:35 2016 +0100 clang-tidy fixes for readability-container-size-empty check. --- livestatus/src/AndingFilter.cc | 2 +- livestatus/src/Query.cc | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/livestatus/src/AndingFilter.cc b/livestatus/src/AndingFilter.cc index cfeacbf..4f5b783 100644 --- a/livestatus/src/AndingFilter.cc +++ b/livestatus/src/AndingFilter.cc @@ -38,7 +38,7 @@ AndingFilter::~AndingFilter() { void AndingFilter::addSubfilter(Filter *f) { _subfilters.push_back(f); } Filter *AndingFilter::stealLastSubfiler() { - if (_subfilters.size() == 0) + if (_subfilters.empty()) return 0; else { Filter *l = _subfilters.back(); diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 1fe7faf..e90fc5e 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -205,7 +205,7 @@ void Query::setError(int error_code, const char *msg) { _output->setError(error_code, msg); } -bool Query::hasNoColumns() { return _columns.size() == 0 && !doStats(); } +bool Query::hasNoColumns() { return _columns.empty() && !doStats(); } int Query::lookupOperator(const char *opname) { int opid; @@ -334,7 +334,7 @@ void Query::parseStatsAndOrLine(char *line, int andor) { AndingFilter *anding = (andor == ANDOR_OR) ? new OringFilter() : new AndingFilter(); while (number > 0) { - if (_stats_columns.size() == 0) { + if (_stats_columns.empty()) { _output->setError( RESPONSE_CODE_INVALID_HEADER, "Invalid count for Stats%s: too few Stats: headers available", @@ -366,7 +366,7 @@ void Query::parseStatsNegateLine(char *line) { "StatsNegate: does not take any arguments"); return; } - if (_stats_columns.size() == 0) { + if (_stats_columns.empty()) { _output->setError(RESPONSE_CODE_INVALID_HEADER, "StatsNegate: no Stats: headers available"); return; @@ -782,7 +782,7 @@ void Query::parseLocaltimeLine(char *line) { } } -bool Query::doStats() { return _stats_columns.size() > 0; } +bool Query::doStats() { return !_stats_columns.empty(); } void Query::start() { doWait(); @@ -796,7 +796,7 @@ void Query::start() { // Aggregators, // directly in _stats_aggregators. When grouping the rows of aggregators // will be created each time a new group is found. - if (_columns.size() == 0) { + if (_columns.empty()) { _stats_aggregators = new Aggregator *[_stats_columns.size()]; for (unsigned i = 0; i < _stats_columns.size(); i++) _stats_aggregators[i] = _stats_columns[i]->createAggregator(); @@ -873,7 +873,7 @@ bool Query::processDataset(void *data) { Aggregator **aggr; // When doing grouped stats, we need to fetch/create a row // of aggregators for the current group - if (_columns.size() > 0) { + if (!_columns.empty()) { _stats_group_spec_t groupspec; computeStatsGroupSpec(groupspec, data); aggr = getStatsGroup(groupspec); @@ -907,7 +907,7 @@ bool Query::processDataset(void *data) { void Query::finish() { // grouped stats - if (doStats() && _columns.size() > 0) { + if (doStats() && !_columns.empty()) { // output values of all stats groups (output has been post poned until // now) for (_stats_groups_t::iterator it = _stats_groups.begin();

8 years, 8 months

← Newer
1
...
34
35
36
37
38
39
40
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016