Module: check_mk
Branch: master
Commit: 2ad7e7167b23b3516b821cd201f6569422ddd6d8
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ad7e7167b23b3…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Tue Apr 22 17:16:20 2014 +0200
improving check manpage for wagner_titanus_topsense.airflow_deviation
---
checkman/wagner_titanus_topsense.airflow_deviation | 22 ++++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/checkman/wagner_titanus_topsense.airflow_deviation b/checkman/wagner_titanus_topsense.airflow_deviation
index 2875f97..2db4c6f 100644
--- a/checkman/wagner_titanus_topsense.airflow_deviation
+++ b/checkman/wagner_titanus_topsense.airflow_deviation
@@ -37,17 +37,17 @@ examples:
]
[parameters]
-lower_crit(float): If the airflow deviation in percent from the set point
- is lower or equal this value, the check returns {CRIT}.
-lower_warn(float): If the airflow deviation in percent from the set point
- is lower or equal this value, the check returns {WARN}.
-upper_warn(float): If the airflow deviation in percent from the set point
- is higher or equal this value, the check returns {WARN}.
-upper_crit(float): If the airflow deviation in percent from the set point
- is higher or equal this value, the check returns {CRIT}.
+parameters (tuple): Containing the four numbers lower_crit, lower_warn, upper_warn, upper_crit.
+ If the airflow deviation in percent from the set point
+ is lower or equal lower_crit, the check returns {CRIT}.
+ If the airflow deviation in percent from the set point
+ is lower or equal lower_warn, the check returns {WARN}.
+ If the airflow deviation in percent from the set point
+ is higher or equal upper_warn, the check returns {WARN}.
+ If the airflow deviation in percent from the set point
+ is higher or equal upper_crit, the check returns {CRIT}.
[configuration]
wagner_titanus_topsense_airflow_deviation_default_values(float, float, float, float):
- Lower level for critical, lower level for warning, upper level for warning,
- upper level for critical, all in percent.
- Defaults to (-20.0, -20.0, 20.0, 20.0)
+ Default values for lower_crit, lower_warn, upper_warn, upper_crit,
+ preset to (-20.0, -20.0, 20.0, 20.0)
Module: check_mk
Branch: master
Commit: 0f5c4b24fd2ac0530406a87c5779d05cf32984f4
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f5c4b24fd2ac0…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Apr 22 13:52:54 2014 +0200
Revert "mem.win: now able to configure swap file levels"
This reverts commit 207481c5d6449981e9ab307835a392bdc498304e.
Conflicts:
ChangeLog
---
.werks/735 | 8 --------
ChangeLog | 5 ++---
checkman/mem.win | 4 ----
checks/mem | 4 +---
web/plugins/wato/check_parameters.py | 33 +++------------------------------
5 files changed, 6 insertions(+), 48 deletions(-)
diff --git a/.werks/735 b/.werks/735
deleted file mode 100644
index 6a0a5f4..0000000
--- a/.werks/735
+++ /dev/null
@@ -1,8 +0,0 @@
-Title: mem.win: now able to configure swap file levels
-Level: 1
-Component: checks
-Version: 1.2.5i1
-Date: 1395416329
-Class: feature
-
-
diff --git a/ChangeLog b/ChangeLog
index a634b46..417c308 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -229,11 +229,8 @@
* 0595 dell_chassis_power, dell_chassis_powersupplies: new checks for Dell Poweredge Chassis Ppower consumption...
* 0596 dell_chassis_status, dell_chassis_temp, dell_chassis_kvm, dell_chassis_io, dell_chassis_fans: new checks to monitor the overall status of various sections of the Dell Poweredge Chassis via CMC
* 0597 dell_chassis_slots: new check to monitor the status of the blade slots of the Dell Poweredge Blade Servers
- * 0759 check_notify_count: New active check to monitor the number of notifications sent to contacts...
- * 0760 The windows agent contains meta information about version, manufacturer etc....
* 0145 apc_symmetra: Changed naming of Batterie Temperature to System Temerature...
NOTE: Please refer to the migration notes!
- * 0735 mem.win: now able to configure swap file levels
* 0146 innovaphone_priports_l1, innovaphone_priports_l2: New Checks for Innovaphone PRI Ports
* 0707 ibm_svc_host: New check: Status of hosts an IBM SVC / V7000 presents volumes to
* 0598 kentix_temp, kentix_humidity: new checks for Kentix MultiSensor-Rack
@@ -244,6 +241,8 @@
* 0771 juniper_trpz_aps: Show the number of connected access points on juniper wlan controllers
* 0772 added special agent for IBM SVC / V7000 storage systems...
* 0147 enterasys_fans: New Check to monitor fans of enterasys swichtes
+ * 0759 check_notify_count: New active check to monitor the number of notifications sent to contacts...
+ * 0760 The windows agent contains meta information about version, manufacturer etc....
* 0103 FIX: services: Fixed bug with service inventory defined in main.mk...
* 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now
* 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs...
diff --git a/checkman/mem.win b/checkman/mem.win
index 6aa124a..296e52c 100644
--- a/checkman/mem.win
+++ b/checkman/mem.win
@@ -21,7 +21,6 @@ examples:
memory_win_default_levels = {
"memory" : (80.0, 90.0), # alert at 80%/90% usage
"pagefile" : (2048, 1024), # alert, if less then 2/1 GB free
- "swap" : (2048, 1024), # alert, if less then 2/1 GB free
"average" : 60, # apply levels on 60-min average
}
@@ -46,9 +45,6 @@ parameters (dict): This check uses a dictionary as parameter. The following
{"pagefile"} Warning and critical levels for page file usage. The same
rules apply as for {memory}.
- {"swap"} Warning and critical levels for swap usage. The same
- rules apply as for {memory}.
-
{"average"} This optional parameters sets a value in minutes for averaging.
In that case all warn/crit levels are applied to the averaged values.
diff --git a/checks/mem b/checks/mem
index a086ea0..2e26709 100644
--- a/checks/mem
+++ b/checks/mem
@@ -81,7 +81,6 @@ check_info['mem.used'] = {
factory_settings["memory_win_default_levels"] = {
"memory" : ( 80.0, 90.0 ),
"pagefile" : ( 50.0, 70.0 ),
- "swap" : ( 70.0, 80.0 ),
}
def inventory_mem_win(info):
@@ -102,8 +101,7 @@ def check_mem_windows(item, params, info):
for title, what, paramname in [
( "Memory", "Mem", "memory" ),
- ( "Page file", "Page", "pagefile" ),
- ( "Swap", "Swap", "swap" )]:
+ ( "Page file", "Page", "pagefile" )]:
total_kb = meminfo[what + "Total"]
free_kb = meminfo[what + "Free"]
used_kb = total_kb - free_kb
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 15918e0..8f2ef51 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -1115,7 +1115,7 @@ register_check_parameters(
register_check_parameters(
subgroup_os,
"memory_pagefile_win",
- _("Memory, pagefile and swap levels for Windows"),
+ _("Memory and pagefile levels for Windows"),
Dictionary(
elements = [
( "memory",
@@ -1137,7 +1137,7 @@ register_check_parameters(
Filesize(title = _("Critical if less than")),
]
),
- # Note: Memory values lesser 1MB will not work
+ # Note: Filesize values lesser 1MB will not work
# -> need hide option in filesize valuespec
back = lambda x: (x[0] / 1024 / 1024, x[1] / 1024 / 1024),
forth = lambda x: (x[0] * 1024 * 1024, x[1] * 1024 * 1024)
@@ -1163,7 +1163,7 @@ register_check_parameters(
Filesize(title = _("Critical if less than")),
]
),
- # Note: Memory values lesser 1MB will not work
+ # Note: Filesize values lesser 1MB will not work
# -> need hide option in filesize valuespec
back = lambda x: (x[0] / 1024 / 1024, x[1] / 1024 / 1024),
forth = lambda x: (x[0] * 1024 * 1024, x[1] * 1024 * 1024)
@@ -1171,33 +1171,6 @@ register_check_parameters(
],
default_value = (50.0, 70.0))
),
- ( "swap",
- Alternative(
- title = _("Swap Levels"),
- elements = [
- Tuple(
- title = _("Swap usage in percent"),
- elements = [
- Percentage(title = _("Warning if above")),
- Percentage(title = _("Critical if above")),
- ]
- ),
- Transform(
- Tuple(
- title = _("Absolute free swap"),
- elements = [
- Filesize(title = _("Warning if less than")),
- Filesize(title = _("Critical if less than")),
- ]
- ),
- # Note: Memory values lesser 1MB will not work
- # -> need hide option in filesize valuespec
- back = lambda x: (x[0] / 1024 / 1024, x[1] / 1024 / 1024),
- forth = lambda x: (x[0] * 1024 * 1024, x[1] * 1024 * 1024)
- )
- ],
- default_value = (70.0, 80.0))
- ),
("average",
Integer (
title = _("Averaging"),