Module: check_mk
Branch: master
Commit: 919f4b9bb65a6702496b93019edf1c3285beb5dc
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=919f4b9bb65a67…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Dec 16 11:17:06 2013 +0100
Moved modbus checks to doc/treasures/modbus
Reason: these checks only work if you have the modbus library installed.
Also you need to compile the special agent yourself.
---
.../special => doc/treasures/modbus}/agent_modbus | Bin 7472 -> 7472 bytes
.../treasures/modbus}/agent_modbus.cpp | 0
.../treasures/modbus/checkman}/modbus_value | 0
.../treasures/modbus/checks}/agent_modbus | 0
{checks => doc/treasures/modbus}/modbus_value | 0
doc/treasures/modbus/perfometer/modbus.py | 10 ++++
doc/treasures/modbus/wato/modbus.py | 54 ++++++++++++++++++++
web/plugins/perfometer/check_mk.py | 8 ---
web/plugins/wato/check_parameters.py | 14 -----
web/plugins/wato/datasource_programs.py | 35 -------------
10 files changed, 64 insertions(+), 57 deletions(-)
diff --git a/agents/special/agent_modbus b/doc/treasures/modbus/agent_modbus
similarity index 100%
rename from agents/special/agent_modbus
rename to doc/treasures/modbus/agent_modbus
diff --git a/agents/special/agent_modbus.cpp b/doc/treasures/modbus/agent_modbus.cpp
similarity index 100%
rename from agents/special/agent_modbus.cpp
rename to doc/treasures/modbus/agent_modbus.cpp
diff --git a/checkman/modbus_value b/doc/treasures/modbus/checkman/modbus_value
similarity index 100%
rename from checkman/modbus_value
rename to doc/treasures/modbus/checkman/modbus_value
diff --git a/checks/agent_modbus b/doc/treasures/modbus/checks/agent_modbus
similarity index 100%
rename from checks/agent_modbus
rename to doc/treasures/modbus/checks/agent_modbus
diff --git a/checks/modbus_value b/doc/treasures/modbus/modbus_value
similarity index 100%
rename from checks/modbus_value
rename to doc/treasures/modbus/modbus_value
diff --git a/doc/treasures/modbus/perfometer/modbus.py
b/doc/treasures/modbus/perfometer/modbus.py
new file mode 100644
index 0000000..e464c15
--- /dev/null
+++ b/doc/treasures/modbus/perfometer/modbus.py
@@ -0,0 +1,10 @@
+#!/usr/bin/python
+# Put this file into share/check_mk/web/plugins/perfometer
+
+def perfometer_modbus_value(row, check_command, perf_data):
+ value = int(perf_data[0][1])
+ return perf_data[0][1], perfometer_logarithmic(value, value*3, 2, '#3366cc')
+
+perfometers['check_mk-modbus_value'] = perfometer_modbus_value
+
+
diff --git a/doc/treasures/modbus/wato/modbus.py b/doc/treasures/modbus/wato/modbus.py
new file mode 100644
index 0000000..851d575
--- /dev/null
+++ b/doc/treasures/modbus/wato/modbus.py
@@ -0,0 +1,54 @@
+#!/usr/bin/python
+# Put this file into share/check_mk/web/plugins/wato. It will create a rules
+# for modbus checks and a rule in the configuration of the special agents.
+
+register_check_parameters(
+ subgroup_environment,
+ "modbus_value",
+ _("Modbus Performance Values"),
+ Tuple(
+ elements = [
+ Integer(title = _("Warning if above")),
+ Integer(title = _("Critical if above"))
+ ]
+ ),
+ TextAscii( title = _("Value Name") ),
+ None
+)
+
+
+register_rule(group,
+ "special_agents:modbus",
+ Tuple(
+ title = _("Check Modbus devices"),
+ help = _( "Configure the Server Address and the ids you want to query from
the device"
+ "Please refer to the documentation of the device to find out which
ids you want"),
+ elements = [
+ Integer( title = _("Port Number"), default_value=502 ),
+ ListOf(
+ Tuple(
+ elements = [
+ Integer( title=_("Counter ID") ),
+ DropdownChoice(
+ title = _("Number of words"),
+ choices = [
+ ( 1 , _("1 Word") ),
+ ( 2, _("2 Words") ),
+ ]
+ ),
+ DropdownChoice(
+ title = _("Value type"),
+ choices = [
+ ( "counter" , _("Its a counter value") ),
+ ( "gauge", _("Its a gauge value") ),
+ ]
+ ),
+ TextAscii( title = _("Counter Description")),
+ ]
+ )
+ )
+ ]
+ ),
+ match = "first")
+
+
diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py
index a828747..1a21a18 100644
--- a/web/plugins/perfometer/check_mk.py
+++ b/web/plugins/perfometer/check_mk.py
@@ -758,11 +758,3 @@ def perfometer_fanspeed(row, check_command, perf_data):
return "%.2f%%" % value, perfometer_linear(value, "silver")
perfometers["check_mk-apc_inrow_fanspeed"] = perfometer_fanspeed
-
-
-def perfometer_modbus_value(row, check_command, perf_data):
- value = int(perf_data[0][1])
- return perf_data[0][1], perfometer_logarithmic(value, value*3, 2, '#3366cc')
-
-perfometers['check_mk-modbus_value'] = perfometer_modbus_value
-
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index f6c35b1..6f6bee9 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -3748,20 +3748,6 @@ register_check_parameters(
register_check_parameters(
- subgroup_environment,
- "modbus_value",
- _("Modubus Performance Values"),
- Tuple(
- elements = [
- Integer(title = _("Warning if above")),
- Integer(title = _("Critical if above"))
- ]
- ),
- TextAscii( title = _("Value Name") ),
- None
-)
-
-register_check_parameters(
subgroup_environment,
"ups_capacity",
_("UPS Capacity"),
diff --git a/web/plugins/wato/datasource_programs.py
b/web/plugins/wato/datasource_programs.py
index e84830a..0a031f9 100644
--- a/web/plugins/wato/datasource_programs.py
+++ b/web/plugins/wato/datasource_programs.py
@@ -142,41 +142,6 @@ register_rule(group,
match = "first")
register_rule(group,
- "special_agents:modbus",
- Tuple(
- title = _("Check Modbus devices"),
- help = _( "Configure the Server Address and the ids you want to query from
the device"
- "Please refer to the documentation of the device to find out which
ids you want"),
- elements = [
- Integer( title = _("Port Number"), default_value=502 ),
- ListOf(
- Tuple(
- elements = [
- Integer( title=_("Counter ID") ),
- DropdownChoice(
- title = _("Number of words"),
- choices = [
- ( 1 , _("1 Word") ),
- ( 2, _("2 Words") ),
- ]
- ),
- DropdownChoice(
- title = _("Value type"),
- choices = [
- ( "counter" , _("Its a counter value") ),
- ( "gauge", _("Its a gauge value") ),
- ]
- ),
- TextAscii( title = _("Counter Description")),
- ]
- )
- )
- ]
- ),
- match = "first")
-
-
-register_rule(group,
"special_agents:random",
FixedValue(
{},