Checkmk git commits January 2012

checkmk-commits@lists.checkmk.com

2 participants
334 discussions

Check_MK Git: check_mk: Added missing icons

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 700a65f2bc55455fe763bc4d1fd953527bece66d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=700a65f2bc5545… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 31 16:00:59 2012 +0100 Added missing icons --- web/htdocs/images/icon_cluster.png | Bin 0 -> 3507 bytes web/htdocs/images/icon_new_cluster.png | Bin 0 -> 4055 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_cluster.png b/web/htdocs/images/icon_cluster.png new file mode 100644 index 0000000..dcadad7 Binary files /dev/null and b/web/htdocs/images/icon_cluster.png differ diff --git a/web/htdocs/images/icon_new_cluster.png b/web/htdocs/images/icon_new_cluster.png new file mode 100644 index 0000000..a954968 Binary files /dev/null and b/web/htdocs/images/icon_new_cluster.png differ

12 years, 10 months

Check_MK Git: check_mk: WATO: configure Check_MK clusters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1062710d122881efb52161fbf31460b5f1e8b1a8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1062710d122881… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 31 15:58:46 2012 +0100 WATO: configure Check_MK clusters Inventory still not working, but will soon --- web/htdocs/valuespec.py | 20 ++++++++- web/htdocs/wato.py | 95 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 95 insertions(+), 20 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1062710d12…

12 years, 10 months

Check_MK Git: check_mk: nexus_temp: first version of new check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 51b117e90d8b2481238fcafeede430e381102f0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51b117e90d8b24… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 31 14:50:57 2012 +0100 nexus_temp: first version of new check --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b7ec9c5..c425394 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ "Temperature %s", in order to be consistent with the other checks. * mounts: exclude changes of the commit option (might change on laptops), make only switch to ro critical, other changes warning. + * nexus_temp: new check for Cisco NEXUS temperature sensors (first version) Multisite: * Improve transaction handling and reload detection: user can have

12 years, 10 months

Check_MK Git: check_mk: nexus_temp: first version of new check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e64182a262cfccfbc313dd1e708815b7af747d45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e64182a262cfcc… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 31 14:51:05 2012 +0100 nexus_temp: first version of new check --- checkman/nexus_temp | 24 +++++ checks/nexus_temp | 185 +++++++++++++++++++++++++++++++++ pnp-templates/check_mk-nexus_temp.php | 37 +++++++ web/plugins/perfometer/nexus_temp.py | 3 + 4 files changed, 249 insertions(+), 0 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e64182a262…

12 years, 10 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: ec931e67a06eb1675ded7aaaf42ca36b9ca060ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec931e67a06eb1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jan 31 14:51:28 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 10 months

Check_MK Git: check_mk: Fixed bug with new multi host validation

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: e6be427af36540a66359bd1b86d32275a28f9720 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e6be427af36540… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 14:17:55 2012 +0100 Fixed bug with new multi host validation --- web/htdocs/wato.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3c63fdb..78e4475 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1737,7 +1737,7 @@ def mode_edithost(phase, new): call_hook_hosts_changed(g_folder) reload_hosts(g_folder) - errors = validate_all_hosts([hostname]) + validate_host(hostname) + errors = validate_all_hosts([hostname]).get(hostname, []) + validate_host(hostname) if errors: # keep on this page if host does not validate return elif new: @@ -1751,7 +1751,7 @@ def mode_edithost(phase, new): if new: render_folder_path() else: - errors = validate_all_hosts([hostname]) + validate_host(hostname) + errors = validate_all_hosts([hostname]).get(hostname, []) + validate_host(hostname) if errors: html.write("<div class=info>")

12 years, 10 months

Check_MK Git: check_mk: oracle_tablespace: Fixed tablespace size/ free space calculations

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b35f8796d4cf9c956a7cff790823a645fa738a6b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b35f8796d4cf9c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 13:40:59 2012 +0100 oracle_tablespace: Fixed tablespace size/free space calculations --- ChangeLog | 1 + agents/plugins/mk_oracle | 23 +++++++++++++--- agents/windows/plugins/mk_oracle | 51 ++++++++++++++++++++++++++++++++++++++ checks/oracle_tablespaces | 7 +++-- 4 files changed, 74 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 064a472..ce1bd0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ "Temperature %s", in order to be consistent with the other checks. * mounts: exclude changes of the commit option (might change on laptops), make only switch to ro critical, other changes warning. + * oracle_tablespace: Fixed tablespace size/free space calculations Multisite: * Improve transaction handling and reload detection: user can have diff --git a/agents/plugins/mk_oracle b/agents/plugins/mk_oracle index 0069f22..eaeb49c 100755 --- a/agents/plugins/mk_oracle +++ b/agents/plugins/mk_oracle @@ -114,12 +114,25 @@ for SID in $SIDS; do if [ "$EXCLUDE" = "${EXCLUDE/oracle_tablespaces/}" ]; then echo '<<<oracle_tablespaces>>>' sqlplus "$SID" <<EOF | sed 's/READ ONLY/READONLY/g' -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 from dba_data_files f, dba_tablespaces t where f.tablespace_name = t.tablespace_name -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 from dba_temp_files f, dba_tablespaces t where f.tablespace_name = t.tablespace_name; + 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; EOF - fi - } > $CACHE_FILE.new && mv $CACHE_FILE.new $CACHE_FILE || rm -f $CACHE_FILE* + fi + } > $CACHE_FILE.new && mv $CACHE_FILE.new $CACHE_FILE || rm -f $CACHE_FILE* " fi done diff --git a/agents/windows/plugins/mk_oracle b/agents/windows/plugins/mk_oracle new file mode 100644 index 0000000..82b772d --- /dev/null +++ b/agents/windows/plugins/mk_oracle @@ -0,0 +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 diff --git a/checks/oracle_tablespaces b/checks/oracle_tablespaces index 89f0928..a98f95a 100644 --- a/checks/oracle_tablespaces +++ b/checks/oracle_tablespaces @@ -45,6 +45,7 @@ # 9. wheter the file is in use (online) # 10. block size in bytes # 11. status of the table space +# 12. free space in the datafile # default levels for *free* space. float: percent, # integer: MB. @@ -99,7 +100,7 @@ def check_oracle_tablespaces(item, params, info): if line[3] in [ "AVAILABLE", "ONLINE", "READONLY" ]: num_avail += 1 current_size += blocksize * int(line[5]) - used += blocksize * int(line[7]) + used += blocksize * (int(line[5]) - int(line[12])) # Autoextensible? Honor max size if line[4] == "YES": num_extensible += 1 @@ -112,12 +113,12 @@ def check_oracle_tablespaces(item, params, info): incs = free_bl / incsize num_increments += incs increment_size += blocksize * incsize * incs - free_space += blocksize * (incsize * incs + (int(line[5]) - int(line[7]))) + free_space += blocksize * (incsize * incs + (int(line[12]))) # not autoextensible: take current size as maximum else: my_max_size = blocksize * int(line[5]) max_size += my_max_size - free_space += blocksize * (int(line[5]) - int(line[7])) + free_space += blocksize * int(line[12]) if ts_status == None:

