Checkmk git commits May 2017

checkmk-commits@lists.checkmk.com

12 participants
254 discussions

4655 fileinfo.groups: Added missing metric information

by Simon Betz

Module: check_mk Branch: master Commit: c9e0a909c48024c2752c21d5d8c6b640eb896ca6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9e0a909c48024… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 12 17:45:12 2017 +0200 4655 fileinfo.groups: Added missing metric information Change-Id: Ia6c0b58da9d70282723f5bce7d56e368da681bb7 --- .werks/4655 | 11 +++++++++ web/plugins/metrics/check_mk.py | 50 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/.werks/4655 b/.werks/4655 new file mode 100644 index 0000000..dfcd43e --- /dev/null +++ b/.werks/4655 @@ -0,0 +1,11 @@ +Title: fileinfo.groups: Added missing metric information +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1494603823 + + diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 36e7b85..1052f02 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -435,6 +435,29 @@ metric_info["file_size"] = { "color" : "16/a", } +metric_info["total_file_size"] = { + "title" : _("Total file size"), + "unit" : "bytes", + "color" : "16/a", +} +metric_info["file_size_smallest"] = { + "title" : _("Smallest file"), + "unit" : "bytes", + "color" : "21/a", +} + +metric_info["file_size_largest"] = { + "title" : _("Largest file"), + "unit" : "bytes", + "color" : "25/a", +} + +metric_info["file_count"] = { + "title" : _("Amount of files"), + "unit" : "count", + "color" : "23/a", +} + # database, tablespace metric_info["database_size"] = { @@ -2739,10 +2762,22 @@ metric_info["checkpoint_age"] = { "color" : "#006040", } -metric_info["backup_age"] = { - "title" : _("Time since last backup"), +metric_info["checkpoint_age"] = { + "title" : _("Time since last checkpoint"), "unit" : "s", - "color" : "34/a", + "color" : "#006040", +} + +metric_info["file_age_oldest"] = { + "title" : _("Oldest file"), + "unit" : "s", + "color" : "11/a", +} + +metric_info["file_age_newest"] = { + "title" : _("Newest file"), + "unit" : "s", + "color" : "13/a", } metric_info["logswitches_last_hour"] = { @@ -4593,6 +4628,15 @@ check_metrics["check_mk-fileinfo"] = { "size" : { "name" : "file_size" } } +check_metrics["check_mk-fileinfo.groups"] = { + "size" : { "name" : "total_file_size" }, + "size_smallest" : { "name" : "file_size_smallest" }, + "size_largest" : { "name" : "file_size_largest" }, + "count" : { "name" : "file_count" }, + "age_oldest" : { "name" : "file_age_oldest" }, + "age_newest" : { "name" : "file_age_newest" }, +} + check_metrics["check_mk-postgres_stat_database.size"] = { "size" : { "name" : "database_size"} }

7 years, 6 months

4654 oracle_reacovery_area: Added missing metric info

by Simon Betz

Module: check_mk Branch: master Commit: 9484c87bc89450a7f4f5a5a978b5316950068781 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9484c87bc89450… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri May 12 17:15:24 2017 +0200 4654 oracle_reacovery_area: Added missing metric info Change-Id: I407295a6685818feacd36da5a72b2502067d2355 --- .werks/4654 | 11 +++++++++++ web/plugins/metrics/check_mk.py | 13 +++++++++++++ 2 files changed, 24 insertions(+) diff --git a/.werks/4654 b/.werks/4654 new file mode 100644 index 0000000..7d397c9 --- /dev/null +++ b/.werks/4654 @@ -0,0 +1,11 @@ +Title: oracle_recovery_area: Added missing metric info +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1494602000 + + diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index cfc24a0..36e7b85 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -512,6 +512,12 @@ metric_info["indexspace_wasted"] = { "color" : "#20a080", } +metric_info["database_reclaimable"] = { + "title" : _("Database reclaimable size"), + "unit" : "bytes", + "color" : "45/a", +} + metric_info["mem_total"] = { "title" : _("RAM installed"), "color": "#f0f0f0", @@ -4045,6 +4051,11 @@ check_metrics["check_mk-oracle_jobs"] = { "duration" : { "name" : "job_duration" } } +check_metrics["check_mk-oracle_recovery_area"] = { + "used" : { "name" : "database_size", "scale" : MB }, + "reclaimable" : { "name" : "database_reclaimable", "scale" : MB }, +} + check_metrics["check_mk-vms_system.procs"] = { "procs" : { "name" : "processes" } } @@ -6429,6 +6440,7 @@ graph_info["database_sizes"] = { ( "data_size", "stack" ), ( "indexes_size", "stack" ), ( "unused_size", "stack" ), + ( "database_reclaimable", "stack"), ], "optional_metrics" : [ "unallocated_size", @@ -6436,6 +6448,7 @@ graph_info["database_sizes"] = { "data_size", "indexes_size", "unused_size", + "database_reclaimable", ], "legend_scale" : MB, }

7 years, 6 months

4653 websphere_mq_channels: Added percent levels for messages

by Simon Betz

Module: check_mk Branch: master Commit: cafe3a00c6cf6b8911224ec67a7f5553a843dabb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cafe3a00c6cf6b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu May 11 14:44:55 2017 +0200 4653 websphere_mq_channels: Added percent levels for messages Change-Id: I4b8a0d7fd62d8d27f7ffaedca6e06905c26127d1 --- .werks/4653 | 10 ++++++++++ checks/websphere_mq_channels | 20 +++++++++++++++++++- web/plugins/wato/check_parameters.py | 32 ++++++++++++++++---------------- 3 files changed, 45 insertions(+), 17 deletions(-) diff --git a/.werks/4653 b/.werks/4653 new file mode 100644 index 0000000..f3e5793 --- /dev/null +++ b/.werks/4653 @@ -0,0 +1,10 @@ +Title: websphere_mq_channels: Added percent levels for messages +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1494506668 +Class: feature + + diff --git a/checks/websphere_mq_channels b/checks/websphere_mq_channels index b179a82..edb4d58 100644 --- a/checks/websphere_mq_channels +++ b/checks/websphere_mq_channels @@ -38,7 +38,7 @@ factory_settings["websphere_mq_channels_default_levels"] = { - 'message_count': ( 900, 1000 ), + 'message_count' : ( 900, 1000 ), 'status': { 'RUNNING': 0, 'STOPPED': 1 @@ -101,8 +101,26 @@ def check_websphere_mq_channels(item, params, parsed): infotext += " (warn crit at %d/%d messages)" % (warn, crit) else: warn, crit = None, None + yield state, infotext, [('messages', messages, warn, crit, 0, max_messages)] + if params.get("message_count_perc"): + warn, crit = params["message_count_perc"] + messages_perc = 1.0 * messages / max_messages + infotext = get_percent_human_readable(messages_perc) + state = 0 + + if messages_perc >= crit: + state = 2 + elif messages_perc >= warn: + state = 1 + if state > 0: + infotext += " (warn/crit at %s/%s)" % ( + get_percent_human_readable(warn), + get_percent_human_readable(crit)) + + yield state, infotext + check_info["websphere_mq_channels"] = { "parse_function" : parse_websphere_mq_channels, diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 6d37aa8..ac14f9f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1756,6 +1756,22 @@ websphere_mq_common_elements = [ default_value = (1000, 1200) ) ), + ("message_count_perc", + OptionalDropdownChoice( + title = _('Percentage of queue length'), + help = _('This setting only applies if the WebSphere MQ reports the queue length'), + choices = [ (None, _("Ignore these levels")) ], + otherlabel = _("Set relative levels"), + explicit = \ + Tuple( + title = _('Percentage of queue length'), + elements = [ + Percentage(title = _("Warning at")), + Percentage(title = _("Critical at")), + ] + ), + default_value = (80.0, 90.0) + )), ] def transform_websphere_mq_queues(source): @@ -1779,22 +1795,6 @@ register_check_parameters( Transform( Dictionary( elements = websphere_mq_common_elements + [ - ("message_count_perc", - OptionalDropdownChoice( - title = _('Percentage of queue length'), - help = _('This setting only applies if the WebSphere MQ reports the queue length'), - choices = [ (None, _("Ignore these levels")) ], - otherlabel = _("Set relative levels"), - explicit = \ - Tuple( - title = _('Percentage of queue length'), - elements = [ - Percentage(title = _("Warning at")), - Percentage(title = _("Critical at")), - ] - ), - default_value = (80.0, 90.0) - )), ("messages_not_processed", Dictionary( title = _("Settings for messages not processed"),

7 years, 6 months

4687 FIX Fixed types of non-Stats: columns in Stats: queries

by Sven Panne

Module: check_mk Branch: master Commit: 867286c981370fb3034185fbb495436b6c121f13 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=867286c981370f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 12 14:05:47 2017 +0200 4687 FIX Fixed types of non-Stats: columns in Stats: queries Livestatus queries with Stats: can contain non-Stats: columns, too (grouping). The latter columns were always rendered as strings, which was incorrect for e.g. numbers. This has been fixed. Change-Id: Ia554d7f8d5d6227369952b6b8da9d5d48cadb131 --- .werks/4687 | 12 +++++++ livestatus/src/AttributeListColumn.cc | 4 --- livestatus/src/AttributeListColumn.h | 1 - livestatus/src/Column.h | 6 ---- livestatus/src/DoubleColumn.cc | 5 --- livestatus/src/DoubleColumn.h | 1 - livestatus/src/IntColumn.cc | 5 --- livestatus/src/IntColumn.h | 1 - livestatus/src/OffsetStringMacroColumn.cc | 12 ++----- livestatus/src/OffsetStringMacroColumn.h | 1 - livestatus/src/OutputBuffer.h | 1 + livestatus/src/Query.cc | 31 +++++++++++++----- livestatus/src/Query.h | 4 +-- livestatus/src/Renderer.cc | 2 ++ livestatus/src/Renderer.h | 52 +++++++++++++++++++++++++------ livestatus/src/StringColumn.cc | 1 + livestatus/src/StringColumn.h | 5 +-- 17 files changed, 87 insertions(+), 57 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=867286c981…

7 years, 6 months

4681 FIX win_logwatch: Fixed exception when baking agents containing this plugin with old config

by Lars Michelsen

Module: check_mk Branch: master Commit: 5db6d6a760c05504871c508126bb51c05a461b7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5db6d6a760c055… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 12 13:23:19 2017 +0200 4681 FIX win_logwatch: Fixed exception when baking agents containing this plugin with old config Change-Id: I19df7f3773d76dfb6d547245b2531360d5cd90df --- .werks/4681 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.werks/4681 b/.werks/4681 new file mode 100644 index 0000000..b78d837 --- /dev/null +++ b/.werks/4681 @@ -0,0 +1,11 @@ +Title: win_logwatch: Fixed exception when baking agents containing this plugin with old config +Level: 1 +Component: agents +Class: fix +Compatible: compat +Edition: cee +State: unknown +Version: 1.5.0i1 +Date: 1494588144 + +

7 years, 6 months

4680 FIX Sync of local hierarchy (MKPs) preserves symlinks now

by Lars Michelsen

Module: check_mk Branch: master Commit: 3d4ba18ebefd25adb367bf2cb02be0be9f24bfbd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d4ba18ebefd25… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 12 12:52:59 2017 +0200 4680 FIX Sync of local hierarchy (MKPs) preserves symlinks now A WATO slave site can be configured to get all local files (e.g. created with MKPs) of the master can be synced to the slave site. Previous versions were not copying symlinks. Instead of it the link destination files were copied to the symlink location. Change-Id: I0c1ebbff3c4239719b6dc1118b7fb1db369e6ada --- .werks/4680 | 13 +++++++++++++ web/htdocs/multitar.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/4680 b/.werks/4680 new file mode 100644 index 0000000..8975bc5 --- /dev/null +++ b/.werks/4680 @@ -0,0 +1,13 @@ +Title: Sync of local hierarchy (MKPs) preserves symlinks now +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1494586265 +Class: fix + +A WATO slave site can be configured to get all local files (e.g. created with MKPs) +of the master can be synced to the slave site. Previous versions were not copying +symlinks. Instead of it the link destination files were copied to the symlink +location. diff --git a/web/htdocs/multitar.py b/web/htdocs/multitar.py index 74aed7b..835036e 100644 --- a/web/htdocs/multitar.py +++ b/web/htdocs/multitar.py @@ -57,7 +57,7 @@ def create(filename, components): exclude_args = list(itertools.chain.from_iterable([ ("--exclude", f) for f in excludes ])) subdata = subprocess.check_output( - [ "tar", "cf", "-", "--dereference", "--force-local" ] + [ "tar", "cf", "-", "--force-local" ] + exclude_args + [ "-C", basedir, filename ] )

7 years, 6 months

4679 Report scheduler: Text body of mails can now be configured in the jobs

by Lars Michelsen

Module: check_mk Branch: master Commit: 1bfdf8c66a4aea6fb59368f1602ef6ab48936431 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1bfdf8c66a4aea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 12 11:15:27 2017 +0200 4679 Report scheduler: Text body of mails can now be configured in the jobs Change-Id: I01234af557072615097506969ddbd1cde722b36f --- .werks/4679 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.werks/4679 b/.werks/4679 new file mode 100644 index 0000000..a50885d --- /dev/null +++ b/.werks/4679 @@ -0,0 +1,10 @@ +Title: Report scheduler: Text body of mails can now be configured in the jobs +Level: 1 +Component: reporting +Compatible: compat +Edition: cee +Version: 1.5.0i1 +Date: 1494580502 +Class: feature + +

7 years, 6 months

Reformatted with clang-format-4.0

by Sven Panne

Module: check_mk Branch: master Commit: 0e0142320edd0d43ad73bda1f297a9491a45a4d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e0142320edd0d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu May 11 13:40:22 2017 +0200 Reformatted with clang-format-4.0 Change-Id: If9e09e00a69c7ac1c8b03215f14190156847e344 --- livestatus/src/AttributeListColumn.cc | 4 +- livestatus/src/DowntimesOrComments.cc | 8 +-- livestatus/src/Query.cc | 4 +- livestatus/src/ServiceListFilter.cc | 8 +-- livestatus/src/module.cc | 130 +++++++++++++++++----------------- 5 files changed, 77 insertions(+), 77 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0e0142320e…

7 years, 6 months

Mechanical refactoring: Decouple Renderer from OutputBuffer.

by Sven Panne

Module: check_mk Branch: master Commit: dad75cb946bb21a3cb9ebf679d9cfa6fd7f7940b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dad75cb946bb21… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu May 11 09:26:28 2017 +0200 Mechanical refactoring: Decouple Renderer from OutputBuffer. Change-Id: If3b0432077ad555911d25e6493587841de0006ad --- livestatus/src/OStreamStateSaver.h | 51 ++++++++++++++++++++++++++++++++ livestatus/src/OutputBuffer.cc | 10 +------ livestatus/src/OutputBuffer.h | 7 +---- livestatus/src/Query.cc | 9 +++--- livestatus/src/Renderer.cc | 58 +++++++++++++++---------------------- livestatus/src/Renderer.h | 24 ++++++--------- livestatus/src/RendererBrokenCSV.cc | 19 +++++++----- livestatus/src/RendererBrokenCSV.h | 10 ++++--- livestatus/src/RendererCSV.cc | 26 +++++++++-------- livestatus/src/RendererCSV.h | 5 ++-- livestatus/src/RendererJSON.cc | 36 ++++++++++++----------- livestatus/src/RendererJSON.h | 5 ++-- livestatus/src/RendererPython.cc | 36 ++++++++++++----------- livestatus/src/RendererPython.h | 5 ++-- livestatus/src/RendererPython3.cc | 38 ++++++++++++------------ livestatus/src/RendererPython3.h | 5 ++-- 16 files changed, 192 insertions(+), 152 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dad75cb946…

7 years, 6 months

clang-tidy: modernize-use-auto fixes.

by Sven Panne

Module: check_mk Branch: master Commit: fb819bd34d010dc504157dcc1cc0c01f566467fd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb819bd34d010d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu May 11 14:50:34 2017 +0200 clang-tidy: modernize-use-auto fixes. Change-Id: Ide1e7af4b26ec91314e5a7453b70cf2fdaf4d026 --- livestatus/src/CustomVarsColumn.cc | 2 +- livestatus/src/module.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/livestatus/src/CustomVarsColumn.cc b/livestatus/src/CustomVarsColumn.cc index b53352f..71f1196 100644 --- a/livestatus/src/CustomVarsColumn.cc +++ b/livestatus/src/CustomVarsColumn.cc @@ -47,7 +47,7 @@ CustomVarsColumn::~CustomVarsColumn() = default; // TODO(sp) This should live in our abstraction layer for cores. unordered_map<string, string> CustomVarsColumn::getCVM(Row row) const { #ifdef CMC - Object *object = columnData<Object>(row); + auto *object = columnData<Object>(row); return object == nullptr ? unordered_map<string, string>() : object->customAttributes(); #else diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 3f51a9e..90d1fcb 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -686,7 +686,7 @@ private: vector<DowntimeData> downtimes_for_object(::host *h, ::service *s) const { vector<DowntimeData> result; for (const auto &entry : fl_store->_downtimes) { - Downtime *dt = static_cast<Downtime *>(entry.second.get()); + auto *dt = static_cast<Downtime *>(entry.second.get()); if (dt->_host == h && dt->_service == s) { result.push_back({dt->_id, dt->_author_name, dt->_comment}); } @@ -697,7 +697,7 @@ private: vector<CommentData> comments_for_object(::host *h, ::service *s) const { vector<CommentData> result; for (const auto &entry : fl_store->_comments) { - Comment *co = static_cast<Comment *>(entry.second.get()); + auto *co = static_cast<Comment *>(entry.second.get()); if (co->_host == h && co->_service == s) { result.push_back({co->_id, co->_author_name, co->_comment, static_cast<uint32_t>(co->_entry_type),

7 years, 6 months

← Newer
1
...
14
15
16
17
18
19
20
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2017