You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2013/04/26 13:03:06 UTC
git commit: updated refs/heads/master to 93ef3ad
Updated Branches:
refs/heads/master 318c7f2af -> 93ef3ad55
CLOUDSTACK-1567 ui and api changes
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/93ef3ad5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/93ef3ad5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/93ef3ad5
Branch: refs/heads/master
Commit: 93ef3ad55050657768703f22c0215427e09f544c
Parents: 318c7f2
Author: Radhika PC <ra...@citrix.com>
Authored: Fri Apr 26 16:31:49 2013 +0530
Committer: Radhika PC <ra...@citrix.com>
Committed: Fri Apr 26 16:32:21 2013 +0530
----------------------------------------------------------------------
docs/en-US/added-API-commands-4.2.xml | 24 ++++++++++++++++++++++++
docs/en-US/delete-event-alerts.xml | 12 ++++++++++++
docs/en-US/events.xml | 2 +-
docs/en-US/images/eip-ns-basiczone.png | Bin 0 -> 55568 bytes
4 files changed, 37 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93ef3ad5/docs/en-US/added-API-commands-4.2.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/added-API-commands-4.2.xml b/docs/en-US/added-API-commands-4.2.xml
index 4bec148..3471624 100644
--- a/docs/en-US/added-API-commands-4.2.xml
+++ b/docs/en-US/added-API-commands-4.2.xml
@@ -39,5 +39,29 @@
<para>The response parameters are: id, ipaddress, secondaryips, gateway, netmask, macaddr,
broadcasturi, isolationuri, isdefault,</para>
</listitem>
+ <listitem>
+ <para>deleteAlerts </para>
+ <para>Deletes the specified alerts. The request parameters are: ids (allowed to pass one or
+ more IDs separated by comma); type (string); olderthan (yyyy-mm-dd format).</para>
+ <para>The response parameters are: true, false </para>
+ </listitem>
+ <listitem>
+ <para>archiveAlerts</para>
+ <para>Archives the specified alerts. The request parameters are: ids (allowed to pass one or
+ more IDs separated by comma); type (string); olderthan (yyyy-mm-dd format).</para>
+ <para>The response parameters are: true, false </para>
+ </listitem>
+ <listitem>
+ <para>deleteEvents </para>
+ <para>Deletes the specified events. The request parameters are: ids (allowed to pass one or
+ more IDs separated by comma); type (string); olderthan (yyyy-mm-dd format).</para>
+ <para>The response parameters are: true, false</para>
+ </listitem>
+ <listitem>
+ <para>archiveEvents</para>
+ <para>Archives the specified events. The request parameters are: ids (allowed to pass one or
+ more IDs separated by comma); type (string); olderthan (yyyy-mm-dd format).</para>
+ <para>The response parameters are: true, false </para>
+ </listitem>
</itemizedlist>
</section>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93ef3ad5/docs/en-US/delete-event-alerts.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/delete-event-alerts.xml b/docs/en-US/delete-event-alerts.xml
index 3eebcb7..ef39040 100644
--- a/docs/en-US/delete-event-alerts.xml
+++ b/docs/en-US/delete-event-alerts.xml
@@ -28,6 +28,18 @@
or by using the Details page. If you want to delete multiple alerts or events at the same time,
you can use the respective context menu. You can delete alerts or events by category for a time
period.</para>
+ <para>In order to support the delete or archive alerts, the following global parameters have been
+ added:</para>
+ <itemizedlist>
+ <listitem>
+ <para><emphasis role="bold">alert.purge.delay</emphasis>: The alerts older than specified
+ number of days are purged. Set the value to 0 to never purge alerts automatically.</para>
+ </listitem>
+ <listitem>
+ <para><emphasis role="bold">alert.purge.interval</emphasis>: The interval in seconds to wait
+ before running the alert purge thread. The default is 86400 seconds (one day).</para>
+ </listitem>
+ </itemizedlist>
<note>
<para>Archived alerts or events cannot be viewed in the UI, or by using the API. They are
maintained in the database for auditing or compliance purposes.</para>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93ef3ad5/docs/en-US/events.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/events.xml b/docs/en-US/events.xml
index 4a14458..3b93ee0 100644
--- a/docs/en-US/events.xml
+++ b/docs/en-US/events.xml
@@ -25,7 +25,7 @@
physical resources associated with a cloud environment. Events are used by monitoring systems,
usage and billing systems, or any other event-driven workflow systems to discern a pattern and
make the right business decision. In &PRODUCT; an event could be a state change of virtual or
- psychical resources, an action performed by an user (action events), or policy based events
+ physical resources, an action performed by an user (action events), or policy based events
(alerts).</para>
<xi:include href="events-log.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="event-framework.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93ef3ad5/docs/en-US/images/eip-ns-basiczone.png
----------------------------------------------------------------------
diff --git a/docs/en-US/images/eip-ns-basiczone.png b/docs/en-US/images/eip-ns-basiczone.png
new file mode 100644
index 0000000..315ff55
Binary files /dev/null and b/docs/en-US/images/eip-ns-basiczone.png differ