Module: check_mk
Branch: master
Commit: 5a822bd88fcf8669e2b4f708d9c67e3bfb7932c7
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a822bd88fcf86…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Feb 5 14:26:34 2016 +0100
#2932 FIX Removal of duplicate services now also works for hosts that are no longer SNMP+TCP
---
.bugs/2307 | 10 ++++++++--
.werks/2932 | 9 +++++++++
ChangeLog | 1 +
modules/check_mk.py | 2 +-
4 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/.bugs/2307 b/.bugs/2307
index b8888d8..4c22196 100644
--- a/.bugs/2307
+++ b/.bugs/2307
@@ -1,9 +1,9 @@
Title: Automatic removal of duplicate services SNMP vs. Agent can fail
Component: core
-State: open
+Class: bug
+State: done
Date: 2015-03-03 10:32:56
Targetversion: 1.2.8
-Class: bug
Situtation:
@@ -24,3 +24,9 @@ remove *all* SNMP checks. Same holds for TCP.
Note: This does change the semantics a bit but is more clean. A
host cannot try to access an agent anymore if it is not tagged
SNMP or TCP resp.
+
+2016-02-05 14:26:05: changed state open -> done
+Removal of duplicates now is also being done for TCP only hosts.
+That fixes the immediate problem. The more general solution
+is being postponed since its implications to existing installations
+are unclear.
diff --git a/.werks/2932 b/.werks/2932
new file mode 100644
index 0000000..eec8986
--- /dev/null
+++ b/.werks/2932
@@ -0,0 +1,9 @@
+Title: Removal of duplicate services now also works for hosts that are no longer SNMP+TCP
+Level: 1
+Component: core
+Compatible: compat
+Version: 1.2.7i4
+Date: 1454678767
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index df27cda..757213b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@
* 2926 FIX: Fix exception in WATO when a check man page has not catalog entry
* 2944 FIX: Fixed exception during config activation having clusters with unresolvable node IP addresses
* 3037 FIX: Terminate datasource programs when check timeout occurs...
+ * 2932 FIX: Removal of duplicate services now also works for hosts that are no longer SNMP+TCP
Checks & Agents:
* 2434 NetApp monitoring: Cluster-Mode is now supported, changes in existing 7Mode checks...
diff --git a/modules/check_mk.py b/modules/check_mk.py
index a07d3c8..b3503d2 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -1857,7 +1857,7 @@ def get_check_table(hostname, remove_duplicates=False, use_cache=True, world='co
if not skip_autochecks and use_cache:
g_check_table_cache[hostname] = check_table
- if remove_duplicates and is_dual_host(hostname):
+ if remove_duplicates:
return remove_duplicate_checks(check_table)
else:
return check_table
Module: check_mk
Branch: master
Commit: a461727cb6f1c86d7729fd0e5e2b81e0321d5627
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a461727cb6f1c8…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Fri Feb 5 12:05:55 2016 +0100
fixed typo
---
doc/helpers/mkcheck | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/helpers/mkcheck b/doc/helpers/mkcheck
index e3cb118..e19c307 100755
--- a/doc/helpers/mkcheck
+++ b/doc/helpers/mkcheck
@@ -23,7 +23,7 @@ content_std="#!/usr/bin/python
# 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
+# tails. 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.
Module: check_mk
Branch: master
Commit: 6fa6111aa1243dec361d1054a398fd3e08866f1e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fa6111aa1243d…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Fri Feb 5 10:58:40 2016 +0100
fixed abbreviations
---
checkman/cisco_wlc | 4 ++--
checkman/cisco_wlc_clients | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/checkman/cisco_wlc b/checkman/cisco_wlc
index 5640809..7c72421 100644
--- a/checkman/cisco_wlc
+++ b/checkman/cisco_wlc
@@ -1,4 +1,4 @@
-title: Cisco Wireless Lan Controller (WLC): Connected Wlan accesspoints
+title: Cisco Wireless LAN Controller (WLC): Connected WLAN accesspoints
agents: snmp
catalog: hw/network/cisco
license: GPL
@@ -6,7 +6,7 @@ distribution: check_mk
description:
This check automatically detects all online accesspoints and checks for the current status.
If an accesspoint is not longer reachable, the checks also triggers a critical state.
- The checks directly connects to a Cisco Wireless Lan Controller. Currently its tested
+ The checks directly connects to a Cisco Wireless LAN Controller. Currently its tested
with the model 5508.
inventory:
diff --git a/checkman/cisco_wlc_clients b/checkman/cisco_wlc_clients
index 54395a9..8b074cc 100644
--- a/checkman/cisco_wlc_clients
+++ b/checkman/cisco_wlc_clients
@@ -1,4 +1,4 @@
-title: Cisco Wireless Lan Controller (WLC): Number of Wifi connections
+title: Cisco Wireless LAN Controller (WLC): Number of Wifi connections
agents: snmp
catalog: hw/network/cisco
license: GPL
@@ -6,7 +6,7 @@ distribution: check_mk
description:
This checks display the amount of connected clients in an wireless network.
Per default the check only displays the information for each network, and also one
- summary. Levels can be set for each network via Wato.
+ summary. Levels can be set for each network via WATO.
item:
Name of the wifi, configured in Cisco's WLC Software or "Summary" for the overall number