Checkmk git commits March 2012

checkmk-commits@lists.checkmk.com

3 participants
160 discussions

Check_MK Git: check_mk: ListOf: reordering now works like a charm :-)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f313ba8951a075bf79712a39ce82b672de2d6e4c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f313ba8951a075… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 8 17:52:08 2012 +0100 ListOf: reordering now works like a charm :-) --- ChangeLog | 1 + web/htdocs/htmllib.py | 2 +- web/htdocs/js/checkmk.js | 22 +++++++++++++++------- web/htdocs/valuespec.py | 14 ++++++++++---- web/htdocs/wato.css | 2 +- 5 files changed, 28 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8893475..559ea0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,7 @@ of host and service (= downtime alerts) WATO: + * Hosttag-editor: allow reordering of tags * Create very basic sample configuration when using WATO the first time (three tag groups, two rules) * Much more checks are configurable via WATO now diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index bad1ee9..cc81e2f 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -275,7 +275,7 @@ class html: def hidden_field(self, var, value): if value != None: - self.write("<input type=hidden name=%s value=\"%s\">\n" % (var, attrencode(value))) + self.write("<input type=hidden name=%s value=\"%s\">" % (var, attrencode(value))) # Beware: call this method just before end_form(). It will # add all current non-underscored HTML variables as hiddedn diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 20aab3a..ec8fe90 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -1474,9 +1474,15 @@ function valuespec_listof_add(varprefix, magic) { // input element with the name varprefix + "_deleted_%nr" function valuespec_listof_delete(oA, varprefix, nr) { var oTr = oA.parentNode.parentNode; // TR - var oTdContent = oTr.childNodes[1]; - oTdContent.innerHTML = '<input type=hidden name="_' + varprefix + '_deleted_' + nr + '" value=1>' - oTr.style.display = "none"; + var oTbody = oTr.parentNode; + oInput = document.createElement("input"); + oInput.type = "hidden"; + oInput.name = "_" + varprefix + '_deleted_' + nr + oInput.value = "1" + var oTable = oTbody.parentNode; + oTable.parentNode.insertBefore(oInput, oTable); + oTbody.removeChild(oTr); + valuespec_listof_fixarrows(oTbody); } function valuespec_listof_move(oA, varprefix, nr, where) { @@ -1503,8 +1509,10 @@ function valuespec_listof_move(oA, varprefix, nr, where) { function valuespec_listof_fixarrows(oTbody) { for (var i in oTbody.childNodes) { var oTd = oTbody.childNodes[i].childNodes[0]; /* TD with buttons */ - var oUpTrans = oTd.childNodes[1]; - var oUp = oTd.childNodes[2]; + var oIndex = oTd.childNodes[0]; + oIndex.value = "" + (parseInt(i) + 1); + var oUpTrans = oTd.childNodes[2]; + var oUp = oTd.childNodes[3]; if (i == 0) { oUpTrans.style.display = ""; oUp.style.display = "none"; @@ -1513,8 +1521,8 @@ function valuespec_listof_fixarrows(oTbody) { oUpTrans.style.display = "none"; oUp.style.display = ""; } - var oDownTrans = oTd.childNodes[3]; - var oDown = oTd.childNodes[4]; + var oDownTrans = oTd.childNodes[4]; + var oDown = oTd.childNodes[5]; if (i >= oTbody.childNodes.length - 1) { oDownTrans.style.display = ""; oDown.style.display = "none"; diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index e630346..7026177 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -526,6 +526,7 @@ class ListOf(ValueSpec): # Render reference element for cloning html.write('<table style="display:none" id="%s_prototype">' % varprefix) html.write('<tr><td class=vlof_buttons>') + html.hidden_field(varprefix + "_indexof_" + self._magic, "") # reconstruct order after moving stuff self.del_button(varprefix, self._magic) self.move_button(varprefix, self._magic, "up") self.move_button(varprefix, self._magic, "down") @@ -539,6 +540,7 @@ class ListOf(ValueSpec): html.write('<table class="valuespec_listof" id="%s_table">' % varprefix) for nr, v in enumerate(value): html.write('<tr><td class=vlof_buttons>') + html.hidden_field(varprefix + "_indexof_%d" % (nr+1), "") # reconstruct order after moving stuff self.del_button(varprefix, nr+1) self.move_button(varprefix, self._magic, "up") # visibility fixed by javascript self.move_button(varprefix, self._magic, "down") @@ -560,10 +562,14 @@ class ListOf(ValueSpec): def from_html_vars(self, varprefix): value = [] - for n in range(1, 1 + int(html.var(varprefix + "_count"))): - if not html.var("_%s_deleted_%d" % (varprefix, n)): - value.append(self._valuespec.from_html_vars( - varprefix + "_%d" % n)) + n = 0 + while True: + indexof = html.var(varprefix + "_indexof_%d" % (n+1)) + if indexof == None: + break; + value.append(self._valuespec.from_html_vars( + varprefix + "_%d" % int(indexof))) + n += 1 return value def validate_datatype(self, value, varprefix): diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 0611f5a..b0d76db 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -306,7 +306,7 @@ table.validationerror img { } .wato img.trans { - width: 16px; + width: 20px; height: 16px; } .wato td.value img {

