Checkmk git commits November 2015

checkmk-commits@lists.checkmk.com

8 participants
303 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: e06f26b380219f10b6bde983da2759cc3ba02c12 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e06f26b380219f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Nov 6 09:54:37 2015 +0100 Removed useless comment --- checks/df | 2 -- 1 file changed, 2 deletions(-) diff --git a/checks/df b/checks/df index 0ab4b9c..299bfa4 100644 --- a/checks/df +++ b/checks/df @@ -127,8 +127,6 @@ def check_df(item, params, info): reserved_mb = size_mb - avail_mb - used_mb # reserved for root fslist_blocks.append((mountpoint, size_mb, avail_mb, reserved_mb)) if df_inodes: - # FIXME: if the normal and the inodes section has not the same format - # this will crash! fslist_inodes.append((mountpoint, int(df_inodes[idx][2]), int(df_inodes[idx][4]))) return df_check_filesystem_list(item, params, fslist_blocks, fslist_inodes)

8 years, 7 months

Reserved 10 bug IDS

by Sebastian Herbord

Module: check_mk Branch: master Commit: e35b433d3b3079c247f8bc8558f468e33c111179 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e35b433d3b3079… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Nov 6 09:06:54 2015 +0100 Reserved 10 bug IDS --- .bugs/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bugs/first_free b/.bugs/first_free index a0198be..20f7c8b 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -2400 +2410

8 years, 7 months

git bug

by Sebastian Herbord

Module: check_mk Branch: master Commit: 5bc2afe0432d4e66d09588c421611217d00b6dd3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bc2afe0432d4e… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Nov 6 09:04:39 2015 +0100 git bug --- .bugs/2366 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/2366 b/.bugs/2366 new file mode 100644 index 0000000..400dddc --- /dev/null +++ b/.bugs/2366 @@ -0,0 +1,12 @@ +Title: mk_logwatch should limit number of lines processed by default +Component: checks +State: open +Date: 2015-11-06 09:02:53 +Targetversion: future +Class: nastiness + +Currently the default behaviour of mk_logwatch is to process all input, independent of the amount of data sent and time spent. +Via the "Text logfiles (Linux)" one can set those limits but the default behaviour should already be sane. +In the same Context, there should be an option to not drop exceeding lines but keep them for the next cycle. +If technically possible it may be desireable to colapse repeated similar lines (i.e. "last line repeated 200 times") +but this would require a reliable way to identify timestamps.

8 years, 7 months

jolokia_metrics: fixed an exception during inventory when the agent output is empty

by Sebastian Herbord

Module: check_mk Branch: master Commit: 87ec6ed83754073f06843f00698e9feec0d617bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87ec6ed8375407… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Nov 5 15:53:04 2015 +0100 jolokia_metrics: fixed an exception during inventory when the agent output is empty --- checks/jolokia_metrics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 52708d0..50605e0 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -827,7 +827,7 @@ jolokia_metrics_perm_gen_default_levels = { "perm" : ( 80.0, 100.0 ) } def inventory_jolokia_metrics_perm_gen(info): parsed = jolokia_metrics_parse(info) for instance, values in parsed.items(): - if "PermGenUsage" in values: + if values and "PermGenUsage" in values: yield instance, "jolokia_metrics_perm_gen_default_levels" def check_jolokia_metrics_perm_gen(item, params, info):

8 years, 7 months

Use using declarations instead of namespace names.

by Sven Panne

