Module: check_mk
Branch: master
Commit: cafe5ed31f52e3da8464c32f14027a3e68745998
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cafe5ed31f52e3…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Oct 16 02:21:53 2013 +0200
Updated bug entries #1049
---
.bugs/1049 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.bugs/1049 b/.bugs/1049
index f2cdd0c..f35b91e 100644
--- a/.bugs/1049
+++ b/.bugs/1049
@@ -1,9 +1,9 @@
Title: Errormessage displayed when configuring distributed monitoring
Component: multisite
-State: open
+Class: bug
+State: done
Date: 2013-09-12 10:27:16
Targetversion: 1.2.3i2
-Class: bug
in distributed monitoring a remote slave is configured
when clicking "save" butto multisite displays an error, where there seems to be none:
@@ -11,3 +11,6 @@ Internal error:: '.siteid' (Retry with debug mode)
but when klicking "Retry with debug mode" it works
the connection is created correct within the first click on save
+
+2013-10-16 02:21:48: changed state open -> done
+Finally fixed this :-)
Module: check_mk
Branch: master
Commit: faadf9b97abfa48cea75b3bcb4adab4f2f544990
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=faadf9b97abfa4…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Oct 16 02:19:50 2013 +0200
FIX: fixed ".siteid" exception when added new site
Yeah. Finally nailed that down. It appeared when you
- Save a new site connection
- that is your first remote replication connection
- you have at least one subfolder
Saving once again helped. But before that - if you
use the liveproxyd - it's configuration was not
written and it therefore could not connect. All fixed
now :-)
---
ChangeLog | 1 +
web/htdocs/wato.py | 1 +
2 files changed, 2 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index af4610f..6525e3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,7 @@
* bulk inventory: display percentage in progress bar
* New option for full SNMP scan in bulk inventory
* FIX: correct display of number of hosts in bulk inventory
+ * FIX: nailed down ".siteid" exception when added new site
1.2.3i4:
Core:
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index a573c7d..f718cb8 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -7428,6 +7428,7 @@ def save_sites(sites, activate=True):
config.load_config() # make new site configuration active
update_distributed_wato_file(sites)
declare_site_attribute()
+ load_all_folders() # make sure that .siteid is present
rewrite_config_files_below(g_root_folder) # fix site attributes
need_sidebar_reload()
Module: check_mk
Branch: master
Commit: 596ca66942b7f1d2d24d9e1466935aecc1762288
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=596ca66942b7f1…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Oct 15 23:48:28 2013 +0200
Updated bug entries #1073
---
.bugs/1073 | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/.bugs/1073 b/.bugs/1073
new file mode 100644
index 0000000..2852c1d
--- /dev/null
+++ b/.bugs/1073
@@ -0,0 +1,11 @@
+Title: Chrome: help switches on randomly
+Component: multisite
+State: open
+Date: 2013-10-15 23:42:57
+Targetversion: 1.2.3i3
+Class: bug
+
+The online help sometimes randomly switches on on Chrome.
+Never seen this on Firefox. Seem like the help.mk in the
+user profile correctly corresponds to the settings, so
+there it is no javascript problem?
Module: check_mk
Branch: master
Commit: 8604387c4798073cef1747cc52028a9dc21ada1b
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8604387c479807…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Oct 15 21:34:13 2013 +0200
Updated bug entries #1072
---
.bugs/1072 | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/.bugs/1072 b/.bugs/1072
new file mode 100644
index 0000000..a21fb0a
--- /dev/null
+++ b/.bugs/1072
@@ -0,0 +1,11 @@
+Title: Removing a tag: error message garbled up
+Component: wato
+State: open
+Date: 2013-10-15 21:30:44
+Targetversion: future
+Class: nastiness
+
+When you delete a tag group and the tag is still referred
+to by a folder, the affected folders are printed in a
+warning message. But the line feeds are fixed up. The first
+folder is printed indented, the following ones not.
Module: check_mk
Branch: master
Commit: 1e5e7f8d3d679115e0edf5a97b9552401c4806db
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e5e7f8d3d6791…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Tue Oct 15 14:09:45 2013 +0200
qnap_disks: New check for Hardisks in Qnap devices
---
ChangeLog | 1 +
checkman/qnap_disks | 18 +++++++++++++++++
checks/qnap_disks | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 74 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 7fd8a10..cae8fd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,7 @@
* FIX: esx_vsphere_hostsystem: fixed bug in handling of params
* steelhead_perrs: New check for Rivergate Gateways
* alcatel_power: Check for power supplies on Alcatel switches
+ * qnap_disks: New check for Hardisks in Qnap devices
WATO:
* You can now have site-specific global settings when using
diff --git a/checkman/qnap_disks b/checkman/qnap_disks
new file mode 100644
index 0000000..97d6e19
--- /dev/null
+++ b/checkman/qnap_disks
@@ -0,0 +1,18 @@
+title: Qnap Harddisk Status
+agents: snmp
+catalog: hw/storagehw/qnap
+license: GPL
+distribution: check_mk
+description:
+ This check monitors the health and current Status of
+ Hardisks attached to a qnap NAS device.
+ The check returns an {CRIT} in case of an error state reported
+ by the device. The check also reports the model number, size and the
+ temperature for each disk.
+
+item:
+ The name of the disk like reported in the MIB
+
+inventory:
+ One check is created for each Disk
+
diff --git a/checks/qnap_disks b/checks/qnap_disks
new file mode 100644
index 0000000..74a0c45
--- /dev/null
+++ b/checks/qnap_disks
@@ -0,0 +1,55 @@
+#!/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.
+
+def inventory_qnap_disks(info):
+ return [ (x[0], None) for x in info ]
+
+def check_qnap_disks(item, _no_params, info):
+ for desc, temp, status, model, size, cond in info:
+ if desc == item:
+ msg = "Model: %s, Temperatur: %s, Size: %s" % \
+ ( model, temp, size )
+ if int(status) != 0:
+ return 2, "Status: %s (Code: %s) %s" % ( cond, status, msg)
+ return 0, msg
+ return 3, "Disk not longer found in output"
+
+check_info["qnap_disks"] = {
+ "check_function" : check_qnap_disks,
+ "inventory_function" : inventory_qnap_disks,
+ "service_description" : "Disk %s",
+ "has_perfdata" : False,
+ "snmp_info" : (".1.3.6.1.4.1.24681.1.2.11.1",[
+ 2, # Description
+ 3, # Temperature
+ 4, # Disk Status (-5 = missing)
+ 5, # Disk Model
+ 6, # Disk Size
+ 7, # Status Text
+ ] ),
+ "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.1.0').startswith('Linux TS-')
+}
+
Module: check_mk
Branch: master
Commit: bcb0456c497f0124d27adef85ca61d985ef96e76
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcb0456c497f01…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Tue Oct 15 14:05:28 2013 +0200
steelhead_perrs: New check for Rivergate Gateways
---
ChangeLog | 1 +
checkman/steelhead_peers | 13 ++++++++++++
checks/steelhead_peers | 51 ++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 65 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 7825bb1..c67ff50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@
* check_sql: Database port can now be explicitly set
* FIX: esx_vsphere_counters: added missing ramdisk type upgradescratch
* FIX: esx_vsphere_hostsystem: fixed bug in handling of params
+ * steelhead_perrs: New check for Rivergate Gateways
WATO:
* You can now have site-specific global settings when using
diff --git a/checkman/steelhead_peers b/checkman/steelhead_peers
new file mode 100644
index 0000000..eade665
--- /dev/null
+++ b/checkman/steelhead_peers
@@ -0,0 +1,13 @@
+title: Riverbed Steelhead Peer Connections
+agents: snmp
+catalog: hw/network/riverbed
+license: GPL
+distribution: check_mk
+description:
+ This is a simple check which checks the current connected peers
+ of a Riverbed Steelhead appliance which a not movible clients.
+ As long the peer is connected the result will be {OK}. In all other cases
+ it is {critical}.
+
+inventory:
+ One check for each peer will be created.
diff --git a/checks/steelhead_peers b/checks/steelhead_peers
new file mode 100644
index 0000000..e70ba0d
--- /dev/null
+++ b/checks/steelhead_peers
@@ -0,0 +1,51 @@
+#!/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.
+
+
+def inventory_steelhead_peers(info):
+ return [ ( x[0], None ) for x in info if x[-1] != "Steelhead Mobile" ]
+
+
+def check_steelhead_peers(item, _no_params, info):
+ for host, version, client, client_type in info:
+ if host == item:
+ return 0, "Version: %s, Client Address: %s (%s)" % \
+ ( version, client, client_type )
+ return 2, "Peer not connected"
+
+
+check_info['steelhead_peers'] = {
+ "check_function" : check_steelhead_peers,
+ "inventory_function" : inventory_steelhead_peers,
+ "service_description" : "Peer %s",
+ "snmp_info" : (".1.3.6.1.4.1.17163.1.1.2.6.1.1" , [
+ 2, #Hostname
+ 3, #Version
+ 4, #Clients
+ 5, #Client Type
+ ] ),
+ "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.17163.")
+}
Module: check_mk
Branch: master
Commit: 94ed7d815c2cb1f790c06a87a82ce0b7e5f205dd
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94ed7d815c2cb1…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Tue Oct 15 14:07:44 2013 +0200
alcatel_power: Check for power supplies on Alcatel switches
---
ChangeLog | 1 +
checkman/alcatel_power | 16 +++++++++++++++
checks/alcatel_power | 52 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 69 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index c67ff50..7fd8a10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,7 @@
* FIX: esx_vsphere_counters: added missing ramdisk type upgradescratch
* FIX: esx_vsphere_hostsystem: fixed bug in handling of params
* steelhead_perrs: New check for Rivergate Gateways
+ * alcatel_power: Check for power supplies on Alcatel switches
WATO:
* You can now have site-specific global settings when using
diff --git a/checkman/alcatel_power b/checkman/alcatel_power
new file mode 100644
index 0000000..36428d9
--- /dev/null
+++ b/checkman/alcatel_power
@@ -0,0 +1,16 @@
+title: Alcatel switches: Power Supplies
+agents: snmp
+catalog: hw/network
+license: GPL
+distribution: check_mk
+description:
+ This check monitors the health of power supplies in
+ Alcatel switches. If one of the two power supplies fails, the
+ check returns {CRIT}.
+
+item:
+ The ID of the power supply as output from the SNMP agent.
+
+inventory:
+ One check is created for each power supply.
+
diff --git a/checks/alcatel_power b/checks/alcatel_power
new file mode 100644
index 0000000..6042249
--- /dev/null
+++ b/checks/alcatel_power
@@ -0,0 +1,52 @@
+#!/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.
+
+def inventory_alcatel_power(info):
+ return [ (x[0], None) for x in info if x[2] in ['0x35000001', '0x45000004']]
+
+def check_alcatel_power(item, _no_params, info):
+ for line in info:
+ if item == line[0]:
+ if line[2] not in ['0x35000001', '0x45000004']:
+ return 3, "No Power supply connected to this port"
+ if int(line[1]) != 1:
+ return 2, "Supply in error condition (%s)" % line[1]
+ return 0, "Supply status OK"
+ return 3, "Supply not found"
+
+check_info["alcatel_power"] = {
+ "check_function" : check_alcatel_power,
+ "inventory_function" : inventory_alcatel_power,
+ "service_description" : "Power Supply %s",
+ "has_perfdata" : False,
+ "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.6486.800"),
+ "snmp_info" : (".1.3.6.1.4.1.6486.800.1.1.1.1.1.1.1",
+ [OID_END,
+ 2, # Error Status
+ 5 # Device Type (0x35000001 == Power Supply)
+ ]),
+}
+