Module: check_mk
Branch: master
Commit: 8eaf08a9f84ac56deab0f2f450437b6d2dcd4831
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8eaf08a9f84ac5…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Dec 10 10:42:16 2013 +0100
Disallow werk ids on branch other than master
---
werk | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/werk b/werk
index 6a06038..2488d3c 100755
--- a/werk
+++ b/werk
@@ -752,6 +752,9 @@ def store_werk_ids(l):
file('.my_ids', 'w').write(repr(l) + "\n")
+def current_branch():
+ return [ l for l in os.popen("git branch") if l.startswith("*") ][0].split()[-1]
+
def main_fetch_ids(args):
if not args:
sys.stdout.write('You have %d reserved IDs.\n' % (len(get_werk_ids())))
@@ -761,6 +764,9 @@ def main_fetch_ids(args):
else:
usage()
+ if current_branch() != "master":
+ bail_out("It is not allowed to reserver IDs on any other branch than the master.\n")
+
# Get the start werk_id to reserve
try:
first_free = int(eval(file('first_free').read()))
Module: check_mk
Branch: master
Commit: f1dbd677be974d81616c798227bdcc7b4228e63e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1dbd677be974d…
Author: Götz Golla <gg(a)mathias-kettner.de>
Date: Tue Dec 10 09:18:40 2013 +0100
werk commit after merge conflict
---
.werks/73 | 8 +++++
ChangeLog | 1 +
checkman/moxa_iologik_register | 16 +++++++++
checks/moxa_iologik_register | 72 ++++++++++++++++++++++++++++++++++++++++
4 files changed, 97 insertions(+)
diff --git a/.werks/73 b/.werks/73
new file mode 100644
index 0000000..9a6f267
--- /dev/null
+++ b/.werks/73
@@ -0,0 +1,8 @@
+Title: moxa_iologik_register: new check to monitor moxa e2000 series registers
+Level: 1
+Component: checks
+Version: 1.2.3i8
+Date: 1386663142
+Class: feature
+
+
diff --git a/ChangeLog b/ChangeLog
index 9d523b8..8cae72b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
1.2.3i8:
Checks & Agents:
* 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets
+ * 0073 moxa_iologik_register: new check to monitor moxa e2000 series registers
* 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/moxa_iologik_register b/checkman/moxa_iologik_register
new file mode 100644
index 0000000..42fe9eb
--- /dev/null
+++ b/checkman/moxa_iologik_register
@@ -0,0 +1,16 @@
+title: Moxa IOLogik Register Check
+agents: snmp
+catalog: hw/other
+license: GPL
+distribution: check_mk
+description:
+ This check monitors the status of registers found on the moxa iologik e2000
+ series. It has been tested on the e2242 devices.
+
+ The check expects the value of the registers to be an integer in the range
+ {0-2} and takes these values as the state of the check. The name of the
+ register is taken as the status detail of the check.
+ If the value is not out of 0,1,2 the check state is {UNKNOWN}.
+
+inventory:
+ A check will be created for all registers found on the device.
diff --git a/checks/moxa_iologik_register b/checks/moxa_iologik_register
new file mode 100644
index 0000000..067cd30
--- /dev/null
+++ b/checks/moxa_iologik_register
@@ -0,0 +1,72 @@
+#!/usr/bin/python
+# -*- encoding: utf-8; py-indent-offset: 4 -*-
+# +------------------------------------------------------------------+
+# | ____ _ _ __ __ _ __ |
+# | / ___| |__ ___ ___| | __ | \/ | |/ / |
+# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / |
+# | | |___| | | | __/ (__| < | | | | . \ |
+# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ |
+# | |
+# | 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.
+
+# "0=Off, 1=On in DI/DO mode or N=Count in DO counter mode"
+
+def inventory_iologik_register(info):
+ inventory = []
+ for line in info:
+ if line[2]:
+ inventory.append((line[0], None ))
+ return inventory
+
+
+def check_iologik_register(item, params, info):
+ for line in info:
+ if line[0] == item:
+ if int(line[2]) in range(0, 2):
+ return (int(line[2]), line[1])
+ else:
+ return (3, "Invalid value %s for register" % line[2])
+
+ return (3, "Register not found")
+
+
+check_info['moxa_iologik_register'] = {
+ "check_function" : check_iologik_register,
+ "inventory_function" : inventory_iologik_register,
+ "service_description" : "Moxa Register",
+ "has_perfdata" : False,
+ "group" : "iologik_register",
+ "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.8691.10.2242.2.0").startswith("E2242-T"),
+ "snmp_info" : (".1.3.6.1.4.1.8691.10.2242.10.4.1.1",
+ [ "1", # index
+ "2", # Name
+ "3", # Value
+ ])
+}
+
+# DIOEntry
+# dioIndex Integer32 (0..11) "The channel dio index."
+# dioType Integer32 (0..1) "The channel dio type. 0=DI, DO=1, AI=2"
+# dioMode Integer32 (0..1) "The channel dio mode. 0=DI, 1=Event Counter"
+# dioStatus Unsigned32 (0..4294967295) "The channel dio(di/do) status. 0=Off, 1=On in DI/DO mode or N=Count in DO counter mode
+# dioFilter Integer32 (1..65535) "The channel dio(di) counter filter. unit=0.5ms"
+# dioTrigger Integer32 (0..1) "The channel dio(di) counter trigger level. 0=L2H, 1=H2L"
+# dioCntStart Integer32 (0..1) "The channel dio(do) counter start/stop. 0=stop, 1=start"
+# dioPulseStart Integer32 (0..1) "The channel dio(do) pulse start/stop. 0=stop, 1=start"
+# dioPulseONWidth Unsigned32 (1..4294967295) "The channel dio(do) signal ON width. unit=0.5ms"
+# dioPulseOFFWidth Unsigned32 (1..4294967295) "The channel dio(do) signal OFF width. unit=0.5ms"
Module: check_mk
Branch: master
Commit: cb036f8bc13bb64c8d286c4786e1be3df4e1b40b
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb036f8bc13bb6…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 9 19:51:48 2013 +0100
Multisite can now set rotation view permissions for NagVis
When using multisite to controll the users permissions within NagVis,
the read access to rotations could not be controlled via Multisite.
The permission for this has been added now. This change only applies
when used with the newest NagVis version (currently daily build).
---
.werks/308 | 11 +++++++++++
ChangeLog | 1 +
web/plugins/wato/nagvis_auth.py | 7 +++++++
3 files changed, 19 insertions(+)
diff --git a/.werks/308 b/.werks/308
new file mode 100644
index 0000000..77c9ca3
--- /dev/null
+++ b/.werks/308
@@ -0,0 +1,11 @@
+Title: Multisite can now set rotation view permissions for NagVis
+Level: 1
+Component: wato
+Version: 1.2.3i8
+Date: 1386614980
+Class: feature
+
+When using multisite to controll the users permissions within NagVis,
+the read access to rotations could not be controlled via Multisite.
+The permission for this has been added now. This change only applies
+when used with the newest NagVis version (currently daily build).
diff --git a/ChangeLog b/ChangeLog
index 4072a85..2a36ae5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
* 0307 FIX: Increased performance of multisite GUI with a large userbase...
WATO:
+ * 0308 Multisite can now set rotation view permissions for NagVis...
* 0057 FIX: Fix exception in WATO host editor on custom tag without topic...
Reporting & Availability:
diff --git a/web/plugins/wato/nagvis_auth.py b/web/plugins/wato/nagvis_auth.py
index e2bbb18..d3d66cc 100644
--- a/web/plugins/wato/nagvis_auth.py
+++ b/web/plugins/wato/nagvis_auth.py
@@ -43,6 +43,13 @@ config.declare_permission(
)
config.declare_permission(
+ 'nagvis.Rotation_view_*',
+ _('Use all map rotations'),
+ _('Grants read access to all rotations.'),
+ [ 'guest' ]
+)
+
+config.declare_permission(
'nagvis.Map_edit_*',
_('Edit all maps'),
_('Grants modify access to all maps.'),
Module: check_mk
Branch: master
Commit: 9388d20b48330246329f15262af19ff8c6dcb19a
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9388d20b483302…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Dec 9 17:57:40 2013 +0100
FIX Virtualmachine names with space no longer have missing piggyback data
Every space character in a virtualmachines name needs to be converted to an underline character.
This didn't apply to the piggyback data section for the VM.
---
.werks/240 | 9 +++++++++
ChangeLog | 1 +
agents/special/agent_vsphere | 4 ++--
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/.werks/240 b/.werks/240
new file mode 100644
index 0000000..791d410
--- /dev/null
+++ b/.werks/240
@@ -0,0 +1,9 @@
+Title: Virtualmachine names with space no longer have missing piggyback data
+Level: 1
+Component: checks
+Version: 1.2.3i8
+Date: 1386608073
+Class: fix
+
+Every space character in a virtualmachines name needs to be converted to an underline character.
+This didn't apply to the piggyback data section for the VM.
diff --git a/ChangeLog b/ChangeLog
index 4072a85..171b102 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
* 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs...
* 0305 FIX: apache_status: Fixed exception when agent reports HTML code as apache-status data...
* 0104 FIX: mssql: Server instances with underline in name are now supported....
+ * 0240 FIX: Virtualmachine names with space no longer have missing piggyback data...
Multisite:
* 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE
diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere
index 94a4f44..452296c 100755
--- a/agents/special/agent_vsphere
+++ b/agents/special/agent_vsphere
@@ -557,7 +557,7 @@ if not error:
for key in sorted(vms.keys()):
data = vms[key]
if data.get("name"):
- print "<<<<%s>>>>" % data.get("name")
+ print "<<<<%s>>>>" % data.get("name").replace(" ", "_")
print "<<<esx_vsphere_vm>>>"
entries = list(data.items())
entries.sort()
@@ -580,7 +580,7 @@ if not error:
for key in sorted(vms.keys()):
data = vms[key]
running_on = hostsystem_name.get(data.get("runtime.host"), data.get("runtime.host"))
- print "virtualmachine\t%s\t%s\t%s" % (data.get("name").replace(" ","_"), running_on, data.get("runtime.powerState"))
+ print "virtualmachine\t%s\t%s\t%s" % (data.get("name").replace(" ", "_"), running_on, data.get("runtime.powerState"))
except Exception, e:
if opt_debug: