From a81ddc5df43a3d8f497d0c93ba5ea6e62777241e Mon Sep 17 00:00:00 2001 From: Swann Croiset Date: Wed, 25 Jan 2017 13:34:10 +0100 Subject: [PATCH] Combine the global and per aggregate Nova memory alarms Change-Id: I96b8e446e6776ffa28cc1537f8a1bd023c2447fa Closes-bug: #1659275 (cherry picked from commit 0460a45377081219faaa249fd66ae8ce2e1a5faf) --- .../modules/fuel_lma_collector/templates/alarming.yaml.erb | 3 --- .../modules/fuel_lma_collector/templates/clusters.yaml.erb | 4 ---- 2 files changed, 7 deletions(-) diff --git a/deployment_scripts/puppet/modules/fuel_lma_collector/templates/alarming.yaml.erb b/deployment_scripts/puppet/modules/fuel_lma_collector/templates/alarming.yaml.erb index c35e73572..f4a1d139d 100644 --- a/deployment_scripts/puppet/modules/fuel_lma_collector/templates/alarming.yaml.erb +++ b/deployment_scripts/puppet/modules/fuel_lma_collector/templates/alarming.yaml.erb @@ -3604,9 +3604,6 @@ lma_collector: members: nova-free-memory: alarms: ['total-nova-free-memory-warning'] - nova-aggregates-free-memory: - alerting: enabled - members: nova-aggregates-free-memory: alarms: ['nova-aggregates-free-memory-critical', 'nova-aggregates-free-memory-warning'] ceph-mon-cluster: diff --git a/deployment_scripts/puppet/modules/fuel_lma_collector/templates/clusters.yaml.erb b/deployment_scripts/puppet/modules/fuel_lma_collector/templates/clusters.yaml.erb index db5faca73..35be38436 100644 --- a/deployment_scripts/puppet/modules/fuel_lma_collector/templates/clusters.yaml.erb +++ b/deployment_scripts/puppet/modules/fuel_lma_collector/templates/clusters.yaml.erb @@ -634,10 +634,6 @@ lma_collector: group_by: member members: - nova-free-memory - nova-aggregates-free-memory: - policy: highest_severity - group_by: member - members: - nova-aggregates-free-memory gse_cluster_node: