浏览代码

Configure AWS SDK logging configuration

Because of security permissions that we do not grant to the AWS SDK (for
use in discovery-ec2 and repository-s3 plugins), certain calls in the
AWS SDK will lead to security exceptions that are logged at the warning
level. These warnings are noise and we should suppress them. This commit
adds plugin log configurations for discovery-ec2 and repository-s3 to
ship with default Log4j 2 configurations that suppress these log
warnings.

Relates #20313
Jason Tedor 9 年之前
父节点
当前提交
981e4f5bc5

+ 6 - 0
plugins/discovery-ec2/build.gradle

@@ -42,6 +42,12 @@ dependencyLicenses {
   mapping from: /jackson-.*/, to: 'jackson'
   mapping from: /jackson-.*/, to: 'jackson'
 }
 }
 
 
+bundlePlugin {
+  from('config/discovery-ec2') {
+    into 'config'
+  }
+}
+
 test {
 test {
   // this is needed for insecure plugins, remove if possible!
   // this is needed for insecure plugins, remove if possible!
   systemProperty 'tests.artifact', project.name
   systemProperty 'tests.artifact', project.name

+ 8 - 0
plugins/discovery-ec2/config/discovery-ec2/log4j2.properties

@@ -0,0 +1,8 @@
+logger.com_amazonaws.name = com.amazonaws
+logger.com_amazonaws.level = warn
+
+logger.com_amazonaws_jmx_SdkMBeanRegistrySupport.name = com.amazonaws.jmx.SdkMBeanRegistrySupport
+logger.com_amazonaws_jmx_SdkMBeanRegistrySupport.level = error
+
+logger.com_amazonaws_metrics_AwsSdkMetrics.name = com.amazonaws.metrics.AwsSdkMetrics
+logger.com_amazonaws_metrics_AwsSdkMetrics.level = error

+ 6 - 0
plugins/repository-s3/build.gradle

@@ -48,6 +48,12 @@ dependencyLicenses {
   mapping from: /jaxb-.*/, to: 'jaxb'
   mapping from: /jaxb-.*/, to: 'jaxb'
 }
 }
 
 
+bundlePlugin {
+  from('config/repository-s3') {
+    into 'config'
+  }
+}
+
 test {
 test {
   // this is needed for insecure plugins, remove if possible!
   // this is needed for insecure plugins, remove if possible!
   systemProperty 'tests.artifact', project.name
   systemProperty 'tests.artifact', project.name

+ 8 - 0
plugins/repository-s3/config/repository-s3/log4j2.properties

@@ -0,0 +1,8 @@
+logger.com_amazonaws.name = com.amazonaws
+logger.com_amazonaws.level = warn
+
+logger.com_amazonaws_jmx_SdkMBeanRegistrySupport.name = com.amazonaws.jmx.SdkMBeanRegistrySupport
+logger.com_amazonaws_jmx_SdkMBeanRegistrySupport.level = error
+
+logger_com_amazonaws_metrics_AwsSdkMetrics.name = com.amazonaws.metrics.AwsSdkMetrics
+logger_com_amazonaws_metrics_AwsSdkMetrics.level = error