Module: check_mk Branch: master Commit: d39d70e4bd9e730051a6ed6acf1455ed23dff559 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d39d70e4bd9e73… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 5 13:30:11 2015 +0100 Use using declarations instead of namespace names. This mechanical change completes the last step in http://www.gotw.ca/publications/migrating_to_namespaces.htm --- livestatus/api/c++/Livestatus.cc | 8 +++--- livestatus/api/c++/demo.cc | 4 ++- livestatus/src/AttributelistColumn.cc | 5 ++-- livestatus/src/Column.cc | 4 +-- livestatus/src/CustomVarsFilter.cc | 3 ++- livestatus/src/DoubleColumn.cc | 3 ++- livestatus/src/DownCommColumn.cc | 6 +++-- livestatus/src/HostFileColumn.cc | 4 +-- livestatus/src/InputBuffer.cc | 7 ++--- livestatus/src/IntColumn.cc | 3 ++- livestatus/src/LogCache.cc | 5 ++-- livestatus/src/Logfile.cc | 3 ++- livestatus/src/OffsetStringMacroColumn.cc | 14 +++++----- livestatus/src/OffsetTimeperiodColumn.cc | 3 ++- livestatus/src/PerfdataAggregator.cc | 5 ++-- livestatus/src/Query.cc | 11 ++++---- livestatus/src/ServicelistColumnFilter.cc | 3 ++- livestatus/src/Store.cc | 40 +++++++++++++++-------------- livestatus/src/Table.cc | 12 +++++---- livestatus/src/TableCommands.cc | 5 ++-- livestatus/src/TableContactgroups.cc | 3 ++- livestatus/src/TableContacts.cc | 5 ++-- livestatus/src/TableDownComm.cc | 7 ++--- livestatus/src/TableHostgroups.cc | 3 ++- livestatus/src/TableHosts.cc | 3 ++- livestatus/src/TableLog.cc | 6 ++--- livestatus/src/TableServicegroups.cc | 3 ++- livestatus/src/TableServices.cc | 3 ++- livestatus/src/TableStateHistory.cc | 20 ++++++++------- livestatus/src/TableTimeperiods.cc | 3 ++- livestatus/src/TimeperiodsCache.cc | 5 ++-- livestatus/src/pnp4nagios.cc | 23 +++++++++-------- 32 files changed, 132 insertions(+), 100 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d39d70e4bd…

8 years, 7 months

Fixed class/struct confusion one more time.

by Sven Panne

Module: check_mk Branch: master Commit: 9787d3c13125a79f04208e946a7f88cdb328e565 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9787d3c13125a7… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 5 11:47:51 2015 +0100 Fixed class/struct confusion one more time. --- livestatus/src/Logfile.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index cb4a717..e8f2c71 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -35,7 +35,9 @@ struct LogEntry; class Query; class LogCache; -class World; +#ifdef CMC +struct World; +#endif typedef std::map<uint64_t, LogEntry *> logfile_entries_t; // key is time_t . lineno

8 years, 7 months

Fixing namespace, should have been in previous commit

by Sven Panne

Module: check_mk Branch: master Commit: 23d57aa55d64ccf509cc917f163ed73865b61029 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23d57aa55d64cc… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 5 11:46:30 2015 +0100 Fixing namespace, should have been in previous commit --- livestatus/src/DoublePointerColumn.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/DoublePointerColumn.h b/livestatus/src/DoublePointerColumn.h index fed58b6..e92fa70 100644 --- a/livestatus/src/DoublePointerColumn.h +++ b/livestatus/src/DoublePointerColumn.h @@ -31,7 +31,7 @@ class DoublePointerColumn : public DoubleColumn { double *_number; public: - DoublePointerColumn(string name, string description, double *number) + DoublePointerColumn(std::string name, std::string description, double *number) : DoubleColumn(name, description, -1), _number(number) {} double getValue(void *) { return *_number; } };

8 years, 7 months

Using "using namespace FOO" in headers is a big no-no.

by Sven Panne

