Module: check_mk
Branch: master
Commit: 63382fec6aaaa91f2a3e8611af8255f162a880d9
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63382fec6aaaa9…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Sun Oct 19 12:36:47 2014 +0200
Fixed typo in comment
---
web/htdocs/wato.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 0b44b8c..b9cb90a 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -7675,7 +7675,7 @@ def save_configuration_settings(vars):
per_domain.setdefault(domain, {})[varname] = vars[varname]
# The global setting wato_enabled is not registered in the configuration domains
- # sind the user must not change it directly. It is set by D-WATO on slave sites.
+ # since the user must not change it directly. It is set by D-WATO on slave sites.
if "wato_enabled" in vars:
per_domain.setdefault("multisite", {})["wato_enabled"] = vars["wato_enabled"]
Module: check_mk
Branch: master
Commit: 7ab687f904e7f09ad0a39047ec8a1eaa4894382b
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ab687f904e7f0…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Oct 17 16:07:00 2014 +0200
fixed incorrect call of inventory plugin
Inventory plugins are handled one after another.
If there wasn't any info available for the first plugin 'None' was returned.
If there wasn't any info available for the followup plugins an Exception
was raised and catched.
In some scenarios an inventory plugin got called, even if there was no info available.
---
modules/inventory.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules/inventory.py b/modules/inventory.py
index 0739d8f..5c274c1 100644
--- a/modules/inventory.py
+++ b/modules/inventory.py
@@ -229,7 +229,8 @@ def do_inv_for(hostname, ipaddress):
raise # Otherwise simply ignore missing agent section
continue
- if info == None: # section not present
+ if not info: # section not present (None or [])
+ # Note: this also excludes existing sections without info..
continue
if opt_verbose:
Module: check_mk
Branch: master
Commit: 22f352b8406592ac1cffe781c14714fe45805c96
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22f352b8406592…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Oct 17 15:38:09 2014 +0200
improved werk layout
---
.werks/1130 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.werks/1130 b/.werks/1130
index 4c5dd17..7facf7c 100644
--- a/.werks/1130
+++ b/.werks/1130
@@ -6,8 +6,7 @@ Version: 1.2.5i6
Date: 1413552488
Class: feature
-The ESX Agent now also queries more data which is used in the HW-Inventory<br>
-For example:<br><br>
+The ESX Agent now also queries more data which is used in the HW-Inventory. For example:<br><br>
<tt>BIOS</tt>
C+:
Module: check_mk
Branch: master
Commit: 0d484ab90d3fadfca3f89d12be177bf4e5ceeca5
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d484ab90d3fad…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Oct 17 15:37:43 2014 +0200
improved werk description
---
.werks/1130 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.werks/1130 b/.werks/1130
index c3aca2b..4c5dd17 100644
--- a/.werks/1130
+++ b/.werks/1130
@@ -6,7 +6,8 @@ Version: 1.2.5i6
Date: 1413552488
Class: feature
-The ESX Agent now also queries the following data which is used in the HW-Inventory<br>
+The ESX Agent now also queries more data which is used in the HW-Inventory<br>
+For example:<br><br>
<tt>BIOS</tt>
C+:
Module: check_mk
Branch: master
Commit: bfd074550e1e9530dc802d51181bf1c297c2a5a2
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfd074550e1e95…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Oct 17 15:36:35 2014 +0200
#1130 esx monitoring: agent_vsphere now retrieves additional data (used by HW-inventory)
The ESX Agent now also queries the following data which is used in the HW-Inventory<br>
<tt>BIOS</tt>
C+:
Date 2012-11-26
Version -[D6E158AUS-1.16]-
C-:
<tt>Processor</tt>
C+:
Speed 133.3 MHz
Cores per CPU 6
Hyperthreads per CPU 12
Maximum Speed 2.93 GHz
Model Intel(R) Xeon(R) CPU X5670 @ 2.93GHz
Total Number of CPUs 2
Total Number of Cores 12
Total Number of Hyperthreads 24
Vendor intel
C-:
<tt>System</tt>
C+:
Product System x3650 M3 -[7945M2G]-
Vendor IBM
C-:
---
.werks/1130 | 34 +++++++++++++
ChangeLog | 1 +
agents/special/agent_vsphere | 82 +++++++++++++++++++++----------
inventory/esx_vpshere_hostsystem | 101 ++++++++++++++++++++++++++++++++++++++
4 files changed, 192 insertions(+), 26 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bfd074550e…