Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 9f8d298e83fc05700aedaec8bf31ea0837cc423e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f8d298e83fc05… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 27 19:27:30 2015 +0100 Removed unused function --- web/htdocs/htmllib.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 05e5513..8a8dc92 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1594,13 +1594,6 @@ class html: def uploaded_file(self, varname, default = None): return self.uploads.get(varname, default) - def magic_move(self, helptext, ajax_url): - self.write('<img align=absmiddle class=iconbutton ' - 'src="images/button_magic_move.png" ' - 'title="%s" ' - 'onclick="start_magic_move(\'%s\')" >' % ( - (helptext, ajax_url))) - # # Per request caching #

8 years, 8 months

Consolidated statusicon rendering

by Lars Michelsen

Module: check_mk Branch: master Commit: c37c203738f59f2b6bb830afe238107613ad1284 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c37c203738f59f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 27 19:25:12 2015 +0100 Consolidated statusicon rendering Now using regular icon/icon_button functions. Moved the status icons to regular icon/button namespaces. --- web/htdocs/htmllib.py | 26 ++++++++++---------- ...us_download_csv.png => button_download_csv.png} | Bin 3106 -> 3106 bytes .../{status_frameurl.png => button_frameurl.png} | Bin 2658 -> 2658 bytes .../{status_pageurl.png => button_pageurl.png} | Bin 2403 -> 2403 bytes .../{status_aggrcomp.png => icon_aggrcomp.png} | Bin 2710 -> 2710 bytes .../{status_persist.png => icon_persist.png} | Bin 3160 -> 3160 bytes web/htdocs/images/status_add_dashlet.png | Bin 920 -> 0 bytes web/htdocs/images/status_ldap.png | Bin 4449 -> 0 bytes web/htdocs/pages.css | 7 +++--- 9 files changed, 16 insertions(+), 17 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index ddbda1b..05e5513 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -392,8 +392,8 @@ class html: else: return "images/icons/%s.png" % icon_name - def icon(self, help, icon): - self.write(self.render_icon(icon, help)) + def icon(self, help, icon, **kwargs): + self.write(self.render_icon(icon, help, **kwargs)) def render_icon(self, icon_name, help="", middle=True, id=None, cssclass=None): align = middle and ' align=absmiddle' or '' @@ -1008,16 +1008,17 @@ class html: self.write(self.render_popup_trigger(content, ident, what, data, url_vars)) def write_status_icons(self): - self.write('<a target="_top" href="%s"><img class=statusicon src="images/status_frameurl.png" title="%s"></a>\n' % \ - (self.makeuri([]), _("URL to this frame"))) - self.write('<a target="_top" href="%s"><img class=statusicon src="images/status_pageurl.png" title="%s"></a>\n' % \ - ("index.py?" + self.urlencode_vars([("start_url", self.makeuri([]))]), _("URL to this page including sidebar"))) + self.icon_button(self.makeuri([]), _("URL to this frame"), + "frameurl", target="_top", cssclass="statusicon") + self.icon_button("index.py?" + self.urlencode_vars([("start_url", self.makeuri([]))]), + _("URL to this page including sidebar"), + "pageurl", target="_top", cssclass="statusicon") # TODO: Move this away from here. Make a context button. The view should handle this if self.myfile == "view" and self.var('mode') != 'availability': - self.write('<a target="_top" href="%s">' \ - '<img class=statusicon src="images/status_download_csv.png" title="%s"></a>\n' % \ - (self.makeuri([("output_format", "csv_export")]), _("Export as CSV"))) + self.icon_button(self.makeuri([("output_format", "csv_export")]), + _("Export as CSV"), + "download_csv", target="_top", cssclass="statusicon") if self.myfile == "view": mode_name = self.var('mode') == "availability" and "availability" or "view" @@ -1031,16 +1032,15 @@ class html: encoded_vars[k] = v self.popup_trigger( - '<img class=statusicon src="images/icon_menu.png" title="%s">\n' % _("Add this view to..."), + self.render_icon("menu", _("Add this view to..."), cssclass="statusicon iconbutton"), 'add_visual', 'add_visual', data=[mode_name, encoded_vars, {'name': self.var('view_name')}]) for img, tooltip in self.status_icons.items(): if type(tooltip) == tuple: tooltip, url = tooltip - self.write('<a target="_top" href="%s"><img class=statusicon src="images/status_%s.png" title="%s"></a>\n' % \ - (url, img, tooltip)) + self.icon_button(url, tooltip, img) else: - self.write('<img class=statusicon src="images/status_%s.png" title="%s">\n' % (img, tooltip)) + self.icon(tooltip, img, cssclass="statusicon") if self.times: self.measure_time('body') diff --git a/web/htdocs/images/status_download_csv.png b/web/htdocs/images/button_download_csv.png similarity index 100% rename from web/htdocs/images/status_download_csv.png rename to web/htdocs/images/button_download_csv.png diff --git a/web/htdocs/images/status_frameurl.png b/web/htdocs/images/button_frameurl.png similarity index 100% rename from web/htdocs/images/status_frameurl.png rename to web/htdocs/images/button_frameurl.png diff --git a/web/htdocs/images/status_pageurl.png b/web/htdocs/images/button_pageurl.png similarity index 100% rename from web/htdocs/images/status_pageurl.png rename to web/htdocs/images/button_pageurl.png diff --git a/web/htdocs/images/status_aggrcomp.png b/web/htdocs/images/icon_aggrcomp.png similarity index 100% rename from web/htdocs/images/status_aggrcomp.png rename to web/htdocs/images/icon_aggrcomp.png diff --git a/web/htdocs/images/status_persist.png b/web/htdocs/images/icon_persist.png similarity index 100% rename from web/htdocs/images/status_persist.png rename to web/htdocs/images/icon_persist.png diff --git a/web/htdocs/images/status_add_dashlet.png b/web/htdocs/images/status_add_dashlet.png deleted file mode 100644 index e7bc181..0000000 Binary files a/web/htdocs/images/status_add_dashlet.png and /dev/null differ diff --git a/web/htdocs/images/status_ldap.png b/web/htdocs/images/status_ldap.png deleted file mode 100644 index c46fda3..0000000 Binary files a/web/htdocs/images/status_ldap.png and /dev/null differ diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 18c92a7..904d975 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -172,11 +172,10 @@ body.main table.footer td.middle { text-align: center; } body.main table.footer td.right { text-align: right; } body.main table.footer a { color: #246; } -body.main table.footer img.statusicon { +body.main table.footer img.statusicon, +body.main table.footer a.statusicon img { width: 16px; - top: 16px; - position: relative; - top: -3px; + height: 16px; } div#foot_refresh, div#foot_refresh_time {

