Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64242 discussions

Check_MK Git: check_mk: New footer buttons for sidebar

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 950a9b5751de616bfbc4c69e1c1ff7474bc70d10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=950a9b5751de61… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 16 16:49:29 2012 +0200 New footer buttons for sidebar --- ChangeLog | 1 + web/htdocs/htmllib.py | 9 ++- web/htdocs/images/button_sidebar_addsnapin_hi.png | Bin 0 -> 1145 bytes web/htdocs/images/button_sidebar_addsnapin_lo.png | Bin 0 -> 1129 bytes web/htdocs/images/button_sidebar_logout_hi.png | Bin 0 -> 1582 bytes web/htdocs/images/button_sidebar_logout_lo.png | Bin 0 -> 1569 bytes web/htdocs/images/button_sidebar_settings_hi.png | Bin 0 -> 1462 bytes web/htdocs/images/button_sidebar_settings_lo.png | Bin 0 -> 1464 bytes web/htdocs/sidebar.css | 66 ++------------------ web/htdocs/sidebar.py | 11 ++- web/htdocs/wato.py | 7 +- web/plugins/sidebar/wato.py | 2 +- 12 files changed, 26 insertions(+), 70 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ea1d0c..5143458 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ of the main frameset (%s will be replaced with OMD site name) * FIX: Fix problem where snapins where invisible * FIX: Fixed multisite timeout errors when nagios not running + * Sidebar: some new layout improvements BI * FIX: Fixed filtering of Single-Host Aggregations diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 0044448..e180460 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -359,7 +359,7 @@ 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=""): + def icon_button(self, url, help, icon, id="", onclick="", style="", target=""): if id: id = "id='%s' " % id @@ -370,12 +370,15 @@ class html: if style: style = 'style="%s" ' % style - self.write('<a %s%s%sonfocus="if (this.blur) this.blur();" href="%s">' + if target: + target = 'target="%s" ' % target + + self.write('<a %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, url, help, icon)) + '</a>' % (id, onclick, style, target, url, help, icon)) def empty_icon_button(self): self.write('<img class="iconbutton trans" src="images/trans.png">') diff --git a/web/htdocs/images/button_sidebar_addsnapin_hi.png b/web/htdocs/images/button_sidebar_addsnapin_hi.png new file mode 100644 index 0000000..3fc7fd0 Binary files /dev/null and b/web/htdocs/images/button_sidebar_addsnapin_hi.png differ diff --git a/web/htdocs/images/button_sidebar_addsnapin_lo.png b/web/htdocs/images/button_sidebar_addsnapin_lo.png new file mode 100644 index 0000000..21ee712 Binary files /dev/null and b/web/htdocs/images/button_sidebar_addsnapin_lo.png differ diff --git a/web/htdocs/images/button_sidebar_logout_hi.png b/web/htdocs/images/button_sidebar_logout_hi.png new file mode 100644 index 0000000..9c760de Binary files /dev/null and b/web/htdocs/images/button_sidebar_logout_hi.png differ diff --git a/web/htdocs/images/button_sidebar_logout_lo.png b/web/htdocs/images/button_sidebar_logout_lo.png new file mode 100644 index 0000000..a48cd56 Binary files /dev/null and b/web/htdocs/images/button_sidebar_logout_lo.png differ diff --git a/web/htdocs/images/button_sidebar_settings_hi.png b/web/htdocs/images/button_sidebar_settings_hi.png new file mode 100644 index 0000000..0083b45 Binary files /dev/null and b/web/htdocs/images/button_sidebar_settings_hi.png differ diff --git a/web/htdocs/images/button_sidebar_settings_lo.png b/web/htdocs/images/button_sidebar_settings_lo.png new file mode 100644 index 0000000..716f4da Binary files /dev/null and b/web/htdocs/images/button_sidebar_settings_lo.png differ diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index ba42335..1e9f0c8 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -93,77 +93,25 @@ body.side { position: absolute; bottom: 0; left: 0; - height: 35px; + height: 50px; width: 100%; z-index: 10; background-repeat: no-repeat; background-image: url("images/sidebar_bottom.png"); } -#side_footer ul.buttons { - height: 20px; - z-index: 20; - position: absolute; +#side_footer img.iconbutton { + position: relative; top: 10px; - left: 15px; - margin: 0; - padding: 0; -} - -#side_footer ul.buttons li { - list-style-type: none; - float: left; - display: inline; - margin-left: 0; -} - -#side_footer ul.buttons a { - width: 75px; - height: 17px; - display: block; - color: #fff; - text-align: center; - vertical-align: middle; - padding-top: 3px; - text-decoration: none; - background-repeat: repeat; - background-image: url("images/sidebar_button_lo.png"); - margin: 0; -} - -#side_footer ul.buttons a:hover { - background-image: url("images/sidebar_button_hi.png"); -} - -#side_footer ul.buttons a.logout { - width: 20px; - margin-left: 5px; - background-image: url("images/sidebar_logout_lo.png"); -} - -#side_footer ul.buttons a.logout:hover { - background-image: url("images/sidebar_logout_hi.png"); -} - -#side_footer ul.buttons a.profile { - width: 20px; - margin-left: 2px; - background-image: url("images/sidebar_profile_lo.png"); -} - -#side_footer ul.buttons a.profile:hover { - background-image: url("images/sidebar_profile_hi.png"); -} - -#side_footer div.buttons a { - float: left; + left: 10px; + margin-right: 3px; } #side_footer div.copyright { color: #fff; position: relative; - left: 130px; - top: 12px; + left: 141px; + top: -5px; width: 122px; text-align: right; } diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index e9521ac..915efde 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -126,13 +126,16 @@ def sidebar_head(): def sidebar_foot(): html.write('<div id="side_footer">') - html.write('<ul class=buttons>\n') if config.may("configure_sidebar"): - html.write('<li><a target="main" href="sidebar_add_snapin.py">%s</a></li>' % _('Add snapin')) + html.icon_button("sidebar_add_snapin.py", _("Add snapin to the sidebar"), "sidebar_addsnapin", + target="main") if config.may("edit_profile") or config.may("change_password"): - html.write('<li><a class=profile target="main" href="user_profile.py" title="%s"></a></li>' % _('Edit user profile')) + html.icon_button("user_profile.py", _("Edit your personal settings, change your password"), "sidebar_settings", + target="main") + # html.write('<li><a class=profile target="main" href="user_profile.py" title="%s"></a></li>' % _('Edit user profile')) if config.may("logout"): - html.write('<li><a class=logout target="_top" href="logout.py" title="%s"></a></li>' % _('Logout')) + html.icon_button("logout.py", _("Log out"), "sidebar_logout", target="_top") + # html.write('<li><a class=logout target="_top" href="logout.py" title="%s"></a></li>' % _('Logout')) html.write('</ul>') html.write("<div class=copyright>%s</div>\n" % _("© <a target=\"_blank\" href=\"http://mathias-kettner.de\">Mathias Kettner</a>")) html.write('</div>') diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1b3a234..255ff38 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -228,7 +228,7 @@ def page_handler(): if modefunc == None: html.header(_("Sorry"), stylesheets=wato_styles) html.begin_context_buttons() - html.context_button(_("Home"), make_link([("mode", "main")]), "home") + html.context_button(_("Main Menu"), make_link([("mode", "main")]), "home") html.end_context_buttons() html.message(_("This module has not yet been implemented.")) html.footer() @@ -769,6 +769,7 @@ def mode_folder(phase): elif phase == "buttons": global_buttons() + # html.write("<br><br><hr>") if config.may("wato.rulesets") or config.may("wato.seeall"): html.context_button(_("Rulesets"), make_link([("mode", "ruleeditor")]), "rulesets") html.context_button(_("Folder Properties"), make_link_to([("mode", "editfolder")], g_folder), "edit") @@ -9921,7 +9922,7 @@ def mode_pattern_editor(phase): return _("Logfile Patterns of Logfile %s on Host %s") % (item, hostname) elif phase == "buttons": - html.context_button(_("Home"), make_link([("mode", "main")]), "home") + html.context_button(_("Main Menu"), make_link([("mode", "main")]), "home") if host: if item: title = _("Show Logfile") @@ -10467,7 +10468,7 @@ def global_buttons(): home_button() def home_button(): - html.context_button(_("Home"), make_link([("mode", "main")]), "home") + html.context_button(_("Main Menu"), make_link([("mode", "main")]), "home") def search_button(): html.context_button(_("Search"), make_link([("mode", "search")]), "search") diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 7cc162f..26c3c2c 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -41,7 +41,7 @@ def render_wato(): html.write(_("You are not allowed to use Check_MK's web configuration GUI.")) return False - iconlink(_("Main menu"), "wato.py", "home") + iconlink(_("Main Menu"), "wato.py", "home") for mode, title, icon, permission, help in wato.modules: if config.may("wato." + permission) or config.may("wato.seeall"): iconlink(title, "wato.py?mode=%s" % mode, icon)

12 years, 5 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: def98220c3d531ce5a3b8388e83b1f45938bc62f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=def98220c3d531… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 16 15:52:27 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 5 months

Check_MK Git: check_mk: Sidebar: added new buttons for site status/ master control

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f96da821a83c2b945ded76fb8d977bd6c99f329c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f96da821a83c2b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 16 15:52:24 2012 +0200 Sidebar: added new buttons for site status/master control --- web/htdocs/images/button_sitestatus_dead_hi.png | Bin 0 -> 1179 bytes web/htdocs/images/button_sitestatus_dead_lo.png | Bin 0 -> 1110 bytes .../images/button_sitestatus_disabled_hi.png | Bin 0 -> 1009 bytes .../images/button_sitestatus_disabled_lo.png | Bin 0 -> 1024 bytes web/htdocs/images/button_sitestatus_down_hi.png | Bin 0 -> 1112 bytes web/htdocs/images/button_sitestatus_down_lo.png | Bin 0 -> 1032 bytes web/htdocs/images/button_sitestatus_online_hi.png | Bin 0 -> 1155 bytes web/htdocs/images/button_sitestatus_online_lo.png | Bin 0 -> 1179 bytes web/htdocs/images/button_sitestatus_unknown_hi.png | Bin 0 -> 1301 bytes web/htdocs/images/button_sitestatus_unknown_lo.png | Bin 0 -> 1301 bytes web/htdocs/images/button_sitestatus_unreach_hi.png | Bin 0 -> 1253 bytes web/htdocs/images/button_sitestatus_unreach_lo.png | Bin 0 -> 1243 bytes web/htdocs/images/button_sitestatus_waiting_hi.png | Bin 0 -> 1325 bytes web/htdocs/images/button_sitestatus_waiting_lo.png | Bin 0 -> 1301 bytes web/htdocs/images/button_snapin_switch_off_hi.png | Bin 0 -> 1086 bytes web/htdocs/images/button_snapin_switch_off_lo.png | Bin 0 -> 1026 bytes web/htdocs/images/button_snapin_switch_on_hi.png | Bin 0 -> 1162 bytes web/htdocs/images/button_snapin_switch_on_lo.png | Bin 0 -> 1157 bytes web/htdocs/images/sidebar_bottom.png | Bin 643 -> 462 bytes web/htdocs/images/sidebar_top.png | Bin 7761 -> 6961 bytes web/htdocs/images/snapin_background.png | Bin 300 -> 196 bytes web/htdocs/images/snapin_closed.png | Bin 1134 -> 845 bytes web/htdocs/images/snapin_footer.png | Bin 633 -> 475 bytes web/htdocs/images/snapin_header.png | Bin 669 -> 509 bytes web/htdocs/sidebar.css | 2 +- web/plugins/sidebar/shipped.py | 56 ++++++------------- 26 files changed, 19 insertions(+), 39 deletions(-) diff --git a/web/htdocs/images/button_sitestatus_dead_hi.png b/web/htdocs/images/button_sitestatus_dead_hi.png new file mode 100644 index 0000000..06e240c Binary files /dev/null and b/web/htdocs/images/button_sitestatus_dead_hi.png differ diff --git a/web/htdocs/images/button_sitestatus_dead_lo.png b/web/htdocs/images/button_sitestatus_dead_lo.png new file mode 100644 index 0000000..ca1e945 Binary files /dev/null and b/web/htdocs/images/button_sitestatus_dead_lo.png differ diff --git a/web/htdocs/images/button_sitestatus_disabled_hi.png b/web/htdocs/images/button_sitestatus_disabled_hi.png new file mode 100644 index 0000000..a516dfe Binary files /dev/null and b/web/htdocs/images/button_sitestatus_disabled_hi.png differ diff --git a/web/htdocs/images/button_sitestatus_disabled_lo.png b/web/htdocs/images/button_sitestatus_disabled_lo.png new file mode 100644 index 0000000..cedbfc9 Binary files /dev/null and b/web/htdocs/images/button_sitestatus_disabled_lo.png differ diff --git a/web/htdocs/images/button_sitestatus_down_hi.png b/web/htdocs/images/button_sitestatus_down_hi.png new file mode 100644 index 0000000..32537e3 Binary files /dev/null and b/web/htdocs/images/button_sitestatus_down_hi.png differ diff --git a/web/htdocs/images/button_sitestatus_down_lo.png b/web/htdocs/images/button_sitestatus_down_lo.png new file mode 100644 index 0000000..c7b838e Binary files /dev/null and b/web/htdocs/images/button_sitestatus_down_lo.png differ diff --git a/web/htdocs/images/button_sitestatus_online_hi.png b/web/htdocs/images/button_sitestatus_online_hi.png new file mode 100644 index 0000000..8c6a3cb Binary files /dev/null and b/web/htdocs/images/button_sitestatus_online_hi.png differ diff --git a/web/htdocs/images/button_sitestatus_online_lo.png b/web/htdocs/images/button_sitestatus_online_lo.png new file mode 100644 index 0000000..7163693 Binary files /dev/null and b/web/htdocs/images/button_sitestatus_online_lo.png differ diff --git a/web/htdocs/images/button_sitestatus_unknown_hi.png b/web/htdocs/images/button_sitestatus_unknown_hi.png new file mode 100644 index 0000000..afb78ce Binary files /dev/null and b/web/htdocs/images/button_sitestatus_unknown_hi.png differ diff --git a/web/htdocs/images/button_sitestatus_unknown_lo.png b/web/htdocs/images/button_sitestatus_unknown_lo.png new file mode 100644 index 0000000..fde96b1 Binary files /dev/null and b/web/htdocs/images/button_sitestatus_unknown_lo.png differ diff --git a/web/htdocs/images/button_sitestatus_unreach_hi.png b/web/htdocs/images/button_sitestatus_unreach_hi.png new file mode 100644 index 0000000..b7c7a73 Binary files /dev/null and b/web/htdocs/images/button_sitestatus_unreach_hi.png differ diff --git a/web/htdocs/images/button_sitestatus_unreach_lo.png b/web/htdocs/images/button_sitestatus_unreach_lo.png new file mode 100644 index 0000000..d5e795d Binary files /dev/null and b/web/htdocs/images/button_sitestatus_unreach_lo.png differ diff --git a/web/htdocs/images/button_sitestatus_waiting_hi.png b/web/htdocs/images/button_sitestatus_waiting_hi.png new file mode 100644 index 0000000..deb4d3c Binary files /dev/null and b/web/htdocs/images/button_sitestatus_waiting_hi.png differ diff --git a/web/htdocs/images/button_sitestatus_waiting_lo.png b/web/htdocs/images/button_sitestatus_waiting_lo.png new file mode 100644 index 0000000..034e3aa Binary files /dev/null and b/web/htdocs/images/button_sitestatus_waiting_lo.png differ diff --git a/web/htdocs/images/button_snapin_switch_off_hi.png b/web/htdocs/images/button_snapin_switch_off_hi.png new file mode 100644 index 0000000..a6cdaf2 Binary files /dev/null and b/web/htdocs/images/button_snapin_switch_off_hi.png differ diff --git a/web/htdocs/images/button_snapin_switch_off_lo.png b/web/htdocs/images/button_snapin_switch_off_lo.png new file mode 100644 index 0000000..db5a76b Binary files /dev/null and b/web/htdocs/images/button_snapin_switch_off_lo.png differ diff --git a/web/htdocs/images/button_snapin_switch_on_hi.png b/web/htdocs/images/button_snapin_switch_on_hi.png new file mode 100644 index 0000000..974583d Binary files /dev/null and b/web/htdocs/images/button_snapin_switch_on_hi.png differ diff --git a/web/htdocs/images/button_snapin_switch_on_lo.png b/web/htdocs/images/button_snapin_switch_on_lo.png new file mode 100644 index 0000000..d7b8049 Binary files /dev/null and b/web/htdocs/images/button_snapin_switch_on_lo.png differ diff --git a/web/htdocs/images/sidebar_bottom.png b/web/htdocs/images/sidebar_bottom.png index b945e5a..30284e7 100644 Binary files a/web/htdocs/images/sidebar_bottom.png and b/web/htdocs/images/sidebar_bottom.png differ diff --git a/web/htdocs/images/sidebar_top.png b/web/htdocs/images/sidebar_top.png index 6e20f09..2057a38 100644 Binary files a/web/htdocs/images/sidebar_top.png and b/web/htdocs/images/sidebar_top.png differ diff --git a/web/htdocs/images/snapin_background.png b/web/htdocs/images/snapin_background.png index 1bd35a0..c967a98 100644 Binary files a/web/htdocs/images/snapin_background.png and b/web/htdocs/images/snapin_background.png differ diff --git a/web/htdocs/images/snapin_closed.png b/web/htdocs/images/snapin_closed.png index 9607c94..c8c489b 100644 Binary files a/web/htdocs/images/snapin_closed.png and b/web/htdocs/images/snapin_closed.png differ diff --git a/web/htdocs/images/snapin_footer.png b/web/htdocs/images/snapin_footer.png index f4938ec..c1b8dbc 100644 Binary files a/web/htdocs/images/snapin_footer.png and b/web/htdocs/images/snapin_footer.png differ diff --git a/web/htdocs/images/snapin_header.png b/web/htdocs/images/snapin_header.png index df703d4..b83aaec 100644 Binary files a/web/htdocs/images/snapin_header.png and b/web/htdocs/images/snapin_header.png differ diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index b503957..ba42335 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -204,7 +204,7 @@ div.snapin div.head.open { div.snapin div.head.closed { background-image: url("images/snapin_closed.png"); - height: 22px; + height: 23px; } /* close button on header */ diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 46ea3c1..91ab9ac 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -421,8 +421,8 @@ def render_sitestatus(): html.write("<tr><td class=left>%s</td>" % text) onclick = "switch_site('_site_switch=%s:%s')" % (sitename, switch) html.write("<td class=state>") - html.write('<a title="%s" href="#" onclick="%s" class="sitestatus %s">%s</a></td>' % - (title, onclick, state, state)) + html.icon_button("#", _("%s this site") % (state == "disabled" and "enable" or "disable"), + "sitestatus_%s" % state, onclick=onclick) html.write("</tr>\n") html.write("</table>\n") @@ -448,14 +448,11 @@ table.sitestate td.left { text-align: left; } -table.sitestate a { - font-weight: bold; - -moz-border-radius: 4px; - margin: 0px; - padding: 0px 0px; - text-align: center; - display: block; +div.snapin table.sitestate td img.iconbutton { + width: 60px; + height: 16px; } + table.sitestate td.left a { text-align: left; font-weight: normal; @@ -466,10 +463,6 @@ table.sitestate td.state { font-size: 7pt; } -table.sitestate td.state a { - border-width: 1px; - border-style: solid; -} """ % snapin_width } @@ -574,11 +567,11 @@ table.tacticaloverview th span { table.tacticaloverview td { width: 33.3%%; text-align: right; - border: 1px solid #123a4a; + /* border: 1px solid #123a4a; */ background-color: #6da1b8; padding: 0px; height: 14px; - box-shadow: 0px 0px 1px #386068; + /* box-shadow: 1px 0px 1px #386068; */ } table.tacticaloverview a { display: block; margin-right: 2px; } """ % snapin_width @@ -962,8 +955,11 @@ def render_master_control(): colvalue = siteline[i + 1] url = defaults.url_prefix + ("check_mk/switch_master_state.py?site=%s&switch=%s&state=%d" % (siteid, colname, 1 - colvalue)) onclick = "get_url('%s', updateContents, 'snapin_master_control')" % url - enabled = colvalue and "enabled" or "disabled" - html.write("<tr><td class=left>%s</td><td class=%s><a onclick=\"%s\" href=\"#\">%s</a></td></tr>\n" % (title, enabled, onclick, enabled)) + html.write("<tr><td class=left>%s</td><td>" % title) + html.icon_button("#", _("Switch %s %s") % (title, colvalue and "off" or "on"), + "snapin_switch_" + (colvalue and "on" or "off"), onclick=onclick) + html.write("</td></tr>") + # html.write("<a onclick=\"%s\" href=\"#\">%s</a></td></tr>\n" % (title, enabled, onclick, enabled)) html.write("</table>") if siteid: html.end_foldable_container() @@ -986,17 +982,6 @@ div.snapin table.master_control td { text-align: right; } -div.snapin table.master_control td a { - font-weight: bold; - -moz-border-radius: 4px; - margin: 0px; - padding: 0px 3px; - text-align: center; - font-size: 7pt; - margin-right: 0px; - display: block; - border: 1px solid black; -} div.snapin table.master_control td.left a { text-align: left; font-size: 8pt; @@ -1007,17 +992,12 @@ div.snapin table.master_control td.left { text-align: left; } -div.snapin table.master_control td.enabled a { - background-color: #4f6; - color: #000; - border-color: #080; -} -div.snapin table.master_control td.disabled a { - background-color: #f33; - border-color: #c00; - color: #fff; +div.snapin table.master_control td img.iconbutton { + width: 60px; + height: 16px; } -""" % (snapin_width - 20) + +""" % (snapin_width - 15) } def ajax_switch_masterstate():

12 years, 5 months

Check_MK Git: check_mk: Merge branch 'master' into logwatch

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 17917dfbff5791e2a39e0b87991304574c9e131e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17917dfbff5791… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 10 08:21:28 2012 +0200 Merge branch 'master' into logwatch ---

12 years, 5 months

Check_MK Git: check_mk: Updated bug entries #0690

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 39ca554bfb7babb80102e32bc85ddb32174ded83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39ca554bfb7bab… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 10 08:21:23 2012 +0200 Updated bug entries #0690 --- .bugs/690 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/690 b/.bugs/690 new file mode 100644 index 0000000..f38fe52 --- /dev/null +++ b/.bugs/690 @@ -0,0 +1,11 @@ +Title: Change default thresholds of ntp check +Component: checks +State: open +Date: 2012-04-02 15:25:35 +Targetversion: future +Class: nastiness + +The default thresholds of the ntp check are too strict for most environments. Thresholds of +20.0ms and 50.0ms are not realistic for datacenter environments. + +We should change the default values to something less strict like around several seconds.

12 years, 5 months

Check_MK Git: check_mk: Merge branch 'master' into logwatch

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e00e6acfad1323c5ddc42a144a94f823c6f2f4a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e00e6acfad1323… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 10 12:06:44 2012 +0200 Merge branch 'master' into logwatch ---

12 years, 5 months

Check_MK Git: check_mk: Reworked logwatch check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 855048ebe30240f9ea5e440f98a29b8464a98f37 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=855048ebe30240… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 10 10:55:40 2012 +0200 Reworked logwatch check --- checks/logwatch | 269 +++++++++++++++++++++++++++---------------------------- 1 files changed, 133 insertions(+), 136 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=855048ebe3…

12 years, 5 months

Check_MK Git: check_mk: Added new rule logwatch_rules to configure logwatch patterns using WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8fe223f7fa2d92f3cb978627cf9fef94de099ce3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fe223f7fa2d92… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 16 12:44:24 2012 +0100 Added new rule logwatch_rules to configure logwatch patterns using WATO --- checks/logwatch | 24 ++++++++++++++----- web/plugins/wato/check_parameters.py | 42 ++++++++++++++++++++++++++++++--- 2 files changed, 56 insertions(+), 10 deletions(-) diff --git a/checks/logwatch b/checks/logwatch index 4aaa609..fe893ec 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -28,6 +28,7 @@ # Configuration variables in main.mk needed during the actual check logwatch_dir = var_dir + '/logwatch' logwatch_patterns = { } +logwatch_rules = [] logwatch_max_filesize = 500000 # do not save more than 500k of message (configurable) # Variables embedded in precompiled checks @@ -76,8 +77,18 @@ def inventory_logwatch(info): # Extracts patterns that are relevant for the current host and item. # Constructs simple list of pairs: [ ('W', 'crash.exe'), ('C', 'sshd.*test') ] def logwatch_precompile(hostname, item, params): - patterns = logwatch_patterns.get(item) + # First load the logwatch_rules var (used by WATO) + description = check_info['logwatch']['service_description'] % item + rules = service_extra_conf(hostname, description, logwatch_rules) + + # Initialize params with these rules but remove the comment params = [] + for rule in rules: + for pattern in rule: + params.append((pattern[0], pattern[1])) + + # Now load the old logwatch_patterns var + patterns = logwatch_patterns.get(item) if patterns: for entry in patterns: hostlist = None @@ -277,10 +288,11 @@ def check_logwatch(item, params, info): return (worst, state + " - error messages present!") -check_info['logwatch'] = ( - check_logwatch, - "LOG %s", - 0, - inventory_logwatch) +check_info['logwatch'] = { + 'check_function': check_logwatch, + 'service_description': "LOG %s", + 'has_perfdata': 0, + 'inventory_function': inventory_logwatch, +} precompile_params['logwatch'] = logwatch_precompile diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 896d494..f2bb546 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -24,10 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -#!/usr/bin/python -# encoding: utf-8 - -# Rules for configuring parameters of checks (services) | +# Rules for configuring parameters of checks (services) group = _("Parameters and rules for inventorized checks") @@ -97,6 +94,43 @@ checkgroups.append(( "first" )) +register_rule(group, + "logwatch_rules", + ListOf( + Tuple( + help = _("This defines one logwatch pattern rule"), + show_titles = True, + orientation = "horizontal", + elements = [ + DropdownChoice( + title = _("State"), + choices = [ + ('C', _('CRITICAL')), + ('W', _('WARNING')), + ('I', _('IGNORE')), + ], + ), + # FIXME: Own object type (optional hidden text field for regex validation) + TextAscii( + title = _("Pattern"), + size = 20, + #help = _("The regular expression to match the log lines."), + ), + TextAscii( + title = _("Comment"), + #help = _("You can insert a log line or a part of a log line to test the pattern stated left."), + ), + ] + ), + help = _('You can define one or several patterns in each logwatch pattern rule. ' + 'These patterns are applied to the selected logfiles to reclassify the ' + 'matching log messages. The first pattern which matches a line will ' + 'be used for reclassifying a message.'), + add_label = _("Add pattern"), + ), + title = _("Logwatch patterns"), + itemtype = "service", +) checkgroups.append(( "brocade_fcport",

12 years, 5 months

Check_MK Git: check_mk: logwatch check: Reclassifying present log messages on each check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 051917b418566de69d492491a6befda35ba6674e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=051917b418566d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 16 14:55:01 2012 +0100 logwatch check: Reclassifying present log messages on each check --- checks/logwatch | 112 +++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 81 insertions(+), 31 deletions(-) diff --git a/checks/logwatch b/checks/logwatch index fe893ec..2dbdbbb 100644 --- a/checks/logwatch +++ b/checks/logwatch @@ -227,39 +227,92 @@ def check_logwatch(item, params, info): else: patterns = logwatch_precompile(g_hostname, item, None) + state = "OK" + worst = 0 + + def parse_line(line): + parts = line.split(None, 1) + level = parts[0] + if len(parts) > 1: + text = parts[1] + else: + text = "" + return level, text + + def reclassify_line(counts, patterns, text, level): + if patterns: + newlevel = logwatch_reclassify(counts, patterns, text) + if newlevel != None: + level = newlevel + return level + + def logwatch_state(worst): + if worst == 1: + return "WARN" + elif worst != 0: + return "CRIT" + else: + return "OK" + + def logwatch_level_worst(worst, level): + if level == 'W': return max(worst, 1) + elif level == 'C': return max(worst, 2) + else: return worst + + # Read old messages and reclassify + if had_old_messages: + # Scan old archive log messages for state. But also reclassify the lines + reclassified_lines = [] + counts = {} # for counting number of matches of a certain pattern + block_header = None + block_worst = 0 + block_lines = [] + + def finish_section(header, block_worst, block_lines): + start = header.split(' ')[0] + return [ start + ' %s>>>' % logwatch_state(block_worst) ] + block_lines + + for line in file(logfile): + line = line.rstrip('\n') + if line.startswith('<<<') and line.endswith('>>>'): + if block_header: + # The last section is finished here. Save it! + reclassified_lines += finish_section(block_header, block_worst, block_lines) + worst = max(worst, block_worst) + block_lines = [] + block_worst = 0 + block_header = line + counts = {} + else: + level, text = parse_line(line) + level = reclassify_line(counts, patterns, text, level) + block_worst = logwatch_level_worst(block_worst, level) + block_lines.append(level + ' ' + text) + if block_header: + reclassified_lines += finish_section(block_header, block_worst, block_lines) + worst = max(worst, block_worst) + file(logfile, 'w').write('\n'.join(reclassified_lines)) + + # + # Now handle the new logs + # counts = {} # for counting number of matches of a certain pattern if len(loglines) > 0: worst = 0 newloglines = [] for line in loglines: - parts = line.split(None, 1) - level = parts[0] - if len(parts) > 1: - text = parts[1] - else: - text = "" - if patterns and level != '.': # do never reclassify informational context messages - newlevel = logwatch_reclassify(counts, patterns, text) - if newlevel != None: - level = newlevel - - if level == 'W': worst = max(worst, 1) - elif level == 'C': worst = max(worst, 2) - newloglines.append(level + ' ' + text) + level, text = parse_line(line) + level = reclassify_line(counts, patterns, text, level) - if worst == 1: - state = "WARN" - elif worst != 0: - state = "CRIT" - else: - state = "OK" + worst = logwatch_level_worst(worst, level) + newloglines.append(level + ' ' + text) # Append new logfile lines to archive file. If state is "OK, do not # write anything if worst > 0: try: logarch = file(logfile, "a+") - logarch.write(time.strftime("<<<%Y-%m-%d %H:%M:%S " + state + ">>>\n")) + logarch.write(time.strftime("<<<%Y-%m-%d %H:%M:%S " + logwatch_state(worst) + ">>>\n")) logarch.write("\n".join(newloglines) + "\n") except Exception, e: raise MKGeneralException("User %s cannot create logfile: %s" % \ @@ -267,25 +320,22 @@ def check_logwatch(item, params, info): else: logfiles = [] # appearently all logfiles reclassified to "I" + # + # Render output + # + + state = logwatch_state(worst) + # Determine current state by scanning logarch for status if not had_old_messages and len(loglines) == 0: return (0, "OK - no old or new error messages") elif not had_old_messages and len(loglines) > 0: return (worst, state + " - %d new messages!" % len(newloglines)) else: - # had old messages. Scan old archive log messages for state - logarch = file(logfile) - state = "WARN" - worst = 1 - for line in logarch: - if line.endswith("CRIT>>>\n"): - state = "CRIT" - worst = 2 - break if len(loglines) > 0: return (worst, state + " - some old and %d new messages present!" % len(newloglines)) else: - return (worst, state + " - error messages present!") + return (worst, state + " - messages present!") check_info['logwatch'] = {

12 years, 5 months

Check_MK Git: check_mk: Removed duplicate code in wato/config code

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0e8d26231e7260bf8c8a845ae4dc33922efbc2d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0e8d26231e7260… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Apr 10 12:36:12 2012 +0200 Removed duplicate code in wato/config code --- web/htdocs/wato.py | 4 +--- web/plugins/icons/builtin.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4876b55..b24b0f3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6523,9 +6523,7 @@ def encrypt_password(password, salt = None): return md5crypt.md5crypt(password, salt, '$1$') def site_is_local(siteid): - site = config.sites[siteid] - return "socket" not in site \ - or site["socket"] == "unix:" + defaults.livestatus_unix_socket + return config.site_is_local(siteid) # Returns the ID of our site. This function only works in replication # mode and looks for an entry connecting to the local socket. diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 09cc393..ddc7a5a 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -244,7 +244,7 @@ multisite_icons.append({ def logwatch_url(sitename, notes_url): i = notes_url.index("check_mk/logwatch.py") site = html.site_status[sitename]["site"] - return site["url_prefix"] + notes_url[i:] + return site["url_prefix"] + notes_url[i:] + '&master_url=&' def paint_notes(what, row, tags, custom_vars): if 'X' in html.display_options:

12 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits