From 6154d5e7615844a32761bbe6f54ec89024adf27c Mon Sep 17 00:00:00 2001 From: Vishaka Sekar Date: Tue, 25 Feb 2020 18:38:30 -0800 Subject: [PATCH 1/2] config.yml update --- CHANGELOG.md | 3 +++ pom.xml | 2 +- src/main/resources/config.yml | 24 +++++++++++++++++++++++- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51f47d0..dff56fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +#### 2.0.3 + 1. Added controllerInfo section and health check flag in config.yml + ### 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/pom.xml b/pom.xml index 1aa3e54..e9704e4 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 4.0.0 com.appdynamics.extensions aws-lambda-monitoring-extension - 2.0.2 + 2.0.3 AWS Lambda Monitoring Extension diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 2df4fe3..8813cae 100644 --- 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 \ No newline at end of file + 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. \ No newline at end of file From 7120fe72e0508233deea60bf79dc618d5f84bca2 Mon Sep 17 00:00:00 2001 From: Vishaka Sekar Date: Mon, 9 Mar 2020 13:32:04 -0700 Subject: [PATCH 2/2] update aws commons to 2.2.1 --- CHANGELOG.md | 1 + README.md | 4 ++-- pom.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dff56fe..a057511 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ #### 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 diff --git a/README.md b/README.md index 55391d7..255372a 100644 --- 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 index e9704e4..dd4342a 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ com.appdynamics.extensions aws-cloudwatch-exts-commons - 2.2.0 + 2.2.1 junit