Merge pull request #7 from Appdynamics/configYmlUpdate

aws-commons update to 2.2.1
Appdynamics · Mar 10, 2020 · 2789680 · 2789680
2 parents 53366f4 + 7120fe7
commit 2789680
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+#### 2.0.3
+    1. Added controllerInfo section and health check flag in config.yml
+    2. Updated aws-cloudwatch-exts-commons to 2.2.1
+
 ### 2.0.2
     1. Updated aws-cloudwatch-exts-commons 2.0.0 to 2.2.0
 ### 2.0.1 - March 22, 2019

diff --git a/README.md b/README.md
@@ -220,8 +220,8 @@ Always feel free to fork and contribute any changes directly here on [GitHub](ht
 ## Version
    |          Name            |  Version   |
    |--------------------------|------------|
-   |Extension Version         |2.0.2      |
+   |Extension Version         |2.0.3      |
    |Controller Compatibility  |4.4 or Later|
    |Agent Compatibility        | 4.5.13 or later|
-   |Last Update               |04 Feb, 2020 |
+   |Last Update               |09 March, 2020 |
 List of changes to this extension can be found [here](https://github.com/Appdynamics/aws-lambda-monitoring-extension/blob/master/CHANGELOG.md)
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.appdynamics.extensions</groupId>
     <artifactId>aws-lambda-monitoring-extension</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
     <name>AWS Lambda Monitoring Extension</name>
 
     <properties>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>com.appdynamics.extensions</groupId>
             <artifactId>aws-cloudwatch-exts-commons</artifactId>
-            <version>2.2.0</version>
+            <version>2.2.1</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -150,4 +150,26 @@ regionEndPoints:
   eu-west-2 : monitoring.eu-west-2.amazonaws.com
   eu-west-3 : monitoring.eu-west-3.amazonaws.com
   sa-east-1 : monitoring.sa-east-1.amazonaws.com
-  us-gov-west-1 : monitoring.us-gov-west-1.amazonaws.com
+  us-gov-west-1 : monitoring.us-gov-west-1.amazonaws.com
+
+
+# If any of the following fields are not set, the values of the specific fields are set from the system properties of the corresponding fields as specified in the comments.
+# If the system properties are not set for the field, then the data is retrieved from machine agent configFile.
+controllerInfo:
+  controllerHost: "" # -Dappdynamics.controller.hostName
+  controllerPort: 8090 # -Dappdynamics.controller.port
+  controllerSslEnabled: false # -Dappdynamics.controller.ssl.enabled
+  enableOrchestration: false # N/A
+  uniqueHostId: "" # -Dappdynamics.agent.uniqueHostId
+  username: "" # -Dappdynamics.agent.monitors.controller.username
+  password: "" # -Dappdynamics.agent.monitors.controller.password
+  encryptedPassword: "" # -Dappdynamics.agent.monitors.controller.encryptedPassword
+  accountAccessKey: "" # -Dappdynamics.agent.accountAccessKey
+  account: "" # -Dappdynamics.agent.accountName
+  machinePath: "" # -Dappdynamics.machine.agent.hierarchyPath
+  simEnabled: false # -Dappdynamics.sim.enabled
+  applicationName: "" # -Dappdynamics.agent.applicationName
+  tierName: "" # -Dappdynamics.agent.tierName
+  nodeName: "" # -Dappdynamics.agent.nodeName
+
+enableHealthChecks: true # If not set, will be retrieved from "-Dappdynamics.agent.monitors.healthchecks.enable=true". Defaults to true.