Checkmk git commits January 2012

checkmk-commits@lists.checkmk.com

2 participants
334 discussions

Check_MK Git: check_mk: mounts: fix python exception

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a20fc1e2b603de72abc28832ec0ce9443e04f9d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a20fc1e2b603de… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 31 17:04:06 2012 +0100 mounts: fix python exception --- checks/mounts | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/checks/mounts b/checks/mounts index 5764cbe..54a7f4f 100644 --- a/checks/mounts +++ b/checks/mounts @@ -38,13 +38,15 @@ def check_mounts(item, targetopts, info): if item == mp: opts = options.split(",") # Now compute the exact difference. + exceeding = [] - missing = [] for o in opts: if o not in targetopts and not o.startswith("commit="): exceeding.append(o) - for o in targetopts and not o.startswith("commit="): - if o not in opts: + + missing = [] + for o in targetopts: + if o not in opts and not o.startswith("commit="): missing.append(o) if not missing and not exceeding:

12 years, 4 months

Check_MK Git: check_mk: WATO: added rule for clustered services

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e0fd0f8aa93b2589a4d2a0cb7b35c560d1803c2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0fd0f8aa93b25… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 31 17:02:43 2012 +0100 WATO: added rule for clustered services --- ChangeLog | 1 + web/plugins/wato/check_mk_configuration.py | 11 +++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index f041226..9993133 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,7 @@ * Replication: Can now handle replication sites which use the form based auth * Replication: Added option to ignore problems with the ssl certificates used in ssl secured replications + * WATO now supports configuring Check_MK clusters * FIX: Fixed missing folders in "move to" dropdown fields * FIX: Fixed "move to target folders" after CSV import * FIX: Fixed problem with duplicate extra_buttons when using the i18n of multiisite diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 9430add..16239a9 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -707,6 +707,17 @@ register_rule(group, "installed."), )) +register_rule(group, + "clustered_services", + title = _("Clustered services"), + help = _("When you define HA clusters in WATO then you also have to specify " + "which services of a node should be assigned to the cluster and " + "which services to the physical node. This is done by this ruleset. " + "Please note that the rule will be applied to the nodes, not " + "to the cluster. Please make sure that you re-inventorize the " + "cluster and the physical nodes after changing this ruleset."), + itemtype = "service") + group = _("SNMP")

12 years, 4 months

Check_MK Git: check_mk: WATO: inventory on clusters working

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 01c6f90c87cc8f7104d22f995cd4fb38a04e6b06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01c6f90c87cc8f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 31 16:54:31 2012 +0100 WATO: inventory on clusters working --- modules/automation.py | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index f6e5213..92ae2c2 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -142,6 +142,31 @@ def automation_try_inventory(args): args = args[1:] hostname = args[0] + + # hostname might be a cluster. In that case we compute the clustered + # services of that cluster. + services = [] + if is_cluster(hostname): + descriptions = set([]) + for node in nodes_of(hostname): + new_services = automation_try_inventory_node(node) + for entry in new_services: + if host_of_clustered_service(node, entry[6]) == hostname: + if entry[6] not in descriptions: + services.append(entry) + descriptions.add(entry[6]) # make it unique + + else: + new_services = automation_try_inventory_node(hostname) + for entry in new_services: + if host_of_clustered_service(hostname, entry[6]) == hostname: + services.append(entry) + + return services + + + +def automation_try_inventory_node(hostname): try: ipaddress = lookup_ipaddress(hostname) except:

12 years, 4 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: 96a012ba97c71b43d473142bff4f280f153be1b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96a012ba97c71b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 31 16:54:41 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Made mk_oracle.bat a little easier to configure

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5dacac62b0471b47f8d6d22137cc897144c1765c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5dacac62b0471b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 16:40:53 2012 +0100 Made mk_oracle.bat a little easier to configure --- agents/windows/plugins/mk_oracle.bat | 41 +++++++++++++++++++--------------- 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/agents/windows/plugins/mk_oracle.bat b/agents/windows/plugins/mk_oracle.bat index 8ce2262..da8340d 100644 --- a/agents/windows/plugins/mk_oracle.bat +++ b/agents/windows/plugins/mk_oracle.bat @@ -1,4 +1,24 @@ @echo off + +REM ; If you not run this plugin with the environment variable ORACLE_SID set, +REM ; you can uncomment (Remove the "REM " prefix) the line below to +REM ; use e.g. "localhost" as oracle sid. +REM SET ORACLE_SID=localhost + +REM ; If you like to use a special auth parameter please change the line below +SET AUTH=/ as sysdba + +echo ^<^<^<oracle_version^>^>^> +(echo.|set /p x=%ORACLE_SID%) +( +echo set cmdsep on +echo set cmdsep '"'; --" +echo "set pages 0" +echo "set feedback off" +echo "set head off" +echo "select * from v$version;" +) | sqlplus -S %AUTH% + echo ^<^<^<oracle_sessions^>^>^> (echo.|set /p x=%ORACLE_SID%) ( @@ -8,8 +28,7 @@ echo "set pages 0" echo "set feedback off" echo "set head off" echo "select count(*) from v$session where status = 'ACTIVE';" -) | sqlplus -S / as sysdba - +) | sqlplus -S %AUTH% echo ^<^<^<oracle_logswitches^>^>^> (echo.|set /p x=%ORACLE_SID%) @@ -20,9 +39,7 @@ echo "set pages 0" echo "set feedback off" echo "set head off" echo "select count(*) from v$loghist where first_time > sysdate - 1/24;" -) | sqlplus -S / as sysdba - - +) | sqlplus -S %AUTH% echo ^<^<^<oracle_tablespaces^>^>^> ( @@ -36,16 +53,4 @@ echo "set head off" echo "column instance format a10" echo "column file_name format a100" echo "select f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, f.ONLINE_STATUS, t.BLOCK_SIZE, t.status, decode(sum(fs.blocks), NULL, 0, sum(fs.blocks)) free_blocks from dba_data_files f, dba_tablespaces t, dba_free_space fs where f.tablespace_name = t.tablespace_name and f.file_id = fs.file_id(+) group by f.file_name, f.tablespace_name, f.status, f.autoextensible, f.blocks, f.maxblocks, f.user_blocks, f.increment_by, f.online_status, t.block_size, t.status UNION select f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, 'TEMP', t.BLOCK_SIZE, t.status, 0 from dba_temp_files f, dba_tablespaces t where f.tablespace_name = t.tablespace_name;" -) | sqlplus -S / as sysdba - -echo ^<^<^<oracle_version^>^>^> -REM (echo %ORACLE_SID%) -(echo.|set /p x=%ORACLE_SID% ) -( -echo set cmdsep on -echo set cmdsep '"'; --" -echo "set pages 0" -echo "set feedback off" -echo "set head off" -echo "select * from v$version;" -) | sqlplus -S / as sysdba +) | sqlplus -S %AUTH%

12 years, 4 months

Check_MK Git: check_mk: Renamed windows oracle agent plugin

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 74ff05316a493543314203c4784147caa9c4f11e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74ff05316a4935… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 16:29:27 2012 +0100 Renamed windows oracle agent plugin --- .../windows/plugins/{mk_oracle => mk_oracle.bat} | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/plugins/mk_oracle b/agents/windows/plugins/mk_oracle.bat similarity index 100% rename from agents/windows/plugins/mk_oracle rename to agents/windows/plugins/mk_oracle.bat

12 years, 4 months

Check_MK Git: check_mk: Changed file format to dos

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: d0d6b6e3c3d04bf37de61c1d67da8b59461cf156 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0d6b6e3c3d04b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 16:32:48 2012 +0100 Changed file format to dos --- agents/windows/plugins/mk_oracle.bat | 102 +++++++++++++++++----------------- 1 files changed, 51 insertions(+), 51 deletions(-) diff --git a/agents/windows/plugins/mk_oracle.bat b/agents/windows/plugins/mk_oracle.bat index 82b772d..8ce2262 100644 --- a/agents/windows/plugins/mk_oracle.bat +++ b/agents/windows/plugins/mk_oracle.bat @@ -1,51 +1,51 @@ -@echo off -echo ^<^<^<oracle_sessions^>^>^> -(echo.|set /p x=%ORACLE_SID%) -( -echo set cmdsep on -echo set cmdsep '"'; --" -echo "set pages 0" -echo "set feedback off" -echo "set head off" -echo "select count(*) from v$session where status = 'ACTIVE';" -) | sqlplus -S / as sysdba - - -echo ^<^<^<oracle_logswitches^>^>^> -(echo.|set /p x=%ORACLE_SID%) -( -echo set cmdsep on -echo set cmdsep '"'; --" -echo "set pages 0" -echo "set feedback off" -echo "set head off" -echo "select count(*) from v$loghist where first_time > sysdate - 1/24;" -) | sqlplus -S / as sysdba - - - -echo ^<^<^<oracle_tablespaces^>^>^> -( -echo set cmdsep on -echo set cmdsep '"'; --" -echo "set pages 0" -echo "set linesize 900" -echo "set tab off" -echo "set feedback off" -echo "set head off" -echo "column instance format a10" -echo "column file_name format a100" -echo "select f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, f.ONLINE_STATUS, t.BLOCK_SIZE, t.status, decode(sum(fs.blocks), NULL, 0, sum(fs.blocks)) free_blocks from dba_data_files f, dba_tablespaces t, dba_free_space fs where f.tablespace_name = t.tablespace_name and f.file_id = fs.file_id(+) group by f.file_name, f.tablespace_name, f.status, f.autoextensible, f.blocks, f.maxblocks, f.user_blocks, f.increment_by, f.online_status, t.block_size, t.status UNION select f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, 'TEMP', t.BLOCK_SIZE, t.status, 0 from dba_temp_files f, dba_tablespaces t where f.tablespace_name = t.tablespace_name;" -) | sqlplus -S / as sysdba - -echo ^<^<^<oracle_version^>^>^> -REM (echo %ORACLE_SID%) -(echo.|set /p x=%ORACLE_SID% ) -( -echo set cmdsep on -echo set cmdsep '"'; --" -echo "set pages 0" -echo "set feedback off" -echo "set head off" -echo "select * from v$version;" -) | sqlplus -S / as sysdba +@echo off +echo ^<^<^<oracle_sessions^>^>^> +(echo.|set /p x=%ORACLE_SID%) +( +echo set cmdsep on +echo set cmdsep '"'; --" +echo "set pages 0" +echo "set feedback off" +echo "set head off" +echo "select count(*) from v$session where status = 'ACTIVE';" +) | sqlplus -S / as sysdba + + +echo ^<^<^<oracle_logswitches^>^>^> +(echo.|set /p x=%ORACLE_SID%) +( +echo set cmdsep on +echo set cmdsep '"'; --" +echo "set pages 0" +echo "set feedback off" +echo "set head off" +echo "select count(*) from v$loghist where first_time > sysdate - 1/24;" +) | sqlplus -S / as sysdba + + + +echo ^<^<^<oracle_tablespaces^>^>^> +( +echo set cmdsep on +echo set cmdsep '"'; --" +echo "set pages 0" +echo "set linesize 900" +echo "set tab off" +echo "set feedback off" +echo "set head off" +echo "column instance format a10" +echo "column file_name format a100" +echo "select f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, f.ONLINE_STATUS, t.BLOCK_SIZE, t.status, decode(sum(fs.blocks), NULL, 0, sum(fs.blocks)) free_blocks from dba_data_files f, dba_tablespaces t, dba_free_space fs where f.tablespace_name = t.tablespace_name and f.file_id = fs.file_id(+) group by f.file_name, f.tablespace_name, f.status, f.autoextensible, f.blocks, f.maxblocks, f.user_blocks, f.increment_by, f.online_status, t.block_size, t.status UNION select f.file_name, f.tablespace_name, f.status, f.AUTOEXTENSIBLE, f.blocks, f.maxblocks, f.USER_BLOCKS, f.INCREMENT_BY, 'TEMP', t.BLOCK_SIZE, t.status, 0 from dba_temp_files f, dba_tablespaces t where f.tablespace_name = t.tablespace_name;" +) | sqlplus -S / as sysdba + +echo ^<^<^<oracle_version^>^>^> +REM (echo %ORACLE_SID%) +(echo.|set /p x=%ORACLE_SID% ) +( +echo set cmdsep on +echo set cmdsep '"'; --" +echo "set pages 0" +echo "set feedback off" +echo "set head off" +echo "select * from v$version;" +) | sqlplus -S / as sysdba

12 years, 4 months

Check_MK Git: check_mk: WATO Foldertree snapin links now to the views selected in the snapin

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e260539e51ad833fa41b059f3f99b9cec745cd44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e260539e51ad83… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 16:20:02 2012 +0100 WATO Foldertree snapin links now to the views selected in the snapin --- ChangeLog | 1 + web/htdocs/js/sidebar.js | 52 ++++++++++++++++++++++++++++------- web/plugins/pages/wato.py | 1 + web/plugins/sidebar/shipped.py | 55 ++++++++++++++++++++++++------------- web/plugins/sidebar/wato.py | 58 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 137 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce1bd0d..994b3af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ * Replaced "wato" sidebar snapin which mixed up WATO and status GUIs with the new "wato_foldertree" snapin which only links to the status views filtered by the WATO folder. + * Added "Dashboard" section to views snapin which shows a list of all dashboards * FIX: Fixed auth problem when following logwatch icon links while using the form based auth * FIX: Fix problem with Umlaut in contact alias diff --git a/web/htdocs/js/sidebar.js b/web/htdocs/js/sidebar.js index 6829fe2..f5a3065 100644 --- a/web/htdocs/js/sidebar.js +++ b/web/htdocs/js/sidebar.js @@ -733,20 +733,50 @@ function storeScrollPos() { /* Foldable Tree in snapin */ function wato_tree_click(folderpath) { - // Get the URL in the main frame. If that is a view or a dashboard, - // then reload that view with an updated "filename" variable. If that is - // a wato.py page, navigate to the according wato page. In all other - // cases, select the view "allhosts" with the according path. - var href = parent.frames[1].location + ""; // adding "" converts url from something magic to string - if (href.indexOf("/view.py") >= 0) - href = add_html_var(href, "wato_folder", folderpath); - else if (href.indexOf("/dashboard.py") >= 0) - href = add_html_var(href, "wato_folder", folderpath); - else - href = "view.py?view_name=allhosts&wato_folder=" + escape(folderpath); + var topic = document.getElementById('topic').value; + var target = document.getElementById('target_' + topic).value; + + if(target.substr(0, 9) == 'dashboard') { + dashboard_name = target.substr(9, target.length); + href = 'dashboard.py?name=' + escape(dashboard_name); + } else { + href = 'view.py?view_name=' + escape(target); + } + + href += '&wato_folder=' + escape(folderpath); + parent.frames[1].location = href; } +function wato_tree_topic_changed(topic_field) { + // First toggle the topic dropdown field + var topic = topic_field.value; + + // Hide all select fields but the wanted one + var select_fields = document.getElementsByTagName('select'); + for(var i = 0; i < select_fields.length; i++) { + if(select_fields[i].id && select_fields[i].id.substr(0, 7) == 'target_') { + select_fields[i].selected = ''; + if(select_fields[i].id == 'target_' + topic) { + select_fields[i].style.display = 'inline'; + } else { + select_fields[i].style.display = 'none'; + } + } + } + + // Then send the info to python code via ajax call for persistance + get_url('ajax_set_foldertree.py?topic=' + escape(topic) + '&target='); +} + +function wato_tree_target_changed(target_field) { + var topic = target_field.id.substr(7, target_field.id.length); + var target = target_field.value; + + // Send the info to python code via ajax call for persistance + get_url('ajax_set_foldertree.py?topic=' + escape(topic) + '&target=' + escape(target)); +} + // adds a variable to a GET url, but tries to remove that // variable, if it is already existing in the URL. In order // to simplify the thing, we just look at the *end* of the diff --git a/web/plugins/pages/wato.py b/web/plugins/pages/wato.py index 393a631..ffe6379 100644 --- a/web/plugins/pages/wato.py +++ b/web/plugins/pages/wato.py @@ -33,4 +33,5 @@ pagehandlers.update({ "automation_login" : wato.page_automation_login, "automation" : wato.page_automation, "user_profile" : wato.page_user_profile, + "ajax_set_foldertree" : sidebar.ajax_set_foldertree, }) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index b28346c..821b490 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import views, time, defaults +import views, time, defaults, dashboard import weblib from lib import * @@ -70,6 +70,36 @@ sidebar_snapins["about"] = { # -------------------------------------------------------------- visible_views = [ "allhosts", "searchsvc" ] +def views_by_topic(): + s = [ (view.get("topic", _("Other")), view["title"], name) + for name, view + in html.available_views.items() + if not view["hidden"] and not view.get("mobile")] + + # Add all the dashboards to the views list + s += [ (_('Dashboards'), d['title'], d_name) + for d_name, d + in dashboard.dashboards.items() + ] + + s.sort() + + # Enforce a certain order on the topics + known_topics = [ _('Dashboards'), "Hosts", "Hostgroups", "Services", "Servicegroups", + _("Business Intelligence"), _("Problems"), _("Addons") ] + + result = [] + for topic in known_topics: + result.append((topic, s)) + + rest = list(set([ t for (t, _t, _v) in s if t not in known_topics ])) + rest.sort() + for topic in rest: + if topic: + result.append((topic, s)) + + return result + def render_views(): def render_topic(topic, s): first = True @@ -82,29 +112,16 @@ def render_views(): if first: html.begin_foldable_container("views", topic, False, topic, indent=True) first = False - bulletlink(title, "view.py?view_name=%s" % name) + if topic == _('Dashboards'): + bulletlink(title, 'dashboard.py?name=%s' % name) + else: + bulletlink(title, "view.py?view_name=%s" % name) if not first: # at least one item rendered html.end_foldable_container() - s = [ (view.get("topic", _("Other")), view["title"], name) - for name, view - in html.available_views.items() - if not view["hidden"] and not view.get("mobile")] - s.sort() - - # Enforce a certain order on the topics - known_topics = [ "Hosts", "Hostgroups", "Services", "Servicegroups", - _("Business Intelligence"), _("Problems"), _("Addons") ] - for topic in known_topics: + for topic, s in views_by_topic(): render_topic(topic, s) - rest = list(set([ t for (t, _t, _v) in s if t not in known_topics ])) - rest.sort() - for topic in rest: - if topic: - render_topic(topic, s) - - links = [] if config.may("edit_views"): if config.debug: diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 185a96c..9e3ab52 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -139,9 +139,46 @@ def render_wato_foldertree(): del f['.folders'][subfolder['.path']] update_foldertree(folder_tree) + # + # Render link target selection + # + selected_topic, selected_target = config.load_user_file("foldertree", (_('Hosts'), 'allhosts')) + + topic_views = views_by_topic() + topics = [ (t, t) for t, s in topic_views ] + html.select("topic", topics, selected_topic, onchange = 'wato_tree_topic_changed(this)') + html.write('%s' % _('Topic')) + + for topic, views in topic_views: + targets = [] + for t, title, name in views: + if config.visible_views and name not in config.visible_views: + continue + if config.hidden_views and name in config.hidden_views: + continue + if t == topic: + if topic == _('Dashboards'): + name = 'dashboard|' + name + targets.append((name, title)) + + attrs = {} + if topic != selected_topic: + attrs['style'] = 'display:none' + default = '' + else: + default = selected_target + + html.select("target_%s" % topic, targets, default, attrs = attrs, onchange = 'wato_tree_target_changed(this)') + + html.write('%s' % _('View')) + html.write('<hr />') + # Now render the whole tree render_tree_folder(folder_tree) +def ajax_set_foldertree(): + config.save_user_file("foldertree", (html.var('topic'), html.var('target'))) + def render_tree_folder(f): subfolders = f.get(".folders", {}) is_leaf = len(subfolders) == 0 @@ -171,4 +208,25 @@ sidebar_snapins['wato_foldertree'] = { 'author' : 'Lars Michelsen', 'render' : render_wato_foldertree, 'allowed' : [ 'admin', 'user', 'guest' ], + 'styles' : """ +#snapin_wato_foldertree select { + float: right; + padding: 0; + width: 190px; +} +#snapin_wato_foldertree span { + display: block; + color: #ffffff; + height: 19px; +} +#snapin_wato_foldertree hr { + background-color: #fff; + height: 1px; + padding: 0; + margin: 4px; + border: 0; + /* Needed for older IE versions */ + color: #fff; +} +""" }

12 years, 4 months

Check_MK Git: check_mk: Improved styling of foldertree fields

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: a1b599c2af85fd0d398ad016235ba6f60f871762 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a1b599c2af85fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 16:24:46 2012 +0100 Improved styling of foldertree fields --- web/plugins/sidebar/wato.py | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-) diff --git a/web/plugins/sidebar/wato.py b/web/plugins/sidebar/wato.py index 9e3ab52..d468a37 100644 --- a/web/plugins/sidebar/wato.py +++ b/web/plugins/sidebar/wato.py @@ -147,7 +147,7 @@ def render_wato_foldertree(): topic_views = views_by_topic() topics = [ (t, t) for t, s in topic_views ] html.select("topic", topics, selected_topic, onchange = 'wato_tree_topic_changed(this)') - html.write('%s' % _('Topic')) + html.write('%s' % _('Topic:')) for topic, views in topic_views: targets = [] @@ -170,8 +170,7 @@ def render_wato_foldertree(): html.select("target_%s" % topic, targets, default, attrs = attrs, onchange = 'wato_tree_target_changed(this)') - html.write('%s' % _('View')) - html.write('<hr />') + html.write('%s' % _('View:')) # Now render the whole tree render_tree_folder(folder_tree) @@ -213,20 +212,14 @@ sidebar_snapins['wato_foldertree'] = { float: right; padding: 0; width: 190px; + margin-bottom: 2px; + background-color: #8EAEB8; + color: #fff; } #snapin_wato_foldertree span { display: block; color: #ffffff; - height: 19px; -} -#snapin_wato_foldertree hr { - background-color: #fff; - height: 1px; - padding: 0; - margin: 4px; - border: 0; - /* Needed for older IE versions */ - color: #fff; + height: 21px; } """ }

12 years, 4 months

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6fbac31a37246b6c4491f924b6c5f7078db178fb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fbac31a37246b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 16:24:51 2012 +0100 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

12 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2012