Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [2842] Add the OOB calculation to the control.jsp file and fix the build error by passing the new third argument to SystemManager.setSystemConfiguration()
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [2842] Add the OOB calculation to the control.jsp file and fix the build error by passing the new third argument to SystemManager.setSystemConfiguration()</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2842</dd> <dt>Author</dt> <dd>hrupp</dd> <dt>Date</dt> <dd>2009-01-30 03:32:13 -0600 (Fri, 30 Jan 2009)</dd> </dl> <h3>Log Message</h3> <pre>Add the OOB calculation to the control.jsp file and fix the build error by passing the new third argument to SystemManager.setSystemConfiguration()</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappadmintestcontroljsp">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp</a></li> <li><a href="#rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverschedulerjobsDataPurgeJobjava">rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJob.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappadmintestcontroljsp"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp (2841 => 2842)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp 2009-01-30 09:09:04 UTC (rev 2841) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/admin/test/control.jsp 2009-01-30 09:32:13 UTC (rev 2842) </span><span class="lines">@@ -49,7 +49,7 @@ </span><span class="cx"> AgentManagerLocal agentManager; SystemManagerLocal systemManager; SubjectManagerLocal subjectManager; </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> coreTestBean = LookupUtil.getCoreTest(); discoveryTestBean = LookupUtil.getDiscoveryTest(); measurementTestBean = LookupUtil.getMeasurementTest(); </span><span class="lines">@@ -134,17 +134,22 @@ </span><span class="cx"> { String alertTemplateId = pageContext.getRequest().getParameter("alertTemplateId"); String numberOfClones = pageContext.getRequest().getParameter("numberOfClones"); </span><span class="rem">- alertTemplateTestBean.cloneAlertTemplate(Integer.parseInt(alertTemplateId), Integer.parseInt(numberOfClones)); </span><span class="add">+ alertTemplateTestBean.cloneAlertTemplate(Integer.parseInt(alertTemplateId), Integer.parseInt(numberOfClones)); </span><span class="cx"> } else if ("calculateAutoBaselines".equals(mode)) { // for now, baselines aren't calculated until we hit our day limit, we force it here java.util.Properties props = systemManager.getSystemConfiguration(); props.put("CAM_BASELINE_LASTTIME", "0"); </span><span class="rem">- systemManager.setSystemConfiguration(subjectManager.getOverlord(), props); </span><span class="add">+ systemManager.setSystemConfiguration(subjectManager.getOverlord(), props,true); </span><span class="cx"> measurementBaselineManager.calculateAutoBaselines(); } </span><span class="add">+ else if ("calculateOOBs".equals(mode)) + { + DataPurgeJob dpj = new DataPurgeJob(); + dpj.calculateOOBs(); + } </span><span class="cx"> else if ("checkForSuspectAgents".equals(mode)) { agentManager.checkForSuspectAgents(); </span><span class="lines">@@ -273,6 +278,8 @@ </span><span class="cx"> <a href="<c:out value="${url}"/>">Check For Suspect Agents</a></li> <li><c:url var="url" value="/admin/test/control.jsp?mode=dataPurgeJob"/> <a href="<c:out value="${url}"/>">Force Data Purge Now</a></li> </span><span class="add">+ <li><c:url var="url" value="/admin/test/control.jsp?mode=calculateOOBs"/> + <a href="<c:out value="${url}"/>">Force calculation of OOBs</a></li> </span><span class="cx"> </ul> <h2>Alerts</h2> </span><span class="lines">@@ -285,7 +292,7 @@ </span><span class="cx"> Number of Clones: <input type="text" name="numberOfClones" size="5"/><br/> <input type="submit" value="Send" name="Send"/> </form> </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> </ul> <h2>Utilities</h2> </span></pre></div> <a id="rhqtrunkmodulesenterpriseserverjarsrcmainjavaorgrhqenterpriseserverschedulerjobsDataPurgeJobjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJob.java (2841 => 2842)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJob.java 2009-01-30 09:09:04 UTC (rev 2841) +++ rhq/trunk/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/DataPurgeJob.java 2009-01-30 09:32:13 UTC (rev 2842) </span><span class="lines">@@ -303,7 +303,7 @@ </span><span class="cx"> * Calculate the OOB values for the last hour. * This also removes outdated ones due to recalculated baselines. */ </span><span class="rem">- private void calculateOOBs() { </span><span class="add">+ public void calculateOOBs() { </span><span class="cx"> long timeStart = System.currentTimeMillis(); LOG.info("Auto-calculation of OOBs starting"); </span> </pre> </div> </div> </body> </html> |
