Module: check_mk
Branch: master
Commit: 7ab733f7dacc6939b91178f57d3a1125add179c0
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ab733f7dacc69…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Dec 14 11:44:46 2011 +0100
FIX: fix hitting enter in Quicksearch on IE 8
---
ChangeLog | 3 +++
web/htdocs/js/search.js | 4 +++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ff8c06a..8545395 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,9 @@
* fileinfo: new check for monitoring age and size of files
1.1.12p5:
+ Multisite:
+ * FIX: fix hitting enter in Quicksearch on IE 8
+
Checks & Agents:
* FIX: lnx_if: assume interfaces as up if ethtool is missing or
not working but interface has been used since last reboot. This
diff --git a/web/htdocs/js/search.js b/web/htdocs/js/search.js
index 0809ffa..71b93e6 100644
--- a/web/htdocs/js/search.js
+++ b/web/htdocs/js/search.js
@@ -330,7 +330,9 @@ function mkSearchGetUrl(objType, objName, objSite, numMatches) {
// This performs a case insensitive search of a substring in a string
// Returns true if found and false if not
function mkSearchMatch(base, search) {
- return base.toLowerCase().indexOf(search.toLowerCase()) > -1;
+ if (!base)
+ return false;
+ return base.toLowerCase().indexOf(search.toLowerCase()) > -1;
}
function mkSearchAddSearchResults(aSearchObjects, objType, val) {
Module: check_mk
Branch: master
Commit: 90f28f48f322edd2fe9ca55edc7665e764ae5803
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90f28f48f322ed…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Dec 14 11:43:54 2011 +0100
Updated bug entries
---
.bugs/413 | 6 ++++--
.bugs/475 | 9 +++++++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/.bugs/413 b/.bugs/413
index 243637a..88e45be 100644
--- a/.bugs/413
+++ b/.bugs/413
@@ -1,10 +1,12 @@
Title: filesystem_levels aus Dokus entfernen
Component: docu
+State: done
+Class: bug
Benefit: 2
-State: open
Cost: 1
Date: 2011-11-07 10:27:18
Targetversion: 1.1.12
-Class: bug
Die Option ist deprecated. Deswegen aus der Doku entfernen.
+
+2011-12-14 11:04:45: changed state open -> done
diff --git a/.bugs/475 b/.bugs/475
index 3f6385f..69d8262 100644
--- a/.bugs/475
+++ b/.bugs/475
@@ -1,13 +1,18 @@
Title: lnx_if fails if ethtool is not working
Component: checks
+State: done
+Class: bug
Benefit: 1
-State: open
Cost: 2
Date: 2011-12-06 08:47:42
Targetversion: 1.1.12
-Class: bug
The check should work, if information from ethtool is missing.
That way also virtual network cards (e.g. from VMWare) will
work. We must make shure, however, that we do not inventorize
lo, sit and other dummy devices.
+
+2011-12-14 10:59:14: changed state open -> done
+We assume a link state of up if information from ethtool
+is missing and the nic has been in use since the last
+reboot.
Module: check_mk
Branch: master
Commit: 749203d18bad35715f04af6f553b9c0dbb6331e4
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=749203d18bad35…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Dec 14 11:45:31 2011 +0100
Updated bug entries #0402
---
.bugs/402 | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.bugs/402 b/.bugs/402
index 386e62b..a582609 100644
--- a/.bugs/402
+++ b/.bugs/402
@@ -1,11 +1,14 @@
Title: IE8: Hitting enter in Quicksearch does not work
Component: multisite
+State: done
+Class: bug
Benefit: 1
-State: open
Cost: 1
Date: 2011-10-27 18:52:58
Targetversion: 1.1.12
-Class: bug
When hitting Enter in Quicksearch when no host matches, a service
search should be done. In Firefox this works, in IE8 not.
+
+2011-12-14 11:45:29: changed state open -> done
+Fixed. Was a javascript error due to an undefined value.
Module: check_mk
Branch: master
Commit: 295ec57af52f7fc700dc7ea1846f9f3ad7082808
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=295ec57af52f7f…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Dec 14 10:52:06 2011 +0100
FIX: lnx_if: assume interfaces as up if ethtool is missing
---
ChangeLog | 7 +++++++
checks/lnx_if | 28 ++++++++++++++++++----------
2 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 82b7b5a..ff8c06a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,13 @@
man page of logwatch for details)
* fileinfo: new check for monitoring age and size of files
+1.1.12p5:
+ Checks & Agents:
+ * FIX: lnx_if: assume interfaces as up if ethtool is missing or
+ not working but interface has been used since last reboot. This
+ fixes the problem where interface are not found by inventory.
+
+1.1.12p4:
Multisite:
* New nifty sidebar snapin "Speed-O-Meter"
* Implemented new cookie based login mechanism including a fancy login GUI
diff --git a/checks/lnx_if b/checks/lnx_if
index 58bc201..642a376 100644
--- a/checks/lnx_if
+++ b/checks/lnx_if
@@ -69,6 +69,7 @@ def if_lnx_convert_to_if64(info):
if_table = []
for nic, attr in nic_info.items():
+ import pprint ; pprint.pprint(attr)
counters = attr.get("counters", [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0])
ifIndex = attr["index"]
@@ -97,16 +98,6 @@ def if_lnx_convert_to_if64(info):
else:
ifSpeed = ''
- # Link state from ethtool. If ethtool has no information about
- # this NIC, we set the state to unknown.
- ld = attr.get("Link detected")
- if ld == "yes":
- ifOperStatus = 1
- elif ld == "no":
- ifOperStatus = 2
- else:
- ifOperStatus = 4 # unknown
-
# Performance counters
ifInOctets = counters[0]
inucast = counters[1] + counters[7]
@@ -122,6 +113,22 @@ def if_lnx_convert_to_if64(info):
ifOutErrors = counters[10]
ifOutQLen = counters[12]
+ # Link state from ethtool. If ethtool has no information about
+ # this NIC, we set the state to unknown.
+ ld = attr.get("Link detected")
+ if ld == "yes":
+ ifOperStatus = 1
+ elif ld == "no":
+ ifOperStatus = 2
+ else:
+ # No information from ethtool. We consider interfaces up
+ # if they have been used at least some time since the
+ # system boot.
+ if ifInOctets > 0:
+ ifOperStatus = 1 # assume up
+ else:
+ ifOperStatus = 4 # unknown (NIC has never been used)
+
if_table.append(map(str, [
ifIndex, ifDescr, ifType, ifSpeed, ifOperStatus,
ifInOctets, inucast, inmcast, inbcast, ifInDiscards,
@@ -131,6 +138,7 @@ def if_lnx_convert_to_if64(info):
return if_table
def inventory_lnx_if(info):
+ import pprint ; pprint.pprint(info)
if linux_nic_check == "legacy":
return []
return inventory_if_common(if_lnx_convert_to_if64(info))