Module: check_mk
Branch: master
Commit: 7a090d247a188c7181560183a0f1a032f006c31b
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a090d247a188c…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Apr 14 15:32:31 2015 +0200
#1904 FIX: mk_oracle: added processes check to ASM...
---
ChangeLog | 1 +
1 file changed, 1 insertion(+)
diff --git a/ChangeLog b/ChangeLog
index 969791a..9b471eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -314,6 +314,7 @@
* 1899 FIX: mk_oracle: backport of werk 1564 from agent...
* 2110 FIX: netapp_api_aggr: check did not take configured levels when using Nagios
* 1954 FIX: fileinfo / fileinfo.groups: Fixed discovery function for fileinfo groups and equalize agent output of fileinfo agents...
+ * 1904 FIX: mk_oracle: added processes check to ASM...
* 2111 FIX: hitachi_hnas_volume: fix for cases when size information of volumes is not available
* 2190 FIX: jolokia_metrics.gc: Fixed exception in check if no warn/crit levels are defined
* 2192 FIX: check_notify_count": Fix exception in PNP template in case of explit email addresses...
Module: check_mk
Branch: master
Commit: cde46ad23ae2b56862a6b07d6d77cec9e96c49f6
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cde46ad23ae2b5…
Author: Konstantin Büttner <kb(a)mathias-kettner.de>
Date: Mon Apr 13 17:02:56 2015 +0200
#1897 FIX Fixed exception in BI Availability view
The Availabilty view for single host BI aggregations would previously crash due to a key error. This has been fixed.
---
.werks/1897 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/bi.py | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/1897 b/.werks/1897
new file mode 100644
index 0000000..c684737
--- /dev/null
+++ b/.werks/1897
@@ -0,0 +1,10 @@
+Title: Fixed exception in BI Availability view
+Level: 1
+Component: bi
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1428937251
+
+The Availabilty view for single host BI aggregations would previously crash due to a key error. This has been fixed.
diff --git a/ChangeLog b/ChangeLog
index af1bbf6..90a6501 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -458,6 +458,7 @@
* 1784 FIX: Fix exception in BI Boxes when parents are being used
* 2020 FIX: Fixed non working FOREACH_CHILD mechanism for BI rules
* 2085 FIX: Host search for child nodes can now filter child nodes by tags or patterns...
+ * 1897 FIX: Fixed exception in BI Availability view...
Reporting & Availability:
* 1990 FIX: Fix two exceptions in PDF exports of host group views
diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py
index 48e3683..adb6e5a 100644
--- a/web/htdocs/bi.py
+++ b/web/htdocs/bi.py
@@ -1194,7 +1194,7 @@ def get_status_info(required_hosts):
# hosts but with a livestatus filter header and a list of columns
# that need to be fetched in any case
def get_status_info_filtered(filter_header, only_sites, limit, add_columns, fetch_parents = True, bygroup=False):
- columns = [ "name", "state", "hard_state", "plugin_output", "scheduled_downtime_depth",
+ columns = [ "name", "host_name", "state", "hard_state", "plugin_output", "scheduled_downtime_depth",
"acknowledged", "services_with_fullstate", "parents" ] + add_columns
html.live.set_only_sites(only_sites)
Module: check_mk
Branch: master
Commit: ff1dd60be0c3ddfdf24fbb01ec27f9262edb9805
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff1dd60be0c3dd…
Author: Sven Rueß <sr(a)mathias-kettner.de>
Date: Mon Apr 13 16:20:13 2015 +0200
#1956 FIX WATO Web-API: Fixed exception information for single sites
Fixed exception information for single site if the action activate changes is used.
---
.werks/1956 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/1956 b/.werks/1956
new file mode 100644
index 0000000..eefc0e6
--- /dev/null
+++ b/.werks/1956
@@ -0,0 +1,10 @@
+Title: WATO Web-API: Fixed exception information for single sites
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1428934623
+
+Fixed exception information for single site if the action activate changes is used.
diff --git a/ChangeLog b/ChangeLog
index ae36f92..af1bbf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -434,6 +434,7 @@
* 2158 FIX: Condition column in WATO rule tables has now a flexible width...
* 2160 FIX: Fixed rename of hosts where a host with this name did exist before
* 2191 FIX: Fixed handling of URL variable 'mode' in web API for discovering services...
+ * 1956 FIX: WATO Web-API: Fixed exception information for single sites...
Notifications:
* 1662 notification plugin spectrum: finalized script. now able to handle host notications
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index a631f72..ad2f0e3 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -18221,7 +18221,7 @@ class API:
try:
activate_changes()
except Exception, e:
- errors.append("%s: %s" % (site["id"], e))
+ errors.append("Exception: %s" % e)
if not errors:
log_commit_pending()