Include simple content match checking

Author: gbc921

META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-SymbolicName: com.realdolmen.dynatrace.restmonitor;singleton:=t
  rue
 Bundle-Name: REST Monitor
-Bundle-Version: 1.2.1
+Bundle-Version: 1.2.2
 Implementation-Version: 6.5.0.1289
 Bundle-ClassPath: .,lib/slf4j-api-1.7.16.jar,lib/httpclient-cache-4.3.
  6.jar,lib/json-smart-2.2.1.jar,lib/json-path-2.2.0.jar,lib/json-simpl

plugin.xml

@@ -57,6 +57,12 @@
           <rule key="useHeader" value="true" />
         </visibility>
       </property>
+      <property key="matchContent" label="Match content" type="boolean" description="If enabled, the specified string will be searched in the retrieved page." default="false" />
+      <property key="searchString" label="Search string" type="string" description="Enter a case-sensitive string to search for in the retrieved result. If the result contains the string, the measure will yield 1, otherwise 0." default="" multiline="true">
+        <visibility>
+          <rule key="matchContent" value="true" />
+        </visibility>
+      </property>
       <property key="serverAuth" label="Server authorization" type="list" description="Specify the authentication type to be used." default="Disabled">
         <list>
           <item value="Disabled" />
@@ -135,6 +141,7 @@
       <metric defaultrate="none" description="%METRIC_RESPONSE_SIZE_DESCRIPTION" displayname="%METRIC_RESPONSE_SIZE_LABEL" name="ResponseSize" unit="bytes" />
       <metric defaultrate="sec" description="%METRIC_THROUGHPUT_DESCRIPTION" displayname="%METRIC_THROUGHPUT_LABEL" hidedisplayaggregation="sum count" name="Throughput" unit="kilobytes" />
       <metric defaultrate="none" description="%METRIC_HTTP_STATUS_CODE_DESCRIPTION" displayname="%METRIC_HTTP_STATUS_CODE_LABEL" hidedisplayaggregation="sum count" name="HttpStatusCode" unit="number" />
+      <metric defaultrate="none" description="%METRIC_CONTENT_VERIFIED_DESCRIPTION" displayname="%METRIC_CONTENT_VERIFIED_LABEL" hidedisplayaggregation="sum count" name="ContentVerified" unit="number" />
       <metric defaultrate="none" description="%METRIC_CONNECTION_CLOSE_DELAY_DESCRIPTION" displayname="%METRIC_CONNECTION_CLOSE_DELAY_LABEL" hidedisplayaggregation="sum count" name="ConnectionCloseDelay" unit="ms" />
       <metric defaultrate="none" description="%METRIC_SOCKET_TIMEDOUT_DESCRIPTION" displayname="%METRIC_SOCKET_TIMEDOUT_LABEL" hidedisplayaggregation="sum count" name="SocketTimedOut" unit="number" />
       <metric defaultrate="none" description="%METRIC_CONNECTION_TIMEDOUT_DESCRIPTION" displayname="%METRIC_CONNECTION_TIMEDOUT_LABEL" hidedisplayaggregation="sum count" name="ConnectionTimedOut" unit="number" />

src/com/realdolmen/dynatrace/restmonitor/Config.java