12 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0604, #0606

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2774d0679b60426d711df9bc728e58af348d2e78 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2774d0679b6042… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 13:24:59 2012 +0100 Updated bug entries #0604, #0606 --- .bugs/604 | 7 +++++-- .bugs/606 | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.bugs/604 b/.bugs/604 index 4136895..c0dcae8 100644 --- a/.bugs/604 +++ b/.bugs/604 @@ -1,10 +1,13 @@ Title: User cannot select "unlocalized", i.e. English Component: multisite -State: open +Class: bug +State: done Date: 2012-01-25 10:02:10 Targetversion: 1.2.0 -Class: bug If you create one language "de" then the user cannot select the language in his properties (default language is also set to "de"). + +2012-01-31 13:17:55: changed state open -> done +Has been implemented. diff --git a/.bugs/606 b/.bugs/606 index d60e149..1b4b3bd 100644 --- a/.bugs/606 +++ b/.bugs/606 @@ -1,9 +1,9 @@ Title: Language selection of user: Default is missing Component: multisite -State: open +Class: bug +State: done Date: 2012-01-25 18:41:17 Targetversion: 1.1.13i1 -Class: bug Wenn man als Benutzer seine Sprache umstellen will, bekommt man in der Liste keine Auswahl für Englisch. Es muss so @@ -25,3 +25,6 @@ ist. Das Verhalten muss dann im user_profile.py und bei der Benutzervewaltung genau gleich sein. + +2012-01-31 13:18:04: changed state open -> done +Has been implemented.

12 years, 10 months

Check_MK Git: check_mk: FIX: Fixed duplicate custom columns in WATO after switching languages

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 36cedb8e6b3291fe1a2025b0024a4b69d145a059 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36cedb8e6b3291… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 12:24:48 2012 +0100 FIX: Fixed duplicate custom columns in WATO after switching languages --- ChangeLog | 1 + web/htdocs/wato.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bed1b08..064a472 100644 --- a/ChangeLog +++ b/ChangeLog @@ -96,6 +96,7 @@ contactgroup in host edit dialog * FIX: Fixed wrong folder contacgroup related permissions in auth.php api * FIX: Fixed not up-to-date role permission data in roles_saved hook + * FIX: Fixed duplicate custom columns in WATO after switching languages BI: * improve doc/treasures/check_bi_local.py: local check that creates diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 6e9e7ee..3c63fdb 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3737,7 +3737,6 @@ class ContactGroupsAttribute(Attribute): # Declare an attribute for each host tag configured in multisite.mk # Also make sure that the tags are reconfigured as soon as the # configuration of the tags has changed. -configured_host_tags = None def declare_host_tag_attributes(): global configured_host_tags global host_attributes @@ -9764,8 +9763,10 @@ def load_plugins(): loaded_with_language = current_language # Reset global vars - global extra_buttons + global extra_buttons, configured_host_tags, host_attributes extra_buttons = [] + configured_host_tags = None + host_attributes = [] # Declare WATO-specific permissions config.declare_permission_section("wato", _("WATO - Check_MK's Web Administration Tool"))

12 years, 10 months

Check_MK Git: check_mk: Fixed invalid python code generated by wato contactgroup management

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4fba09a605a8a13a06e0f8e9895991788a85f2fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fba09a605a8a1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 31 12:07:05 2012 +0100 Fixed invalid python code generated by wato contactgroup management --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4405224..6e9e7ee 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -636,7 +636,7 @@ def save_hosts(folder = None): if use and cgs: out.write("\nhost_contactgroups += [\n") for cg in cgs: - out.write(' ( %r, [%r] )\n' % (cg, hostname)) + out.write(' ( %r, [%r] ),\n' % (cg, hostname)) out.write(']\n\n') for attr, topic in host_attributes:

12 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2012