New feature to block/unblock an Oracle DB Monitor. Not implemented for

JMX Monitors yet.

@@ -55,6 +55,16 @@ function getData(type, input, pdb) {
     	client1.send();
     	client1.send();
 }
 }
 
 
+function setBlocked(type, input, state) {
+	// Update the data
+	var client1 = new XMLHttpRequest();
+	client1.onreadystatechange = dataHandler;
+	client1.open("GET", "" + type + "/getData?block=" + state + "&connectionString=" + encodeURIComponent(input));
+	client1.setRequestHeader('Cache-Control', 'no-cache');
+	client1.setRequestHeader('Pragma', 'no-cache');
+	client1.send();
+}
+
 function getMetrics(type, input, pdb) {
 function getMetrics(type, input, pdb) {
         // Get the metrics
         // Get the metrics
         var pdbAdd = "";
         var pdbAdd = "";
@@ -104,6 +114,7 @@ function dataHandler() {
 	<table>
 	<table>
 		<tr>
 		<tr>
 			<th>Name</th>
 			<th>Name</th>
+			<th>Instance</th>
 			<th>Connection String</th>
 			<th>Connection String</th>
 			<th>Data Calls</th>
 			<th>Data Calls</th>
 			<th>Success</th>
 			<th>Success</th>
@@ -111,10 +122,12 @@ function dataHandler() {
 			<th>Last Exception</th>
 			<th>Last Exception</th>
 			<th>Age</th>
 			<th>Age</th>
 			<th>RT</th>
 			<th>RT</th>
+			<th>Blocked</th>
 			<th>Action</th>
 			<th>Action</th>
 		</tr>
 		</tr>
 		<% for (OraMon mon : se.lil.om.Registry.getList()) { %>
 		<% for (OraMon mon : se.lil.om.Registry.getList()) { %>
 		<tr>
 		<tr>
+			<td><%= mon.getFriendlyName() %></td>
 			<td><%= mon.getDBName() %></td>
 			<td><%= mon.getDBName() %></td>
 			<td><%= mon.getConString() %></td>
 			<td><%= mon.getConString() %></td>
 			<td><%= mon.getDataCalled() %></td>
 			<td><%= mon.getDataCalled() %></td>
@@ -123,8 +136,10 @@ function dataHandler() {
 			<td><%= mon.getLastEx() %></td>
 			<td><%= mon.getLastEx() %></td>
 			<td><%= mon.getAgeTs() %>s</td>
 			<td><%= mon.getAgeTs() %>s</td>
 			<td><%= mon.getLastRTms() %>ms</td>
 			<td><%= mon.getLastRTms() %>ms</td>
+			<td><%= mon.getBlockedState() %></td>
 			<td>
 			<td>
 				<form method="POST">
 				<form method="POST">
+					<input id="blockButton" type="button" <%if(mon.getBlockedState()) { %>value="Unblock"<% } else { %>value="Block"<% } %> onClick="setBlocked('OraMonREST', '<%= mon.getConString() %>','<%= !mon.getBlockedState() %>')">
 					<input type="submit" name="action" value="remove" >
 					<input type="submit" name="action" value="remove" >
 					<input type="hidden" name="omconstr" value="<%= mon.getConString() %>">
 					<input type="hidden" name="omconstr" value="<%= mon.getConString() %>">
 					<input type="button" value="graph" onClick="showGraph('viewOraMon','<%= URLEncoder.encode(mon.getConString(), "UTF-8") %>',this.form.pdbName.value)">
 					<input type="button" value="graph" onClick="showGraph('viewOraMon','<%= URLEncoder.encode(mon.getConString(), "UTF-8") %>',this.form.pdbName.value)">

@@ -133,17 +133,40 @@ public class OraMonRESTgetData extends HttpServlet {
 				}
 				}
 				
 				
 				if(monitor != null) {
 				if(monitor != null) {
-					// Call getData()
-					boolean didUpdate = monitor.getData(age,pdbName);
-					String dbName = monitor.getFriendlyName(pdbName);
-					if(didUpdate) {
-						sb.append("{\"error\":false,\"msg\":\"Sucessfully collected data on '" + dbName + "'\"");
-						sb.append(",\"ms\":"+monitor.getLastRTms()+"}");
+					if(request.getParameterMap().containsKey("block")) { 
+						// Call setBlocked()
+						boolean blockedState = false;
+						try {
+							blockedState = Boolean.parseBoolean(request.getParameter("block"));
+						} catch (Exception e) {
+							response.setStatus(400);
+							response.getWriter().println("{\"error\":true,\"msg\":\"The specified block parameter is not a valid boolean\"}");
+							return;
+						}
+						monitor.setBlockedState(blockedState);
+						if(blockedState == monitor.getBlockedState()) {
+							response.setStatus(200);
+							response.getWriter().println("{\"error\":false,\"msg\":\"The blocked state is now set to "+blockedState+"\"}");
+							return;
+						} else {
+							response.setStatus(500);
+							response.getWriter().println("{\"error\":true,\"msg\":\"The blocked state could not be set to "+blockedState+"\"}");
+							return;
+						}
 					} else {
 					} else {
-						response.setStatus(HttpServletResponse.SC_ACCEPTED);
-						sb.append("{\"error\":false");
-						sb.append(",\"msg\":\"Data does not need to be updated on '" + dbName + "' either because another thread did concurrently update the monitor and we just waited for it to complete, or because the age (if) specified was higher than the monitors data age.\"");
-						sb.append(",\"age\":"+monitor.getAgeTs()+"}");
+						// Call getData()
+						boolean didUpdate = monitor.getData(age,pdbName);
+						String dbName = monitor.getFriendlyName(pdbName);
+						if(didUpdate) {
+							sb.append("{\"error\":false,\"msg\":\"Sucessfully collected data on '" + dbName + "'\"");
+							sb.append(",\"ms\":"+monitor.getLastRTms()+"}");
+						} else {
+							response.setStatus(HttpServletResponse.SC_ACCEPTED);
+							sb.append("{\"error\":false");
+							sb.append(",\"msg\":\"Data does not need to be updated on '" + dbName + "' either because it is blocked, another thread did concurrently update the monitor and we just waited for it to complete, or because the age (if) specified was higher than the monitors data age.\"");
+							sb.append(",\"age\":"+monitor.getAgeTs());
+							sb.append(",\"blocked\":"+monitor.getBlockedState()+"}");
+						}
 					}
 					}
 				} else {
 				} else {
 					response.setStatus(HttpServletResponse.SC_NOT_FOUND);
 					response.setStatus(HttpServletResponse.SC_NOT_FOUND);

@@ -35,6 +35,16 @@ public class OraMon {
 	public static final String strNiwTime = " niwtime";
 	public static final String strNiwTime = " niwtime";
 	public static final String strSeparator = " ";
 	public static final String strSeparator = " ";
 	
 	
+	private boolean blocked = false;
+	
+	public void setBlockedState(Boolean blockedState) {
+		this.blocked = blockedState;
+	}
+	
+	public boolean getBlockedState() {
+		return this.blocked;
+	}
+	
 	public int getNumPdbs() {
 	public int getNumPdbs() {
 		if(pdbSet != null) return pdbSet.size();
 		if(pdbSet != null) return pdbSet.size();
 		else return 0;
 		else return 0;
@@ -325,6 +335,9 @@ public class OraMon {
 	Throwable lastEx = null;
 	Throwable lastEx = null;
 	
 	
  	public boolean getData(long ageTs, String pdbName) throws Throwable {
  	public boolean getData(long ageTs, String pdbName) throws Throwable {
+ 		//Check if we are blocked. If we are, just return with false telling the caller we did not update.
+ 		if(this.blocked) return false;
+ 		
  		//Check age (unless pdbName was set for the first time, in that case we need to discard the cached data)
  		//Check age (unless pdbName was set for the first time, in that case we need to discard the cached data)
  		if(getPdbs == false && pdbName != null) { 
  		if(getPdbs == false && pdbName != null) { 
  			getPdbs = true; 
  			getPdbs = true;