@@ -45,6 +45,9 @@ public class Config implements Migrator {
 
 	protected static final String CONFIG_USE_HEADER = "useHeader";
 	protected static final String CONFIG_HEADER = "header";
+	
+	protected static final String CONFIG_MATCH_CONTENT = "matchContent";
+	protected static final String CONFIG_SEARCH_STRING = "searchString";
 
 	protected static final String CONFIG_USE_PROXY = "useProxy";
 	protected static final String CONFIG_PROXY_HOST = "proxyHost";
@@ -83,6 +86,10 @@ public class Config implements Migrator {
 	boolean useHeader;
 	String header;
 
+	// match content
+	boolean matchContent;
+	String searchString;
+	
 	// proxy
 	boolean useProxy;
 	String proxyHost;
@@ -157,6 +164,11 @@ public Config() {
 			header = env.getConfigString(CONFIG_HEADER);
 		}
 
+		matchContent = env.getConfigBoolean(CONFIG_MATCH_CONTENT) == null ? false : env.getConfigBoolean(CONFIG_MATCH_CONTENT);
+		if (matchContent) {
+			searchString = env.getConfigString(CONFIG_SEARCH_STRING);
+		}
+		
 		useProxy = env.getConfigBoolean(CONFIG_USE_PROXY) == null ? false : env.getConfigBoolean(CONFIG_USE_PROXY);
 		if (useProxy) {
 			proxyHost = env.getConfigString(CONFIG_PROXY_HOST);

src/com/realdolmen/dynatrace/restmonitor/MeasureConnection.java

@@ -23,6 +23,7 @@ public class MeasureConnection {
 	static final String MSR_CONN_CLOSE_DELAY = "ConnectionCloseDelay";
 	static final String MSR_SOCKET_TIMEOUT = "SocketTimedOut";
 	static final String MSR_CONNECT_TIMEOUT = "ConnectionTimedOut";
+	static final String MSR_CONTENT_VERIFIED = "ContentVerified";
 
 	private static final double MILLIS = 0.000001;
 	private static final double SECS = 0.000000001;
@@ -36,6 +37,7 @@ public class MeasureConnection {
 	private int inputSize = 0;
 	private boolean socketTimedOut = false;
 	private boolean connectionTimedOut = false;
+	private boolean contentVerified = false;
 
 	private MonitorEnvironment monitorEnvironment;
 
@@ -69,6 +71,12 @@ final void applyBinaryMeasuresToEnvironment() {
 			for (MonitorMeasure measure : measures)
 				measure.setValue(socketTimedOut ? 1 : 0);
 		}
+		
+		// set content verified
+		if ((measures = monitorEnvironment.getMonitorMeasures(METRIC_GROUP, MSR_CONTENT_VERIFIED)) != null) {
+			for (MonitorMeasure measure : measures)
+				measure.setValue(contentVerified ? 1 : 0);
+		}
 	}
 
 	/**
@@ -176,4 +184,9 @@ void setConnectionTimedOut()
 	{
 		this.connectionTimedOut = true;
 	}
+	
+	void setContentVerified()
+	{
+		this.contentVerified = true;
+	}
 }

src/com/realdolmen/dynatrace/restmonitor/RestMonitor.java

@@ -173,6 +173,13 @@ public Status execute(MonitorEnvironment env) throws Exception {
 						if (log.isLoggable(Level.FINE)){
 							messageBuffer.append("content: \n" + resultContent.toString());
 						}
+						
+						// check if content matches
+						if (matchContent(resultContent.toString()))
+						{
+							measureConnection.setContentVerified();
+						}
+
 						final MeasureCapturedValues measureCapturedValues = new MeasureCapturedValues(env);
 						measureCapturedValues.applyMeasuresToEnvironment(resultContent.toString(), config.format);
 					}
@@ -327,6 +334,27 @@ private void setupHeader(DynaTraceHttpClient httpClient) {
 			httpClient.addRequestHeader(headerSplit[0], headerSplit[1]);
 		}
 	}
+	
+	private boolean matchContent(String resultContent) {
+		if (!config.matchContent) {
+			log.fine("Not checking for file content.");
+			return false;
+		}
+		if (config.searchString.isEmpty()) {
+			log.warning("Search String is empty");
+			return false;
+		} else {
+			log.finer("Checking if: " + config.searchString.toString() + "is on");
+			log.finer("response: " + resultContent);
+			if(resultContent.contains(config.searchString.toString()))
+			{
+				log.finer("content match!");
+				return true;
+			}
+		}
+		log.fine("Bailing out content matching");
+		return false;
+	}
 
 	private void setupHttpClient() {
 		DynaTraceHttpClientBuilder builder = new DynaTraceHttpClientBuilder();