12 years, 3 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: c810bf52196bb39f0e3f94536c5c605846722d79 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c810bf52196bb3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 8 17:52:11 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: FIX apc_sumertra_power: added loading state (-1)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a769262c37770069e89f004921c00488ce028611 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a769262c377700… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Mar 8 17:37:22 2012 +0100 FIX apc_sumertra_power: added loading state (-1) --- checks/apc_symmetra_power | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/apc_symmetra_power b/checks/apc_symmetra_power index 4ef68a6..415cc38 100644 --- a/checks/apc_symmetra_power +++ b/checks/apc_symmetra_power @@ -38,9 +38,9 @@ def check_apc_power(item, params, info): infotext = " - current power: %d W, warn/crit at and below %d/%d W" % \ (power, warn, crit) - if power <= crit: + if power != -1 and power <= crit: return (2, "CRIT" + infotext, perfdata) - elif power <= warn: + elif power != -1 and power <= warn: return (1, "WARN" + infotext, perfdata) else: return (0, "OK" + infotext, perfdata)

12 years, 3 months

Check_MK Git: check_mk: ListOf(): add buttns for moving up and done

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: da20f198d5dd932b5a4247932d8613c8800f6a21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da20f198d5dd93… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 8 16:19:21 2012 +0100 ListOf(): add buttns for moving up and done still not functional, though --- web/htdocs/check_mk.css | 1 + web/htdocs/htmllib.py | 16 +++++++++++----- web/htdocs/pages.css | 6 +++++- web/htdocs/valuespec.py | 13 +++++++++++++ 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index fc3215e..5017605 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -318,6 +318,7 @@ table.vs_date th { table.valuespec_listof td.vlof_buttons { margin-right: 5px; + white-space: nowrap; } table.valuespec_listof td.vlof_content { border: 1px solid white; diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index c3e8c33..0576c16 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -337,17 +337,20 @@ class html: def empty_icon(self): self.write('<img class=icon src="images/trans.png">') - def icon_button(self, url, help, icon, onclick=None): + def icon_button(self, url, help, icon, onclick=None, style=""): if onclick: onclick = " onclick=\"%s\"" % onclick url = "#" - self.write('<a href="%s"%s>' + if style: + style = ' style="%s"' % style + + self.write('<a href="%s"%s%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>\n' % (url, onclick, help, icon)) + '</a>\n' % (url, onclick, style, help, icon)) def empty_icon_button(self): self.write('<img class="iconbutton trans" src="images/trans.png">\n') @@ -532,7 +535,9 @@ class html: add_attr = [] # do not use [] as default element, it will be a global variable! error = self.user_errors.get(varname) if error: - self.write("<x class=inputerror><span class=checkbox>") + self.write("<x class=inputerror>") + + self.write("<span class=checkbox>") # Problem with checkboxes: The browser will add the variable # only to the URL if the box is checked. So in order to detect # wether we should add the default value, we need to detect @@ -555,8 +560,9 @@ class html: self.form_vars.append(varname) if label: self.write('<label for="%s">%s</label>\n' % (id, label)) + self.write("</span>") if error: - self.write("</span></x>") + self.write("</x>") # Check if the current form is currently filled in (i.e. we display # the form a second time while showing value typed in at the first diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index cec1284..6a4915b 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -475,7 +475,7 @@ input.date, input.time { font-family: monospace; } -.inputerror input, .inputerror textarea, span.checkbox { +.inputerror input, .inputerror textarea, .inputerror span.checkbox { background-color: #f84; } @@ -490,6 +490,10 @@ input.date, input.time { margin: 1px; } +span.checkbox { + white-space: nowrap; +} + /*-------------------------------------------------------------------------. | _ _ _ | | / \ ___| |_(_) ___ _ __ ___ | diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 3291e5b..7622d1f 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -503,6 +503,15 @@ class ListOf(ValueSpec): js = "valuespec_listof_delete(this, '%s', '%s')" % (vp, nr) html.icon_button("#", _("Delete this entry"), "delete", onclick=js) + def move_button(self, vp, nr, where, visible): + js = "valuespec_listof_move(this, '%s', '%s', '%s')" % (vp, nr, where) + where_name = { + "up" : _("up"), + "down" : _("down"), + } + html.icon_button("#", _("Move this entry %s") % where_name[where], + where, onclick=js, style = not visible and "display: none;" or "") + # Implementation idea: we render our element-valuespec # once in a hidden div that is not evaluated. All occurances # of a magic string are replaced with the actual number @@ -517,6 +526,8 @@ class ListOf(ValueSpec): html.write('<table style="display:none" id="%s_prototype">' % varprefix) html.write('<tr><td class=vlof_buttons>') self.del_button(varprefix, self._magic) + self.move_button(varprefix, self._magic, "up", True) + self.move_button(varprefix, self._magic, "down", True) html.write('</td><td class=vlof_content>') self._valuespec.render_input( varprefix + "_" + self._magic, @@ -528,6 +539,8 @@ class ListOf(ValueSpec): for nr, v in enumerate(value): html.write('<tr><td class=vlof_buttons>') self.del_button(varprefix, nr+1) + self.move_button(varprefix, self._magic, "up", nr > 0) + self.move_button(varprefix, self._magic, "down", nr < len(value) - 1) html.write("</td><td class=vlof_content>") self._valuespec.render_input(varprefix + "_%d" % (nr+1), v) html.write("</td></tr>")

12 years, 3 months

Check_MK Git: check_mk: FIX: inventory in WATO was broken if legacy checks exist

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c86be7a8fbbf8c5f36336b99e6ac135a50c5799a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c86be7a8fbbf8c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 8 16:26:09 2012 +0100 FIX: inventory in WATO was broken if legacy checks exist --- modules/automation.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index d143bfb..eeca56f 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -301,7 +301,10 @@ def automation_try_inventory_node(hostname): output = "WAITING - Legacy check, cannot be done offline" perfdata = [] - checkgroup = check_info[ct]["group"] + if ct == "legacy": + checkgroup = None + else: + checkgroup = check_info[ct]["group"] table.append((state_type, ct, checkgroup, item, paramstring, params, descr, exitcode, output, perfdata)) if not table and (tcp_error or snmp_error):

12 years, 3 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: 2746c90077ede00c83245e782d7d956ad2e70f98 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2746c90077ede0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 8 16:26:11 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Added windows agent plugin for monitoring MSSQL servers ( Checks will be added soon)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a26798590f318d13e405a9c9268fce377996c185 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a26798590f318d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 8 14:28:25 2012 +0100 Added windows agent plugin for monitoring MSSQL servers (Checks will be added soon) --- agents/windows/plugins/mssql.vbs | 155 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 155 insertions(+), 0 deletions(-) diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs new file mode 100644 index 0000000..2ceae73 --- /dev/null +++ b/agents/windows/plugins/mssql.vbs @@ -0,0 +1,155 @@ +' ----------------------------------------------------------------------------- +' Check_MK windows agent plugin to gather information from local MSSQL servers +' +' This plugin can be used to collect information of all running MSSQL server +' on the local system. +' +' The current implementation of the check uses the "trusted authentication" +' where no user/password needs to be created in the MSSQL server instance. It +' is only needed to grant the user as which the Check_MK windows agent service +' is running access to the MSSQL database. +' +' The following sources are asked: +' 1. WMI - to gather a list of local MSSQL-Server instances +' 2. MSSQL-Servers via ADO/sqloledb connection to gather infos these infos: +' a) list and sizes of available databases +' b) counters of the database instance +' +' This check has been developed with MSSQL Server 2008 R2. It should work with +' older versions starting from at least MSSQL Server 2005. +' ----------------------------------------------------------------------------- + +Option Explicit + +Dim WMI, prop, instId, instVersion, instIds, instName + +' Directory of all database instance names +Set instIds = CreateObject("Scripting.Dictionary") + +' Loop all found local MSSQL server instances +Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement10") +For Each prop In WMI.ExecQuery("SELECT * FROM SqlServiceAdvancedProperty WHERE " & _ + "SQLServiceType = 1 AND PropertyName = 'VERSION'") + + instId = prop.ServiceName + instVersion = prop.PropertyStrValue + + WScript.echo "<<<mssql_versions>>>" + WScript.echo instId & " " & instVersion + + ' Now query the server instance for the databases + ' Use name as key and always empty value for the moment + instIds.add instId, "" +Next + +Set WMI = nothing + +Dim CONN, RS, hostname + +hostname = WScript.CreateObject("WScript.Shell").ExpandEnvironmentStrings("%COMPUTERNAME%") + +' Initialize connection objects +Set CONN = CreateObject("ADODB.Connection") +Set RS = CreateObject("ADODB.Recordset") +CONN.Provider = "sqloledb" +' Select a special DB +'CONN.Properties("Initial Catalog").Value = "test123" +' At this place one could implement to user other authentication mechanism +CONN.Properties("Integrated Security").Value = "SSPI" + + +' Loop all found server instances and connect to them +' In my tests only the connect using the "named instance" string worked +For Each instId In instIds.Keys + instName = Split(instId, "$")(1) + CONN.Properties("Data Source").Value = hostname & "\" & instName + CONN.Open + + ' Get counter data for the whole instance + RS.Open "SELECT counter_name, object_name, cntr_value FROM sys.dm_os_performance_counters " & _ + "WHERE object_name NOT LIKE '%Deprecated%'", CONN + wscript.echo "<<<mssql_counters>>>" + Dim objectName, counterName, value + Do While NOT RS.Eof + objectName = Replace(Trim(RS("object_name")), " ", "_") + counterName = Replace(Trim(RS("counter_name")), " ", "_") + value = Trim(RS("cntr_value")) + wscript.echo objectName & " " & counterName & " " & value + RS.MoveNext + Loop + RS.Close + + ' First only read all databases in this instance and save it to the db names dict + RS.Open "EXEC sp_databases", CONN + Dim x, dbName, dbNames + Set dbNames = CreateObject("Scripting.Dictionary") + Do While NOT RS.Eof + dbName = RS("DATABASE_NAME") + dbNames.add dbName, "" + RS.MoveNext + Loop + RS.Close + + ' Now gather the db size and unallocated space + wscript.echo "<<<mssql_tablespaces>>>" + Dim i, dbSize, unallocated, reserved, data, indexSize, unused + For Each dbName in dbNames.Keys + ' Switch to other database and then ask for stats + RS.Open "USE " & dbName, CONN + ' sp_spaceused is a stored procedure which returns two selects + ' which need to be looped + RS.Open "EXEC sp_spaceused", CONN + i = 0 + Do Until RS Is Nothing + Do While NOT RS.Eof + 'For Each x in RS.fields + ' wscript.echo x.name & " " & x.value + 'Next + If i = 0 Then + ' Size of the current database in megabytes. database_size includes both data and log files. + dbSize = Trim(RS("database_size")) + ' Space in the database that has not been reserved for database objects. + unallocated = Trim(RS("unallocated space")) + Elseif i = 1 Then + ' Total amount of space allocated by objects in the database. + reserved = Trim(RS("reserved")) + ' Total amount of space used by data. + data = Trim(RS("data")) + ' Total amount of space used by indexes. + indexSize = Trim(RS("index_size")) + ' Total amount of space reserved for objects in the database, but not yet used. + unused = Trim(RS("unused")) + End If + RS.MoveNext + Loop + Set RS = RS.NextRecordset + i = i + 1 + Loop + wscript.echo instId & " " & dbName & " " & dbSize & " " & unallocated & " " & reserved & " " & _ + data & " " & indexSize & " " & unused + Set RS = CreateObject("ADODB.Recordset") + Next + + ' Loop all databases to get the date of the last backup. Only show databases + ' which have at least one backup + Dim lastBackupDate + wscript.echo "<<<mssql_backup>>>" + For Each dbName in dbNames.Keys + RS.open "SELECT DATEDIFF(s, '19700101', MAX(backup_finish_date)) AS last_backup_date " & _ + "FROM msdb.dbo.backupset " & _ + "WHERE database_name = '" & dbName & "'", CONN + Do While Not RS.Eof + lastBackupDate = Trim(RS("last_backup_date")) + If lastBackupDate <> "" Then + wscript.echo instId & " " & dbName & " " & lastBackupDate + End If + RS.MoveNext + Loop + RS.Close + Next + + CONN.Close +Next + +Set RS = nothing +Set CONN = nothing

12 years, 3 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1ae8cc0de78c60aa2bdc174bd2a8a84a2a9fcaed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1ae8cc0de78c60… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Mar 8 16:20:42 2012 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 3 months

Check_MK Git: check_mk: Updated bug entries #0669

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1cf9ef739efeade45a762fc8544a8886f5452188 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cf9ef739efead… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 8 16:01:49 2012 +0100 Updated bug entries #0669 --- .bugs/669 | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/.bugs/669 b/.bugs/669 new file mode 100644 index 0000000..4488b77 --- /dev/null +++ b/.bugs/669 @@ -0,0 +1,12 @@ +Title: Legacy checks prevent auto full scan in inventory +Component: wato +State: open +Date: 2012-03-08 16:00:40 +Targetversion: 1.2.0 +Class: bug + +If you have configured legacy checks via rules then the +inventory of a new host will only work if you click on +"Full Scan" since the list of services of the host is +not empty. The condition for this should rather be "if the +host has no inventorized services".

12 years, 3 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: 4332efe04f06a81e8203676292020825bbbc7e9c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4332efe04f06a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 8 16:01:52 2012 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2012