From d5aa896d875a2d59c7d8ca9fbe154fb022ce7db7 Mon Sep 17 00:00:00 2001 From: Vishaka Sekar Date: Tue, 4 Feb 2020 09:18:09 -0800 Subject: [PATCH 1/6] Updated aws-cloudwatch-exts-commons 2.0.0 to 2.2.0 --- CHANGELOG.md | 7 +++++-- README.md | 4 ++-- pom.xml | 4 ++-- .../extensions/aws/lambda/LambdaMonitor.java | 13 ++++++++++--- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30a9196..51f47d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,11 @@ +### 2.0.2 + 1. Updated aws-cloudwatch-exts-commons 2.0.0 to 2.2.0 +### 2.0.1 - March 22, 2019 + 1. Updated the aws-cloudwatch-exts-commons to 2.0.1.1 from 2.0.0 + ### 2.0.0 - August 10, 2018 1. Porting to aws-cloudwatch-exts-commons 2.0.1 2. Moved all the region-endpoints into config.yml 3. Covered tests 4. Updated readme as per the guidelines. -### 2.0.1 - March 22, 2019 - 1. Updated the aws-cloudwatch-exts-commons to 2.0.1.1 from 2.0.0 diff --git a/README.md b/README.md index 74930dd..d62b606 100644 --- a/README.md +++ b/README.md @@ -215,8 +215,8 @@ Always feel free to fork and contribute any changes directly here on [GitHub](ht ## Version | Name | Version | |--------------------------|------------| - |Extension Version |2.0.1 | + |Extension Version |2.0.2 | |Controller Compatibility |4.4 or Later| - |Last Update |22nd Mar, 2019 | + |Last Update |04 Feb, 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 c93c88e..1aa3e54 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 4.0.0 com.appdynamics.extensions aws-lambda-monitoring-extension - 2.0.1 + 2.0.2 AWS Lambda Monitoring Extension @@ -31,7 +31,7 @@ com.appdynamics.extensions aws-cloudwatch-exts-commons - 2.0.1.1 + 2.2.0 junit diff --git a/src/main/java/com/appdynamics/extensions/aws/lambda/LambdaMonitor.java b/src/main/java/com/appdynamics/extensions/aws/lambda/LambdaMonitor.java index 691a58d..7e88d3d 100644 --- a/src/main/java/com/appdynamics/extensions/aws/lambda/LambdaMonitor.java +++ b/src/main/java/com/appdynamics/extensions/aws/lambda/LambdaMonitor.java @@ -14,6 +14,11 @@ import com.appdynamics.extensions.aws.metric.processors.MetricsProcessor; import org.apache.log4j.Logger; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import static com.appdynamics.extensions.aws.Constants.METRIC_PATH_SEPARATOR; /** @@ -43,10 +48,12 @@ public String getMonitorName() { } @Override - protected int getTaskCount() { - return 3; + protected List> getServers() { + Map serversMap = new HashMap(); + List> serversList = new ArrayList>(); + serversList.add(serversMap); + return serversList; } - @Override protected NamespaceMetricStatisticsCollector getNamespaceMetricsCollector(Configuration config) { MetricsProcessor metricsProcessor = createMetricsProcessor(config); From 0f6b3557f8ccb7605df11370fb53c28105d3f82b Mon Sep 17 00:00:00 2001 From: Vishaka Sekar Date: Mon, 10 Feb 2020 20:16:55 -0800 Subject: [PATCH 2/6] MA version update --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d62b606..f5803e9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # AWS Lambda Monitoring Extension ## Use Case -AWS LAmbda Monitoring Extension captures Lambda statistics from Amazon CloudWatch and displays them in the AppDynamics Metric Browser. +AWS Lambda Monitoring Extension captures Lambda statistics from Amazon CloudWatch and displays them in the AppDynamics Metric Browser. **Note : By default, the Machine agent can only send a fixed number of metrics to the controller. This extension potentially reports thousands of metrics, so to change this limit, please follow the instructions mentioned [here](https://docs.appdynamics.com/display/PRO40/Metrics+Limits).** ## Prerequisites @@ -13,7 +13,10 @@ Please give the following permissions to the account being used to with the exte ``` In order to use this extension, you do need a [Standalone JAVA Machine Agent](https://docs.appdynamics.com/display/PRO44/Standalone+Machine+Agents) or [SIM Agent](https://docs.appdynamics.com/display/PRO44/Server+Visibility). For more details on downloading these products, please visit [here](https://download.appdynamics.com/). The extension needs to be able to connect to the HAProxy in order to collect and send metrics. To do this, you will have to either establish a remote connection in between the extension and the product, or have an agent on the same machine running the product in order for the extension to collect and send the metrics. +**This extension is compatible with Machine Agent version 4.5.13 or later. +If you are seeing warning messages while starting the Machine Agent, update the http-client and http-core JARs in {MACHINE_AGENT_HOME}/monitorsLibs httpclient-4.5.9 and httpcore-4.4.12 in monitorsLibs to make this warning go away. +To make AWS extensions work on Machine Agent < 4.5.13 the http-client and http-core JARs in {MACHINE_AGENT_HOME}/monitorsLibs has to be manually be updated to httpclient-4.5.9 and httpcore-4.4.12 ## Installation 1. Run 'mvn clean install' from aws-lambda-monitoring-extension @@ -217,6 +220,6 @@ Always feel free to fork and contribute any changes directly here on [GitHub](ht |--------------------------|------------| |Extension Version |2.0.2 | |Controller Compatibility |4.4 or Later| + |Agent Compatibility | 4.5.13 or later| |Last Update |04 Feb, 2020 | - List of changes to this extension can be found [here](https://github.com/Appdynamics/aws-lambda-monitoring-extension/blob/master/CHANGELOG.md) From 469562a9daac22ed9c075cb6f4516e04de31586b Mon Sep 17 00:00:00 2001 From: Vishaka Sekar Date: Mon, 10 Feb 2020 20:20:01 -0800 Subject: [PATCH 3/6] MA version update --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f5803e9..c67793e 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,11 @@ Please give the following permissions to the account being used to with the exte ``` In order to use this extension, you do need a [Standalone JAVA Machine Agent](https://docs.appdynamics.com/display/PRO44/Standalone+Machine+Agents) or [SIM Agent](https://docs.appdynamics.com/display/PRO44/Server+Visibility). For more details on downloading these products, please visit [here](https://download.appdynamics.com/). The extension needs to be able to connect to the HAProxy in order to collect and send metrics. To do this, you will have to either establish a remote connection in between the extension and the product, or have an agent on the same machine running the product in order for the extension to collect and send the metrics. -**This extension is compatible with Machine Agent version 4.5.13 or later. +**This extension is compatible with Machine Agent version 4.5.13 or later. -If you are seeing warning messages while starting the Machine Agent, update the http-client and http-core JARs in {MACHINE_AGENT_HOME}/monitorsLibs httpclient-4.5.9 and httpcore-4.4.12 in monitorsLibs to make this warning go away. -To make AWS extensions work on Machine Agent < 4.5.13 the http-client and http-core JARs in {MACHINE_AGENT_HOME}/monitorsLibs has to be manually be updated to httpclient-4.5.9 and httpcore-4.4.12 +* If you are seeing warning messages while starting the Machine Agent, update the http-client and http-core JARs in {MACHINE_AGENT_HOME}/monitorsLibs to httpclient-4.5.9 and httpcore-4.4.12 in monitorsLibs to make this warning go away. +* To make AWS extensions work on Machine Agent < 4.5.13: + The http-client and http-core JARs in {MACHINE_AGENT_HOME}/monitorsLibs has to be manually be updated to httpclient-4.5.9 and httpcore-4.4.12 ## Installation 1. Run 'mvn clean install' from aws-lambda-monitoring-extension From 317c726b485cf9765acd3fa7c0207bccc1cd023d Mon Sep 17 00:00:00 2001 From: Vishaka Sekar Date: Mon, 10 Feb 2020 20:21:08 -0800 Subject: [PATCH 4/6] MA version update --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c67793e..6b8f6db 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,8 @@ Please give the following permissions to the account being used to with the exte ``` In order to use this extension, you do need a [Standalone JAVA Machine Agent](https://docs.appdynamics.com/display/PRO44/Standalone+Machine+Agents) or [SIM Agent](https://docs.appdynamics.com/display/PRO44/Server+Visibility). For more details on downloading these products, please visit [here](https://download.appdynamics.com/). The extension needs to be able to connect to the HAProxy in order to collect and send metrics. To do this, you will have to either establish a remote connection in between the extension and the product, or have an agent on the same machine running the product in order for the extension to collect and send the metrics. -**This extension is compatible with Machine Agent version 4.5.13 or later. + +**Note : This extension is compatible with Machine Agent version 4.5.13 or later. * If you are seeing warning messages while starting the Machine Agent, update the http-client and http-core JARs in {MACHINE_AGENT_HOME}/monitorsLibs to httpclient-4.5.9 and httpcore-4.4.12 in monitorsLibs to make this warning go away. * To make AWS extensions work on Machine Agent < 4.5.13: From bea63187f044718c7defe01a24539f5d6d79f5b1 Mon Sep 17 00:00:00 2001 From: Vishaka Sekar Date: Mon, 10 Feb 2020 20:21:52 -0800 Subject: [PATCH 5/6] MA version update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6b8f6db..6e4c5b3 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ The extension needs to be able to connect to the HAProxy in order to collect and **Note : This extension is compatible with Machine Agent version 4.5.13 or later. -* If you are seeing warning messages while starting the Machine Agent, update the http-client and http-core JARs in {MACHINE_AGENT_HOME}/monitorsLibs to httpclient-4.5.9 and httpcore-4.4.12 in monitorsLibs to make this warning go away. +* If you are seeing warning messages while starting the Machine Agent, update the http-client and http-core JARs in {MACHINE_AGENT_HOME}/monitorsLibs to httpclient-4.5.9 and httpcore-4.4.12 to make this warning go away. * To make AWS extensions work on Machine Agent < 4.5.13: The http-client and http-core JARs in {MACHINE_AGENT_HOME}/monitorsLibs has to be manually be updated to httpclient-4.5.9 and httpcore-4.4.12 From 60013dc37cddc9da50dd9339e7799224df6e3fac Mon Sep 17 00:00:00 2001 From: Vishaka Sekar Date: Mon, 10 Feb 2020 20:29:58 -0800 Subject: [PATCH 6/6] MA version update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6e4c5b3..55391d7 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Please give the following permissions to the account being used to with the exte **cloudwatch:GetMetricStatistics** ``` In order to use this extension, you do need a [Standalone JAVA Machine Agent](https://docs.appdynamics.com/display/PRO44/Standalone+Machine+Agents) or [SIM Agent](https://docs.appdynamics.com/display/PRO44/Server+Visibility). For more details on downloading these products, please visit [here](https://download.appdynamics.com/). -The extension needs to be able to connect to the HAProxy in order to collect and send metrics. To do this, you will have to either establish a remote connection in between the extension and the product, or have an agent on the same machine running the product in order for the extension to collect and send the metrics. +The extension needs to be able to connect to the AWS Lamda in order to collect and send metrics. To do this, you will have to either establish a remote connection in between the extension and the product, or have an agent on the same machine running the product in order for the extension to collect and send the metrics. **Note : This extension is compatible with Machine Agent version 4.5.13 or later.