Module: check_mk
Branch: master
Commit: b3213a9c973d6cbeac016b902fe9ea67b28777ab
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3213a9c973d6c…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Aug 24 17:02:54 2011 +0200
Perf-O-Meters are now aware if there really is a PNP graph
---
.bugs/112 | 7 ++++++-
ChangeLog | 1 +
web/plugins/views/perfometer.py | 7 +++++--
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/.bugs/112 b/.bugs/112
index ca50fe4..0204532 100644
--- a/.bugs/112
+++ b/.bugs/112
@@ -1,6 +1,6 @@
Title: PNP-Links in Perf-O-Meter should be intelligent
Component: multisite
-State: open
+State: done
Class: cleanup
Date: 2011-01-28 09:34:33
Benefit: 1
@@ -9,3 +9,8 @@ Fun: 0
If there is no PNP database the perfometer should not contain a hlink
to PNP. We can use the same logic as in the intelligent PNP icon.
+
+2011-08-24 17:02:17: changed state open -> done
+If no information avaiable, then the link is always displayed (-1)
+This is the case if the user has not configured a rrdpath when load
+ing livestatus.
diff --git a/ChangeLog b/ChangeLog
index e18efdf..333f278 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,6 +61,7 @@
* Added several missing i18n strings in view editor
* Views can now be sorted by the users by clicking on the table headers.
The user sort options are not persisted.
+ * Perf-O-Meters are now aware if there really is a PNP graph
WATO:
* Show error message in case of empty inventory due to agent error
diff --git a/web/plugins/views/perfometer.py b/web/plugins/views/perfometer.py
index 126512b..78fec0f 100644
--- a/web/plugins/views/perfometer.py
+++ b/web/plugins/views/perfometer.py
@@ -155,7 +155,9 @@ def paint_perfometer(row):
content += '<div class=title>%s</div>' % title
content += '<img class=glass src="images/perfometer-bg.png">'
- if 'X' in html.display_options:
+ # pnpgraph_present: -1 means unknown (path not configured), 0: no, 1: yes
+ if 'X' in html.display_options and \
+ row["service_pnpgraph_present"] != 0:
return "perfometer", ('<a href="%s">%s</a>' % (pnp_url(row, "service"), content))
else:
return "perfometer", content
@@ -169,7 +171,8 @@ def paint_perfometer(row):
multisite_painters["perfometer"] = {
"title" : _("Service Perf-O-Meter"),
"short" : _("Perf-O-Meter"),
- "columns" : [ "service_perf_data", "service_state", "service_check_command" ],
+ "columns" : [ "service_perf_data", "service_state",
+ "service_check_command", "service_pnpgraph_present" ],
"paint" : paint_perfometer
}
Module: check_mk
Branch: master
Commit: 7b6fe33d4620094608699ec709fa907105b9af64
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b6fe33d462009…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Aug 24 15:59:36 2011 +0200
df: enabled trend_perfdata per default
---
.bugs/341 | 10 +++++++---
ChangeLog | 2 ++
checkman/df | 8 +++++---
checks/df.include | 2 +-
4 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/.bugs/341 b/.bugs/341
index 2044812..25a7514 100644
--- a/.bugs/341
+++ b/.bugs/341
@@ -1,9 +1,13 @@
Title: Enable performance data for fs trends per default
Component: checks
+State: done
+Class: cleanup
+Date: 2011-08-23 17:49:06
Benefit: 1
-State: open
Cost: 1
-Date: 2011-08-23 17:49:06
-Class: cleanup
+Fun: 0
Also describe this in the migration notes.
+
+2011-08-24 15:56:58: changed state open -> done
+Enabled now.
diff --git a/ChangeLog b/ChangeLog
index 15c370f..b32ea2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,8 @@
* hr_mem: added Perf-O-Meter
* Renamed all temperature checks to "Temperature %s". Please
read the migration notes!
+ * df and friends: enabled trend performance data per default. Please
+ carefully read the migration notes!
MK Livestatus:
* WaitObject: allow to separate host name and service with a semicolon.
diff --git a/checkman/df b/checkman/df
index 97b7c0a..a5392e6 100644
--- a/checkman/df
+++ b/checkman/df
@@ -54,8 +54,8 @@ examples:
# alternative[2]: Just change the default partially
filesystem_default_levels["magic"] = 0.8
- # Make df output trend performance data (beware of exsting RRDs)
- filesystem_default_levels["trend_perfdata"] = True
+ # Disable trend performance data (beware of exsting RRDs)
+ filesystem_default_levels["trend_perfdata"] = False
# Override warning/critical levels for all checks where
@@ -88,7 +88,9 @@ perfdata:
levels in MB are provided. If you set the parameter {"trend_perfdata" : True}, then
two additional values are output: the change of the usage in MB per range
since the last check (e.g. in MB per 24 hours) and the averaged change (so called trend),
- also in MB per range. This can done globally in {main.mk} by {filesystem_default_levels["trend_perfdata"] = True}.
+ also in MB per range. Please note, that as of version 1.1.11i3, performance data for
+ trends is enabled per default. You can globally disable that in {main.mk}
+ with {filesystem_default_levels["trend_perfdata"] = False}.
Please note, that - until you use the storage type {MULTIPLE} in PNP4Nagios -
changing the parameter {"trend_perfdata"} will stop all updates to
diff --git a/checks/df.include b/checks/df.include
index a620b63..c338d02 100644
--- a/checks/df.include
+++ b/checks/df.include
@@ -50,7 +50,7 @@ factory_settings["filesystem_default_levels"] = {
"magic_normsize" : 20, # Standard size if 20 GB
"levels_low" : (50, 60), # Never move warn level below 50% due to magic factor
"trend_range" : 24,
- "trend_perfdata" : False, # do not send performance data for trends
+ "trend_perfdata" : True, # do send performance data for trends
}
# Users might have set filesystem_default_levels to old format like (80, 90)