Module: check_mk Branch: master Commit: 220ddeb7e6ae30d7ffa76c40af217a8184819e64 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=220ddeb7e6ae30… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Nov 5 10:51:10 2015 +0100 Using "using namespace FOO" in headers is a big no-no. Just to save a few keystrokes, doing this introduces several maintenance problems: By including a header, one can get unexpected name clashes. Even worse: By adding an include, one can silently change the *meaning* of a program, because the compiler might pick a better match for a function candidate. So "using namespace" in headers is considered an anti-pattern, and even using it in implementation files is very contraversial. For more background, see Herb Sutter's article "Migrating to Namespaces": http://www.gotw.ca/publications/migrating_to_namespaces.htm --- livestatus/src/AndingFilter.h | 2 +- livestatus/src/AttributelistColumn.cc | 4 +-- livestatus/src/AttributelistColumn.h | 4 +-- livestatus/src/BlobColumn.h | 2 +- livestatus/src/ClientQueue.h | 3 +- livestatus/src/Column.cc | 2 +- livestatus/src/Column.h | 9 +++-- livestatus/src/ColumnsColumn.h | 2 +- livestatus/src/ContactgroupsColumn.h | 2 +- livestatus/src/ContactgroupsMemberColumn.h | 2 +- livestatus/src/ContactsColumn.h | 2 +- livestatus/src/CustomTimeperiodColumn.h | 4 +-- livestatus/src/CustomVarsColumn.h | 4 +-- livestatus/src/CustomVarsExplicitColumn.h | 4 +-- livestatus/src/CustomVarsFilter.h | 6 ++-- livestatus/src/DoubleColumn.cc | 2 +- livestatus/src/DoubleColumn.h | 4 +-- livestatus/src/DoubleColumnFilter.h | 1 - livestatus/src/DownCommColumn.cc | 4 +-- livestatus/src/DownCommColumn.h | 2 +- livestatus/src/DowntimeOrComment.h | 1 - livestatus/src/DynamicColumn.h | 7 ++-- livestatus/src/EmptyColumn.h | 2 +- livestatus/src/Filter.h | 5 ++- livestatus/src/FixedIntColumn.h | 2 +- livestatus/src/GlobalCountersColumn.h | 2 +- livestatus/src/HostContactsColumn.h | 2 +- livestatus/src/HostFileColumn.cc | 2 +- livestatus/src/HostFileColumn.h | 6 ++-- livestatus/src/HostServiceState.h | 3 +- livestatus/src/HostSpecialDoubleColumn.h | 2 +- livestatus/src/HostSpecialIntColumn.h | 2 +- livestatus/src/HostgroupsColumn.h | 2 +- livestatus/src/HostlistColumn.h | 2 +- livestatus/src/HostlistColumnFilter.h | 3 +- livestatus/src/HostlistStateColumn.h | 2 +- livestatus/src/InputBuffer.cc | 6 ++-- livestatus/src/InputBuffer.h | 5 ++- livestatus/src/IntColumn.cc | 2 +- livestatus/src/IntColumn.h | 4 +-- livestatus/src/IntColumnFilter.h | 3 +- livestatus/src/IntPointerColumn.h | 2 +- livestatus/src/ListColumn.h | 2 +- livestatus/src/LogCache.cc | 2 +- livestatus/src/LogCache.h | 2 +- livestatus/src/Logfile.cc | 2 +- livestatus/src/Logfile.h | 4 +-- livestatus/src/MetricsColumn.h | 2 +- livestatus/src/NullColumn.h | 2 +- livestatus/src/OffsetDoubleColumn.h | 2 +- livestatus/src/OffsetIntColumn.h | 2 +- livestatus/src/OffsetStringColumn.h | 2 +- livestatus/src/OffsetStringHostMacroColumn.h | 2 +- livestatus/src/OffsetStringMacroColumn.cc | 12 +++---- livestatus/src/OffsetStringMacroColumn.h | 4 +-- livestatus/src/OffsetStringServiceMacroColumn.h | 2 +- livestatus/src/OffsetTimeColumn.h | 2 +- livestatus/src/OffsetTimeperiodColumn.cc | 2 +- livestatus/src/OffsetTimeperiodColumn.h | 2 +- livestatus/src/OutputBuffer.h | 3 +- livestatus/src/PerfdataAggregator.cc | 2 +- livestatus/src/Query.cc | 10 +++--- livestatus/src/Query.h | 17 +++++----- livestatus/src/ServiceContactsColumn.h | 2 +- livestatus/src/ServiceSpecialDoubleColumn.h | 2 +- livestatus/src/ServiceSpecialIntColumn.h | 2 +- livestatus/src/ServicegroupsColumn.h | 2 +- livestatus/src/ServicelistColumn.h | 2 +- livestatus/src/ServicelistColumnFilter.cc | 2 +- livestatus/src/ServicelistColumnFilter.h | 5 ++- livestatus/src/ServicelistStateColumn.h | 2 +- livestatus/src/StatusSpecialIntColumn.h | 2 +- livestatus/src/Store.cc | 38 ++++++++++----------- livestatus/src/Store.h | 4 +-- livestatus/src/StringColumn.h | 4 +-- livestatus/src/StringColumnFilter.h | 4 +-- livestatus/src/StringPointerColumn.h | 2 +- livestatus/src/Table.cc | 10 +++--- livestatus/src/Table.h | 5 ++- livestatus/src/TableColumns.h | 2 +- livestatus/src/TableCommands.cc | 2 +- livestatus/src/TableCommands.h | 2 +- livestatus/src/TableContactgroups.cc | 2 +- livestatus/src/TableContactgroups.h | 2 +- livestatus/src/TableContacts.cc | 4 +-- livestatus/src/TableContacts.h | 2 +- livestatus/src/TableDownComm.cc | 6 ++-- livestatus/src/TableDownComm.h | 5 ++- livestatus/src/TableHostgroups.cc | 2 +- livestatus/src/TableHostgroups.h | 2 +- livestatus/src/TableHosts.cc | 2 +- livestatus/src/TableHosts.h | 2 +- livestatus/src/TableLog.cc | 4 +-- livestatus/src/TableLog.h | 2 +- livestatus/src/TableServicegroups.cc | 2 +- livestatus/src/TableServicegroups.h | 2 +- livestatus/src/TableServices.cc | 2 +- livestatus/src/TableServices.h | 3 +- livestatus/src/TableStateHistory.cc | 10 +++--- livestatus/src/TableStateHistory.h | 2 +- livestatus/src/TableTimeperiods.cc | 2 +- livestatus/src/TableTimeperiods.h | 2 +- livestatus/src/TimePointerColumn.h | 2 +- livestatus/src/pnp4nagios.cc | 41 +++++++++++------------ livestatus/src/store_c.cc | 2 -- 105 files changed, 190 insertions(+), 221 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=220ddeb7e6…

8 years, 7 months

Convert legacy bookmarks to bookmark list only when user has no other bookmark lists

by Lars Michelsen

Module: check_mk Branch: master Commit: 2181fd3ed9c0ddd8b7341f2e5e47b73a34fc7fa9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2181fd3ed9c0dd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 5 08:32:23 2015 +0100 Convert legacy bookmarks to bookmark list only when user has no other bookmark lists --- web/plugins/sidebar/shipped.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index fde5d12..d1a4d02 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1144,9 +1144,15 @@ class BookmarkList(pagetypes.Overridable, pagetypes.Base): @classmethod def load_legacy_bookmarks(self): + # Don't load the legacy bookmarks when there is already a my_bookmarks list if self.has_instance((config.user_id, "my_bookmarks")): return + # Also don't load them when the user has at least one bookmark list + for user_id, name in self.instances_dict().keys(): + if user_id == config.user_id: + return + bookmark_list = { "title" : u"My Bookmarks", "public" : False,

8 years, 7 months

Fixed permissions issues on bookmark lists

by Lars Michelsen

Module: check_mk Branch: master Commit: 616581825220718363e9d52aae842af156ab805e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61658182522071… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 5 08:48:00 2015 +0100 Fixed permissions issues on bookmark lists --- web/htdocs/pagetypes.py | 2 +- web/plugins/sidebar/shipped.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index d3bf5e1..86745b8 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -712,7 +712,7 @@ class Overridable: builtin_instances.append(instance) elif instance.is_mine(): my_instances.append(instance) - else: + elif instance.is_public(): foreign_instances.append(instance) for title, instances in [ diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index d1a4d02..1d8bd5b 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1212,7 +1212,8 @@ def get_bookmarks_by_topic(): topics = {} BookmarkList.load() for instance in BookmarkList.instances_sorted(): - if instance.may_see(): + if (instance.is_mine() and instance.may_see()) or \ + (not instance.is_mine() and instance.is_public() and instance.may_see()): for topic, bookmarks in instance.bookmarks_by_topic(): if topic == None: topic = instance.default_bookmark_topic()

8 years, 7 months

← Newer
1
...
23
24
25
26
27
28
29
30
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2015