Module: check_mk
Branch: master
Commit: 02737e3a18beb2e185588e2103a99e598b9bf55a
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=02737e3a18beb2…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Mar 4 16:19:54 2015 +0100
#2044 IBM SVC checks: renamed services, remove bogus IBM SVC
A couple of IBM SVC checks have been renamed. Note: this only hold for
new installations. Existing installations will not be touched. You can activate
the new names nevertheless by activating them in your global settings
in <i>Operation Mode of Check_MK / Use new service descriptions</i>. If you
do this then RRD files will be created from scratch and existing rules
might now match anymore.
---
.werks/2044 | 14 ++++++++++++++
ChangeLog | 1 +
2 files changed, 15 insertions(+)
diff --git a/.werks/2044 b/.werks/2044
new file mode 100644
index 0000000..5a2bfc1
--- /dev/null
+++ b/.werks/2044
@@ -0,0 +1,14 @@
+Title: IBM SVC checks: renamed services, remove bogus IBM SVC
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.7i1
+Date: 1425482277
+Class: feature
+
+A couple of IBM SVC checks have been renamed. Note: this only hold for
+new installations. Existing installations will not be touched. You can activate
+the new names nevertheless by activating them in your global settings
+in <i>Operation Mode of Check_MK / Use new service descriptions</i>. If you
+do this then RRD files will be created from scratch and existing rules
+might now match anymore.
diff --git a/ChangeLog b/ChangeLog
index fc34f49..17af9ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -107,6 +107,7 @@
* 2053 New windows plugin: windows_if.ps1, renders wmic_if.ps1 obsolete...
* 2043 ibm_svc_mdiskgrp: Fix computation of capacity, show and check provisioning...
NOTE: Please refer to the migration notes!
+ * 2044 IBM SVC checks: renamed services, remove bogus IBM SVC...
* 1457 FIX: logins: new check renamed from "users" check...
NOTE: Please refer to the migration notes!
* 1762 FIX: lnx_thermal: Now ignoring trip points with level 0...
Module: check_mk
Branch: master
Commit: 9107d9dbf37099f7e836b2f440fbfccedf7149cc
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9107d9dbf37099…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Mar 4 16:17:54 2015 +0100
#2043 ibm_svc_mdiskgrp: Fix computation of capacity, show and check provisioning
The check <tt>ibm_svc_mdiskgrp</tt> now also shows the provisioning. You can
now set levels on the provisioning. Note: This is an incompatible change since
a new WATO rule set has been introduced in order to add the new parameter
for the provisioning levels. So if you already have configured levels for
your checks you need to re-do this configuration with the new WATO rule set.
---
.werks/2043 | 13 +++++++
ChangeLog | 2 ++
checks/df.include | 4 +--
checks/ibm_svc_mdiskgrp | 52 ++++++++++++++++++++++------
checks/ibm_svc_system | 2 +-
checks/ibm_svc_systemstats | 8 ++---
modules/check_mk.py | 32 ++++++++++-------
web/htdocs/metrics.py | 52 +++++++++++++++++-----------
web/htdocs/wato.py | 6 ++++
web/plugins/metrics/check_mk.py | 19 ++++++++--
web/plugins/wato/check_mk_configuration.py | 34 ++++++++++--------
web/plugins/wato/check_parameters.py | 24 +++++++++++++
12 files changed, 181 insertions(+), 67 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=9107d9dbf3…
Module: check_mk
Branch: master
Commit: 12d5ffae54e48ac66007355e55b394d8f5314f1f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12d5ffae54e48a…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Mar 4 14:57:05 2015 +0100
#2042 Services are now sorted in a natural way, this affects services containing numbers
Previously services would be sorted alphabetically, e.g. <tt>foo1</tt>,
<tt>foo10</tt>, <tt>foo11</tt>, ... <tt>foo2</tt>, <tt>foo3</tt>, etc.
Now numbers within the descriptions are being detected by a smart algorithm
and the sorting is then <tt>foo1</tt>, <tt>foo2</tt>, ... , <tt>foo9</tt>,
<tt>foo10</tt>, <tt>foo11</tt>, just as you would expect.
---
.werks/2042 | 13 +++++++++++++
ChangeLog | 1 +
web/plugins/views/sorters.py | 7 ++-----
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/.werks/2042 b/.werks/2042
new file mode 100644
index 0000000..465cdba
--- /dev/null
+++ b/.werks/2042
@@ -0,0 +1,13 @@
+Title: Services are now sorted in a natural way, this affects services containing numbers
+Level: 2
+Component: multisite
+Compatible: compat
+Version: 1.2.7i1
+Date: 1425477221
+Class: feature
+
+Previously services would be sorted alphabetically, e.g. <tt>foo1</tt>,
+<tt>foo10</tt>, <tt>foo11</tt>, ... <tt>foo2</tt>, <tt>foo3</tt>, etc.
+Now numbers within the descriptions are being detected by a smart algorithm
+and the sorting is then <tt>foo1</tt>, <tt>foo2</tt>, ... , <tt>foo9</tt>,
+<tt>foo10</tt>, <tt>foo11</tt>, just as you would expect.
diff --git a/ChangeLog b/ChangeLog
index dcf70e1..9903b9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -238,6 +238,7 @@
* 1979 Relative timestamps display warnings when they should be in future but are in past
* 1937 cpu.loads: performance graph now displays number of CPUs
* 2040 Allow commands for setting downtimes and acknowledging on BI aggregates...
+ * 2042 Services are now sorted in a natural way, this affects services containing numbers...
* 1781 FIX: Fix broken grouping by host/service group in availability
* 1783 FIX: Finish the view "History of Scheduled Downtimes"...
* 1206 FIX: Hostname not longer shown as column in host views
diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py
index 0317d5c..e724b31 100644
--- a/web/plugins/views/sorters.py
+++ b/web/plugins/views/sorters.py
@@ -142,11 +142,8 @@ def cmp_service_name_equiv(r):
return 0
def cmp_service_name(column, r1, r2):
- o = cmp(cmp_service_name_equiv(r1[column]), cmp_service_name_equiv(r2[column]))
- if o == 0:
- return cmp_simple_string(column, r1, r2)
- else:
- return o
+ return cmp(cmp_service_name_equiv(r1[column]), cmp_service_name_equiv(r2[column])) or \
+ cmp_num_split(column, r1, r2)
# name title column sortfunction
declare_simple_sorter("svcdescr", _("Service description"), "service_description", cmp_service_name)
Module: check_mk
Branch: master
Commit: ab6c7ee4c39a6a41658546820e638af228350566
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab6c7ee4c39a6a…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Mar 4 13:53:56 2015 +0100
#2055 FIX agent_vsphere, licenses check: now really configurable on / off
The licenses of the ESX systems were always checked, regardless of the configuration option.
---
.werks/2055 | 10 ++++++++++
ChangeLog | 1 +
agents/special/agent_vsphere | 37 +++++++++++++++++++------------------
3 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/.werks/2055 b/.werks/2055
new file mode 100644
index 0000000..55cdc21
--- /dev/null
+++ b/.werks/2055
@@ -0,0 +1,10 @@
+Title: agent_vsphere, licenses check: now really configurable on / off
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1425473556
+
+The licenses of the ESX systems were always checked, regardless of the configuration option.
diff --git a/ChangeLog b/ChangeLog
index 9f1ba8a..dcf70e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -224,6 +224,7 @@
* 2087 FIX: netapp_api_temp: Fixed exception when dealing with old discovered checks...
* 2051 FIX: windows agent: no longer outputs stderr of local and plugin scripts...
* 2088 FIX: cisco_cpu: Dealing with non CPU utilization information correctly...
+ * 2055 FIX: agent_vsphere, licenses check: now really configurable on / off...
Multisite:
* 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report...
diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere
index e64884c..503daeb 100755
--- a/agents/special/agent_vsphere
+++ b/agents/special/agent_vsphere
@@ -699,24 +699,25 @@ if not error:
###########################
# Licenses
###########################
- reply_code, reply_msg, reply_headers, licenses_response = query_server(telegram_list["licenseassigned"])
- license_hosts = get_pattern('<returnval>(.*?)</returnval>', licenses_response)
- licenses = {}
- for host in license_hosts:
- license_info = get_pattern("<licenseKey>(.*?)</licenseKey>.*?<name>(.*?)</name><total>(.*?)</total><used>(.*?)</used>", host)
- if not license_info:
- continue
- key, name, total, used = license_info[0]
- # We merge all entries with the same name, duplicate keys are ignored since they provide the same data
- licenses.setdefault(name, {"used_keys": [], "total": 0, "used": 0})
- if key not in licenses[name]["used_keys"]:
- licenses[name]["total"] += int(total)
- licenses[name]["used"] += int(used)
- licenses[name]["used_keys"].append(key)
-
- print "<<<esx_vsphere_licenses:sep(9)>>>"
- for license, values in licenses.items():
- print "%s\t%s %s" % (license, values["used"], values["total"])
+ if "licenses" in query_objects:
+ reply_code, reply_msg, reply_headers, licenses_response = query_server(telegram_list["licenseassigned"])
+ license_hosts = get_pattern('<returnval>(.*?)</returnval>', licenses_response)
+ licenses = {}
+ for host in license_hosts:
+ license_info = get_pattern("<licenseKey>(.*?)</licenseKey>.*?<name>(.*?)</name><total>(.*?)</total><used>(.*?)</used>", host)
+ if not license_info:
+ continue
+ key, name, total, used = license_info[0]
+ # We merge all entries with the same name, duplicate keys are ignored since they provide the same data
+ licenses.setdefault(name, {"used_keys": [], "total": 0, "used": 0})
+ if key not in licenses[name]["used_keys"]:
+ licenses[name]["total"] += int(total)
+ licenses[name]["used"] += int(used)
+ licenses[name]["used_keys"].append(key)
+
+ print "<<<esx_vsphere_licenses:sep(9)>>>"
+ for license, values in licenses.items():
+ print "%s\t%s %s" % (license, values["used"], values["total"])
#############################
# Determine available host systems