8 years, 8 months

fixed incorrect graph scaling of ping check (werk already exists)

by Andreas Boesl

Module: check_mk Branch: master Commit: 50f6a0bcd1180f10f49f3b0ab71d55399efd408c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50f6a0bcd1180f… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 27 17:25:55 2015 +0100 fixed incorrect graph scaling of ping check (werk already exists) --- web/plugins/metrics/check_mk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index aeab587..fd27aa4 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -2635,13 +2635,13 @@ metric_info["managed_object_count"] = { # | metrics | # '----------------------------------------------------------------------' -check_metrics["check-mk-ping"] = { +check_metrics["check_mk_active-icmp"] = { "rta" : { "scale" : m }, "rtmax" : { "scale" : m }, "rtmin" : { "scale" : m }, } -check_metrics["check-mk-ping-cluster"] = { +check_metrics["check-mk-host-ping-cluster"] = { "~.*rta" : { "name" : "rta", "scale": m }, "~.*pl" : { "name" : "pl", "scale": m }, "~.*rtmax" : { "name" : "rtmax", "scale": m },

8 years, 8 months

Updated bug entries #2382

by Mathias Kettner

Module: check_mk Branch: master Commit: 637016c7b3151bf4fcb9a7a028969132f75f341b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=637016c7b3151b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 27 17:16:14 2015 +0100 Updated bug entries #2382 --- .bugs/2382 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2382 b/.bugs/2382 new file mode 100644 index 0000000..61d5282 --- /dev/null +++ b/.bugs/2382 @@ -0,0 +1,10 @@ +Title: If check files are available in local, we must not read in those in share! +Component: core +State: open +Date: 2015-10-27 17:14:55 +Targetversion: future +Class: bug + +When creating precompiled Nagios files this is already exactly the implemented +behaviour. But when you run cmk -v or CMC then *both* files are being read. +This can lead to a different (wrong) behaviour.

8 years, 8 months

Fix exception in activate changes when clusters are defined

by Mathias Kettner

Module: check_mk Branch: master Commit: 6df0bf66a96ae325e450cf56a3e8c975af94e1e2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6df0bf66a96ae3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 27 17:08:07 2015 +0100 Fix exception in activate changes when clusters are defined --- modules/check_mk.py | 21 +++++++++++++++++++++ modules/nagios.py | 22 ---------------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 386aa7b..8402777 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1436,6 +1436,27 @@ def get_cluster_attributes(hostname, nodes): return attrs +def verify_cluster_address_family(hostname): + cluster_host_family = is_ipv6_primary(hostname) and "IPv6" or "IPv4" + + address_families = [ + "%s: %s" % (hostname, cluster_host_family), + ] + + address_family = cluster_host_family + mixed = False + for nodename in nodes_of(hostname): + family = is_ipv6_primary(nodename) and "IPv6" or "IPv4" + address_families.append("%s: %s" % (nodename, family)) + if address_family == None: + address_family = family + elif address_family != family: + mixed = True + + if mixed: + raise MKGeneralException("Cluster '%s' has different primary address families: %s" % + (hostname, ", ".join(address_families))) + def ip_address_of(hostname, family=None): try: return lookup_ip_address(hostname, family) diff --git a/modules/nagios.py b/modules/nagios.py index ba9e488..f369af0 100644 --- a/modules/nagios.py +++ b/modules/nagios.py @@ -673,28 +673,6 @@ define service { """ % (pingonly_template, descr, ping_command, arguments, extra_service_conf_of(hostname, descr), hostname)) -def verify_cluster_address_family(hostname): - cluster_host_family = is_ipv6_primary(hostname) and "IPv6" or "IPv4" - - address_families = [ - "%s: %s" % (hostname, cluster_host_family), - ] - - address_family = cluster_host_family - mixed = False - for nodename in nodes_of(hostname): - family = is_ipv6_primary(nodename) and "IPv6" or "IPv4" - address_families.append("%s: %s" % (nodename, family)) - if address_family == None: - address_family = family - elif address_family != family: - mixed = True - - if mixed: - raise MKGeneralException("Cluster '%s' has different primary address families: %s" % - (hostname, ", ".join(address_families))) - - def autodetect_plugin(command_line): plugin_name = command_line.split()[0] if command_line[0] not in [ '$', '/' ]:

8 years, 8 months

Fix config generation via WATO with nagios core

by Mathias Kettner

Module: check_mk Branch: master Commit: 90da2efb791007c49c5794a876b7c2c5e3e3ad2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90da2efb791007… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Oct 27 17:07:52 2015 +0100 Fix config generation via WATO with nagios core --- modules/automation.py | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/automation.py b/modules/automation.py index 3d65ed1..778816f 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -409,6 +409,7 @@ def automation_restart(job = "restart", use_rushd = True): try: if monitoring_core == "nagios": + load_module("nagios") create_nagios_config(file(objects_file, "w")) configuration_warnings = [] # not supported else:

8 years, 8 months

Simplified handling of icon buttons, no special hilight icon needed anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 3baae9c38ad8671389004e040c0b24b858ba790a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3baae9c38ad867… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 27 16:42:20 2015 +0100 Simplified handling of icon buttons, no special hilight icon needed anymore --- web/htdocs/htmllib.py | 4 ++-- ...tton_add_dashlet_lo.png => button_add_dashlet.png} | Bin 920 -> 920 bytes web/htdocs/images/button_add_dashlet_hi.png | Bin 912 -> 0 bytes .../images/{button_aggr_lo.png => button_aggr.png} | Bin 2720 -> 2720 bytes web/htdocs/images/button_aggr_hi.png | Bin 2596 -> 0 bytes .../{button_analyze_lo.png => button_analyze.png} | Bin 3185 -> 3185 bytes web/htdocs/images/button_analyze_hi.png | Bin 3260 -> 0 bytes ...button_annotation_lo.png => button_annotation.png} | Bin 4018 -> 4018 bytes web/htdocs/images/button_annotation_hi.png | Bin 3898 -> 0 bytes .../{button_auditlog_lo.png => button_auditlog.png} | Bin 3728 -> 3728 bytes web/htdocs/images/button_auditlog_hi.png | Bin 3762 -> 0 bytes ...on_availability_lo.png => button_availability.png} | Bin 3719 -> 3719 bytes web/htdocs/images/button_availability_hi.png | Bin 3452 -> 0 bytes .../images/{button_back_lo.png => button_back.png} | Bin 2172 -> 2172 bytes web/htdocs/images/button_back_hi.png | Bin 2262 -> 0 bytes .../{button_backup_lo.png => button_backup.png} | Bin 3242 -> 3242 bytes web/htdocs/images/button_backup_hi.png | Bin 3236 -> 0 bytes .../{button_bitree_lo.png => button_bitree.png} | Bin 2672 -> 2672 bytes web/htdocs/images/button_bitree_hi.png | Bin 1808 -> 0 bytes .../{button_bottom_lo.png => button_bottom.png} | Bin 2474 -> 2474 bytes web/htdocs/images/button_bottom_hi.png | Bin 2594 -> 0 bytes ..._parameters_lo.png => button_check_parameters.png} | Bin 1222 -> 1222 bytes web/htdocs/images/button_check_parameters_hi.png | Bin 1166 -> 0 bytes ..._check_plugins_lo.png => button_check_plugins.png} | Bin 2463 -> 2463 bytes web/htdocs/images/button_check_plugins_hi.png | Bin 2311 -> 0 bytes .../{button_checkbox_lo.png => button_checkbox.png} | Bin 684 -> 684 bytes ..._checkbox_down_lo.png => button_checkbox_down.png} | Bin 855 -> 855 bytes web/htdocs/images/button_checkbox_down_hi.png | Bin 859 -> 0 bytes web/htdocs/images/button_checkbox_hi.png | Bin 693 -> 0 bytes .../images/{button_clone_lo.png => button_clone.png} | Bin 2475 -> 2475 bytes web/htdocs/images/button_clone_hi.png | Bin 2365 -> 0 bytes ...tton_closesnapin_hi.png => button_closesnapin.png} | Bin 169 -> 169 bytes web/htdocs/images/button_closesnapin_lo.png | Bin 169 -> 0 bytes ..._closetimewarp_lo.png => button_closetimewarp.png} | Bin 3149 -> 3149 bytes web/htdocs/images/button_closetimewarp_hi.png | Bin 2820 -> 0 bytes .../{button_commands_lo.png => button_commands.png} | Bin 1115 -> 1115 bytes web/htdocs/images/button_commands_hi.png | Bin 1111 -> 0 bytes ..._configuration_lo.png => button_configuration.png} | Bin 3722 -> 3722 bytes web/htdocs/images/button_configuration_hi.png | Bin 3716 -> 0 bytes ..._contactgroups_lo.png => button_contactgroups.png} | Bin 4077 -> 4077 bytes web/htdocs/images/button_contactgroups_hi.png | Bin 4105 -> 0 bytes ..._controls_lo.png => button_dashboard_controls.png} | Bin 2105 -> 2105 bytes web/htdocs/images/button_dashboard_controls_hi.png | Bin 2100 -> 0 bytes .../{button_delete_lo.png => button_delete.png} | Bin 3779 -> 3779 bytes web/htdocs/images/button_delete_hi.png | Bin 3720 -> 0 bytes .../{button_diagnose_lo.png => button_diagnose.png} | Bin 3185 -> 3185 bytes web/htdocs/images/button_diagnose_hi.png | Bin 3135 -> 0 bytes .../images/{button_down_lo.png => button_down.png} | Bin 2130 -> 2130 bytes web/htdocs/images/button_down_hi.png | Bin 2156 -> 0 bytes .../{button_download_lo.png => button_download.png} | Bin 3242 -> 3242 bytes ...nload_agents_lo.png => button_download_agents.png} | Bin 2720 -> 2720 bytes web/htdocs/images/button_download_agents_hi.png | Bin 2780 -> 0 bytes web/htdocs/images/button_download_hi.png | Bin 3179 -> 0 bytes .../images/{button_edit_lo.png => button_edit.png} | Bin 2616 -> 2616 bytes web/htdocs/images/button_edit_hi.png | Bin 2711 -> 0 bytes .../images/{button_end_lo.png => button_end.png} | Bin 2426 -> 2426 bytes web/htdocs/images/button_end_hi.png | Bin 2534 -> 0 bytes .../{button_filters_lo.png => button_filters.png} | Bin 1140 -> 1140 bytes web/htdocs/images/button_filters_down_hi.png | Bin 1148 -> 0 bytes web/htdocs/images/button_filters_down_lo.png | Bin 1106 -> 0 bytes web/htdocs/images/button_filters_hi.png | Bin 1142 -> 0 bytes web/htdocs/images/button_filters_set_down_hi.png | Bin 1259 -> 0 bytes web/htdocs/images/button_filters_set_down_lo.png | Bin 1182 -> 0 bytes web/htdocs/images/button_filters_set_hi.png | Bin 1258 -> 0 bytes web/htdocs/images/button_filters_set_lo.png | Bin 1254 -> 0 bytes .../{button_folder_lo.png => button_folder.png} | Bin 2985 -> 2985 bytes web/htdocs/images/button_folder_hi.png | Bin 3034 -> 0 bytes ...rproperties_lo.png => button_folderproperties.png} | Bin 4257 -> 4257 bytes web/htdocs/images/button_folderproperties_hi.png | Bin 3863 -> 0 bytes .../images/{button_forth_lo.png => button_forth.png} | Bin 2273 -> 2273 bytes web/htdocs/images/button_forth_hi.png | Bin 2396 -> 0 bytes .../{button_history_lo.png => button_history.png} | Bin 3831 -> 3831 bytes web/htdocs/images/button_history_hi.png | Bin 3364 -> 0 bytes .../images/{button_home_lo.png => button_home.png} | Bin 3188 -> 3188 bytes web/htdocs/images/button_home_hi.png | Bin 3301 -> 0 bytes ...button_hostgroups_lo.png => button_hostgroups.png} | Bin 3940 -> 3940 bytes web/htdocs/images/button_hostgroups_hi.png | Bin 3901 -> 0 bytes .../{button_hosttag_lo.png => button_hosttag.png} | Bin 2705 -> 2705 bytes web/htdocs/images/button_hosttag_hi.png | Bin 2766 -> 0 bytes .../images/{button_icons_lo.png => button_icons.png} | Bin 3837 -> 3837 bytes web/htdocs/images/button_icons_hi.png | Bin 3851 -> 0 bytes .../{button_ignore_lo.png => button_ignore.png} | Bin 3084 -> 3084 bytes web/htdocs/images/button_ignore_hi.png | Bin 2859 -> 0 bytes .../{button_insert_lo.png => button_insert.png} | Bin 2475 -> 2475 bytes web/htdocs/images/button_insert_hi.png | Bin 2365 -> 0 bytes ...button_insertdate_lo.png => button_insertdate.png} | Bin 4196 -> 4196 bytes web/htdocs/images/button_insertdate_hi.png | Bin 3468 -> 0 bytes ...tory_failed_lo.png => button_inventory_failed.png} | Bin 5213 -> 5213 bytes web/htdocs/images/button_inventory_failed_hi.png | Bin 4938 -> 0 bytes .../images/{button_login_lo.png => button_login.png} | Bin 982 -> 982 bytes web/htdocs/images/button_login_hi.png | Bin 745 -> 0 bytes ...button_magic_move_lo.png => button_magic_move.png} | Bin 3465 -> 3465 bytes web/htdocs/images/button_magic_move_hi.png | Bin 3202 -> 0 bytes ...button_maxisnapin_hi.png => button_maxisnapin.png} | Bin 80 -> 80 bytes web/htdocs/images/button_maxisnapin_lo.png | Bin 80 -> 0 bytes .../images/{button_menu_lo.png => button_menu.png} | Bin 739 -> 739 bytes web/htdocs/images/button_menu_hi.png | Bin 745 -> 0 bytes ...button_minisnapin_hi.png => button_minisnapin.png} | Bin 82 -> 82 bytes web/htdocs/images/button_minisnapin_lo.png | Bin 82 -> 0 bytes .../images/{button_move_lo.png => button_move.png} | Bin 6524 -> 6524 bytes web/htdocs/images/button_move_hi.png | Bin 6163 -> 0 bytes .../{button_movedown_lo.png => button_movedown.png} | Bin 158 -> 158 bytes web/htdocs/images/button_movedown_hi.png | Bin 159 -> 0 bytes .../{button_moveup_lo.png => button_moveup.png} | Bin 158 -> 158 bytes web/htdocs/images/button_moveup_hi.png | Bin 159 -> 0 bytes ...kmark_list_hi.png => button_new_bookmark_list.png} | Bin 5047 -> 5047 bytes web/htdocs/images/button_new_bookmark_list_lo.png | Bin 5047 -> 0 bytes ..._notifications_lo.png => button_notifications.png} | Bin 4083 -> 4083 bytes web/htdocs/images/button_notifications_hi.png | Bin 3912 -> 0 bytes ...ainteroptions_lo.png => button_painteroptions.png} | Bin 1338 -> 1338 bytes web/htdocs/images/button_painteroptions_hi.png | Bin 1333 -> 0 bytes ...button_properties_lo.png => button_properties.png} | Bin 4257 -> 4257 bytes ...tton_quicksearch_lo.png => button_quicksearch.png} | Bin 1250 -> 1250 bytes web/htdocs/images/button_quicksearch_hi.png | Bin 1303 -> 0 bytes .../{button_random_lo.png => button_random.png} | Bin 3386 -> 3386 bytes web/htdocs/images/button_random_hi.png | Bin 3202 -> 0 bytes ...on_reloadsnapin_lo.png => button_reloadsnapin.png} | Bin 78 -> 78 bytes web/htdocs/images/button_reloadsnapin_hi.png | Bin 310 -> 0 bytes .../{button_replay_lo.png => button_replay.png} | Bin 2175 -> 2175 bytes web/htdocs/images/button_replay_hi.png | Bin 1842 -> 0 bytes .../{button_restore_lo.png => button_restore.png} | Bin 1918 -> 1918 bytes web/htdocs/images/button_restore_hi.png | Bin 1898 -> 0 bytes .../images/{button_roles_lo.png => button_roles.png} | Bin 3711 -> 3711 bytes web/htdocs/images/button_roles_hi.png | Bin 3702 -> 0 bytes .../{button_rulesets_lo.png => button_rulesets.png} | Bin 3629 -> 3629 bytes web/htdocs/images/button_rulesets_hi.png | Bin 3673 -> 0 bytes ..._servicegroups_lo.png => button_servicegroups.png} | Bin 3940 -> 3940 bytes web/htdocs/images/button_servicegroups_hi.png | Bin 3901 -> 0 bytes .../{button_services_lo.png => button_services.png} | Bin 5138 -> 5138 bytes web/htdocs/images/button_services_hi.png | Bin 5159 -> 0 bytes .../{button_showbi_lo.png => button_showbi.png} | Bin 2024 -> 2024 bytes web/htdocs/images/button_showbi_hi.png | Bin 1784 -> 0 bytes ..._addsnapin_lo.png => button_sidebar_addsnapin.png} | Bin 916 -> 916 bytes web/htdocs/images/button_sidebar_addsnapin_hi.png | Bin 940 -> 0 bytes ...idebar_logout_lo.png => button_sidebar_logout.png} | Bin 1266 -> 1266 bytes web/htdocs/images/button_sidebar_logout_hi.png | Bin 1283 -> 0 bytes ...ar_messages_lo.png => button_sidebar_messages.png} | Bin 1248 -> 1248 bytes web/htdocs/images/button_sidebar_messages_hi.png | Bin 1257 -> 0 bytes ...ar_settings_lo.png => button_sidebar_settings.png} | Bin 1187 -> 1187 bytes web/htdocs/images/button_sidebar_settings_hi.png | Bin 1222 -> 0 bytes .../images/{button_sites_lo.png => button_sites.png} | Bin 4557 -> 4557 bytes web/htdocs/images/button_sites_hi.png | Bin 4542 -> 0 bytes ...estatus_dead_lo.png => button_sitestatus_dead.png} | Bin 972 -> 972 bytes web/htdocs/images/button_sitestatus_dead_hi.png | Bin 1027 -> 0 bytes ...disabled_lo.png => button_sitestatus_disabled.png} | Bin 941 -> 941 bytes web/htdocs/images/button_sitestatus_disabled_hi.png | Bin 969 -> 0 bytes ...estatus_down_lo.png => button_sitestatus_down.png} | Bin 992 -> 992 bytes web/htdocs/images/button_sitestatus_down_hi.png | Bin 1068 -> 0 bytes ...tus_online_lo.png => button_sitestatus_online.png} | Bin 1067 -> 1067 bytes web/htdocs/images/button_sitestatus_online_hi.png | Bin 1052 -> 0 bytes ...s_unknown_lo.png => button_sitestatus_unknown.png} | Bin 1159 -> 1159 bytes web/htdocs/images/button_sitestatus_unknown_hi.png | Bin 1181 -> 0 bytes ...s_unreach_lo.png => button_sitestatus_unreach.png} | Bin 1131 -> 1131 bytes web/htdocs/images/button_sitestatus_unreach_hi.png | Bin 1138 -> 0 bytes ...s_waiting_lo.png => button_sitestatus_waiting.png} | Bin 1132 -> 1132 bytes web/htdocs/images/button_sitestatus_waiting_hi.png | Bin 1193 -> 0 bytes ...ch_off_lo.png => button_snapin_greyswitch_off.png} | Bin 951 -> 951 bytes web/htdocs/images/button_snapin_greyswitch_off_hi.png | Bin 979 -> 0 bytes ...itch_on_lo.png => button_snapin_greyswitch_on.png} | Bin 1086 -> 1086 bytes web/htdocs/images/button_snapin_greyswitch_on_hi.png | Bin 1073 -> 0 bytes ...switch_off_lo.png => button_snapin_switch_off.png} | Bin 972 -> 972 bytes web/htdocs/images/button_snapin_switch_off_hi.png | Bin 1006 -> 0 bytes ...n_switch_on_lo.png => button_snapin_switch_on.png} | Bin 1085 -> 1085 bytes web/htdocs/images/button_snapin_switch_on_hi.png | Bin 1093 -> 0 bytes .../images/{button_start_lo.png => button_start.png} | Bin 2340 -> 2340 bytes web/htdocs/images/button_start_hi.png | Bin 2425 -> 0 bytes ..._static_checks_lo.png => button_static_checks.png} | Bin 2755 -> 2755 bytes web/htdocs/images/button_static_checks_hi.png | Bin 2583 -> 0 bytes ...on_svc_problems_lo.png => button_svc_problems.png} | Bin 2368 -> 2368 bytes web/htdocs/images/button_svc_problems_hi.png | Bin 5180 -> 0 bytes ...ctions_off_hi.png => button_table_actions_off.png} | Bin 311 -> 311 bytes web/htdocs/images/button_table_actions_off_lo.png | Bin 311 -> 0 bytes ..._actions_on_hi.png => button_table_actions_on.png} | Bin 299 -> 299 bytes web/htdocs/images/button_table_actions_on_lo.png | Bin 299 -> 0 bytes .../{button_timeline_lo.png => button_timeline.png} | Bin 2045 -> 2045 bytes web/htdocs/images/button_timeline_hi.png | Bin 1846 -> 0 bytes ...tton_timeperiods_lo.png => button_timeperiods.png} | Bin 3784 -> 3784 bytes web/htdocs/images/button_timeperiods_hi.png | Bin 3863 -> 0 bytes .../{button_timewarp_lo.png => button_timewarp.png} | Bin 2178 -> 2178 bytes web/htdocs/images/button_timewarp_hi.png | Bin 2071 -> 0 bytes .../images/{button_top_lo.png => button_top.png} | Bin 2389 -> 2389 bytes web/htdocs/images/button_top_hi.png | Bin 2531 -> 0 bytes web/htdocs/images/{button_up_lo.png => button_up.png} | Bin 2218 -> 2218 bytes web/htdocs/images/button_up_hi.png | Bin 2288 -> 0 bytes .../images/{button_url_lo.png => button_url.png} | Bin 4557 -> 4557 bytes web/htdocs/images/button_url_hi.png | Bin 4467 -> 0 bytes .../images/{button_users_lo.png => button_users.png} | Bin 4449 -> 4449 bytes web/htdocs/images/button_users_hi.png | Bin 4439 -> 0 bytes ...button_wikisearch_lo.png => button_wikisearch.png} | Bin 1250 -> 1250 bytes web/htdocs/images/button_wikisearch_hi.png | Bin 1303 -> 0 bytes web/htdocs/js/checkmk.js | 7 +++---- web/htdocs/js/sidebar.js | 4 ++-- web/htdocs/pages.css | 17 +++++++++-------- web/htdocs/sidebar.py | 4 +++- web/htdocs/wato.py | 6 ++---- 195 files changed, 21 insertions(+), 21 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3baae9c38a…

8 years, 8 months

download agent output icons: added missing livestatus column declaration

by Lars Michelsen

Module: check_mk Branch: master Commit: c253aa5c49df783b16ce884cec4b5a3dcb046c7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c253aa5c49df78… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 27 16:46:06 2015 +0100 download agent output icons: added missing livestatus column declaration --- web/plugins/icons/wato.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/plugins/icons/wato.py b/web/plugins/icons/wato.py index 76b82a0..adb47a8 100644 --- a/web/plugins/icons/wato.py +++ b/web/plugins/icons/wato.py @@ -106,12 +106,14 @@ def paint_download_agent_output(what, row, tags, host_custom_vars, ty): multisite_icons_and_actions['download_agent_output'] = { + 'host_columns' : [ "filename" ], 'paint' : lambda *args: paint_download_agent_output(*args, ty="agent"), 'toplevel' : False, 'sort_index' : 50, } multisite_icons_and_actions['download_snmp_walk'] = { + 'host_columns' : [ "filename" ], 'paint' : lambda *args: paint_download_agent_output(*args, ty="walk"), 'toplevel' : False, 'sort_index' : 50,

8 years, 8 months

Cleaned up duplicated code

by Lars Michelsen

Module: check_mk Branch: master Commit: 2b25ae6d8bdc6b2b2028a0744c0dafd6f765ec9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b25ae6d8bdc6b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 27 16:15:33 2015 +0100 Cleaned up duplicated code --- web/htdocs/htmllib.py | 26 ++++++++++++-------------- web/plugins/sidebar/shipped.py | 12 +++--------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 2a18684..9c54750 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -405,7 +405,8 @@ class html: def empty_icon(self): self.write('<img class=icon src="images/trans.png" />') - def icon_button(self, url, help, icon, id="", onclick="", style="", target="", cssclass=""): + + def render_icon_button(self, url, help, icon, id="", onclick="", style="", target="", cssclass=""): if id: id = "id='%s' " % id @@ -422,19 +423,16 @@ class html: if cssclass: cssclass = 'class="%s" ' % cssclass - self.write('<a %s%s%s%s%sonfocus="if (this.blur) this.blur();" href="%s">' - '<img align=absmiddle class=iconbutton title="%s" ' - 'src="images/button_%s_lo.png" ' - 'onmouseover=\"hilite_icon(this, 1)\" ' - 'onmouseout=\"hilite_icon(this, 0)\">' - '</a>' % (id, onclick, style, target, cssclass, url, self.attrencode(help), icon)) - - def render_icon_button(self, *args, **kwargs): - self.plug() - self.icon_button(*args, **kwargs) - code = self.drain() - self.unplug() - return code + return '<a %s%s%s%s%sonfocus="if (this.blur) this.blur();" href="%s">' \ + '<img align=absmiddle class=iconbutton title="%s" ' \ + 'src="images/button_%s_lo.png" ' \ + 'onmouseover=\"hilite_icon(this, 1)\" ' \ + 'onmouseout=\"hilite_icon(this, 0)\">' \ + '</a>' % (id, onclick, style, target, cssclass, url, self.attrencode(help), icon) + + + def icon_button(self, *args, **kwargs): + self.write(self.render_icon_button(*args, **kwargs)) def empty_icon_button(self): diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 022246e..e3b7b7d 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -1726,15 +1726,9 @@ def render_tag_tree_level(taggroups, path, cwd, title, tree): if path != cwd and is_tag_subdir(path, cwd): bullet = tag_tree_bullet(tag_tree_worst_state(tree), path, False) if tag_tree_has_svc_problems(tree): - # We cannot use html.plug() here, since this is not (yet) - # reentrant and it is used by the sidebar snapin updater. - # So we need to duplicate the code of icon_button here: - bullet += ('<a target="main" onfocus="if (this.blur) this.blur();" href="%s">' - '<img align=absmiddle class=iconbutton title="%s" src="images/button_svc_problems_lo.png" ' - 'onmouseover="hilite_icon(this, 1)" onmouseout="hilite_icon(this, 0)"></a>' % ( - tag_tree_url(taggroups, path, "svcproblems"), - _("Show the service problems contained in this branch"))) - + bullet += html.render_icon_button(tag_tree_url(taggroups, path, "svcproblems"), + _("Show the service problems contained in this branch"), + "svc_problems") if path: html.begin_foldable_container("tag-tree", ".".join(map(str, path)), False, bullet + title)

8 years, 8 months

#2439 FIX solaris_prtdiag: Can now handle Oracle Corporation SUN FIRE X4170 M2 SERVER

by Andreas Boesl

Module: check_mk Branch: master Commit: b0b9f493b730e7237976948ba047639797bf0cc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b0b9f493b730e7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Oct 27 15:41:29 2015 +0100 #2439 FIX solaris_prtdiag: Can now handle Oracle Corporation SUN FIRE X4170 M2 SERVER The inventory plugin was unable to handle systems of this type <i>Oracle Corporation SUN FIRE X4170 M2 SERVER</i>. --- .werks/2439 | 10 ++++++++++ ChangeLog | 1 + inventory/solaris_prtdiag | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/.werks/2439 b/.werks/2439 new file mode 100644 index 0000000..1888018 --- /dev/null +++ b/.werks/2439 @@ -0,0 +1,10 @@ +Title: solaris_prtdiag: Can now handle Oracle Corporation SUN FIRE X4170 M2 SERVER +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1445956783 + +The inventory plugin was unable to handle systems of this type <i>Oracle Corporation SUN FIRE X4170 M2 SERVER</i>. diff --git a/ChangeLog b/ChangeLog index b65f313..942347d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ * 2436 NetApp monitoring: Now able to gather data for inventory... * 2667 FIX: solaris_mem: fix exception in inventory plugin * 2714 FIX: Fixed visibility of folding arrows by making them dark + * 2439 FIX: solaris_prtdiag: Can now handle Oracle Corporation SUN FIRE X4170 M2 SERVER... 1.2.7i3: diff --git a/inventory/solaris_prtdiag b/inventory/solaris_prtdiag index 2fd8716..d4aadb6 100644 --- a/inventory/solaris_prtdiag +++ b/inventory/solaris_prtdiag @@ -104,12 +104,15 @@ def inv_solaris_prtdiag(info): # 'System Configuration: Oracle Corporation sun4v SPARC T4-1' # 'System Configuration: Sun Microsystems sun4u SPARC Enterprise M4000 Server' # 'System Configuration: Supermicro H8DG6/H8DGi' + # 'System Configuration: Oracle Corporation SUN FIRE X4170 M2 SERVER' node = inv_tree("hardware.system.") system_info = line[0].split(':', 1)[1].rstrip('\'') # Fields are separated by double spaces for some outputs if " " in system_info: system_info_list = system_info.split(" ") + elif system_info.startswith(" Oracle Corporation") and len(system_info) > 20: + system_info_list = system_info[1:19], system_info[20:] else: system_info_list = system_info.split() @@ -117,6 +120,7 @@ def inv_solaris_prtdiag(info): node["product"] = system_info_list[1] product_list = node["product"].split() + if product_list[-1].startswith('T'): node["family"] = "T-series" elif product_list[-2].startswith('M'):

8 years, 8 months

← Newer
1
...
5
6
7
8
9
10
11
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2015