Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ethtool input plugin #3

Merged
merged 1 commit into from
Jun 23, 2020
Merged

Add ethtool input plugin #3

merged 1 commit into from
Jun 23, 2020

Conversation

pxaws
Copy link
Contributor

@pxaws pxaws commented Jun 23, 2020

Issue #, if available:

Description of changes:

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

* Enable the ethtool plugin from telegraf
* Add ethtool json config to schema
* Add translation for ethtool json config to toml config
  - "fieldpass" is mapped to "metrics_include" so that
    only the customer-specified metrics will be passed
@pxaws pxaws requested review from haojhcwa and yimuniao June 23, 2020 05:43
@yimuniao yimuniao merged commit 6b96826 into aws:master Jun 23, 2020
gmealy1 added a commit to gmealy1/amazon-cloudwatch-agent that referenced this pull request Jul 7, 2022
# This is the 1st commit message:

# This is a combination of 6 commits.
# This is the 1st commit message:

Initial commit for GetMetricData query utilities

added configuration file for CWA test

inital commit for data collection/GetMetricData portion of test

initial commit for main test driver that starts agent and then calls data collection

changed test error to fatal if error is returned by data collection

added comments

removed unnecessary code that prints output

copy CWA config file to it's destination

changed log print to error return in utilities. few small formatting changes

implemented feedback from PR. Biggest change is dynamically grabbing metric names from config file instead of them being declared in the code

fixed creation of metric names for query and added comments

fixed config spacing

fixed agent runtime

addressed more pull request comments. Moved config parsing to a new function

