Module: check_mk
Branch: master
Commit: 2ca5483407964f78a19e3219d5273f8009357250
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ca5483407964f…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Jan 29 12:33:25 2016 +0100
#3036 FIX Bulk discovery steps are now timing out short before HTTP request timeout
The bulk discovery could cause stability issues by consuming too much resources on
the monitoring server. This could be caused in case the single discovery steps take
longer than the configured timeout of the web server service the Check_MK GUI. In
case a request (discovery step) took longer than the request timeout, the browser
request was timing out and the next discovery step was started while the former
discovery process of Check_MK was still running. If this happened multiple times,
like several hundret times, this could consume all system memory and causing a lot
of CPU load which may result in an unstable monitoring server. Only a restart of
the whole sites web server could fix this situation.
---
.werks/3036 | 17 +++++++++++++++++
ChangeLog | 1 +
modules/automation.py | 20 +++++++++++++++++++-
modules/check_mk_base.py | 15 ++++++++++-----
modules/discovery.py | 7 +++++--
web/htdocs/html_mod_python.py | 5 +++++
web/htdocs/htmllib.py | 3 +++
web/htdocs/wato.py | 15 +++++++++++----
web/htdocs/watolib.py | 22 ++++++++++++++--------
9 files changed, 85 insertions(+), 20 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2ca5483407…
Module: check_mk
Branch: master
Commit: 7b6604d1ca9a1149eda6a603e7503abe7841e851
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b6604d1ca9a11…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Jan 29 10:24:07 2016 +0100
#2928 Fix display of rule set Do hardware/software Inventory
When you selected one of the two options for setting the state then
this was correctly saved but not correctly displayed in the rule table
nor when editing the rule again. This has been fixed.
---
.werks/2928 | 11 +++++++++++
ChangeLog | 3 ++-
web/plugins/wato/inventory.py | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/.werks/2928 b/.werks/2928
new file mode 100644
index 0000000..4be3ab3
--- /dev/null
+++ b/.werks/2928
@@ -0,0 +1,11 @@
+Title: Fix display of rule set Do hardware/software Inventory
+Level: 1
+Component: wato
+Compatible: compat
+Version: 1.2.7i4
+Date: 1454059333
+Class: fix
+
+When you selected one of the two options for setting the state then
+this was correctly saved but not correctly displayed in the rule table
+nor when editing the rule again. This has been fixed.
diff --git a/ChangeLog b/ChangeLog
index f20a360..349c8a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -100,8 +100,8 @@
* 2832 netscaler_vserver: improved check output for unknown protocols...
* 3033 check_http: Now supporting extended perfdata parameter of the check
* 2456 palo_alto, palo_alto_sessions: Two new checks for Palo Alto firewalls.
- * 2457 mssql_counters.sqlstats: New check to monitor several rates from the SQL statistics object
* 2985 MongoDB: Introduced agent plugin and some checks...
+ * 2457 mssql_counters.sqlstats: New check to monitor several rates from the SQL statistics object
* 2660 FIX: fixed windows agent using the wrong working directory...
* 2664 FIX: ps: Speedup in situation with many matching processes...
* 2661 FIX: windows agent: fixed incomplete process list...
@@ -315,6 +315,7 @@
* 2831 FIX: Removing a previously set custom attribute for a contact did not work as intented...
* 2973 FIX: showing subfolder info in WATO if there are more than four groups
* 2964 FIX: Deleting site having hosts assigned links to list of hosts now
+ * 2928 FIX: Fix display of rule set Do hardware/software Inventory...
Notifications:
* 2811 Mail notifications: Now able to add Host/Service Notes Url...
diff --git a/web/plugins/wato/inventory.py b/web/plugins/wato/inventory.py
index 57d9c49..f84db39 100644
--- a/web/plugins/wato/inventory.py
+++ b/web/plugins/wato/inventory.py
@@ -55,7 +55,7 @@ register_rule(group,
"<b>Note:</b> in order to get any useful "
"result for agent based hosts make sure that you have installed "
"the agent plugin <tt>mk_inventory</tt> on these hosts."),
- forth = lambda x: { }, # convert from legacy None
+ forth = lambda x: x != None and x or {}, # convert from legacy None
),
match = "all",
)
Module: check_mk
Branch: master
Commit: c924f1106c62d1b2646ff50cc9338412a2071a7a
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c924f1106c62d1…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Thu Jan 28 17:20:58 2016 +0100
fixed werk formatting
---
.werks/2985 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.werks/2985 b/.werks/2985
index 53c7fb7..ad2c10a 100644
--- a/.werks/2985
+++ b/.werks/2985
@@ -26,8 +26,8 @@ Note:
If the MongoDB is running as a replica set most of the agent sections are sent to
a piggyback host named after the replication set. You can find the replica name
in the agent output under <<<<{replicaname}>>>>.
-So you need to create a host named {replicaname} and execute a service discovery.<br>
-Reason:<br><br>
+So you need to create a host named {replicaname} and execute a service discovery.<br><br>
+Reason:<br>
A MongoDB replica set consists of n-Hosts. All of these hosts have the mk_mongodb plugin installed.
There is a primary host in this replica set which sends the complete plugin information.
The secondary and arbiter hosts will only send a subset of this data.
Module: check_mk
Branch: master
Commit: d045216df1ff8991d4c181224a6b9724ef861130
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d045216df1ff89…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Thu Jan 28 17:20:33 2016 +0100
fixed werk formatting
---
.werks/2985 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.werks/2985 b/.werks/2985
index 8a9abbc..53c7fb7 100644
--- a/.werks/2985
+++ b/.werks/2985
@@ -11,7 +11,7 @@ checks are available:
<table>
<tr><th>Check</th><th>Description</th></tr>
-<tr> <td>mongodb_asserts</td><td>Monitors the rate of various assert types<td> </tr>
+<tr> <td>mongodb_asserts</td><td>Monitors the rate of various assert types</td> </tr>
<tr> <td>mongodb_connections</td><td>Monitors the number of connections</td> </tr>
<tr> <td>mongodb_collections</td><td>Monitors the collection size</td> </tr>
<tr> <td>mongodb_counters</td><td>Monitors the number of MongoDB operations</td> </tr>
@@ -25,9 +25,9 @@ checks are available:
Note:
If the MongoDB is running as a replica set most of the agent sections are sent to
a piggyback host named after the replication set. You can find the replica name
-in the agent output under <<<<{replicaname}&gr;&gr;&gr;&gr;.
+in the agent output under <<<<{replicaname}>>>>.
So you need to create a host named {replicaname} and execute a service discovery.<br>
-Reason:<br>
+Reason:<br><br>
A MongoDB replica set consists of n-Hosts. All of these hosts have the mk_mongodb plugin installed.
There is a primary host in this replica set which sends the complete plugin information.
The secondary and arbiter hosts will only send a subset of this data.
Module: check_mk
Branch: master
Commit: f81ccb4fef51cd285ed2c012e675869cf8efc8b6
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f81ccb4fef51cd…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Thu Jan 28 17:18:03 2016 +0100
added missing manpage
---
checkman/mongodb_connections | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/checkman/mongodb_connections b/checkman/mongodb_connections
new file mode 100644
index 0000000..820a9e8
--- /dev/null
+++ b/checkman/mongodb_connections
@@ -0,0 +1,21 @@
+title: MongoDB Connections
+agents: linux
+catalog: app/mongodb
+license: GPL
+distribution: check_mk
+description:
+ This check monitors the number of current connections to the MongoDB instance.
+ You can configure levels for the absolute / percentage amount of connections.
+ The default values are set to 80%/90% of available connections.
+ This check also shows the connection rate which is derived from the number
+ of total connections.
+
+ Note: If the MongoDB is running as a replica set, this check is not discovered
+ on the same host where the {mk_mongodb} plugin is installed. The data is piggybacked
+ to a pseudo host named after the replica set name, intead.
+
+perfdata:
+ Collection size, growth and trend until full.
+
+inventory:
+ One service is created