modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventDriftJSON.jsp | 59 ++++++++++ modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventsView.jsp | 9 + 2 files changed, 68 insertions(+)
New commits: commit 867eb2edccefc24d4730fdf4e0494dc1dddc94aa Author: John Mazzitelli mazz@redhat.com Date: Thu Aug 25 13:51:35 2011 -0400
add drift to timeline
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventDriftJSON.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventDriftJSON.jsp new file mode 100644 index 0000000..b2f42fb --- /dev/null +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventDriftJSON.jsp @@ -0,0 +1,59 @@ +<%@ page import="java.text.SimpleDateFormat" %> +<%@ page import="java.util.Locale" %> +<%@ page import="org.rhq.core.domain.auth.Subject" %> +<%@ page import="org.rhq.core.domain.util.PageControl" %> +<%@ page import="org.rhq.core.domain.util.PageList" %> +<%@ page import="org.rhq.enterprise.gui.legacy.ParamConstants" %> +<%@ page import="org.rhq.enterprise.gui.legacy.WebUser" %> +<%@ page import="org.rhq.enterprise.gui.legacy.util.SessionUtils" %> +<%@ page import="org.rhq.enterprise.gui.util.WebUtility" %> +<%@ page import="org.rhq.enterprise.server.util.LookupUtil" %> +<%@ page import="org.rhq.core.domain.resource.Resource" %> +<%@ page import="org.rhq.enterprise.server.drift.DriftManagerLocal"%> +<%@ page import="org.rhq.core.domain.criteria.GenericDriftChangeSetCriteria"%> +<%@ page import="org.rhq.core.domain.drift.DriftChangeSet"%> + +<% + int resourceId = WebUtility.getOptionalIntRequestParameter(request, ParamConstants.RESOURCE_ID_PARAM, -1); + + WebUser user = SessionUtils.getWebUser(request.getSession()); + Subject subject = user.getSubject(); + + long end = Long.parseLong(WebUtility.getRequiredRequestParameter(request, "end")); + long begin = Long.parseLong(WebUtility.getRequiredRequestParameter(request, "begin")); + + DriftManagerLocal driftManager = LookupUtil.getDriftManager(); + GenericDriftChangeSetCriteria criteria = new GenericDriftChangeSetCriteria(); + criteria.addFilterResourceId(resourceId); + criteria.addFilterCreatedAfter(begin); + criteria.addFilterCreatedBefore(end); + PageList<? extends DriftChangeSet<?>> results = driftManager.findDriftChangeSetsByCriteria(subject, criteria); +%> + +{ "events": [ + +<% + SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd yyyy HH:mm:ss Z", Locale.US); + String link = "/coregui/CoreGUI.html#Resource/" + resourceId + "/Drift/ChangeSets"; + String icon = "/images/icons/Drift_16.png"; + boolean first = true; + for (DriftChangeSet entry : results) { + if (!first) { + out.write(",\n"); + } + first = false; +%> + +{ "start" : "<%=sdf.format(entry.getCtime())%>", + "title" : "Drift Detected", + "link" : "<%=link%>", + "description" : "Drift was detected! A change set was created to document the changes.", + "icon" : "<%=icon%>", + "color" : "#3333FF" +} + +<% + } +%> + +]} diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventsView.jsp b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventsView.jsp index 1bbdb2f..1ac93c7 100644 --- a/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventsView.jsp +++ b/modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/events/EventsView.jsp @@ -236,6 +236,15 @@ function onLoad() { }); }
+ if (document.forms['show'].drift.checked) { + link = "/resource/common/monitor/events/EventDriftJSON.jsp?id=" + resourceId + "&begin=" + begin + "&end=" + end; + Timeline.loadJSON(link, function(json, url) { + eventSource.loadJSON(json, url); + document.getElementById("event-count").innerHTML = eventSource.getCount(); + done(); + }); + } + if (document.forms['show']['content'].checked) { link = "/resource/common/monitor/events/EventContentJSON.jsp?id=" + resourceId + "&begin=" + begin + "&end=" + end; Timeline.loadJSON(link, function(json, url) {
rhq-commits@lists.fedorahosted.org