Performance Tracking Integration Test and Data Collection (aws#497)

* Initial commit for GetMetricData query utilities

added configuration file for CWA test

inital commit for data collection/GetMetricData portion of test

initial commit for main test driver that starts agent and then calls data collection

changed test error to fatal if error is returned by data collection

added comments

removed unnecessary code that prints output

* copy CWA config file to it's destination

* changed log print to error return in utilities. few small formatting changes

* implemented feedback from PR. Biggest change is dynamically grabbing metric names from config file instead of them being declared in the code

* fixed creation of metric names for query and added comments

* fixed config spacing

* fixed agent runtime

* addressed more pull request comments. Moved config parsing to a new function

added statistics calculation and log monitoring to CWA config. test now writes to log files while CWA monitors

Initial commit for GetMetricData query utilities

added configuration file for CWA test

inital commit for data collection/GetMetricData portion of test

initial commit for main test driver that starts agent and then calls data collection

changed test error to fatal if error is returned by data collection

added comments

removed unnecessary code that prints output

copy CWA config file to it's destination

changed log print to error return in utilities. few small formatting changes

implemented feedback from PR. Biggest change is dynamically grabbing metric names from config file instead of them being declared in the code

fixed creation of metric names for query and added comments

fixed config spacing

fixed agent runtime

addressed more pull request comments. Moved config parsing to a new function

Performance Tracking Integration Test and Data Collection (aws#497)

* Initial commit for GetMetricData query utilities

added configuration file for CWA test

inital commit for data collection/GetMetricData portion of test

initial commit for main test driver that starts agent and then calls data collection

changed test error to fatal if error is returned by data collection

added comments

removed unnecessary code that prints output

* copy CWA config file to it's destination

* changed log print to error return in utilities. few small formatting changes

* implemented feedback from PR. Biggest change is dynamically grabbing metric names from config file instead of them being declared in the code

* fixed creation of metric names for query and added comments

* fixed config spacing

* fixed agent runtime

* addressed more pull request comments. Moved config parsing to a new function

Performance Tracking Integration Test and Data Collection (aws#497)

* Initial commit for GetMetricData query utilities

added configuration file for CWA test

inital commit for data collection/GetMetricData portion of test

initial commit for main test driver that starts agent and then calls data collection

changed test error to fatal if error is returned by data collection

added comments

removed unnecessary code that prints output

* copy CWA config file to it's destination

* changed log print to error return in utilities. few small formatting changes

* implemented feedback from PR. Biggest change is dynamically grabbing metric names from config file instead of them being declared in the code

* fixed creation of metric names for query and added comments

* fixed config spacing

* fixed agent runtime

* addressed more pull request comments. Moved config parsing to a new function

fixed merge conflicts

# The commit message aws#2 will be skipped:

# Reduce timeout for scrapping IMDS and give instruction when fail to scrape IMDS inside container (aws#480)
#
# * Fix Aggregrator Shut Down Behavior
# 
# * Always setting hops to 2 if CloudWatchAgent is deployed as container
# 
# * Reduce timeout for scrapping IMDS and give instrucstion when timeout--ammend
# 
# * Reduce timeout for scrapping IMDS and give instrucstion when timeout--ammend
# 
# * Reduce timeout for scrapping IMDS and give instrucstion when timeout--ammend
# 
# * Reduce timeout for scrapping IMDS and give instrucstion when timeout--ammend
# 
# * Reduce timeout for scrapping IMDS and give instrucstion when timeout--ammend
# 
# * Reduce timeout for scrapping IMDS and give instrucstion when timeout--ammend
# 
# * Reduce timeout for scrapping IMDS and give instruction when fail to scrape IMDS inside container

# The commit message aws#3 will be skipped:

# Export Go Bin Path (aws#498)
#

# The commit message aws#4 will be skipped:

# Performance Tracking Integration Test and Data Collection (aws#497)
#
# * Initial commit for GetMetricData query utilities
# 
# added configuration file for CWA test
# 
# inital commit for data collection/GetMetricData portion of test
# 
# initial commit for main test driver that starts agent and then calls data collection
# 
# changed test error to fatal if error is returned by data collection
# 
# added comments
# 
# removed unnecessary code that prints output
# 
# * copy CWA config file to it's destination
# 
# * changed log print to error return in utilities. few small formatting changes
# 
# * implemented feedback from PR. Biggest change is dynamically grabbing metric names from config file instead of them being declared in the code
# 
# * fixed creation of metric names for query and added comments
# 
# * fixed config spacing
# 
# * fixed agent runtime
# 
# * addressed more pull request comments. Moved config parsing to a new function

# The commit message aws#5 will be skipped:

# Update release note V352 (aws#502)
#

# The commit message aws#6 will be skipped:

# Support escape path for MacOs, Linux (aws#499)
#
# * Support scrapt paths for Linux,MacOs
# 
# * Support escape path for MacOs, Linux

# The commit message aws#2 will be skipped:

# Initial commit for GetMetricData query utilities
#
# added configuration file for CWA test
#
# inital commit for data collection/GetMetricData portion of test
#
# initial commit for main test driver that starts agent and then calls data collection
#
# changed test error to fatal if error is returned by data collection
#
# added comments
#
# removed unnecessary code that prints output
#
# copy CWA config file to it's destination
#
# changed log print to error return in utilities. few small formatting changes
#
# implemented feedback from PR. Biggest change is dynamically grabbing metric names from config file instead of them being declared in the code
#
# fixed creation of metric names for query and added comments
#
# fixed config spacing
#
# fixed agent runtime
#
# addressed more pull request comments. Moved config parsing to a new function
#
# Performance Tracking Integration Test and Data Collection (aws#497)
#
# * Initial commit for GetMetricData query utilities
#
# added configuration file for CWA test
#
# inital commit for data collection/GetMetricData portion of test
#
# initial commit for main test driver that starts agent and then calls data collection
#
# changed test error to fatal if error is returned by data collection
#
# added comments
#
# removed unnecessary code that prints output
#
# * copy CWA config file to it's destination
#
# * changed log print to error return in utilities. few small formatting changes
#
# * implemented feedback from PR. Biggest change is dynamically grabbing metric names from config file instead of them being declared in the code
#
# * fixed creation of metric names for query and added comments
#
# * fixed config spacing
#
# * fixed agent runtime
#
# * addressed more pull request comments. Moved config parsing to a new function
#
# added statistics calculation and log monitoring to CWA config. test now writes to log files while CWA monitors
#
# Initial commit for GetMetricData query utilities
#
# added configuration file for CWA test
#
# inital commit for data collection/GetMetricData portion of test
#
# initial commit for main test driver that starts agent and then calls data collection
#
# changed test error to fatal if error is returned by data collection
#
# added comments
#
# removed unnecessary code that prints output
#
# copy CWA config file to it's destination
#
# changed log print to error return in utilities. few small formatting changes
#
# implemented feedback from PR. Biggest change is dynamically grabbing metric names from config file instead of them being declared in the code
#
# fixed creation of metric names for query and added comments
#
# fixed config spacing
#
# fixed agent runtime
#
# addressed more pull request comments. Moved config parsing to a new function
#
# Performance Tracking Integration Test and Data Collection (aws#497)
#
# * Initial commit for GetMetricData query utilities
#
# added configuration file for CWA test
#
# inital commit for data collection/GetMetricData portion of test
#
# initial commit for main test driver that starts agent and then calls data collection
#
# changed test error to fatal if error is returned by data collection
#
# added comments
#
# removed unnecessary code that prints output
#
# * copy CWA config file to it's destination
#
# * changed log print to error return in utilities. few small formatting changes
#
# * implemented feedback from PR. Biggest change is dynamically grabbing metric names from config file instead of them being declared in the code
#
# * fixed creation of metric names for query and added comments
#
# * fixed config spacing
#
# * fixed agent runtime
#
# * addressed more pull request comments. Moved config parsing to a new function
#
# Performance Tracking Integration Test and Data Collection (aws#497)
#
# * Initial commit for GetMetricData query utilities
#
# added configuration file for CWA test
#
# inital commit for data collection/GetMetricData portion of test
#
# initial commit for main test driver that starts agent and then calls data collection
#
# changed test error to fatal if error is returned by data collection
#
# added comments
#
# removed unnecessary code that prints output
#
# * copy CWA config file to it's destination
#
# * changed log print to error return in utilities. few small formatting changes
#
# * implemented feedback from PR. Biggest change is dynamically grabbing metric names from config file instead of them being declared in the code
#
# * fixed creation of metric names for query and added comments
#
# * fixed config spacing
#
# * fixed agent runtime
#
# * addressed more pull request comments. Moved config parsing to a new function
#
# fixed merge conflicts
#
# changed period in GetMetrics call 30->10

# The commit message aws#3 will be skipped:

# Reduce timeout for scrapping IMDS and give instruction when fail to scrape IMDS inside container (aws#480)
#
# * Fix Aggregrator Shut Down Behavior
# 
# * Always setting hops to 2 if CloudWatchAgent is deployed as container
# 
# * Reduce timeout for scrapping IMDS and give instrucstion when timeout--ammend
# 
# * Reduce timeout for scrapping IMDS and give instrucstion when timeout--ammend
# 
# * Reduce timeout for scrapping IMDS and give instrucstion when timeout--ammend
# 
# * Reduce timeout for scrapping IMDS and give instrucstion when timeout--ammend
# 
# * Reduce timeout for scrapping IMDS and give instrucstion when timeout--ammend
# 
# * Reduce timeout for scrapping IMDS and give instrucstion when timeout--ammend
# 
# * Reduce timeout for scrapping IMDS and give instruction when fail to scrape IMDS inside container

# The commit message aws#4 will be skipped:

# Export Go Bin Path (aws#498)
#

# The commit message aws#5 will be skipped:

# Performance Tracking Integration Test and Data Collection (aws#497)
#
# * Initial commit for GetMetricData query utilities
# 
# added configuration file for CWA test
# 
# inital commit for data collection/GetMetricData portion of test
# 
# initial commit for main test driver that starts agent and then calls data collection
# 
# changed test error to fatal if error is returned by data collection
# 
# added comments
# 
# removed unnecessary code that prints output
# 
# * copy CWA config file to it's destination
# 
# * changed log print to error return in utilities. few small formatting changes
# 
# * implemented feedback from PR. Biggest change is dynamically grabbing metric names from config file instead of them being declared in the code
# 
# * fixed creation of metric names for query and added comments
# 
# * fixed config spacing
# 
# * fixed agent runtime
# 
# * addressed more pull request comments. Moved config parsing to a new function

# The commit message aws#6 will be skipped:

# Update release note V352 (aws#502)
#

# The commit message aws#7 will be skipped:

# Support escape path for MacOs, Linux (aws#499)
#
# * Support scrapt paths for Linux,MacOs
# 
# * Support escape path for MacOs, Linux
sethAmazon added a commit that referenced this pull request Aug 2, 2022
* Added concurrent testing and release updates

clean up

go mod tidy

* added the git date env variable

* applied pr comments

* Applied PR changes
* Moved retry to updateItem
* cleanup

* bug fixes

* fixed error due skipNow

* updated the release tag

* working release test

* Applied PR changes #3

* go mod tidy

* tried resetting go mod

* small fix with expression update

* changed and to coma

* changed expression

* go mod tidy

* Added concurrent testing and release updates

clean up

go mod tidy

* Update Deprecated CodeQL (#531)

* Fix Code Scan Bug https://github.com/aws/amazon-cloudwatch-agent/security/code-scanning/4 (#530)

Co-authored-by: Seth L <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants