Module: check_mk
Branch: master
Commit: 5a9467e3ebe8106a6e56a712f31d480d5f78b6ec
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a9467e3ebe810…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Jun 19 08:39:35 2012 +0200
FIX: Fixed syntax errors in a bunch of man pages
---
ChangeLog | 1 +
checkman/hpux_fchba | 8 --------
checkman/postgres_stat_database.size | 6 +-----
checkman/tsm_drives | 10 ----------
checkman/tsm_stagingpools | 12 +++++++-----
checkman/tsm_storagepools | 9 +--------
6 files changed, 10 insertions(+), 36 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7615765..d33cc7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
1.2.0p2:
Checks & Agents:
+ * FIX: Fixed syntax errors in a bunch of man pages
* if_lancom: silently ignore Logical and Point-To-Point interfaces
Multisite:
diff --git a/checkman/hpux_fchba b/checkman/hpux_fchba
index c526d01..70dd1fa 100644
--- a/checkman/hpux_fchba
+++ b/checkman/hpux_fchba
@@ -26,11 +26,3 @@ inventory:
Older {"td"} / {"fcms"} based HBAs are not reported from the
agent per default.
-
-[parameters]
- There are no check parameters
-
-
-[perfdata]
- No perfdata is returned by the check.
-
diff --git a/checkman/postgres_stat_database.size b/checkman/postgres_stat_database.size
index fe5f6bb..920a005 100644
--- a/checkman/postgres_stat_database.size
+++ b/checkman/postgres_stat_database.size
@@ -11,9 +11,5 @@ description:
inventory:
The check generates one item per Database found.
-
-[configuration]
- This check has no configuration.
-
perfdata:
- The check sends performance data for the size of the database.
+ The the size of the database.
diff --git a/checkman/tsm_drives b/checkman/tsm_drives
index 655b684..4241a83 100644
--- a/checkman/tsm_drives
+++ b/checkman/tsm_drives
@@ -14,15 +14,5 @@ description:
item:
The name of the tape drive.
-
inventory:
The check inventorizes all tape drives as reported by TSM.
-
-
-[parameters]
- There are no check parameters
-
-
-[perfdata]
- No perfdata is returned by the check.
-
diff --git a/checkman/tsm_stagingpools b/checkman/tsm_stagingpools
index 9d4d461..150599a 100644
--- a/checkman/tsm_stagingpools
+++ b/checkman/tsm_stagingpools
@@ -21,7 +21,6 @@ description:
tapes that still have enough capacity reserve to be considered
as free.
-
item:
The name of the staging pool.
@@ -29,12 +28,15 @@ item:
inventory:
The check creates one item per staging pool found.
+perfdata:
+ The number of tapes that are considered free,
+ the average utilization and the levels for alerting
[parameters]
tsm_stagingpools_default_levels (dict):
- "free_below" - maximum usage of a tape drive to be considered as free
-(warn, crit) = Number of free tapes
+ {"free_below"}: A percentage (float) for the usage below which a tape is considered
+ to be free.
+ {"levels"} A pair of integers of levels for warning and critical for the number
+ of required free tapes
-[perfdata]
- The check returns the number of tapes that are considered free, the average utilization and the levels for alerting
diff --git a/checkman/tsm_storagepools b/checkman/tsm_storagepools
index af8701a..aaaf9ab 100644
--- a/checkman/tsm_storagepools
+++ b/checkman/tsm_storagepools
@@ -10,19 +10,12 @@ description:
Since this check is mostly informational it always returns an OK state.
-
item:
The name of the storage pool.
-
inventory:
The check inventorizes all storage pools on the server, independent of their type.
-
-[parameters]
- There are no check parameters
-
-
-[perfdata]
+perfdata:
The used capacity in Megabytes.
Module: check_mk
Branch: master
Commit: 4429ab509cb9d55a466ba0aad7e5be173ade44f2
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4429ab509cb9d5…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Jun 18 16:16:49 2012 +0200
Do not paint host icons if data is incomplete
---
web/plugins/views/painters.py | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py
index b4eb304..c789e38 100644
--- a/web/plugins/views/painters.py
+++ b/web/plugins/views/painters.py
@@ -116,11 +116,15 @@ multisite_icons = []
load_web_plugins('icons', globals())
+# Paint column with various icons. The icons use
+# a plugin based mechanism so it is possible to
+# register own icon "handlers".
+# what: either "host" or "service"
+# row: the data row of the host or service
def paint_icons(what, row):
- """
- what: "host" or "service"
- row: The livestatus row of the current object
- """
+ if not row["host_name"]:
+ return "", ""# Host probably does not exist
+
custom_vars = dict(zip(row["host_custom_variable_names"],
row["host_custom_variable_values"]))
Module: check_mk
Branch: master
Commit: bf65284f1fe682c63dc2f9a9a8e17d0dec431d41
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf65284f1fe682…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Jun 18 16:06:27 2012 +0200
ValueSpec DropdownChoice: handle yet other case with no choices
---
web/htdocs/valuespec.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py
index 2219a3c..775878a 100644
--- a/web/htdocs/valuespec.py
+++ b/web/htdocs/valuespec.py
@@ -795,7 +795,7 @@ class DropdownChoice(ValueSpec):
val = entry[0]
if sel == str(n):
return val
- return self.choices()[0][0] # can only happen if user garbled URL
+ return self.default_value() # can only happen if user garbled URL or len(choices) == 0
def validate_datatype(self, value, varprefix):
for val, title in self.choices():