found on Solaris)
User-Agent: Heirloom mailx 12.4 7/29/08
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Module: check_mk
Branch: master
Commit: afa5c4cbc0dcd6bf2b1d40f265f2445c14fddbb6
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=afa5c4cbc0dcd6…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Jun 5 17:18:08 2012 +0200
tcp_conn_stats: handle state BOUND (found on Solaris)
---
ChangeLog | 1 +
checks/tcp_conn_stats | 1 +
web/plugins/wato/check_parameters.py | 12 ++++++++++++
3 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d8d90e9..0415657 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
* postgres_stat_database.size: New check for PostgreSQL database size
* FIX: hpux_if: convert_to_hex was missing on non-SNMP-hosts -replace
with inline implementation
+ * tcp_conn_stats: handle state BOUND (found on Solaris)
1.2.0b6:
Multisite:
diff --git a/checks/tcp_conn_stats b/checks/tcp_conn_stats
index 1d75cb0..3b6e046 100644
--- a/checks/tcp_conn_stats
+++ b/checks/tcp_conn_stats
@@ -35,6 +35,7 @@ tcp_conn_stats_states = [
"CLOSING", # our socket is shut down; remote endpoint is shut down; not all data has been sent
"FIN_WAIT1", # our socket has closed; we are in the process of tearing down the connection
"FIN_WAIT2", # the connection has been closed; our socket is waiting for the remote endpoint to shut down
+"BOUND", # Socket did a bound() but TCP stack not yet active (Solaris)
]
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 96227fe..9bfe53f 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -630,6 +630,18 @@ checkgroups.append((
]
)
),
+ ( "BOUND",
+ Tuple(
+ title = _("BOUND"),
+ help = _("the socket has been created and an address assigned "
+ "to with bind(). The TCP stack is not active yet. "
+ "This state is only reported on Solaris."),
+ elements = [
+ Integer(title = _("Warning at"), label = _("connections")),
+ Integer(title = _("Critical at"), label = _("connections"))
+ ]
+ )
+ ),
]
),
None,
Module: check_mk
Branch: master
Commit: 2536f8d10aeb8f57fb46296e5bf3a399be78cae7
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2536f8d10aeb8f…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Jun 5 17:11:53 2012 +0200
FIX: hpux_if: convert_to_hex was missing on non-SNMP-hosts
---
ChangeLog | 2 ++
checks/if.include | 5 ++---
modules/snmp.py | 12 ------------
3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f696844..d8d90e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@
* postgres_sessions: New check for PostgreSQL number of sessions
* postgres_stat_database: New check for PostgreSQL database statistics
* postgres_stat_database.size: New check for PostgreSQL database size
+ * FIX: hpux_if: convert_to_hex was missing on non-SNMP-hosts -replace
+ with inline implementation
1.2.0b6:
Multisite:
diff --git a/checks/if.include b/checks/if.include
index f1ebe87..e088cd9 100644
--- a/checks/if.include
+++ b/checks/if.include
@@ -134,7 +134,6 @@ def inventory_if_common(info):
return inventory
-
def check_if_common(item, params, info):
# Params now must be a dict. Some keys might
# be set to None
@@ -206,8 +205,8 @@ def check_if_common(item, params, info):
ref_speed = None
if ifPhysAddress:
- ifPhysAddress = ':'.join(convert_to_hex(ifPhysAddress).strip().split(' '))
- infotext += 'MAC: %s, ' % ifPhysAddress
+ mac = ":".join(["%02s" % hex(ord(m))[2:] for m in ifPhysAddress]).replace(' ', '0')
+ infotext += 'MAC: %s, ' % mac
# Check speed settings of interface, but only if speed information
# is available. This is not always the case.
diff --git a/modules/snmp.py b/modules/snmp.py
index 58c41ce..6ee6951 100644
--- a/modules/snmp.py
+++ b/modules/snmp.py
@@ -66,18 +66,6 @@ def convert_from_hex(value):
r += chr(int(hx, 16))
return r
-# Converts back the values converted by the snmp code of Check_MK.
-# e.g. In case of MAC addresses it is not ok to convert the value.
-# Though we need the original value back.
-def convert_to_hex(value):
- r = ''
- for c in value:
- h = hex(ord(c)).replace('0x', '')
- if len(h) == 1:
- h = '0' + h
- r += h + ' '
- return r + ' '
-
def oid_to_bin(oid):
return u"".join([ unichr(int(p)) for p in oid.strip(".").split(".") ])
Module: check_mk
Branch: master
Commit: 2c0163ea4e9bd046ff820c420808994707412c23
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c0163ea4e9bd0…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Jun 5 13:37:39 2012 +0200
Make l10n of language selection help easier
---
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 15cfd7e..a071416 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -10366,8 +10366,8 @@ def select_language(user_language):
'the checkbox, then the system default will be used.<br><br>'
'Note: currently Multisite is internationalized '
'but comes without any actual localisations (translations). If you want to '
- 'create you own translation, you find <a href="%s">documentation online</a>.') %
- "http://mathias-kettner.de/checkmk_multisite_i18n.html")
+ 'create you own translation, you find <a href="%(url)s">documentation online</a>.') %
+ { "url" : "http://mathias-kettner.de/checkmk_multisite_i18n.html"} )
def page_user_profile():
if not config.user_id:
Module: check_mk
Branch: master
Commit: 1da0a9af9c63da7069f6db6b98affadb7b227336
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1da0a9af9c63da…
Author: Florian Heigl <fh(a)mathias-kettner.de>
Date: Tue Jun 5 13:21:34 2012 +0200
Corrections for postgres_sessions man page
---
checkman/postgres_sessions | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/checkman/postgres_sessions b/checkman/postgres_sessions
index 33d3f83..d415a6f 100644
--- a/checkman/postgres_sessions
+++ b/checkman/postgres_sessions
@@ -6,13 +6,11 @@ distribution: check_mk
description:
This check allows tracking of the session parameters for a PostgreSQL
database.
- It reports how many sessions there are in total, how many of them are
- active, and at what rate new sessions are generated.
+ It reports how many sessions there are in total and how many of them are
+ actively querying something.
It allows to set {WARN} and {CRIT} tresholds on any of these parameters.
- The data is gathered from the {show global status} query.
-
inventory:
The check generates one item for the sessions connected to the PostgreSQL
daemon.
@@ -24,5 +22,4 @@ inventory:
perfdata:
- The check generates perfdata for the total and running sessions, and the
- connection rate.
+ The check generates perfdata for the total and running sessions.