diff --git a/doc/source/examples/templates/threshold.yml b/doc/source/examples/templates/threshold.yml deleted file mode 100644 index 8d00073..0000000 --- a/doc/source/examples/templates/threshold.yml +++ /dev/null @@ -1,59 +0,0 @@ -heat_template_version: 2014-10-16 -description: A simple auto-scalable server, based on a threshold alarm. - -resources: - group: - type: OS::Heat::AutoScalingGroup - properties: - cooldown: 60 - desired_capacity: 2 - max_size: 3 - min_size: 1 - resource: - type: OS::Nova::Server - properties: - image: cirros-0.3.5-x86_64-disk - flavor: m1.nano - networks: - - network: public - key_name: scale - - scaleup_policy: - type: OS::Heat::ScalingPolicy - properties: - adjustment_type: change_in_capacity - auto_scaling_group_id: { get_resource: group } - cooldown: 60 - scaling_adjustment: 1 - - scaledown_policy: - type: OS::Heat::ScalingPolicy - properties: - adjustment_type: change_in_capacity - auto_scaling_group_id: { get_resource: group } - cooldown: 60 - scaling_adjustment: -1 - - no_change_policy: - type: OS::Heat::ScalingPolicy - properties: - adjustment_type: change_in_capacity - auto_scaling_group_id: { get_resource: group } - cooldown: 60 - scaling_adjustment: 0 - - cpu_alarm_high: - type: OS::Aodh::Alarm - properties: - meter: cpu.cpu - threshold: 1 - period: 60 - evaluation_period: 1 - alarm_actions: - - {get_attr: [scaleup_policy, alarm_url]} - ok_actions: - - {get_attr: [scaledown_policy, alarm_url]} - insufficient_actions: - - {get_attr: [no_change_policy, alarm_url]} - comparison_operator: gt - statistic: max diff --git a/doc/source/heat_scaling_guide.rst b/doc/source/heat_scaling_guide.rst index 93bc98c..239c543 100644 --- a/doc/source/heat_scaling_guide.rst +++ b/doc/source/heat_scaling_guide.rst @@ -38,7 +38,7 @@ policies. The collectd-gnocchi plugin only supports certain types of Aodh alarms. Please find a list of these options in: -https://github.com/openstack/collectd-ceilometer-plugin/blob/master/doc/source/alarms_guide.rst. +https://github.com/openstack/collectd-ceilometer-plugin/blob/master/doc/source/alarms_guide.rst Creating a heat template for auto-scaling @@ -125,23 +125,6 @@ it has scaled up/down via: openstack server list -collectd-ceilometer-plugin alarms ---------------------------------- - -As described in alarms_guide.rst, this plugin allows you to create Aodh -threshold alarms. This type of alarm can be defined in a heat template using -an OS::Aodh::Alarm resource. -Define this resource with the ceilometer meter that you want to monitor and -the threshold you want the alarm to be triggered at. -For more information on this resource: -https://docs.openstack.org/heat/latest/template_guide/openstack.html#OS::Aodh::Alarm - - :: - - threshold_alarm: - type: OS::Aodh::Alarm - - collectd-gnocchi-plugin alarms ------------------------------