summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSwann Croiset <scroiset@mirantis.com>2017-01-25 13:34:10 +0100
committerSwann Croiset <scroiset@mirantis.com>2017-01-25 13:34:10 +0100
commit0460a45377081219faaa249fd66ae8ce2e1a5faf (patch)
tree55cfe153d209c7fd77a97e3335885840a296589d
parent389648c5153e06de2506396189ac35c586a86743 (diff)
Combine the global and per aggregate Nova memory alarms
Notes
Notes (review): Code-Review+1: Olivier Bourdon <obourdon@mirantis.com> Code-Review+2: Simon Pasquier <spasquier@mirantis.com> Workflow+1: Swann Croiset <scroiset@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 27 Jan 2017 11:10:09 +0000 Reviewed-on: https://review.openstack.org/425161 Project: openstack/fuel-plugin-lma-collector Branch: refs/heads/master
-rw-r--r--deployment_scripts/puppet/modules/fuel_lma_collector/templates/alarming.yaml.erb3
-rw-r--r--deployment_scripts/puppet/modules/fuel_lma_collector/templates/clusters.yaml.erb4
2 files changed, 0 insertions, 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 c35e735..f4a1d13 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:
3604 members: 3604 members:
3605 nova-free-memory: 3605 nova-free-memory:
3606 alarms: ['total-nova-free-memory-warning'] 3606 alarms: ['total-nova-free-memory-warning']
3607 nova-aggregates-free-memory:
3608 alerting: enabled
3609 members:
3610 nova-aggregates-free-memory: 3607 nova-aggregates-free-memory:
3611 alarms: ['nova-aggregates-free-memory-critical', 'nova-aggregates-free-memory-warning'] 3608 alarms: ['nova-aggregates-free-memory-critical', 'nova-aggregates-free-memory-warning']
3612 ceph-mon-cluster: 3609 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 db5faca..35be384 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:
634 group_by: member 634 group_by: member
635 members: 635 members:
636 - nova-free-memory 636 - nova-free-memory
637 nova-aggregates-free-memory:
638 policy: highest_severity
639 group_by: member
640 members:
641 - nova-aggregates-free-memory 637 - nova-aggregates-free-memory
642 638
643 gse_cluster_node: 639 gse_cluster_node: