Fix bugs and improve accuracy of alarms and clusters

Co-Authored-By: Patrick Petit <ppetit@mirantis.com>
Co-Authored-By: Eric Lemoine <elemoine@mirantis.com>

Change-Id: I784544984b6415316e06e5587e1184e31547bd10
2 files changed