Module: check_mk
Branch: master
Commit: 8284fb20f20ea0bab84da6202012d89acefef8cc
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8284fb20f20ea0…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Apr 11 15:33:52 2013 +0200
Fix file header of one PNP-template and convert to unix
---
pnp-templates/check_mk-apc_symmetra_power.php | 75 ++++++++++++-------------
1 files changed, 36 insertions(+), 39 deletions(-)
diff --git a/pnp-templates/check_mk-apc_symmetra_power.php b/pnp-templates/check_mk-apc_symmetra_power.php
index 63b2c8b..3d7ecc2 100644
--- a/pnp-templates/check_mk-apc_symmetra_power.php
+++ b/pnp-templates/check_mk-apc_symmetra_power.php
@@ -1,39 +1,36 @@
-<?php
-# +------------------------------------------------------------------+
-# | ____ _ _ __ __ _ __ |
-# | / ___| |__ ___ ___| | __ | \/ | |/ / |
-# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / |
-# | | |___| | | | __/ (__| < | | | | . \ |
-# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ |
-# | |
-# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de |
-# +------------------------------------------------------------------+
-#
-# This file is part of Check_MK.
-# The official homepage is at http://mathias-kettner.de/check_mk.
-#
-# check_mk is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation in version 2. check_mk is distributed
-# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with-
-# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE. See the GNU General Public License for more de-
-# ails. You should have received a copy of the GNU General Public
-# License along with GNU Make; see the file COPYING. If not, write
-# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-# Boston, MA 02110-1301 USA.
-
-$opt[1] = "--vertical-label \"Watt\" -l 0 -u 60 --title \"Current Power\" ";
-
-
-$def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX ";
-$def[1] .= "AREA:var1#800040:\"Power\:\" ";
-$def[1] .= "GPRINT:var1:LAST:\"%2.0lfW\" ";
-$def[1] .= "LINE1:var1#800040:\"\" ";
-$def[1] .= "GPRINT:var1:MAX:\"(Max\: %2.0lfW,\" ";
-$def[1] .= "GPRINT:var1:AVERAGE:\"Avg\: %2.0lfW)\" ";
-$def[1] .= "HRULE:$CRIT[1]#FF0000:\"Critical\: $CRIT[1]W\" ";
-
-
-
-?>
+<?php
+# +------------------------------------------------------------------+
+# | ____ _ _ __ __ _ __ |
+# | / ___| |__ ___ ___| | __ | \/ | |/ / |
+# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / |
+# | | |___| | | | __/ (__| < | | | | . \ |
+# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ |
+# | |
+# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de |
+# +------------------------------------------------------------------+
+#
+# This file is part of Check_MK.
+# The official homepage is at http://mathias-kettner.de/check_mk.
+#
+# check_mk is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation in version 2. check_mk is distributed
+# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with-
+# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more de-
+# ails. You should have received a copy of the GNU General Public
+# License along with GNU Make; see the file COPYING. If not, write
+# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301 USA.
+
+$opt[1] = "--vertical-label \"Watt\" -l 0 -u 60 --title \"Current Power\" ";
+
+$def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX ";
+$def[1] .= "AREA:var1#800040:\"Power\:\" ";
+$def[1] .= "GPRINT:var1:LAST:\"%2.0lfW\" ";
+$def[1] .= "LINE1:var1#800040:\"\" ";
+$def[1] .= "GPRINT:var1:MAX:\"(Max\: %2.0lfW,\" ";
+$def[1] .= "GPRINT:var1:AVERAGE:\"Avg\: %2.0lfW)\" ";
+$def[1] .= "HRULE:$CRIT[1]#FF0000:\"Critical\: $CRIT[1]W\" ";
+
+?>
Module: check_mk
Branch: master
Commit: 4b907661364c0998cb33eeb8de69f1cbe70b11ef
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b907661364c09…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Apr 11 13:44:28 2013 +0200
Move rule datasource_programs to topic Datasource Programs
---
web/plugins/wato/check_mk_configuration.py | 14 --------------
web/plugins/wato/datasource_programs.py | 14 ++++++++++++++
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py
index 30c0f9c..59826fa 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -1666,20 +1666,6 @@ register_rule(group,
register_rule(group,
- "datasource_programs",
- TextAscii(
- title = _("Individual program call instead of agent access"),
- help = _("For agent based checks Check_MK allows you to specify an alternative "
- "program that should be called by Check_MK instead of connecting the agent "
- "via TCP. That program must output the agent's data on standard output in "
- "the same format the agent would do. This is for example useful for monitoring "
- "via SSH. The command line may contain the placeholders <tt><IP></tt> and "
- "<tt><HOST></tt>."),
- label = _("Command line to execute"),
- size = 80,
- attrencode = True))
-
-register_rule(group,
"piggyback_translation",
Dictionary(
title = _("Hostname translation for piggybacked hosts"),
diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py
index ef8d568..43716b3 100644
--- a/web/plugins/wato/datasource_programs.py
+++ b/web/plugins/wato/datasource_programs.py
@@ -30,6 +30,20 @@ register_rulegroup("datasource_programs",
group = "datasource_programs"
register_rule(group,
+ "datasource_programs",
+ TextAscii(
+ title = _("Individual program call instead of agent access"),
+ help = _("For agent based checks Check_MK allows you to specify an alternative "
+ "program that should be called by Check_MK instead of connecting the agent "
+ "via TCP. That program must output the agent's data on standard output in "
+ "the same format the agent would do. This is for example useful for monitoring "
+ "via SSH. The command line may contain the placeholders <tt><IP></tt> and "
+ "<tt><HOST></tt>."),
+ label = _("Command line to execute"),
+ size = 80,
+ attrencode = True))
+
+register_rule(group,
"special_agents:vsphere",
Dictionary(
title = _("Check state of VMWare ESX via vSphere"),