[checkmk-commits] 3627 FIX fixed double graphs of database size

Module: check_mk Branch: master Commit: 5cc24418b4ecdecb82c6368a4d0a668b0000c83b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cc24418b4ecde… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon May 30 11:30:49 2016 +0200 3627 FIX fixed double graphs of database size --- .werks/3627 | 10 ++++++++++ ChangeLog | 1 + web/plugins/metrics/check_mk.py | 11 ++++++----- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.werks/3627 b/.werks/3627 new file mode 100644 index 0000000..75d98ef --- /dev/null +++ b/.werks/3627 @@ -0,0 +1,10 @@ +Title: fixed double graphs of database size +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1464600580 + + diff --git a/ChangeLog b/ChangeLog index 957c11e..c957aed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -320,6 +320,7 @@ * 3571 FIX: Fixed missing downtime author filter * 3537 FIX: PNP/Graph Templates: fixed incorrect scaling of check-mk-ping, check_mk-active-icmp and check-mk-host-ping... * 3576 FIX: LDAP: Fixed "Internal error" when using the "Filter Group" option in an LDAP connection... + * 3627 FIX: fixed double graphs of database size WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index cd9f19a..e7104bf 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -5802,11 +5802,12 @@ graph_info.append({ ( "indexes_size", "stack" ), ( "unused_size", "stack" ), ], -}) - -graph_info.append({ - "metrics" : [ - ( "database_size", "area" ), + "optional_metrics" : [ + "unallocated_size", + "reserved_size", + "data_size", + "indexes_size", + "unused_size", ], "legend_scale" : MB, })