Module: check_mk
Branch: master
Commit: 731adc6496e345c63eeca8723f611a19abcca56b
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=731adc6496e345…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Fri Sep 21 17:45:59 2012 +0200
Fixed hp_blade_blades check for new firmware 3.6.0
---
checks/hp_blade_blades | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/checks/hp_blade_blades b/checks/hp_blade_blades
index 16aa74a..8f51177 100644
--- a/checks/hp_blade_blades
+++ b/checks/hp_blade_blades
@@ -65,6 +65,7 @@ def check_hp_blade_blades(item, params, info):
# should represent a state but is empty. So set it to "fake" OK and
# display the other gathered information.
state = line[2] == '' and 2 or line[2]
+ state = saveint(state)
snmp_state = hp_blade_status_map[state]
status = hp_blade_status2nagios_map[snmp_state]
Module: check_mk
Branch: master
Commit: 12e2f64ec10730607fc0524f85281eb94d12028f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12e2f64ec10730…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Sep 21 14:57:37 2012 +0200
datasources.py: added comments
---
web/plugins/views/datasources.py | 42 ++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/web/plugins/views/datasources.py b/web/plugins/views/datasources.py
index 8755312..82b6fdc 100644
--- a/web/plugins/views/datasources.py
+++ b/web/plugins/views/datasources.py
@@ -28,13 +28,47 @@
##################################################################################
# Data sources
##################################################################################
-
-# keys: columns which must be fetched in order to execute commands on
+# title: Used as display-string for the datasource in multisite (e.g. view editor)
+#
+# table: Might be a string which refers to a livestatus table or a function
+# which is called instead of the livestatus function query_data().
+#
+# infos: A key to be used to create groups out of single painters and filters.
+# e.g. 'host' groups all painters and filters which begin with "host_".
+# Out of this declaration multisite knows which filters or painters are
+# available for the single datasources.
+#
+# merge_by:
+# 1. Results in fetching these columns from the datasource.
+# 2. Rows from different sites are merged together. For example members
+# of hostgroups which exist on different sites are merged together to
+# show the user one big hostgroup.
+#
+# add_columns: list of columns the datasource is known to add itself
+#
+# add_headers: additional livestatus headers to add to each call
+#
+# keys: columns which must be fetched in order to execute commands on
# the items (= in order to identify the items and gather all information
# needed for constructing Nagios commands)
-
+# those columns are always fetched from the datasource for each item
+#
# idkeys: these are used to generate a key which is uniq for each data row
-
+# is used to identify an item between http requests
+#
+# join: A view can display e.g. host-rows and include information from e.g.
+# the service table to create a column which shows e.g. the state of one
+# service.
+# With this attibute it is configured which tables can be joined into
+# this table and by which attribute. It must be given as tuple, while
+# the first argument is the name of the table to be joined and the second
+# argument is the column in the master table (in this case hosts) which
+# is used to match the rows of the master and slave table.
+#
+# joinkey: Each joined column in the view can have a 4th attribute which is
+# used as value for this column to filter the datasource query
+# to get the matching row of the slave table.
+#
# ignore_limit: Ignore the soft/hard query limits in view.py/query_data(). This
# fixes stats queries on e.g. the log table.
Module: check_mk
Branch: master
Commit: 72abef366002b35b313a06d0658ae4828b8529c6
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72abef366002b3…
Author: Florian Heigl <fh(a)mathias-kettner.de>
Date: Fri Sep 21 14:30:19 2012 +0200
Solaris Agent: Remove typo that could disable statgrab net. Thanks to Matthew Stier for pointing at it
---
agents/check_mk_agent.solaris | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris
index bbbd388..961e785 100755
--- a/agents/check_mk_agent.solaris
+++ b/agents/check_mk_agent.solaris
@@ -81,7 +81,7 @@ statgrab_vars="const. cpu. disk. general. mem. page. proc. swap. user."
statgrab_sections="proc cpu disk page"
# Only collect net stats if we aren't in a unpriv. zone.
if [ "$platform" != "zone" ]; then
- statgrab_vars="$statgrab_vars .net"
+ statgrab_vars="$statgrab_vars net."
statgrab_sections="$statgrab_sections net"
fi