Skip to content

Products / LILOM

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 5791fcf8 5791fcf89475b719072dd502953a59222e94d735 by Christian Gerdes
Options

Merge branch 'master' of https://git.lightsinline.se/products/LILOM.git

2 parents 19f030f3 21aac603
Inline Side-by-side
Showing 15 changed files with 482 additions and 134 deletions
......@@ -43,21 +43,25 @@ if(request.getParameter("action") != null) {
<% } %>
<script type="text/javascript">
function getData(type, input) {
function getData(type, input, pdb) {
// Update the data
var pdbAdd = "";
if(pdb != "" && pdb != null) pdbAdd = "&pdbName=" + pdb;
var client1 = new XMLHttpRequest();
client1.onreadystatechange = dataHandler;
client1.open("GET", "/" + type + "/getData?age=14&connectionString=" + encodeURIComponent(input));
client1.open("GET", "/" + type + "/getData?age=14" + pdbAdd + "&connectionString=" + encodeURIComponent(input));
client1.setRequestHeader('Cache-Control', 'no-cache');
client1.setRequestHeader('Pragma', 'no-cache');
client1.send();
}
function getMetrics(type, input) {
function getMetrics(type, input, pdb) {
// Get the metrics
var pdbAdd = "";
if(pdb != "" && pdb != null) pdbAdd = "pdbName=" + pdb + "&";
var client2 = new XMLHttpRequest();
client2.onreadystatechange = metricsHandler;
client2.open("GET", "/" + type + "/getMetrics?connectionString=" + encodeURIComponent(input));
client2.open("GET", "/" + type + "/getMetrics?" + pdbAdd + "connectionString=" + encodeURIComponent(input));
client2.setRequestHeader('Cache-Control', 'no-cache');
client2.setRequestHeader('Pragma', 'no-cache');
client2.send();
......@@ -117,8 +121,9 @@ function dataHandler() {
<input type="submit" name="action" value="remove" >
<input type="hidden" name="omconstr" value="<%= mon.getConString() %>">
<input type="button" value="graph" onClick="window.open('/viewOraMon.html?<%= URLEncoder.encode(mon.getConString(), "UTF-8") %>')">
<input id="getDataButton" type="button" value="getData" onClick="getData('OraMonREST', '<%= mon.getConString() %>')">
<input id="getMetricsButton" type="button" value="getMetrics" onClick="getMetrics('OraMonREST', '<%= mon.getConString() %>')">
<input id="getDataButton" type="button" value="getData" onClick="getData('OraMonREST', '<%= mon.getConString() %>',this.form.pdbName.value)">
<input id="getMetricsButton" type="button" value="getMetrics" onClick="getMetrics('OraMonREST', '<%= mon.getConString() %>',this.form.pdbName.value)">
<input id="pdbName" name="pdbName" size="10">
</form>
</td>
</tr>
......
No preview for this file type
No preview for this file type
......@@ -53,27 +53,44 @@ public class OraMonRESTgetData extends HttpServlet {
if(shortConArray.length != 2) {
// Error, wrong format of string
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
response.getWriter().println("{\"error\":true,\"msg\":\"connectionString needs to be in format jdbc:oracle:thin:@//host:port/sid with optional :username:password at the end.\"}");
response.getWriter().println("{\"error\":true,\"msg\":\"connectionString needs to be in format jdbc:oracle:thin:@//host:port/servicename or jdbc:oracle:thin:@(<TNS Connection String>) with optional :username:password at the end.\"}");
return;
}
String[] shortConArray2 = shortConArray[1].split(":");
if(shortConArray2[0].startsWith("//") && shortConArray2.length == 4) {
// We have new style and username and password, we can try to create the monitor if it doesnt exist
monitor = Registry.findOrCreate(shortConArray[0] + "@" + shortConArray2[0] + ":" + shortConArray2[1], shortConArray2[2], shortConArray2[3]);
} else if(!shortConArray2[0].startsWith("//") && shortConArray2.length == 5) {
// We have old style with sid with :username:password, try to find or create it
monitor = Registry.findOrCreate(shortConArray[0] + "@" + shortConArray2[0] + ":" + shortConArray2[1] + ":" + shortConArray2[2], shortConArray2[3], shortConArray2[4]);
} else if(shortConArray2[0].startsWith("//") && shortConArray2.length == 2) {
// We have new style but only have the connection string, try to find it (we cant create one without username/password)
monitor = Registry.find(request.getParameter("connectionString"));
} else if(!shortConArray2[0].startsWith("//") && shortConArray2.length == 3) {
// We have old style sid and no :username:password
monitor = Registry.find(request.getParameter("connectionString"));
if(shortConArray2[0].startsWith("(")) {
// TNS Format
if(shortConArray2.length == 3) {
// We have a TNS connection string and username + password
monitor = Registry.findOrCreate(shortConArray[0] + "@" + shortConArray2[0], shortConArray2[1], shortConArray2[2]);
} else if (shortConArray2.length == 1) {
// We only have the TNS connection string, no username or password
monitor = Registry.find(shortConArray[0] + "@" + shortConArray2[0]);
} else {
// We have something else, not implemented
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
response.getWriter().println("{\"error\":true,\"msg\":\"connectionString needs to be in format jdbc:oracle:thin:@(<TNS Connection String>) with optional :username:password at the end.\"}");
return;
}
} else {
// Wrong format
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
response.getWriter().println("{\"error\":true,\"msg\":\"connectionString needs to be in format jdbc:oracle:thin:@//host:port/sid with optional :username:password at the end.\"}");
return;
// JDBC Format
if(shortConArray2[0].startsWith("//") && shortConArray2.length == 4) {
// We have new style and username and password, we can try to create the monitor if it doesnt exist
monitor = Registry.findOrCreate(shortConArray[0] + "@" + shortConArray2[0] + ":" + shortConArray2[1], shortConArray2[2], shortConArray2[3]);
} else if(!shortConArray2[0].startsWith("//") && shortConArray2.length == 5) {
// We have old style with sid with :username:password, try to find or create it
monitor = Registry.findOrCreate(shortConArray[0] + "@" + shortConArray2[0] + ":" + shortConArray2[1] + ":" + shortConArray2[2], shortConArray2[3], shortConArray2[4]);
} else if(shortConArray2[0].startsWith("//") && shortConArray2.length == 2) {
// We have new style but only have the connection string, try to find it (we cant create one without username/password)
monitor = Registry.find(request.getParameter("connectionString"));
} else if(!shortConArray2[0].startsWith("//") && shortConArray2.length == 3) {
// We have old style sid and no :username:password
monitor = Registry.find(request.getParameter("connectionString"));
} else {
// Wrong format
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
response.getWriter().println("{\"error\":true,\"msg\":\"connectionString needs to be in format jdbc:oracle:thin:@//host:port/servicename with optional :username:password at the end.\"}");
return;
}
}
} else {
// Short con string
......@@ -94,7 +111,7 @@ public class OraMonRESTgetData extends HttpServlet {
}
String conStr, usrStr, pwdStr;
if(serviceName) {
conStr = "jdbc:oracle:thin:@" + conStrParamArray[0] + ":" + conStrParamArray[1];
conStr = "jdbc:oracle:thin:@//" + conStrParamArray[0] + ":" + conStrParamArray[1];
usrStr = conStrParamArray[2];
pwdStr = conStrParamArray[3];
} else {
......@@ -107,17 +124,23 @@ public class OraMonRESTgetData extends HttpServlet {
monitor = Registry.findOrCreate(conStr, usrStr, pwdStr);
}
String pdbName = null;
if(request.getParameterMap().containsKey("pdbName")) {
String temp = request.getParameter("pdbName");
if (!temp.isEmpty()) pdbName = temp;
}
if(monitor != null) {
// Call getData()
boolean didUpdate = monitor.getData(age);
String dbName = monitor.getDBName();
boolean didUpdate = monitor.getData(age,pdbName);
String dbName = monitor.getFriendlyName(pdbName);
if(didUpdate) {
sb.append("{\"error\":false,\"msg\":\"Sucessfully collected data on instance '" + dbName + "'\"");
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 instance '" + 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(",\"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()+"}");
}
} else {
......
import java.io.IOException;
import java.util.ArrayList;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
......@@ -32,44 +31,57 @@ public class OraMonRESTgetMetrics extends HttpServlet {
*/
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
response.setContentType("application/json");
OraMon monitor = null;
try {
StringBuffer sb = new StringBuffer();
ArrayList<OraMon> list = Registry.getList();
if(request.getParameterMap().containsKey("connectionString")) {
// We have a connection string, find the monitor and report only on that monitor
OraMon monitor = null;
if(request.getParameter("connectionString").startsWith("jdbc:oracle")) {
// Full con string
String[] shortConArray = request.getParameter("connectionString").split("@");
if(shortConArray.length != 2) {
// Error, wrong format of string
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
response.getWriter().println("{\"error\":true,\"msg\":\"connectionString needs to be in format jdbc:oracle:thin:@//host:port/sid with optional :username:password at the end.\"}");
response.getWriter().println("{\"error\":true,\"msg\":\"connectionString needs to be in format jdbc:oracle:thin:@//host:port/servicename or jdbc:oracle:thin:@(<TNS Connection String>) with optional :username:password at the end.\"}");
return;
}
String[] shortConArray2 = shortConArray[1].split(":");
if(shortConArray2[0].startsWith("//") && (shortConArray2.length == 4 || shortConArray2.length == 2)) {
// We seem to have a correct connection string, if :username:password exist we ignore them here
monitor = Registry.find(shortConArray[0] + "@" + shortConArray2[0] + ":" + shortConArray2[1]);
if(monitor == null) {
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.getWriter().println("{\"error\":true,\"msg\":\"Can not find a monitor with connection string "+shortConArray[0] + "@" + shortConArray2[0] + ":" + shortConArray2[1]+"\"}");
return;
if(shortConArray2[0].startsWith("(")) {
// TNS Format
if(shortConArray2.length >= 1) {
monitor = Registry.find(shortConArray[0] + "@" + shortConArray2[0]);
if(monitor == null) {
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.getWriter().println("{\"error\":true,\"msg\":\"Can not find a monitor with connection string "+shortConArray[0] + "@" + shortConArray2[0]+"\"}");
return;
}
}
} else if(!shortConArray2[0].startsWith("//") && (shortConArray2.length == 5 || shortConArray2.length == 3)) {
// We seem to have a correct connection string, if :username:password exist we ignore them here
monitor = Registry.find(shortConArray[0] + "@" + shortConArray2[0] + ":" + shortConArray2[1] + ":" + shortConArray2[2]);
if(monitor == null) {
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.getWriter().println("{\"error\":true,\"msg\":\"Can not find a monitor with connection string "+shortConArray[0] + "@" + shortConArray2[0] + ":" + shortConArray2[1] + ":" + shortConArray2[2]+"\"}");
} else {
// JDBC Format
if(shortConArray2[0].startsWith("//") && (shortConArray2.length == 4 || shortConArray2.length == 2)) {
// We seem to have a correct connection string, if :username:password exist we ignore them here
monitor = Registry.find(shortConArray[0] + "@" + shortConArray2[0] + ":" + shortConArray2[1]);
if(monitor == null) {
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.getWriter().println("{\"error\":true,\"msg\":\"Can not find a monitor with connection string "+shortConArray[0] + "@" + shortConArray2[0] + ":" + shortConArray2[1]+"\"}");
return;
}
} else if(!shortConArray2[0].startsWith("//") && (shortConArray2.length == 5 || shortConArray2.length == 3)) {
// We seem to have a correct connection string, if :username:password exist we ignore them here
monitor = Registry.find(shortConArray[0] + "@" + shortConArray2[0] + ":" + shortConArray2[1] + ":" + shortConArray2[2]);
if(monitor == null) {
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.getWriter().println("{\"error\":true,\"msg\":\"Can not find a monitor with connection string "+shortConArray[0] + "@" + shortConArray2[0] + ":" + shortConArray2[1] + ":" + shortConArray2[2]+"\"}");
return;
}
} else {
// Wrong format
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
response.getWriter().println("{\"error\":true,\"msg\":\"connectionString needs to be in format jdbc:oracle:thin:@//host:port/servicename with optional :username:password at the end.\"}");
return;
}
} else {
// Wrong format
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
response.getWriter().println("{\"error\":true,\"msg\":\"connectionString needs to be in format jdbc:oracle:thin:@//host:port/sid with optional :username:password at the end.\"}");
return;
}
} else {
// Check that we have a valid connection string (old style)
......@@ -89,64 +101,65 @@ public class OraMonRESTgetMetrics extends HttpServlet {
}
String conStr;
if(serviceName) {
conStr = "jdbc:oracle:thin:@" + conStrParamArray[0] + ":" + conStrParamArray[1];
conStr = "jdbc:oracle:thin:@//" + conStrParamArray[0] + ":" + conStrParamArray[1];
} else {
conStr = "jdbc:oracle:thin:@" + conStrParamArray[0] + ":" + conStrParamArray[1] + ":" + conStrParamArray[2];
}
monitor = Registry.find(conStr);
if(monitor == null) {
// Not found, create it
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.getWriter().println("{\"error\":true,\"msg\":\"Can not find a monitor with connection string "+request.getParameter("connectionString")+"\"}");
return;
}
}
// Set this monitor to the only one on the list
list = new ArrayList<OraMon>();
list.add(monitor);
}
// Loop over all monitors and output a Json array with the default set of metrics
if(monitor == null) {
// Not found, response with 404
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
response.getWriter().println("{\"error\":true,\"msg\":\"Can not find a monitor with connection string "+request.getParameter("connectionString")+"\"}");
return;
}
for (OraMon item : list) {
sb.append("{\"name\":\"" + item.getDBName() + "\",\"error\":false,\"nvarray\":");
sb.append("[");
sb.append("{\"name\":\"Cpu Usage (%)\",\"value\":" + item.getCPUPercent() + "}");
sb.append(",{\"name\":\"Logical Reads (#/s)\",\"value\":" + item.getLogicalReadsPerSecond() + "}");
sb.append(",{\"name\":\"Executes (#/s)\",\"value\":" + item.getPerSecondValue("execute count") + "}");
sb.append(",{\"name\":\"User Calls (#/s)\",\"value\":" + item.getPerSecondValue("user calls") + "}");
sb.append(",{\"name\":\"Cache Hit Ratio (%)\",\"value\":" + item.getCacheHitRatioPercent() + "}");
sb.append(",{\"name\":\"Redo Size (#/s)\",\"value\":" + item.getPerSecondValue("redo size") + "}");
sb.append(",{\"name\":\"OS Busy (%)\",\"value\":" + item.getOsBusyPercent() + "}");
sb.append(",{\"name\":\"OS Load (#)\",\"value\":" + item.getOsLoad() + "}");
sb.append(",{\"name\":\"OS Page In (KB/s)\",\"value\":" + item.getPerSecondValue("VM_IN_BYTES", OraMon.OSSTAT)/1024 + "}");
sb.append(",{\"name\":\"OS Page Out (KB/s)\",\"value\":" + item.getPerSecondValue("VM_OUT_BYTES", OraMon.OSSTAT)/1024 + "}");
sb.append(",{\"name\":\"OS Load per Cpu (#)\",\"value\":" + item.getOsLoadPerCPU() + "}");
sb.append(",{\"name\":\"Consistent Gets (#/s)\",\"value\":" + item.getPerSecondValue("consistent gets") + "}");
sb.append(",{\"name\":\"DB Block Gets (#/s)\",\"value\":" + item.getPerSecondValue("db block gets") + "}");
sb.append(",{\"name\":\"Buffer Cache Hit Ratio (%)\",\"value\":" + item.getBufferCacheHitRatioPercent() + "}");
sb.append(",{\"name\":\"DB Block Changes (#/s)\",\"value\":" + item.getPerSecondValue("db block changes") + "}");
sb.append(",{\"name\":\"Physical Reads (#/s)\",\"value\":" + item.getPerSecondValue("physical reads") + "}");
sb.append(",{\"name\":\"Physical Writes (#/s)\",\"value\":" + item.getPerSecondValue("physical writes") + "}");
sb.append(",{\"name\":\"Redo Writes (#/s)\",\"value\":" + item.getPerSecondValue("redo writes") + "}");
sb.append(",{\"name\":\"Non-idle Wait Time (ms/s)\",\"value\":" + item.getPerSecondValue("non-idle wait time") + "}");
sb.append(",{\"name\":\"File I/O Wait Time (ms/s)\",\"value\":" + item.getPerSecondValue("file io wait time") + "}");
sb.append(",{\"name\":\"User Commits (#/s)\",\"value\":" + item.getPerSecondValue("user commits") + "}");
sb.append(",{\"name\":\"User Rollbacks (#/s)\",\"value\":" + item.getPerSecondValue("user rollbacks") + "}");
sb.append(",{\"name\":\"Parse Count Total (#/s)\",\"value\":" + item.getPerSecondValue("parse count (total)") + "}");
sb.append(",{\"name\":\"Parse Count Hard (#/s)\",\"value\":" + item.getPerSecondValue("parse count (hard)") + "}");
sb.append(",{\"name\":\"Cpu Usage xNIWT (%)\",\"value\":" + item.getCPUPercent(true) + "}");
sb.append(",{\"name\":\"Cpu Time (us/s)\",\"value\":" + item.getCPUTimePerSecond() + "}");
sb.append(",{\"name\":\"Cpus (#)\",\"value\":" + item.getNumberOfCPUs() + "}");
String pdbName = null;
if(request.getParameterMap().containsKey("pdbName")) {
String temp = request.getParameter("pdbName");
if (!temp.isEmpty()) pdbName = temp;
}
// Write out the monitors data
sb.append("{\"name\":\"" + monitor.getFriendlyName(pdbName) + "\",\"error\":false,\"nvarray\":");
sb.append("[");
sb.append("{\"name\":\"Cpu Usage (%)\",\"value\":" + monitor.getCPUPercent(pdbName) + "}");
sb.append(",{\"name\":\"Logical Reads (#/s)\",\"value\":" + monitor.getLogicalReadsPerSecond(pdbName) + "}");
sb.append(",{\"name\":\"Executes (#/s)\",\"value\":" + monitor.getPerSecondValue("execute count",pdbName) + "}");
sb.append(",{\"name\":\"User Calls (#/s)\",\"value\":" + monitor.getPerSecondValue("user calls",pdbName) + "}");
sb.append(",{\"name\":\"Cache Hit Ratio (%)\",\"value\":" + monitor.getCacheHitRatioPercent(pdbName) + "}");
sb.append(",{\"name\":\"Redo Size (#/s)\",\"value\":" + monitor.getPerSecondValue("redo size",pdbName) + "}");
sb.append(",{\"name\":\"OS Busy (%)\",\"value\":" + monitor.getOsBusyPercent() + "}");
sb.append(",{\"name\":\"OS Load (#)\",\"value\":" + monitor.getOsLoad() + "}");
sb.append(",{\"name\":\"OS Page In (KB/s)\",\"value\":" + monitor.getPerSecondValue("VM_IN_BYTES", OraMon.OSSTAT)/1024 + "}");
sb.append(",{\"name\":\"OS Page Out (KB/s)\",\"value\":" + monitor.getPerSecondValue("VM_OUT_BYTES", OraMon.OSSTAT)/1024 + "}");
sb.append(",{\"name\":\"OS Load per Cpu (#)\",\"value\":" + monitor.getOsLoadPerCPU() + "}");
sb.append(",{\"name\":\"Consistent Gets (#/s)\",\"value\":" + monitor.getPerSecondValue("consistent gets",pdbName) + "}");
sb.append(",{\"name\":\"DB Block Gets (#/s)\",\"value\":" + monitor.getPerSecondValue("db block gets",pdbName) + "}");
sb.append(",{\"name\":\"Buffer Cache Hit Ratio (%)\",\"value\":" + monitor.getBufferCacheHitRatioPercent(pdbName) + "}");
sb.append(",{\"name\":\"DB Block Changes (#/s)\",\"value\":" + monitor.getPerSecondValue("db block changes",pdbName) + "}");
sb.append(",{\"name\":\"Physical Reads (#/s)\",\"value\":" + monitor.getPerSecondValue("physical reads",pdbName) + "}");
sb.append(",{\"name\":\"Physical Writes (#/s)\",\"value\":" + monitor.getPerSecondValue("physical writes",pdbName) + "}");
sb.append(",{\"name\":\"Redo Writes (#/s)\",\"value\":" + monitor.getPerSecondValue("redo writes",pdbName) + "}");
sb.append(",{\"name\":\"Non-idle Wait Time (ms/s)\",\"value\":" + monitor.getPerSecondValue("non-idle wait time",pdbName) + "}");
sb.append(",{\"name\":\"File I/O Wait Time (ms/s)\",\"value\":" + monitor.getPerSecondValue("file io wait time",pdbName) + "}");
sb.append(",{\"name\":\"User Commits (#/s)\",\"value\":" + monitor.getPerSecondValue("user commits",pdbName) + "}");
sb.append(",{\"name\":\"User Rollbacks (#/s)\",\"value\":" + monitor.getPerSecondValue("user rollbacks",pdbName) + "}");
sb.append(",{\"name\":\"Parse Count Total (#/s)\",\"value\":" + monitor.getPerSecondValue("parse count (total)",pdbName) + "}");
sb.append(",{\"name\":\"Parse Count Hard (#/s)\",\"value\":" + monitor.getPerSecondValue("parse count (hard)",pdbName) + "}");
sb.append(",{\"name\":\"Cpu Usage xNIWT (%)\",\"value\":" + monitor.getCPUPercent(true,pdbName) + "}");
sb.append(",{\"name\":\"Cpu Time (us/s)\",\"value\":" + monitor.getCPUTimePerSecond(pdbName) + "}");
sb.append(",{\"name\":\"Cpus (#)\",\"value\":" + monitor.getNumberOfCPUs() + "}");
sb.append("]}");
response.getWriter().println(sb.toString());
......
javaw.exe -Dcom.sun.management.jmxremote.ssl=false -cp "wls-12.2.1.2.0.4/wljmxclient.jar;jconsole.1.8.0_91.jar" sun.tools.jconsole.JConsole "service:jmx:rmi:///jndi/iiop://damk321s2.da.kap.rsv.se:17010/weblogic.management.mbeanservers.runtime"
\ No newline at end of file
No preview for this file type
No preview for this file type
# Notes
## PDB logic
Bytt approuch och tagit bort allt som tidigare fanns i PDB branchen och har mergat den med master (då den innehöll TNS koden).
Gamla tanken var att via en PDB klura ut vad CDB databasens conn sträng är, ansluta till den, och hämta data för alla PDBer istället och cacha detta i CDB objektet.
Hade funkat fint, förutom att det förutsätter att CDB och PDB har samma lyssnare, vilket de inte nödvändigtvist har. Jag kan inte klura ut vad lyssnaren ska vara till CDB.
Istället får det bli en lösning där användaren alltid anger CDB databasens conn sträng, men kan med en flagga välja att få ut en PDB's info istället.
Idag ser tex ett anrop ut så här:
GET /OraMonREST/getData?age=14&connectionString=jdbc%3Aoracle%3Athin%3A%40%2F%2Fu03634.kap.rsv.se%3A1526%2FDB1K12
I detta kan vi lägga till en parameter, forPDB=DA1K001 tex och då returneras endast värden för den PDB'n.
På så sätt kommer anrop till flera olika PDB att hämtas från samma CDB data cache.
Anropet till CDB'n skulle kunna returnera en lista på alla PDBer också.
Ännu snyggare vore om en CDB kunde bryta ner graferna per PDB också ;)
SQL satser
select cdb from v$database;
Returnerar YES om databasen är en CDB (dvs Oracle 12 med CDB påslaget). Returnerar YES även på en PDB.
Views for PDB's
V_$CON_SYSSTAT
V_$CON_SYSTEM_WAIT_CLASS
V_$CON_SYSTEM_EVENT
V_$CON_SYS_TIME_MODEL
Can be checked with a select like
select view_name from all_views where view_name like 'V_$CON_%';
Slå samman con_id med statname
select systimestamp, name || con_id, value from V$CON_SYSSTAT;
2018-03-28
Första versionen med PDB stöd. Behövs mer tester.
PDB CPU: 11.056953715796771
CDB CPU: 11.204673034978592
DA1K001: 11.084891829252536
DA1K002: 55.75905904774211
TOTAL : 66.84395087699465
Exemplet ovan är med ett delta på 60 sekunder, PDB går direkt mot PDB con string, CDB direkt mot CDB och DA räknarna är från denna CDB.
DA1K002 är på samma CDB, och getCPUPercent() ovan returnerar av någon anledning att den tar 55% cpu när hela CDB bara tar 11.2 vilket känns fel.
Det är bara DA1K001 som jobbar. Nedan från samma mätning fast Logical IO per Second istället:
PDB LIO: 433961.7046663872
CDB LIO: 433532.02901594585
DA1K001: 435343.22211814864
DA1K002: 9.075934239850135
TOTAL : 435352.2980523885
Här känns alla värden rätt. Får göra klart GUI bitarna och se hur monitorerna beteer sig under längre tid.
När jag kört ett tag i graph läget nu på en PDB via CDB, ser jag även konstiga värden på mycket annat. Cache Hit Ratio på 1200%, negativa värden på flera räknare, mm.
GUI delarna lirar inte riktigt heller, getMetrics ger en 500 och en NullPointer (beror på att pdbName skickas alltid, null om den inte ska användas, och det funkar
inte i alla metoder i OraMon.java klassen). Anger man en PDB i OraMon.jsp så blir det HTTP 0 status?? på getData och getMetrics knapparna.
\ No newline at end of file
......@@ -83,4 +83,17 @@ class Collector {
else
return 0;
}
public double getSeconds(String name) throws Throwable {
LongDelta myDelta = null;
for(int x = 0; x<list.size() && myDelta == null; x++) {
if(name.equals(list.get(x).name)) {
myDelta = list.get(x);
}
}
if(myDelta != null)
return myDelta.getSeconds();
else
return 0;
}
}
\ No newline at end of file
......
......@@ -34,7 +34,7 @@ class LongDelta {
update(value, timestamp, false);
}
public void update(Long value, Timestamp timestamp, boolean convert) {
public void update(long value, Timestamp timestamp, boolean convert) {
if(convert) value = value/1000;
if(urProt) {
if(this.curValue != null && this.curValue > value) {
......
package se.lil.om;
import java.sql.*;
import java.util.HashSet;
import java.util.Properties;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class OraMon {
Connection conn = null;
......@@ -11,6 +14,7 @@ public class OraMon {
String conUser = "system";
String conPass = "passw0rd";
String dbName = null;
String serviceName = null;
public static final int SYSSTAT = 1;
public static final int OSSTAT = 2;
......@@ -21,6 +25,24 @@ public class OraMon {
int getDataCalls = 0;
int getDataSucess = 0;
boolean getPdbs = false;
Collector colPdbSysStat = null;
Collector colPdbCPU = null;
HashSet<String> pdbSet = null;
public static final String strCpuTime = " cputime";
public static final String strNiwTime = " niwtime";
public static final String strSeparator = " ";
public int getNumPdbs() {
if(pdbSet != null) return pdbSet.size();
else return 0;
}
public String[] getPdbArray() {
if(pdbSet != null) return (String[]) pdbSet.toArray();
else return null;
}
public int getDataCalled() {
return getDataCalls;
}
......@@ -37,6 +59,33 @@ public class OraMon {
return this.conString;
}
public String getServiceName() {
if(this.serviceName != null) return this.serviceName;
if(this.conString != null) {
if(this.conString.contains("SERVICE_NAME=")) {
//TNS format
Pattern pat = Pattern.compile("SERVICE_NAME=(\\w+)");
Matcher m = pat.matcher(this.conString);
if(m.find()) {
this.serviceName = m.group(1);
} else {
this.serviceName = null;
}
} else {
int last = this.conString.lastIndexOf('/');
if(last >=0)
this.serviceName = this.conString.substring(last +1);
else {
last = this.conString.lastIndexOf(':');
this.serviceName = this.conString.substring(last +1);
}
}
} else {
this.serviceName = null;
}
return this.serviceName;
}
//NUM_CPUS
int numCpus = 0;
public long getNumberOfCPUs() throws Throwable {
......@@ -46,57 +95,110 @@ public class OraMon {
//DB CPU
LongDelta cpuTime = new LongDelta(true);
LongDelta niwTime = new LongDelta(true);
public double getCPUPercent(boolean excludeNonIdleWaitTime) throws Throwable {
double perSec = cpuTime.getPerSecondValue();
public double getCPUPercent(boolean excludeNonIdleWaitTime, String pdbName) throws Throwable {
double cpuPerSec;
if(pdbName == null) cpuPerSec = cpuTime.getPerSecondValue();
else cpuPerSec = colPdbCPU.getPerSecValue(pdbName + strCpuTime);
double niwPerSec;
if(pdbName == null) niwPerSec = niwTime.getPerSecondValue();
else niwPerSec = colPdbCPU.getPerSecValue(pdbName + strNiwTime);
if(excludeNonIdleWaitTime) {
double newPerSec = perSec - (niwTime.getPerSecondValue() * 1000);
if(newPerSec > 0) perSec = newPerSec; else perSec = 0;
double newPerSec = cpuPerSec - (niwPerSec * 1000);
if(newPerSec > 0) cpuPerSec = newPerSec; else cpuPerSec = 0;
}
double totSec = numCpus * 1000 * 1000;
double percent = (perSec / totSec) * 100;
double percent = (cpuPerSec / totSec) * 100;
if(percent > 100D) percent=100D;
if(percent < 0D) percent=0D;
return percent;
}
public double getCPUPercent(boolean excludeNonIdleWaitTime) throws Throwable {
return getCPUPercent(excludeNonIdleWaitTime, null);
}
public double getCPUPercent() throws Throwable {
return getCPUPercent(false);
}
public double getCPUPercent(String pdbName) throws Throwable {
return getCPUPercent(false, pdbName);
}
public double getCPUAvailableSeconds() throws Throwable {
return cpuTime.getSeconds()*numCpus;
}
public double getCPUAvailableSeconds(String pdbName) throws Throwable {
return colPdbCPU.getSeconds(pdbName + strCpuTime)*numCpus;
}
public long getCPURawValue() throws Throwable {
return cpuTime.getCurrentValue();
}
public long getCPURawDiff() {
if(cpuTime != null && cpuTime.lastValue != null)
return cpuTime.curValue - cpuTime.lastValue;
else
return 0;
public long getCPURawValue(String pdbName) throws Throwable {
return colPdbCPU.getCurrentValue(pdbName + strCpuTime);
}
public long getCPURawDiff() throws Throwable {
return cpuTime.getDelta();
}
public long getCPURawDiff(String pdbName) throws Throwable {
return colPdbCPU.getDelta(pdbName + strCpuTime);
}
public double getCPUTimePerSecond() throws Throwable {
return cpuTime.getPerSecondValue();
}
public double getCPUTimePerSecond(String pdbName) throws Throwable {
return colPdbCPU.getPerSecValue(pdbName + strCpuTime);
}
public double getPerSecondValue(String name) throws Throwable {
return getPerSecondValue(name, SYSSTAT);
return getPerSecondValue(name, SYSSTAT, null);
}
public double getPerSecondValue(String name, int table) throws Throwable {
return getPerSecondValue(name, table, null);
}
public double getPerSecondValue(String name, String pdbName) throws Throwable {
return getPerSecondValue(name, SYSSTAT, pdbName);
}
public double getPerSecondValue(String name, int table, String pdbName) throws Throwable {
switch (table) {
case OSSTAT:
return colOsStat.getPerSecValue(name);
case SYSSTAT:
return colSysStat.getPerSecValue(name);
if(pdbName == null)
return colSysStat.getPerSecValue(name);
else
return colPdbSysStat.getPerSecValue(pdbName + strSeparator + name);
default:
return colSysStat.getPerSecValue(name);
}
}
public String getDBName() {
// Returns the instance name unless we are a PDB, in that case the service name from the con string is returned instead.
return this.dbName;
}
public String getFriendlyName() {
return getFriendlyName(null);
}
public String getFriendlyName(String pdbName) {
// Returns a friendly name of the database, either the service name from con string or the database name from the instance
getServiceName();
if(pdbName != null) {
if(this.serviceName != null) return this.serviceName + ":" + pdbName;
else return this.dbName + ":" + pdbName;
} else {
if(this.serviceName != null) return this.serviceName;
else return this.dbName;
}
}
public double getOsBusyPercent() throws Throwable {
double idle = getPerSecondValue("IDLE_TIME", OSSTAT);
double busy = getPerSecondValue("BUSY_TIME", OSSTAT);
......@@ -124,9 +226,23 @@ public class OraMon {
}
public double getBufferCacheHitRatioPercent() throws Throwable {
double conGetsCache = getPerSecondValue("consistent gets from cache");
double dbBlocksCache = getPerSecondValue("db block gets from cache");
double physReadsCache = getPerSecondValue("physical reads cache");
return getBufferCacheHitRatioPercent(null);
}
public double getBufferCacheHitRatioPercent(String pdbName) throws Throwable {
double conGetsCache;
double dbBlocksCache;
double physReadsCache;
if(pdbName == null) {
conGetsCache = getPerSecondValue("consistent gets from cache");
dbBlocksCache = getPerSecondValue("db block gets from cache");
physReadsCache = getPerSecondValue("physical reads cache");
} else {
conGetsCache = colPdbSysStat.getPerSecValue(pdbName + strSeparator + "consistent gets from cache");
dbBlocksCache = colPdbSysStat.getPerSecValue(pdbName + strSeparator + "db block gets from cache");
physReadsCache = colPdbSysStat.getPerSecValue(pdbName + strSeparator + "physical reads cache");
}
if (conGetsCache + dbBlocksCache + physReadsCache == 0) {
return 100;
}
......@@ -142,9 +258,23 @@ public class OraMon {
}
public double getCacheHitRatioPercent() throws Throwable {
double conGets = getPerSecondValue("consistent gets");
double dbBlocks = getPerSecondValue("db block gets");
double physReads = getPerSecondValue("physical reads");
return getCacheHitRatioPercent(null);
}
public double getCacheHitRatioPercent(String pdbName) throws Throwable {
double conGets;
double dbBlocks;
double physReads;
if(pdbName == null) {
conGets = getPerSecondValue("consistent gets");
dbBlocks = getPerSecondValue("db block gets");
physReads = getPerSecondValue("physical reads");
} else {
conGets = colPdbSysStat.getPerSecValue(pdbName + strSeparator + "consistent gets");
dbBlocks = colPdbSysStat.getPerSecValue(pdbName + strSeparator + "db block gets");
physReads = colPdbSysStat.getPerSecValue(pdbName + strSeparator + "physical reads");
}
if (conGets + dbBlocks + physReads == 0) {
return 100;
}
......@@ -159,7 +289,13 @@ public class OraMon {
}
public double getLogicalReadsPerSecond() throws Throwable {
return getPerSecondValue("consistent gets") + getPerSecondValue("db block gets");
return getLogicalReadsPerSecond(null);
}
public double getLogicalReadsPerSecond(String pdbName) throws Throwable {
if(pdbName == null)
return getPerSecondValue("consistent gets") + getPerSecondValue("db block gets");
else
return colPdbSysStat.getPerSecValue(pdbName + strSeparator + "consistent gets") + colPdbSysStat.getPerSecValue(pdbName + strSeparator + "db block gets");
}
long lastRTns = 0;
......@@ -168,19 +304,31 @@ public class OraMon {
}
long lastFetchTSns = 0;
public boolean getData(long ageTs) throws Throwable {
if ((System.nanoTime() - lastFetchTSns) > (ageTs * 1000 * 1000 * 1000)) return getData();
else return false;
}
public long getAgeTs() {
return (System.nanoTime() - lastFetchTSns)/(1000*1000*1000);
}
public boolean getData() throws Throwable {
return getData(0, null);
}
public boolean getData(long ageTs) throws Throwable {
return getData(ageTs, null);
}
Lock lock = new ReentrantLock();
Throwable lastEx = null;
public boolean getData() throws Throwable {
public boolean getData(long ageTs, String pdbName) throws Throwable {
//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) {
getPdbs = true;
}
else {
if ((System.nanoTime() - lastFetchTSns) < (ageTs * 1000 * 1000 * 1000)) return false;
}
// Start thread safe
// Try to get a lock
boolean haveLock = lock.tryLock();
......@@ -194,6 +342,7 @@ public class OraMon {
return false;
}
// We do have the lock. Do the rest in a try catch everything and if we catch anything, re throw the catch but always release the lock.
Statement stmt = null;
try {
long startTSns = System.nanoTime();
getDataCalls++;
......@@ -210,10 +359,10 @@ public class OraMon {
if(stale) {
open();
}
Statement stmt = conn.createStatement();
stmt = conn.createStatement();
ResultSet rset = null;
//Get the database name once
//Get the database name once // Currently always gets the CDB name
if(this.dbName == null) {
rset = stmt.executeQuery("select value from V$SYSTEM_PARAMETER where name = 'db_name'");
rset.next();
......@@ -221,28 +370,47 @@ public class OraMon {
rset.close();
}
// All other cases (CDB or an instance without containers) get the data from the database
//Get the entire V_$OSSTAT table from DB
colOsStat.update(stmt.executeQuery("select systimestamp, stat_name, value from V$OSSTAT"));
//Set numCpus
this.numCpus = (int) colOsStat.getCurrentValue("NUM_CPUS");
// Get OS Load
osLoad.update(stmt.executeQuery("select systimestamp, value from V$OSSTAT where stat_name='LOAD'"));
// Get DB CPU use time
rset = stmt.executeQuery("select systimestamp, s.value as NIWT, t.value as DBCPU from V$SYSSTAT s, V$SYS_TIME_MODEL t where s.name='non-idle wait time' and t.STAT_NAME='DB CPU'");
rset.next();
niwTime.update(rset.getLong(2), rset.getTimestamp(1));
cpuTime.update(rset.getLong(3), rset.getTimestamp(1));
rset.close();
// cpuTime.update(stmt.executeQuery("select systimestamp, value from V$SYS_TIME_MODEL where stat_name='DB CPU'"));
// niwTime.update(stmt.executeQuery("select systimestamp, value from V$SYSSTAT where name='non-idle wait time'"));
// Get OS Load
osLoad.update(stmt.executeQuery("select systimestamp, value from V$OSSTAT where stat_name='LOAD'"));
//Get the entire V_$SYSSTAT table from DB
colSysStat.update(stmt.executeQuery("select systimestamp, name, value from V$SYSSTAT"));
//Get PDB specific data if getPDB is set to true
if(getPdbs) {
//CPU
if(colPdbCPU == null) colPdbCPU = new Collector();
rset = stmt.executeQuery("select systimestamp, c.NAME, s.value as NIWT, t.value as DBCPU from V$CON_SYSSTAT s, V$CON_SYS_TIME_MODEL t, V$CONTAINERS c where s.CON_ID=t.CON_ID and s.CON_ID=c.CON_ID and s.name='non-idle wait time' and t.STAT_NAME='DB CPU'");
while(rset.next()) {
Timestamp ts = rset.getTimestamp(1);
String name = rset.getString(2);
colPdbCPU.updateValue(ts, name + strNiwTime, rset.getLong(3));
colPdbCPU.updateValue(ts, name + strCpuTime, rset.getLong(4));
if(pdbSet == null) pdbSet = new HashSet<String>();
pdbSet.add(name);
}
rset.close();
//SYSSTATS
if(colPdbSysStat == null) colPdbSysStat = new Collector();
colPdbSysStat.update(stmt.executeQuery("select systimestamp, c.NAME || '" + strSeparator + "' || s.name, s.value from V$CON_SYSSTAT s, V$CONTAINERS c where s.CON_ID=c.CON_ID"));
}
stmt.close();
getDataSucess++;
lastFetchTSns = System.nanoTime();
......@@ -253,6 +421,13 @@ public class OraMon {
Throwable thisCause = e;
while(lastCause != null) { thisCause = lastCause; lastCause = thisCause.getCause(); }
lastEx = thisCause;
// Close the connection and statement to prevent memory leaks
try {
stmt.close();
conn.close();
} catch (Exception e2) {
// Dont care
}
throw (e);
} finally {
lock.unlock();
......
......@@ -11,13 +11,69 @@ public class TestRunner {
/**
* @param args
*/
public static void main(String[] args) throws Throwable{
public static void main(String[] args) throws Throwable {
//runner1();
//test1();
//testTns();
testPDB();
}
public static void testPDB() throws Throwable {
OraMon cdb = new OraMon("jdbc:oracle:thin:@//u03634.kap.rsv.se:1526/DB1K12","dbsnmp","dbsnmp"); // CDB
OraMon pdb = new OraMon("jdbc:oracle:thin:@//u03634.kap.rsv.se:1526/DA1K001","dbsnmp","dbsnmp"); // PDB
int times = 5;
while(times-- > 0) {
cdb.getData(0, "DA1K001");
pdb.getData();
System.out.println("PDB CPU: " + pdb.getCPUPercent());
System.out.println("CDB CPU: " + cdb.getCPUPercent());
System.out.println("DA1K001: " + cdb.getCPUPercent(false, "DA1K001"));
System.out.println("DA1K002: " + cdb.getCPUPercent(false, "DA1K002"));
System.out.println("TOTAL : " + (cdb.getCPUPercent(false, "DA1K001") + cdb.getCPUPercent(false, "DA1K002")));
System.out.println("PDB LIO: " + pdb.getLogicalReadsPerSecond());
System.out.println("CDB LIO: " + cdb.getLogicalReadsPerSecond());
System.out.println("DA1K001: " + cdb.getLogicalReadsPerSecond("DA1K001"));
System.out.println("DA1K002: " + cdb.getLogicalReadsPerSecond("DA1K002"));
System.out.println("TOTAL : " + (cdb.getLogicalReadsPerSecond("DA1K001") + cdb.getLogicalReadsPerSecond("DA1K002")));
System.out.println("Sleeping 15s\n");
Thread.sleep(60000);
}
cdb.close();
pdb.close();
}
public static void test1() throws Throwable {
OraMon mon = new OraMon("jdbc:oracle:thin:@//u02822.kap.rsv.se:1526/DB1K06","dbsnmp","dbsnmp"); // CDB
System.out.println("getData returned: " + mon.getData());
System.out.println("getDatabaseName: " + mon.getDBName());
}
public static void testTns() throws Throwable {
//OraMon mon = new OraMon("jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(Host=u00153.kap.rsv.se)(Port=1526))(ADDRESS=(PROTOCOL=TCP)(Host=u00154.kap.rsv.se)(Port=1526)))(CONNECT_DATA=(SERVICE_NAME=PB1K001)))","dbsnmp","dbsnmp"); // PDB using TNS
OraMon mon = new OraMon("jdbc:oracle:thin:@//u00153.kap.rsv.se:1526/DB1K01","dbsnmp","dbsnmp");
System.out.println("getData returned: " + mon.getData());
System.out.println("getDatabaseName: " + mon.getDBName());
System.out.println("getServiceName: " + mon.getServiceName());
System.out.println("getFriendlyName: " + mon.getFriendlyName());
System.out.println("getConString: " + mon.getConString());
System.out.println("getNumberOfCPUs: " + mon.getNumberOfCPUs());
}
public static void runner1() throws Throwable {
// TODO Auto-generated method stub
//ArrayList<OraMon> oraList = new ArrayList<OraMon>();
ArrayList<OraMon> oraList = Registry.getList();
OraMon mon1 = new OraMon("jdbc:oracle:thin:@uvp3dbkappkg:1550:VP1K03","dbsnmp","dbsnmp"); // SID eller Service Name format
//OraMon mon1 = new OraMon("jdbc:oracle:thin:@uvp3dbkappkg:1550:VP1K03","dbsnmp","dbsnmp"); // SID eller Service Name format
//OraMon mon1 = new OraMon("jdbc:oracle:thin:@//u00154.kap.rsv.se:1526/DB1K01","dbsnmp","dbsnmp");
//OraMon mon1 = new OraMon("jdbc:oracle:thin:@//u03634.kap.rsv.se:1526/DA1K001","dbsnmp","dbsnmp"); // PDB, CDB är DB1K12
//OraMon mon1 = new OraMon("jdbc:oracle:thin:@//u03634.kap.rsv.se:1526/DA1K002","dbsnmp","dbsnmp"); // Andra PDB på CDB DB1K12
OraMon mon1 = new OraMon("jdbc:oracle:thin:@//u03634.kap.rsv.se:1526/DB1K12","dbsnmp","dbsnmp"); // PDB, CDB är DB1K12
//OraMon mon2 = new OraMon("jdbc:oracle:thin:@host:port:sid","user","pass"); // SID format
mon1.open();
//mon2.open();
......