moved commands configuration inside database config to support for multiple databases

Author: BalakrishnaV

README.md

@@ -36,32 +36,30 @@ Please make sure to not use tab (\t) while editing yaml files. You may want to v
 
    ```
       # Configure the SQLMonitor
+      # Provide password OR encryptedPassword,encryptionKey. See the documentation to find about password encryption.
+      # isolationLevel:Transaction isolation level to apply on the connection
+      #Supported values are TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ and TRANSACTION_SERIALIZABLE
+      #Default is TRANSACTION_READ_UNCOMMITTED
       servers:
-          - server: "localhost"
+          - displayName: "Instance1"
             driver: "com.mysql.jdbc.Driver"
-            connectionString: "jdbc:mysql://localhost:3388/test"
+            connectionString: "jdbc:mysql://localhost:3388/database1"
             user: "root"
-            #Provide password or encryptedPassword and encryptionKey. See the documentation to find about password encryption.
             password: "root"
-
-            encryptedPassword:
             encryptionKey:
-            #Transaction isolation level to apply on the connection
-            #Supported values are TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ and TRANSACTION_SERIALIZABLE
-            #Default is TRANSACTION_READ_UNCOMMITTED
+            encryptedPassword:
             isolationLevel: "TRANSACTION_READ_UNCOMMITTED"
-
-
-      commands:
-         - command: "select value from monitortest where id = 1"
-           displayPrefix: "Expedia"
-         - command: "select value from monitortest where id = 2"
-           displayPrefix: "DerbySoft"
-
+            commands:
+              - command: "select value from monitortest where id = 1"
+                displayPrefix: "Expedia"
+              - command: "select value from monitortest where id = 2"
+                displayPrefix: "DerbySoft"
       # Make sure the metric prefix ends with a |
-
+      #This will create this metric in all the tiers, under this path.
       metricPrefix: "Custom Metrics|SQL|"
-```
+      #This will create it in specific Tier. Replace <ComponentID> with TierID
+      #metricPrefix: "Server|Component:<ComponentID>|Custom Metrics|SQL|"
+   ```
 
 2. Configure the path to the config.yaml file by editing the <task-arguments> in the monitor.xml file. Below is the sample
 
@@ -121,7 +119,7 @@ Find out more in the [AppDynamics Exchange][].
 
 For any questions or feature request, please contact [AppDynamics Center of Excellence][].
 
-**Version:** 1.3
+**Version:** 1.3.1
 **Controller Compatibility:** 3.7 or later
 **SQL Version Tested On:** MySQL, 5.5.46
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.appdynamics.extensions</groupId>
     <artifactId>sql-monitoring-extension</artifactId>
-    <version>1.3</version>
+    <version>1.3.1</version>
     <packaging>jar</packaging>
     <name>sql-monitoring-extension</name>
     <url>http://maven.apache.org</url>
@@ -151,7 +151,7 @@
                                     <fileset dir="src/main/resources/conf" includes="config.yml"/>
                                 </copy>
                                 <copy todir="${target.dir}">
-                                    <fileset dir="${build.directory}"
+                                    <fileset dir="${project.build.directory}"
                                              includes="${project.artifactId}.${project.packaging}"/>
                                 </copy>
                                 <zip destfile="${target.dir}-${project.version}.zip">

src/main/java/com/appdynamics/monitors/sql/SQLMonitor.java

@@ -65,10 +65,10 @@ public TaskOutput execute(Map<String, String> taskArguments, TaskExecutionContex
                 //read the config.
                 Configuration config = YmlReader.readFromFile(configFilename, Configuration.class);
 
-                // no point continuing if we don't have this
+                /*// no point continuing if we don't have this
                 if (config.getCommands().isEmpty()) {
                     return new TaskOutput("Failure");
-                }
+                }*/
                 processMetricPrefix(config.getMetricPrefix());
 
                 status = executeCommands(config, status);
@@ -89,12 +89,12 @@ private String executeCommands(Configuration config, String status) {
             for (Server server : config.getServers()) {
                 conn = connect(server);
 
-                for (Command command : config.getCommands()) {
+                for (Command command : server.getCommands()) {
                     try {
                         int counter = 1;
                         logger.info("sql statement: " + counter++);
                         String statement = command.getCommand();
-                        String displayPrefix = server.getServer()+"|"+command.getDisplayPrefix();
+                        String displayPrefix = server.getDisplayName()+"|"+command.getDisplayPrefix();
                         if (statement != null) {
                             statement = statement.trim();
                             // parse into statement and roll up

src/main/java/com/appdynamics/monitors/sql/config/Configuration.java

@@ -25,7 +25,6 @@ public class Configuration {
 
     String metricPrefix;
     List<Server> servers;
-    List<Command> commands;
 
     public List<Server> getServers() {
         return servers;
@@ -43,13 +42,6 @@ public void setMetricPrefix(String metricPrefix) {
         this.metricPrefix = metricPrefix;
     }
 
-    public List<Command> getCommands() {
-        return commands;
-    }
-
-    public void setCommands(List<Command> commands) {
-        this.commands = commands;
-    }
 }
 
 

src/main/java/com/appdynamics/monitors/sql/config/Server.java

@@ -17,16 +17,19 @@
 package com.appdynamics.monitors.sql.config;
 
 
+import java.util.List;
+
 public class Server {
 
-    private String server;
+    private String displayName;
     private String driver;
     private String connectionString;
     private String user;
     private String password;
     private String encryptedPassword;
     private String encryptionKey;
     private String isolationLevel;
+    private List<Command> commands;
 
     public enum IsolationLevel {
         TRANSACTION_READ_UNCOMMITTED(1), TRANSACTION_READ_COMMITTED(2), TRANSACTION_REPEATABLE_READ(4), TRANSACTION_SERIALIZABLE(8);
@@ -85,12 +88,12 @@ public void setPassword(String password) {
     }
 
 
-    public String getServer() {
-        return server;
+    public String getDisplayName() {
+        return displayName;
     }
 
-    public void setServer(String server) {
-        this.server = server;
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
     }
 
     public String getEncryptedPassword() {
@@ -117,5 +120,12 @@ public void setIsolationLevel(String isolationLevel) {
         this.isolationLevel = isolationLevel;
     }
 
+    public List<Command> getCommands() {
+        return commands;
+    }
+
+    public void setCommands(List<Command> commands) {
+        this.commands = commands;
+    }
 }
 

src/main/resources/conf/config.yml

@@ -1,26 +1,46 @@
-# Configure the SQLMonitor
+# SQLMonitor Configuration
+
+# Provide password OR encryptedPassword,encryptionKey. See the documentation to find about password encryption.
+
+# isolationLevel:Transaction isolation level to apply on the connection
+#Supported values are TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ and TRANSACTION_SERIALIZABLE
+#Default is TRANSACTION_READ_UNCOMMITTED
+
 servers:
-    - server: "localhost"
+    - displayName: "Instance1"
       driver: "com.mysql.jdbc.Driver"
-      connectionString: "jdbc:mysql://localhost:3388/test"
+      connectionString: "jdbc:mysql://localhost:3388/database1"
       user: "root"
-      #Provide password or encryptedPassword and encryptionKey. See the documentation to find about password encryption.
       password: "root"
-
+      encryptionKey:
       encryptedPassword:
+      isolationLevel: "TRANSACTION_READ_UNCOMMITTED"
+
+      commands:
+        - command: "select value from monitortest where id = 1"
+          displayPrefix: "Expedia"
+        - command: "select value from monitortest where id = 2"
+          displayPrefix: "DerbySoft"
+
+
+    - displayName: "Instance2"
+      driver: "com.mysql.jdbc.Driver"
+      connectionString: "jdbc:mysql://localhost:3388/database2"
+      user: "root"
+      password: "root"
       encryptionKey:
-      #Transaction isolation level to apply on the connection
-      #Supported values are TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ and TRANSACTION_SERIALIZABLE
-      #Default is TRANSACTION_READ_UNCOMMITTED
+      encryptedPassword:
       isolationLevel: "TRANSACTION_READ_UNCOMMITTED"
 
+      commands:
+        - command: "select value from monitortest where id = 1"
+          displayPrefix: "Expedia"
+        - command: "select value from monitortest where id = 2"
+          displayPrefix: "DerbySoft"
 
-commands:
-   - command: "select value from monitortest where id = 1"
-     displayPrefix: "Expedia"
-   - command: "select value from monitortest where id = 2"
-     displayPrefix: "DerbySoft"
 
 # Make sure the metric prefix ends with a |
-
-metricPrefix: "Custom Metrics|SQL|"
+#This will create this metric in all the tiers, under this path.
+metricPrefix: "Custom Metrics|SQL|"
+#This will create it in specific Tier. Replace <ComponentID> with TierID
+#metricPrefix: "Server|Component:<ComponentID>|Custom Metrics|SQL|"