Checkmk git commits August 2018

checkmk-commits@lists.checkmk.com

10 participants
351 discussions

Cleaned up ancient special case of button images

by Lars Michelsen

Module: check_mk Branch: master Commit: c360daa74cc2cdda65b054078bd9a51bf7fa8610 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c360daa74cc2cd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 30 09:34:54 2018 +0200 Cleaned up ancient special case of button images We had two types of internal icons in the past. The ones that start with icon_* and the ones starting with button_*. That time the button_* icons had a highlight variant and a normal image. This was cleaned up several versions ago. Since then we did not need to distinguish between the both image types. This resulted in a lot of duplicate images. These have all been cleaned up now. Change-Id: Ice671880eb805fccb9e8573043d7aa96b7a29e3b --- cmk/gui/htmllib.py | 8 ++------ cmk/gui/plugins/dashboard/dashlets.py | 3 ++- cmk/gui/plugins/views/painters.py | 2 +- cmk/gui/plugins/wato/bi.py | 5 +++-- cmk/gui/plugins/wato/utils/__init__.py | 5 +++-- cmk/gui/wato/__init__.py | 2 +- tests/unit/web/old/unittest_files/icon_button.unittest | 3 +-- .../web/old/unittest_files/render_icon_button.unittest | 3 +-- web/htdocs/images/button_aggr.png | Bin 2720 -> 0 bytes web/htdocs/images/button_analyze.png | Bin 3185 -> 0 bytes web/htdocs/images/button_annotation.png | Bin 4018 -> 0 bytes web/htdocs/images/button_auditlog.png | Bin 3728 -> 0 bytes web/htdocs/images/button_availability.png | Bin 3719 -> 0 bytes web/htdocs/images/button_back.png | Bin 2172 -> 0 bytes web/htdocs/images/button_backup.png | Bin 3242 -> 0 bytes web/htdocs/images/button_backup_restore_start.png | Bin 1992 -> 0 bytes web/htdocs/images/button_bi_rules.png | Bin 1723 -> 0 bytes web/htdocs/images/button_bitree.png | Bin 2096 -> 0 bytes web/htdocs/images/button_cached.png | Bin 3246 -> 0 bytes web/htdocs/images/button_check_parameters.png | Bin 1222 -> 0 bytes web/htdocs/images/button_check_plugins.png | Bin 2463 -> 0 bytes web/htdocs/images/button_contactgroups.png | Bin 4077 -> 0 bytes web/htdocs/images/button_delete.png | Bin 3779 -> 0 bytes web/htdocs/images/button_diagnose.png | Bin 3185 -> 0 bytes web/htdocs/images/button_download.png | Bin 3242 -> 0 bytes web/htdocs/images/button_download_agents.png | Bin 2720 -> 0 bytes web/htdocs/images/button_download_csv.png | Bin 3106 -> 0 bytes web/htdocs/images/button_edit.png | Bin 2616 -> 0 bytes web/htdocs/images/button_folder.png | Bin 2985 -> 0 bytes web/htdocs/images/button_guitest.png | Bin 3344 -> 0 bytes web/htdocs/images/button_history.png | Bin 3831 -> 0 bytes web/htdocs/images/button_home.png | Bin 3188 -> 0 bytes web/htdocs/images/button_hostgroups.png | Bin 3940 -> 0 bytes web/htdocs/images/button_hosttag.png | Bin 2705 -> 0 bytes web/htdocs/images/button_icons.png | Bin 3837 -> 0 bytes web/htdocs/images/button_ignore.png | Bin 3084 -> 0 bytes web/htdocs/images/button_inventory_failed.png | Bin 5213 -> 0 bytes web/htdocs/images/button_menu.png | Bin 739 -> 0 bytes web/htdocs/images/button_mkeventd.png | Bin 3972 -> 0 bytes web/htdocs/images/button_mkeventd_rules.png | Bin 1723 -> 0 bytes web/htdocs/images/button_move.png | Bin 6524 -> 0 bytes web/htdocs/images/button_new_bookmark_list.png | Bin 4126 -> 0 bytes web/htdocs/images/button_notifications.png | Bin 4083 -> 0 bytes web/htdocs/images/button_painteroptions.png | Bin 1338 -> 0 bytes web/htdocs/images/button_properties.png | Bin 4257 -> 0 bytes web/htdocs/images/button_random.png | Bin 3386 -> 0 bytes web/htdocs/images/button_release_mkp.png | Bin 4096 -> 0 bytes web/htdocs/images/button_roles.png | Bin 3711 -> 0 bytes web/htdocs/images/button_rulesets.png | Bin 3629 -> 0 bytes web/htdocs/images/button_servicegroups.png | Bin 3940 -> 0 bytes web/htdocs/images/button_services.png | Bin 5138 -> 0 bytes web/htdocs/images/button_showbi.png | Bin 2024 -> 0 bytes web/htdocs/images/button_site_globals.png | Bin 3722 -> 0 bytes web/htdocs/images/button_static_checks.png | Bin 2755 -> 0 bytes web/htdocs/images/button_svc_problems.png | Bin 2368 -> 0 bytes web/htdocs/images/button_timeline.png | Bin 2045 -> 0 bytes web/htdocs/images/button_timeperiods.png | Bin 3784 -> 0 bytes web/htdocs/images/button_timewarp.png | Bin 2178 -> 0 bytes web/htdocs/images/button_url.png | Bin 4557 -> 0 bytes web/htdocs/images/button_users.png | Bin 4449 -> 0 bytes web/htdocs/images/button_view.png | Bin 2203 -> 0 bytes ...on_acknowledge_test.png => icon_acknowledge_test.png} | Bin .../{button_add_dashlet.png => icon_add_dashlet.png} | Bin .../images/{button_assume_0.png => icon_assume_0.png} | Bin .../images/{button_assume_1.png => icon_assume_1.png} | Bin .../images/{button_assume_2.png => icon_assume_2.png} | Bin .../images/{button_assume_3.png => icon_assume_3.png} | Bin .../{button_assume_none.png => icon_assume_none.png} | Bin ..._backup_restore.png => icon_backup_restore_start.png} | Bin .../{button_backup_start.png => icon_backup_start.png} | Bin .../{button_backup_state.png => icon_backup_state.png} | Bin .../{button_backup_stop.png => icon_backup_stop.png} | Bin web/htdocs/images/{button_bottom.png => icon_bottom.png} | Bin web/htdocs/images/{button_clone.png => icon_clone.png} | Bin .../{button_closesnapin.png => icon_closesnapin.png} | Bin .../{button_closetimewarp.png => icon_closetimewarp.png} | Bin ...ashboard_controls.png => icon_dashboard_controls.png} | Bin .../{button_disable_test.png => icon_disable_test.png} | Bin web/htdocs/images/{button_down.png => icon_down.png} | Bin .../{button_enable_test.png => icon_enable_test.png} | Bin web/htdocs/images/{button_end.png => icon_end.png} | Bin ...on_folderproperties.png => icon_folderproperties.png} | Bin web/htdocs/images/{button_forth.png => icon_forth.png} | Bin .../images/{button_frameurl.png => icon_frameurl.png} | Bin web/htdocs/images/{button_insert.png => icon_insert.png} | Bin .../{button_insertdate.png => icon_insertdate.png} | Bin web/htdocs/images/{button_login.png => icon_login.png} | Bin .../{button_magic_move.png => icon_magic_move.png} | Bin .../{button_maxisnapin.png => icon_maxisnapin.png} | Bin .../{button_minisnapin.png => icon_minisnapin.png} | Bin .../images/{button_movedown.png => icon_movedown.png} | Bin web/htdocs/images/{button_moveup.png => icon_moveup.png} | Bin .../images/{button_pageurl.png => icon_pageurl.png} | Bin ...tions_down_hi.png => icon_painteroptions_down_hi.png} | Bin ...tions_down_lo.png => icon_painteroptions_down_lo.png} | Bin ...ainteroptions_off.png => icon_painteroptions_off.png} | Bin .../{button_quicksearch.png => icon_quicksearch.png} | Bin ...elease_mkp_yellow.png => icon_release_mkp_yellow.png} | Bin .../{button_reloadsnapin.png => icon_reloadsnapin.png} | Bin ...oadsnapin_lo_alt.png => icon_reloadsnapin_lo_alt.png} | Bin web/htdocs/images/{button_replay.png => icon_replay.png} | Bin .../images/{button_restore.png => icon_restore.png} | Bin .../images/{button_showhide.png => icon_showhide.png} | Bin ..._sidebar_addsnapin.png => icon_sidebar_addsnapin.png} | Bin ...button_sidebar_logout.png => icon_sidebar_logout.png} | Bin ...on_sidebar_messages.png => icon_sidebar_messages.png} | Bin ...on_sidebar_settings.png => icon_sidebar_settings.png} | Bin .../{button_configuration.png => icon_site_globals.png} | Bin ...obals_modified.png => icon_site_globals_modified.png} | Bin ...greyswitch_off.png => icon_snapin_greyswitch_off.png} | Bin ...n_greyswitch_on.png => icon_snapin_greyswitch_on.png} | Bin web/htdocs/images/{button_start.png => icon_start.png} | Bin .../images/{button_sync_mkp.png => icon_sync_mkp.png} | Bin ..._table_actions_off.png => icon_table_actions_off.png} | Bin ...on_table_actions_on.png => icon_table_actions_on.png} | Bin ...button_toggle_context.png => icon_toggle_context.png} | Bin ...button_toggle_details.png => icon_toggle_details.png} | Bin web/htdocs/images/{button_top.png => icon_top.png} | Bin ...nacknowledge_test.png => icon_unacknowledge_test.png} | Bin web/htdocs/images/{button_up.png => icon_up.png} | Bin web/htdocs/images/{button_sites.png => icon_url.png} | Bin .../{button_wikisearch.png => icon_wikisearch.png} | Bin .../themes/facelift/images/button_acknowledge_test.png | Bin 1629 -> 0 bytes web/htdocs/themes/facelift/images/button_agents.png | Bin 1398 -> 0 bytes web/htdocs/themes/facelift/images/button_aggr.png | Bin 395 -> 0 bytes .../themes/facelift/images/button_alert_handlers.png | Bin 424 -> 0 bytes web/htdocs/themes/facelift/images/button_analyze.png | Bin 888 -> 0 bytes web/htdocs/themes/facelift/images/button_assume_0.png | Bin 925 -> 0 bytes web/htdocs/themes/facelift/images/button_assume_1.png | Bin 980 -> 0 bytes web/htdocs/themes/facelift/images/button_assume_2.png | Bin 447 -> 0 bytes web/htdocs/themes/facelift/images/button_assume_3.png | Bin 756 -> 0 bytes web/htdocs/themes/facelift/images/button_assume_none.png | Bin 1336 -> 0 bytes web/htdocs/themes/facelift/images/button_auditlog.png | Bin 750 -> 0 bytes .../themes/facelift/images/button_availability.png | Bin 1036 -> 0 bytes web/htdocs/themes/facelift/images/button_back.png | Bin 1217 -> 0 bytes web/htdocs/themes/facelift/images/button_backup.png | Bin 573 -> 0 bytes .../themes/facelift/images/button_backup_restore.png | Bin 813 -> 0 bytes .../facelift/images/button_backup_restore_start.png | Bin 813 -> 0 bytes .../themes/facelift/images/button_backup_start.png | Bin 539 -> 0 bytes .../themes/facelift/images/button_backup_state.png | Bin 1494 -> 0 bytes web/htdocs/themes/facelift/images/button_backup_stop.png | Bin 474 -> 0 bytes web/htdocs/themes/facelift/images/button_bi_rules.png | Bin 1286 -> 0 bytes web/htdocs/themes/facelift/images/button_bitree.png | Bin 430 -> 0 bytes web/htdocs/themes/facelift/images/button_cached.png | Bin 789 -> 0 bytes .../themes/facelift/images/button_check_plugins.png | Bin 645 -> 0 bytes web/htdocs/themes/facelift/images/button_clone.png | Bin 517 -> 0 bytes .../themes/facelift/images/button_configuration.png | Bin 1378 -> 0 bytes .../themes/facelift/images/button_contactgroups.png | Bin 1742 -> 0 bytes .../themes/facelift/images/button_custom_graph.png | Bin 1974 -> 0 bytes web/htdocs/themes/facelift/images/button_delete.png | Bin 509 -> 0 bytes web/htdocs/themes/facelift/images/button_diagnose.png | Bin 888 -> 0 bytes .../themes/facelift/images/button_disable_test.png | Bin 1396 -> 0 bytes web/htdocs/themes/facelift/images/button_down.png | Bin 1275 -> 0 bytes web/htdocs/themes/facelift/images/button_download.png | Bin 470 -> 0 bytes .../themes/facelift/images/button_download_agents.png | Bin 775 -> 0 bytes .../themes/facelift/images/button_download_csv.png | Bin 576 -> 0 bytes .../themes/facelift/images/button_edit (Kopie).png | Bin 786 -> 0 bytes web/htdocs/themes/facelift/images/button_edit.png | Bin 786 -> 0 bytes web/htdocs/themes/facelift/images/button_enable_test.png | Bin 1016 -> 0 bytes web/htdocs/themes/facelift/images/button_forth.png | Bin 1223 -> 0 bytes web/htdocs/themes/facelift/images/button_frameurl.png | Bin 774 -> 0 bytes .../themes/facelift/images/button_graph_tuning.png | Bin 1459 -> 0 bytes web/htdocs/themes/facelift/images/button_gui_design.png | Bin 1255 -> 0 bytes web/htdocs/themes/facelift/images/button_history.png | Bin 1650 -> 0 bytes web/htdocs/themes/facelift/images/button_home.png | Bin 607 -> 0 bytes web/htdocs/themes/facelift/images/button_hostgroups.png | Bin 367 -> 0 bytes web/htdocs/themes/facelift/images/button_hosttag.png | Bin 728 -> 0 bytes web/htdocs/themes/facelift/images/button_icons.png | Bin 1165 -> 0 bytes web/htdocs/themes/facelift/images/button_ignore.png | Bin 436 -> 0 bytes web/htdocs/themes/facelift/images/button_insert.png | Bin 517 -> 0 bytes web/htdocs/themes/facelift/images/button_menu.png | Bin 187 -> 0 bytes web/htdocs/themes/facelift/images/button_mkeventd.png | Bin 528 -> 0 bytes .../themes/facelift/images/button_mkeventd_rules.png | Bin 2090 -> 0 bytes web/htdocs/themes/facelift/images/button_mkps.png | Bin 333 -> 0 bytes web/htdocs/themes/facelift/images/button_move.png | Bin 723 -> 0 bytes .../themes/facelift/images/button_new_bookmark_list.png | Bin 517 -> 0 bytes .../themes/facelift/images/button_new_custom_graph.png | Bin 517 -> 0 bytes .../facelift/images/button_new_graph_collection.png | Bin 1079 -> 0 bytes .../themes/facelift/images/button_new_graph_tuning.png | Bin 1079 -> 0 bytes .../facelift/images/button_new_sla_configuration.png | Bin 517 -> 0 bytes .../themes/facelift/images/button_notifications.png | Bin 982 -> 0 bytes web/htdocs/themes/facelift/images/button_pageurl.png | Bin 512 -> 0 bytes web/htdocs/themes/facelift/images/button_pdf.png | Bin 859 -> 0 bytes web/htdocs/themes/facelift/images/button_pdfpreview.png | Bin 1462 -> 0 bytes web/htdocs/themes/facelift/images/button_random.png | Bin 1553 -> 0 bytes web/htdocs/themes/facelift/images/button_release_mkp.png | Bin 496 -> 0 bytes .../themes/facelift/images/button_release_mkp_yellow.png | Bin 496 -> 0 bytes web/htdocs/themes/facelift/images/button_replay.png | Bin 811 -> 0 bytes .../themes/facelift/images/button_reportscheduler.png | Bin 1257 -> 0 bytes web/htdocs/themes/facelift/images/button_restore.png | Bin 1367 -> 0 bytes web/htdocs/themes/facelift/images/button_roles.png | Bin 1188 -> 0 bytes web/htdocs/themes/facelift/images/button_rulesets.png | Bin 335 -> 0 bytes web/htdocs/themes/facelift/images/button_services.png | Bin 746 -> 0 bytes web/htdocs/themes/facelift/images/button_showbi.png | Bin 702 -> 0 bytes web/htdocs/themes/facelift/images/button_showhide.png | Bin 1569 -> 0 bytes web/htdocs/themes/facelift/images/button_sites.png | Bin 1836 -> 0 bytes .../themes/facelift/images/button_static_checks.png | Bin 1583 -> 0 bytes web/htdocs/themes/facelift/images/button_timeline.png | Bin 1169 -> 0 bytes web/htdocs/themes/facelift/images/button_timeperiods.png | Bin 1527 -> 0 bytes .../themes/facelift/images/button_toggle_context.png | Bin 1157 -> 0 bytes .../themes/facelift/images/button_toggle_details.png | Bin 897 -> 0 bytes web/htdocs/themes/facelift/images/button_up.png | Bin 1277 -> 0 bytes web/htdocs/themes/facelift/images/button_url.png | Bin 635 -> 0 bytes web/htdocs/themes/facelift/images/button_users.png | Bin 1558 -> 0 bytes web/htdocs/themes/facelift/images/button_view.png | Bin 470 -> 0 bytes 205 files changed, 14 insertions(+), 17 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c360daa74c…

