Merge pull request #8 from Appdynamics/v2.0.3

V2.0.3

Author: abeytom07

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.appdynamics</groupId>
     <artifactId>appd-exts-commons</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
     <packaging>jar</packaging>
     <name>extension-utils</name>
     <properties>

src/main/java/com/appdynamics/extensions/ABaseMonitor.java

@@ -7,6 +7,8 @@
 import com.singularity.ee.agent.systemagent.api.exception.TaskExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import java.io.File;
 import java.util.Map;
 
 /**
@@ -91,12 +93,19 @@ protected void initialize(Map<String, String> args) {
         if(configuration == null){
             monitorJob = createMonitorJob();
             MonitorConfiguration conf = new MonitorConfiguration(monitorName,getDefaultMetricPrefix(), monitorJob);
-            conf.setConfigYml(args.get("config-file"));
+            conf.setConfigYml(args.get("config-file"), new MonitorConfiguration.FileWatchListener() {
+                @Override
+                public void onFileChange(File file) {
+                    onConfigReload(file);
+                }
+            });
             initializeMoreStuff(conf);
             this.configuration = conf;
         }
     }
 
+    protected void onConfigReload(File file){};
+
     protected AMonitorJob createMonitorJob() {
         return new AMonitorJob(this);
     }

src/main/java/com/appdynamics/extensions/conf/MonitorConfiguration.java

@@ -275,4 +275,5 @@ public MetricWriter getFromWriterCache(String metricPath) {
     public void putInWriterCache(String metricPath, MetricWriter writer) {
         cacheModule.putInWriterCache(metricPath,writer);
     }
+
 }

src/main/java/com/appdynamics/extensions/dashboard/CustomDashboardUploader.java

@@ -58,7 +58,7 @@ public void uploadDashboard(String dashboardName, Xml xml, Map<String, String> a
                     }
                 }
                 logger.debug("The controller login is successful, the cookie is [{}] and csrf is {}", cookies, csrf);
-                boolean isPresent = isDashboardPresent(client, cookies, dashboardName);
+                boolean isPresent = isDashboardPresent(client, cookies, dashboardName, csrf);
                 if (isPresent) {
                     if (overwrite) {
                         uploadFile(dashboardName, xml, argsMap, cookies, csrf);
@@ -91,9 +91,11 @@ private void setProxyIfApplicable(Map<String, String> argsMap) {
         }
     }
 
-    private boolean isDashboardPresent(SimpleHttpClient client, StringBuilder cookies, String dashboardName) {
-        Response response = client.target().path("controller/restui/dashboards/list/false")
-                .header("Cookie", cookies.toString()).get();
+    private boolean isDashboardPresent(SimpleHttpClient client, StringBuilder cookies, String dashboardName, String csrf) {
+        Response response = client.target().path("controller/restui/dashboards/list/getAllDashboardsByType/false")
+                .header("Cookie", cookies.toString())
+                .header("X-CSRF-TOKEN",csrf)
+                .get();
         if (response.getStatus() == 200) {
             ArrayNode arrayNode = response.json(ArrayNode.class);
             boolean isPresent = false;
@@ -111,7 +113,8 @@ private boolean isDashboardPresent(SimpleHttpClient client, StringBuilder cookie
                     , response.getStatus());
             logger.info("Please change the [uploadDashboard] property in the config.yml to false. " +
                     "The xml will be written to the logs folder. Please import it to controller manually");
-            return false;
+            logger.error("This API was changed in the controller version 4.3. So for older controllers, upload the dashboard xml file from the logs folder.");
+            return true;//Fake that the dashboard exists.
         }
     }