Module: check_mk
Branch: master
Commit: 11cfaaf28d16e408adfb10af6657c9b2097ab845
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11cfaaf28d16e4…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Feb 11 19:06:08 2014 +0100
Add CSV export to availability views
In the availability table views there is now the small CSV export icon at the
bottom left of the page, which allows a CVS export of the table.
---
.werks/405 | 9 ++
ChangeLog | 1 +
web/htdocs/htmllib.py | 19 ++--
web/htdocs/images/status_download_csv.png | Bin 0 -> 3890 bytes
web/htdocs/table.py | 138 +++++++++++++++++------------
web/plugins/views/availability.py | 69 ++++++++++-----
6 files changed, 148 insertions(+), 88 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=11cfaaf28d…
Module: check_mk
Branch: master
Commit: 30253474029ec1917e5d1104d7404a4cf32d6aa6
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=30253474029ec1…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Feb 11 14:13:30 2014 +0100
FIX TIMEPERIOD TRANSITION messages no longer cut at 64 bytes
Whenever the timeperiod name was specified very long not all information got
logged into the monitoring history during a timeperiod transition.<br>
For example:<br>
nagios-02-07-2014-00.log:[1391684695] TIMEPERIOD TRANSITION: ab@mathias-kettner.de_demo_timeperiod@shd-online.d<br><br>
Some mandatory information was missing at the end of the line, thus causing
the livestatus statehist table to crash, while processing such an invalid entry.
---
.werks/282 | 15 +++++++++++++++
ChangeLog | 1 +
livestatus/src/TimeperiodsCache.cc | 2 +-
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/.werks/282 b/.werks/282
new file mode 100644
index 0000000..3e7b280
--- /dev/null
+++ b/.werks/282
@@ -0,0 +1,15 @@
+Title: TIMEPERIOD TRANSITION messages no longer cut at 64 bytes
+Level: 1
+Component: core
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1392123708
+
+Whenever the timeperiod name was specified very long not all information got
+logged into the monitoring history during a timeperiod transition.<br>
+For example:<br>
+nagios-02-07-2014-00.log:[1391684695] TIMEPERIOD TRANSITION: ab@mathias-kettner.de_demo_timeperiod@shd-online.d<br><br>
+
+Some mandatory information was missing at the end of the line, thus causing
+the livestatus statehist table to crash, while processing such an invalid entry.
diff --git a/ChangeLog b/ChangeLog
index 91c8aec..2700dde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@
* 0696 FIX: Remove garbled output of cmk -v in state of CMC
* 0682 FIX: Allow overriding of active and custom checks by more specific rule...
* 0267 FIX: Fixed auth.serials permission problem in check_mk standalone installation...
+ * 0282 FIX: TIMEPERIOD TRANSITION messages no longer cut at 64 bytes...
Checks & Agents:
* 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets
diff --git a/livestatus/src/TimeperiodsCache.cc b/livestatus/src/TimeperiodsCache.cc
index 5a3a21f..e8679a7 100644
--- a/livestatus/src/TimeperiodsCache.cc
+++ b/livestatus/src/TimeperiodsCache.cc
@@ -148,7 +148,7 @@ bool TimeperiodsCache::inTimeperiod(timeperiod *tp)
void TimeperiodsCache::logTransition(char *name, int from, int to)
{
- char buffer[64];
+ char buffer[256];
snprintf(buffer, sizeof(buffer), "TIMEPERIOD TRANSITION: %s;%d;%d", name, from, to);
write_to_all_logs(buffer, LOG_INFO);
}
Module: check_mk
Branch: master
Commit: c3ec1bc7f4bbf65859d1d2d54554985837de39a8
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3ec1bc7f4bbf6…
Author: Götz Golla <gg(a)mathias-kettner.de>
Date: Tue Feb 11 11:23:25 2014 +0100
Cleanup of man pages
---
checkman/cisco_mem | 5 +++--
checkman/cisco_temp | 13 ++++++-------
checkman/cisco_temp_perf | 7 +++----
checkman/ups_bat_temp | 7 ++-----
checkman/ups_test | 12 +++++++-----
5 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/checkman/cisco_mem b/checkman/cisco_mem
index abd1514..5a97927 100644
--- a/checkman/cisco_mem
+++ b/checkman/cisco_mem
@@ -4,8 +4,9 @@ catalog: hw/network/cisco
license: GPL
distribution: check_mk
description:
- This check monitors the memory usage of Cisco devices. The check distinguises between
- CPU and I/O pool.
+
+ This check monitors the memory usage of Cisco devices. The check distinguishes
+ between CPU and I/O pool memory.
inventory:
A check for i/o pool and one for cpu pool will be created.
diff --git a/checkman/cisco_temp b/checkman/cisco_temp
index 5521df2..a6b3db2 100644
--- a/checkman/cisco_temp
+++ b/checkman/cisco_temp
@@ -4,13 +4,12 @@ catalog: hw/network/cisco
license: GPL
distribution: check_mk
description:
- This check monitors the state of temperature sensors
- on older Cisco devices using data from the
- {CISCO-ENVMON-MIB}. This checks is useful for
- devices which do not provide a current level
- and threshold information and does not send performance
- data. Use {cisco_temp_perf} if your devices provides
- such data.
+
+ This check monitors the state of temperature sensors on older Cisco
+ devices using data from the {CISCO-ENVMON-MIB}. This checks is useful
+ for devices which do not provide the current temperature value and threshold
+ information. It thus does not collect performance data. Use {cisco_temp_perf}
+ if your devices provides such data.
Depending on the state of the sensor the checks can
be {OK}, {WARN}, {CRIT} or {UNKNOWN}.
diff --git a/checkman/cisco_temp_perf b/checkman/cisco_temp_perf
index 242a4b2..8588ad5 100644
--- a/checkman/cisco_temp_perf
+++ b/checkman/cisco_temp_perf
@@ -11,16 +11,15 @@ description:
Depending on the state of the sensor the checks can
be {OK}, {WARN}, {CRIT} or {UNKNOWN}.
- In addition to {cisco_temp} this check outputs performance
+ In addition to {cisco_temp} this check determines performance
data.
perfdata:
The current temperature in degrees celsius
item:
- The description of the sensor as provided by
- the device.
+ The description of the sensor as provided by the device.
inventory:
- One check for each sensor is created by the inventory, if the
+ One check for each sensor is created by the inventory if the
sensor is not in state {5} (not present).
diff --git a/checkman/ups_bat_temp b/checkman/ups_bat_temp
index 29fff1c..f9e3650 100644
--- a/checkman/ups_bat_temp
+++ b/checkman/ups_bat_temp
@@ -4,13 +4,10 @@ catalog: hw/power
license: GPL
distribution: check_mk
description:
- This check monitors the state of temperature sensors
- on UPS devices.
-
+ This check monitors the state of temperature sensors on UPS devices.
item:
- The description of the sensor as provided by
- the device.
+ The description of the sensor as provided by the device.
perfdata:
The actual temperature in degree
diff --git a/checkman/ups_test b/checkman/ups_test
index da09089..533555b 100644
--- a/checkman/ups_test
+++ b/checkman/ups_test
@@ -4,11 +4,13 @@ catalog: hw/power
license: GPL
distribution: check_mk
description:
- This check monitors parameters related to the self test of UPS devices: the result of the
- last self test and the last date of the self test run. The check becomes {CRIT} if the test
- result is {"doneError"} or {"aborted"}, and {WARN} if the result is {"doneWarning"} or
- {"noTestsInitiated"}. It also has a {WARN} or {CRIT} state if the date of the last self
- test is more than the warning or critical level ago.
+
+ This check monitors parameters related to the self test of UPS devices: the
+ result of the last self test and the last date of the self test run. The
+ check becomes {CRIT} if the test result is {"doneError"} or {"aborted"},
+ and {WARN} if the result is {"doneWarning"} or {"noTestsInitiated"}. It also
+ has a {WARN} or {CRIT} state if the date of the last self test is more than
+ the warning or critical level ago.
examples:
# sets the warning and critical levels to 5 and 10 days, respectively