6 years, 4 months

Fixed broken mobile GUI

by Lars Michelsen

Module: check_mk Branch: master Commit: 7ddcf3bf00d111c0d464eef5ad2b00b857cc10c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ddcf3bf00d111… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 31 08:16:21 2018 +0200 Fixed broken mobile GUI Change-Id: Id3b6b50e4386b235a05abcb4746e7de2c2c9a11e --- cmk/gui/htmllib.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/gui/htmllib.py b/cmk/gui/htmllib.py index 3ab5860..67fd7f1 100644 --- a/cmk/gui/htmllib.py +++ b/cmk/gui/htmllib.py @@ -1181,7 +1181,7 @@ class html(HTMLGenerator): # Redirect to mobile GUI if we are a mobile device and the index is requested if myfile == "index" and self.mobile: - self.myfile = "mobile" + myfile = "mobile" return myfile @@ -1194,7 +1194,7 @@ class html(HTMLGenerator): self.response.set_cookie("mobile", str(int(self.mobile))) elif self.request.has_cookie("mobile"): - self.mobile = self.cookie("mobile", "0") == "1" + self.mobile = self.request.cookie("mobile", "0") == "1" else: self.mobile = self._is_mobile_client(self.request.user_agent)

6 years, 4 months

Cleaned up some hand crafted HTML

by Lars Michelsen

Module: check_mk Branch: master Commit: 3d7713c6ff5df66b45a4d1e693169bebe46af581 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d7713c6ff5df6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 31 08:19:25 2018 +0200 Cleaned up some hand crafted HTML Change-Id: Ib8b8862014581c5b3b26c4c327f865231a3e868d --- cmk/gui/mobile.py | 8 ++++---- cmk/gui/notifications.py | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmk/gui/mobile.py b/cmk/gui/mobile.py index 709594f..6817412 100644 --- a/cmk/gui/mobile.py +++ b/cmk/gui/mobile.py @@ -34,6 +34,7 @@ import cmk.gui.utils from cmk.gui.i18n import _ from cmk.gui.globals import html +from cmk.gui.htmllib import HTML from cmk.gui.exceptions import MKGeneralException, MKUserError from cmk.gui.plugins.views import painter_options @@ -190,10 +191,9 @@ def page_login(): html.set_focus("_username") html.end_form() html.open_div(id_="loginfoot") - html.write('<img class="logomk" src="images/logo_cmk_small.png">') - html.write('<div class="copyright">%s</div>' % - _("© <a target=\"_blank\" href=\"https://mathias-kettner.com\">Mathias Kettner</a>")) - html.write('</div>') + html.img("images/logo_cmk_small.png", class_="logomk") + html.div(HTML(_("© <a target=\"_blank\" href=\"https://mathias-kettner.com\">Mathias Kettner</a>")), + class_="copyright") jqm_page_footer() mobile_html_foot() diff --git a/cmk/gui/notifications.py b/cmk/gui/notifications.py index 620cfae..dea72eb 100644 --- a/cmk/gui/notifications.py +++ b/cmk/gui/notifications.py @@ -174,14 +174,14 @@ def render_page_confirm(acktime, prev_url, failed_notifications): html.header(_("Confirm failed notifications"), javascripts=[], stylesheets=[ "pages", "check_mk" ]) if failed_notifications: - html.write('<div class="really">\n') - html.write(_("Do you really want to acknowledge all failed notifications up to %s?") %\ + html.open_div(class_="really") + html.write_text(_("Do you really want to acknowledge all failed notifications up to %s?") %\ cmk.render.date_and_time(acktime)) html.begin_form("confirm", method="GET", action=prev_url) html.hidden_field('acktime', acktime) html.button('_confirm', _("Yes")) html.end_form() - html.write('</div>\n') + html.close_div() render_notification_table(failed_notifications)

6 years, 4 months

agent_azure: bug fix and refactoring

by Moritz Kiemer

Module: check_mk Branch: master Commit: f9dae7e2b6f4973f59c12674bdae28bc3dd69508 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f9dae7e2b6f497… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Aug 2 15:37:46 2018 +0200 agent_azure: bug fix and refactoring Change-Id: I44f4d3d91a5fa10c53cc79aa8054c7589d3cfc01 --- agents/special/agent_azure | 95 +++++++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 44 deletions(-) diff --git a/agents/special/agent_azure b/agents/special/agent_azure index c74c652..a8686a7 100755 --- a/agents/special/agent_azure +++ b/agents/special/agent_azure @@ -45,6 +45,7 @@ import time import logging import atexit +from collections import namedtuple from multiprocessing import Process, Lock from azure.mgmt.monitor import MonitorManagementClient @@ -566,6 +567,9 @@ class CachedMetricsMMC(MonitorManagementClient): return value +MetricRow = namedtuple('MetricRow', ("Name", "Aggregation", "Value", "Unit", "Timestamp")) + + class AzureClient(object): def __init__(self, config): super(AzureClient, self).__init__() @@ -639,12 +643,9 @@ class AzureClient(object): return metric_objects - def get_metrics_of_resource(self, resource): - """Returns the values of all metrics of the given resource""" - out = [] - err = [] - metric_objects = [] + def _get_metric_objects(self, resource, err): + metric_objects = [] try: metricnames = self._monitor_client.cached_metricnames(resource, self._config.cache_mode) metricnames = filter(self.match_metric, metricnames) @@ -654,56 +655,62 @@ class AzureClient(object): err.append("exception: %s" % e) if self._config.debug: raise e + return metric_objects - if metric_objects: - fmt = "%30s %13s %20s %20s %20s" - out += [ - "metrics following: %d" % len(metric_objects), fmt % ("Name", "Aggregation", - "Value", "Unit", "Timestamp") - ] + def extract_row_from_metric(self, metric, resource, err): + + aggregation = self._monitor_client.cached_aggregation(metric, resource, + self._config.cache_mode) + + # Assuming this agent is executed to gather one value per metric + count = len(metric.timeseries) + if count > 1: + log.warning("len(metric.timeseries) == %d" % count) + log.warning("this agent is executed to gather one value per metric") + + for measurement in reversed(metric.timeseries): + log.debug("measurement: %s" % measurement) + log.debug("measurement.data: %s" % measurement.data) + if not measurement.data: + continue + + data = measurement.data[-1] + timestamp = calendar.timegm(data.time_stamp.utctimetuple()) + if not hasattr(data, aggregation): + err.append('issue: missing aggregation %s of metric %s' \ + % (aggregation, metric.name.value)) + continue + value = getattr(data, aggregation) + return MetricRow(metric.name.value, aggregation, value, metric.unit.name, timestamp) + return None + def get_metrics_of_resource(self, resource): + """Returns the values of all metrics of the given resource""" + err = [] # pass this to methods to collect issues + + metric_objects = self._get_metric_objects(resource, err) + + table = [] for metric in metric_objects: - name = metric.name.value - log.debug("metric.name.value: %s" % name) + log.debug("metric.name.value: %s" % metric.name.value) log.debug("metric.timeseries: %s" % metric.timeseries) try: - aggregation = self._monitor_client.cached_aggregation(metric, resource, - self._config.cache_mode) - - # Assuming this agent is executed to gather one value per metric - count = len(metric.timeseries) - if count != 1: - log.warning("len(metric.timeseries) == %d" % count) - log.warning("this agent is executed to gather one value per metric") - - for measurement in reversed(metric.timeseries): - log.debug("measurement: %s" % measurement) - log.debug("measurement.data: %s" % measurement.data) - if not measurement.data: - continue - - data = measurement.data[-1] - timestamp = calendar.timegm(data.time_stamp.utctimetuple()) - if not hasattr(data, aggregation): - err.append('issue: missing aggregation %s of metric %s' \ - % (aggregation, name)) - continue - value = getattr(data, aggregation) - out.append(fmt % ( - name, - aggregation, - value, - metric.unit.name, - timestamp, - )) - break - + row = self.extract_row_from_metric(metric, resource, err) except Exception as e: + row = None err.append("exception: %s" % e) if self._config.debug: raise e + if row: + table.append(row) + + if not table: + return [], err + out = ["metrics following: %d" % len(table)] + table.insert(0, table[-1]._fields) + out += ["%30s %13s %20s %20s %20s" % row for row in table] return out, err def process_resource(self, resource):

6 years, 4 months

6424 FIX LDAP: Only set SSL/TLS specific options when SSL is enabled ( Fix 1.4.0p34 regression)

by Lars Michelsen

Module: check_mk Branch: master Commit: c47249c6f7114c4817bdc688f70ecbabbdbb08a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c47249c6f7114c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 2 20:06:08 2018 +0200 6424 FIX LDAP: Only set SSL/TLS specific options when SSL is enabled (Fix 1.4.0p34 regression) In some environments, especially when using older linux distributions, a change in 1.4.0p34 (#6184) could break already working LDAP setups. An error like this could occur when trying to perform the LDAP sync: "ValueError: option error". Change-Id: I7cbebf857dcffdd48a5189212922cbb662d5ad4f --- .werks/6424 | 14 ++++++++++++++ cmk/gui/plugins/userdb/ldap_connector.py | 5 +++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/6424 b/.werks/6424 new file mode 100644 index 0000000..42eafc6 --- /dev/null +++ b/.werks/6424 @@ -0,0 +1,14 @@ +Title: LDAP: Only set SSL/TLS specific options when SSL is enabled +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1533232961 + +In some environments, especially when using older linux distributions, a change +in 1.5.0b6 (#6184) could break already working LDAP setups. + +An error like this could occur when trying to perform the LDAP sync: "ValueError: option error". diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index c7cdc40..e6470d7 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -233,10 +233,11 @@ class LDAPUserConnector(UserConnector): if self.is_active_directory(): conn.set_option(ldap.OPT_REFERRALS, 0) - conn.set_option(ldap.OPT_X_TLS_CACERTFILE, + if 'use_ssl' in self._config: + conn.set_option(ldap.OPT_X_TLS_CACERTFILE, "%s/var/ssl/ca-certificates.crt" % cmk.paths.omd_root) - conn.set_option(ldap.OPT_X_TLS_NEWCTX, 0) + conn.set_option(ldap.OPT_X_TLS_NEWCTX, 0) self.default_bind(conn) return conn, None

6 years, 4 months

Moved custom attribute modes to dedicated python module

by Lars Michelsen

Module: check_mk Branch: master Commit: 0fe7284d22dc79e6fdeb87d189af52ddcea144ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fe7284d22dc79… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 2 17:01:43 2018 +0200 Moved custom attribute modes to dedicated python module Change-Id: I08c0bdef7b8b25a86762feeef83ad49d642ece27 --- cmk/gui/wato/__init__.py | 466 +----------------------------- cmk/gui/wato/pages/custom_attributes.py | 489 ++++++++++++++++++++++++++++++++ 2 files changed, 497 insertions(+), 458 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0fe7284d22…

6 years, 4 months

6422 FIX Prevent non-admin users from managing custom host/user attributes

by Lars Michelsen

Module: check_mk Branch: master Commit: e738edef2293e222a06270d2068cab1dd3349712 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e738edef2293e2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 2 17:21:30 2018 +0200 6422 FIX Prevent non-admin users from managing custom host/user attributes In previous versions it was possible for non-admin users that are allowed to configure hosts in WATO to also manage custom host attributes. This has been changed by introducing a new permission "Manage custom attributes" that is needed in addition to the host / user managing permission. By default this permission is only given to the "admin" role. Change-Id: Ife58cae95867904ac3360e4c944a18591fc61b81 --- .werks/6422 | 16 ++++++++++++++++ cmk/gui/wato/__init__.py | 11 +++++++++-- cmk/gui/wato/pages/custom_attributes.py | 8 ++++---- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/.werks/6422 b/.werks/6422 new file mode 100644 index 0000000..e0473e3 --- /dev/null +++ b/.werks/6422 @@ -0,0 +1,16 @@ +Title: Prevent non-admin users from managing custom host/user attributes +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1533222667 +Class: fix + +In previous versions it was possible for non-admin users that are allowed +to configure hosts in WATO to also manage custom host attributes. + +This has been changed by introducing a new permission "Manage custom attributes" +that is needed in addition to the host / user managing permission. By default +this permission is only given to the "admin" role. + diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 19f07ea..7352572 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -572,7 +572,8 @@ class ModeFolder(WatoMode): "inventory") if config.user.may("wato.rename_hosts"): html.context_button(_("Bulk renaming"), self._folder.url([("mode", "bulk_rename_host")]), "rename_host") - html.context_button(_("Custom attributes"), watolib.folder_preserving_link([("mode", "host_attrs")]), "custom_attr") + if config.user.may("wato.custom_attributes"): + html.context_button(_("Custom attributes"), watolib.folder_preserving_link([("mode", "host_attrs")]), "custom_attr") if not self._folder.locked_hosts() and config.user.may("wato.parentscan") and self._folder.may("write"): html.context_button(_("Parent scan"), self._folder.url([("mode", "parentscan"), ("all", "1")]), "parentscan") @@ -9919,7 +9920,8 @@ class ModeUsers(WatoMode): def buttons(self): global_buttons() html.context_button(_("New user"), watolib.folder_preserving_link([("mode", "edit_user")]), "new") - html.context_button(_("Custom attributes"), watolib.folder_preserving_link([("mode", "user_attrs")]), "custom_attr") + if config.user.may("wato.custom_attributes"): + html.context_button(_("Custom attributes"), watolib.folder_preserving_link([("mode", "user_attrs")]), "custom_attr") if userdb.sync_possible(): if not self._job_snapshot.is_running(): html.context_button(_("Sync users"), html.makeactionuri([("_sync", 1)]), "replicate") @@ -16610,6 +16612,11 @@ def load_plugins(force): _("Upload or delete custom icons"), [ "admin" ]) + config.declare_permission("wato.custom_attributes", + _("Manage custom attributes"), + _("Manage custom host- and user attributes"), + [ "admin" ]) + config.declare_permission("wato.download_agents", _("Monitoring Agents"), _("Download the default Check_MK monitoring agents for Linux, " diff --git a/cmk/gui/wato/pages/custom_attributes.py b/cmk/gui/wato/pages/custom_attributes.py index 6461d06..47c0c06 100644 --- a/cmk/gui/wato/pages/custom_attributes.py +++ b/cmk/gui/wato/pages/custom_attributes.py @@ -261,7 +261,7 @@ class ModeEditCustomUserAttr(ModeEditCustomAttr): @classmethod def permissions(cls): - return ["users"] + return ["users", "custom_attributes"] @property @@ -322,7 +322,7 @@ class ModeEditCustomHostAttr(ModeEditCustomAttr): @classmethod def permissions(cls): - return ["hosts", "manage_hosts"] + return ["hosts", "manage_hosts", "custom_attributes"] @property @@ -442,7 +442,7 @@ class ModeCustomUserAttrs(ModeCustomAttrs): @classmethod def permissions(cls): - return ["users"] + return ["users", "custom_attributes"] @property def _type(self): @@ -468,7 +468,7 @@ class ModeCustomHostAttrs(ModeCustomAttrs): @classmethod def permissions(cls): - return ["hosts", "manage_hosts"] + return ["hosts", "manage_hosts", "custom_attributes"] @property

6 years, 4 months

fixed uncrypted windows realtime monitoring

by Andreas Boesl

Module: check_mk Branch: master Commit: 6aa49ad02f6549572bcf08ef5132babe8719d930 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6aa49ad02f6549… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Aug 2 10:53:58 2018 +0200 fixed uncrypted windows realtime monitoring Change-Id: Ia1bb2fbf8a308f266a2c165e448a84c7bf667b01 --- .werks/6245 | 13 +++++++++++++ agents/windows/check_mk_agent.cc | 19 +++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/.werks/6245 b/.werks/6245 new file mode 100644 index 0000000..2e05aa6 --- /dev/null +++ b/.werks/6245 @@ -0,0 +1,13 @@ +Title: Windows realtime checking did not work without data encryption +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1533199744 + +Unencrypted realtime data from the windows agent was sent with an invalid data protocol header +and got discarded on the monitoring side. + diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 7824630..fc2d118 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -108,7 +108,8 @@ using std::vector; // | Declarations of macros, structs and function prototypes | // '----------------------------------------------------------------------' -static const char RT_PROTOCOL_VERSION[2] = {'0', '0'}; +static const char RT_PROTOCOL_VERSION_ENCRYPTED[2] = {'0', '0'}; +static const char RT_PROTOCOL_VERSION_UNENCRYPTED[2] = {'9', '9'}; #define SERVICE_NAME "Check_MK_Agent" @@ -677,9 +678,15 @@ DWORD WINAPI realtime_check_func(void *data_in) { char timestamp[11]; snprintf(timestamp, 11, "%" PRIdtime, time(NULL)); - // these writes are unencrypted! + // The realtime mode uses the following "protocol" + // - encrypted output is indicated by "00" + // - unencrypted output is indicated by "99" + // After the encryption indicator, a 10 bytes timestamp is written, + // followed by the actual un/encrypted content if (*s_config->encrypted) { - out->writeBinary(RT_PROTOCOL_VERSION, 2); + out->writeBinary(RT_PROTOCOL_VERSION_ENCRYPTED, 2); + } else { + out->writeBinary(RT_PROTOCOL_VERSION_UNENCRYPTED, 2); } out->writeBinary(timestamp, 10); output_data(*out, data->env, true, false, @@ -753,8 +760,12 @@ void do_adhoc(const Environment &env) { if (connection) { out->setSocket(connection.get()); + // The adhoc mode uses the following "protocol" + // - encrypted output is indicated by "00" + // - unencrypted output MUST start with "<<<" + // These are usually generated by one the agent sections if (*s_config->encrypted) { - out->writeBinary(RT_PROTOCOL_VERSION, 2); + out->writeBinary(RT_PROTOCOL_VERSION_ENCRYPTED, 2); } const sockaddr_storage addr = sock.address(connection.get());

6 years, 4 months

6390 Check_MK service: Missing section state for specific agent sections is configurable

by Simon Betz

Module: check_mk Branch: master Commit: 1cac03aae6a801a5fdce10e806c325194033ec40 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cac03aae6a801… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Aug 1 11:59:47 2018 +0200 6390 Check_MK service: Missing section state for specific agent sections is configurable Change-Id: I0fe579fcab4f31ddaf3fc37ee25d8ee6aa9d4cf8 --- .werks/6390 | 27 +++++++++++++++++++++ cmk/gui/plugins/wato/check_mk_configuration.py | 12 ++++++++++ cmk_base/checking.py | 33 ++++++++++++++++++++++++-- 3 files changed, 70 insertions(+), 2 deletions(-) diff --git a/.werks/6390 b/.werks/6390 new file mode 100644 index 0000000..09e9944 --- /dev/null +++ b/.werks/6390 @@ -0,0 +1,27 @@ +Title: Check_MK service: The monitoring state for each missing section is configurable +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1533117549 +Class: feature + +Previously only the generic monitoring state was configurable +if {{some}} agent section were missing. But there was no +differentiation between these sections. + +Now beside of setting the generic "Missing sections" state in the +ruleset {{State of the Check_MK services}} you can specify +a regex pattern to match specific section names and give them +an individual state in case they are missing. +Note that the first match is used. + +The section name can be found in the {{Service check command}} row in +the details view of a service: +Without the prefix {{check_mk-}} and the suffix after the dot (incl.). + +For example the section name of the service check command +{{check_mk-cpu.loads}} is {{cpu}}. + +This applies only for passive check types. diff --git a/cmk/gui/plugins/wato/check_mk_configuration.py b/cmk/gui/plugins/wato/check_mk_configuration.py index 2913370..e05d9a7 100644 --- a/cmk/gui/plugins/wato/check_mk_configuration.py +++ b/cmk/gui/plugins/wato/check_mk_configuration.py @@ -2659,6 +2659,18 @@ register_rule(group, default_value = 1, title = _("State if just <i>some</i> agent sections are missing")), ), + ("specific_missing_sections", ListOf( + Tuple(elements=[ + RegExpUnicode( + help = _('Beside of setting the generic "Missing sections" state above' + 'you can specify a regex pattern to match specific section names and' + 'give them an individual state in case they are missing.' + 'Note that the first match is used.'), + mode = RegExpUnicode.prefix), + MonitoringState(), + ], orientation="horizontal"), + title=_("State if specific sections are missing"), + )), ] )), ("individual", Dictionary( diff --git a/cmk_base/checking.py b/cmk_base/checking.py index 6e36211..97a9919 100644 --- a/cmk_base/checking.py +++ b/cmk_base/checking.py @@ -36,6 +36,7 @@ import cmk.defines as defines import cmk.tty as tty import cmk.cpu_tracking as cpu_tracking from cmk.exceptions import MKGeneralException +from cmk.regex import regex import cmk_base.utils import cmk_base.crash_reporting @@ -114,8 +115,10 @@ def do_check(hostname, ipaddress, only_check_plugin_names=None): perfdata.extend(source_perfdata) if missing_sections and num_success > 0: - infotexts.append("Missing agent sections: %s" % ", ".join(missing_sections)) - status = max(status, exit_spec.get("missing_sections", 1)) + missing_sections_status, missing_sections_infotext = \ + _check_missing_sections(missing_sections, exit_spec) + status = max(status, missing_sections_status) + infotexts.append(missing_sections_infotext) elif missing_sections: infotexts.append("Got no information from host") @@ -153,6 +156,32 @@ def do_check(hostname, ipaddress, only_check_plugin_names=None): cmk_base.cee.inline_snmp.save_snmp_stats() +def _check_missing_sections(missing_sections, exit_spec): + specific_missing_sections_spec = exit_spec.get("specific_missing_sections", []) + specific_missing_sections, generic_missing_sections = set(), set() + for section in missing_sections: + match = False + for pattern, status in specific_missing_sections_spec: + reg = regex(pattern) + if reg.match(section): + match = True + specific_missing_sections.add((section, status)) + break + if not match: + generic_missing_sections.add(section) + + generic_missing_sections_status = exit_spec.get("missing_sections", 1) + infotexts = ["Missing agent sections: %s%s" % ( + ", ".join(sorted(generic_missing_sections)), + check_api_utils.state_markers[generic_missing_sections_status])] + + for section, status in sorted(specific_missing_sections): + infotexts.append("%s%s" % (section, check_api_utils.state_markers[status])) + generic_missing_sections_status = max(generic_missing_sections_status, status) + + return generic_missing_sections_status, ", ".join(infotexts) + + # Loops over all checks for ANY host (cluster, real host), gets the data, calls the check # function that examines that data and sends the result to the Core. def _do_all_checks_on_host(sources, hostname, ipaddress, only_check_plugin_names=None):

6 years, 4 months

Cleaned up star import for WATO plugins

by Lars Michelsen

Module: check_mk Branch: master Commit: 482c65ea64068e7898c05732e300e0dc8929754a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=482c65ea64068e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 1 17:37:44 2018 +0200 Cleaned up star import for WATO plugins Change-Id: Ifab80c1221b1e5f0e2fdcae75a9a3b2be41a41dc --- cmk/gui/plugins/wato/__init__.py | 70 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/cmk/gui/plugins/wato/__init__.py b/cmk/gui/plugins/wato/__init__.py index 00df213..9bf57bc 100644 --- a/cmk/gui/plugins/wato/__init__.py +++ b/cmk/gui/plugins/wato/__init__.py @@ -43,7 +43,75 @@ __all__ = [ os.path.basename(f)[:-3] for f in modules if f not in [ "__init__.py # TODO: Would be better to replace this star import with an explicit list of # names needed for the plugins. Then we would have something like an official # plugin API. At least a list of names that are intended to be used by plugins. -from cmk.gui.plugins.wato.utils import * +from cmk.gui.plugins.wato.utils import ( + ACResultCRIT, + ACResultOK, + ACResultWARN, + ACTest, + ACTestCategories, + add_change, + add_replication_paths, + changelog_button, + CheckTypeSelection, + ConfigDomain, + ConfigDomainCore, + ConfigDomainEventConsole, + ConfigDomainGUI, + ConfigDomainOMD, + configvar_order, + ContactGroupsAttribute, + declare_host_attribute, + EventsMode, + folder_preserving_link, + get_search_expression, + global_buttons, + GroupSelection, + home_button, + HostnameTranslation, + IndividualOrStoredPassword, + IPMIParameters, + is_wato_slave_site, + Levels, + LivestatusViaTCP, + MainMenu, + make_action_link, + may_edit_ruleset, + MenuItem, + mode_registry, + monitoring_macro_help, + multifolder_host_rule_match_conditions, + multisite_dir, + NagiosTextAttribute, + PluginCommandLine, + PredictiveLevels, + register_check_parameters, + register_configvar, + register_configvar_group, + register_modules, + register_notification_parameters, + register_rule, + register_rulegroup, + rule_option_elements, + search_form, + ServiceDescriptionTranslation, + site_neutral_path, + SNMPCredentials, + sort_sites, + TimeperiodSelection, + transform_simple_to_multi_host_rule_match_conditions, + UserIconOrAction, + user_script_choices, + user_script_title, + ValueSpecAttribute, + vs_bulk_discovery, + WatoBackgroundJob, + wato_confirm, + wato_fileheader, + WatoMode, + WatoModule, + wato_root_dir, + wato_styles, +) #. # .--Plugins-------------------------------------------------------------.

6 years, 4 months

← Newer
1
...
28
29
30
31
32
33
34
35
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2018