Skip to content

Commit

Permalink
Merge pull request #1 in AE/kafka-monitoring-extension from bugfix/AC…
Browse files Browse the repository at this point in the history 
…E-953-NFE-for-Infinity to master

* commit 'c20845f883d0889609f9cda2068f128bfff7cb64': (22 commits)
  fixing tc dependencies
  ACE-980 Add readme and nightly build schedule
  ACE-980 Fixed dashboard integration test
  ACE-980 Clean up integration test - keep only extension specific integration test
  ACE-980 Fix integration test for metric char replacer and multiplier
  ACE-980 Fix integration test/config.yml
  ACE-980 Fix integration test/config.yml
  ACE-980 Fix failing integration tests
  ACE-980 updating to commons 2.2.3
  rename workbench dockerfile, update machine agent service name
  rename workbench dockerfile, update encryption command
  Updating encryptionKey to clear text
  add machine_ssl to Makefile
  SSL for BTD - have keys in MA start-up command
  ACE-953 adding truststore for testing
  ACE-953 adding truststore for testing
  ACE-953 revamping to latest BtD standard
  Changing UUID after project rename to fix TC error
  ACE-953 correct uuid
  ACE-953 correct typos
  ...
  • Loading branch information
Vishaka Sekar committed May 1, 2020
2 parents a73ea5e + c20845f commit d1ddd31
Show file tree
Hide file tree
Showing 24 changed files with 352 additions and 1,126 deletions.
11 changes: 11 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
target
*.iml
.settings
.classpath
.project
*.log
*.ipr
*.iws
*.idea
.DS_Store

45 changes: 0 additions & 45 deletions Dockerfile_Kafka
View file

This file was deleted.

36 changes: 0 additions & 36 deletions Dockerfile_Workbench
View file

This file was deleted.

6 changes: 5 additions & 1 deletion NOTICE.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
Notice and Disclaimer

All Extensions published by AppDynamics are governed by the Apache License v2 and are excluded from the definition of covered software under any agreement between AppDynamics and the User governing AppDynamics Pro Edition, Test & Dev Edition, or any other Editions.
All Extensions published by AppDynamics are governed
by the Apache License v2 and are excluded from the
definition of covered software under any agreement
between AppDynamics and the User governing AppDynamics Pro Edition,
Test & Dev Edition, or any other Editions.

18 changes: 0 additions & 18 deletions download-kafka.sh
View file

This file was deleted.

167 changes: 38 additions & 129 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.appdynamics.extensions</groupId>
<artifactId>kafka-monitoring-extension</artifactId>
<version>2.0.3</version>
<version>2.0.4</version>
<packaging>jar</packaging>
<name>kafka-monitoring-extension</name>
<url>http://maven.apache.org</url>
Expand All @@ -13,37 +13,21 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
<target.dir>${project.build.directory}/KafkaMonitor</target.dir>
<kotlin.version>1.2.71</kotlin.version>
<skipITs>true</skipITs>
</properties>

<dependencies>
<dependency>
<groupId>com.appdynamics</groupId>
<artifactId>appd-exts-commons</artifactId>
<version>2.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.3.5</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
<scope>provided</scope>
<version>2.2.3</version>
</dependency>
<dependency>
<groupId>com.appdynamics</groupId>
<artifactId>machine-agent</artifactId>
<version>3.7.11</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.21</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand All @@ -56,22 +40,6 @@
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>2.6.1</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-test</artifactId>
<version>${kotlin.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
Expand All @@ -84,14 +52,21 @@
<version>2.0.0</version>
<scope>test</scope>
</dependency>


</dependencies>


<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>8</source>
<target>8</target>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand Down Expand Up @@ -145,8 +120,7 @@

<fileset dir="src/main/resources/conf" includes="config.yml"/>
<fileset dir="src/main/resources/conf" includes="monitor.xml"/>
<fileset dir="src/test/resources/keystore/" includes="kafka.client.truststore.jks" />
<fileset dir="src/integration-test/resources/" includes="CustomDashboard_Kafka+BTD+Dashbaord_1550505032301.json"/>
<fileset dir="src/main/resources/dashboards/" includes="Kafka+Dashboard.json"/>
</copy>
<copy todir="${target.dir}">
<fileset dir="${build.directory}" includes="${project.artifactId}.${project.packaging}"/>
Expand All @@ -169,44 +143,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>add-test-source</id>
<phase>process-resources</phase>
<goals>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>src/integration-test/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.15</version>
<executions>
<execution>
<id>integration-test</id>
<goals>
<goal>integration-test</goal>
</goals>
</execution>
<execution>
<id>verify</id>
<goals>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
Expand All @@ -219,81 +155,54 @@
<tag>${project.artifactId}-${project.version}</tag>
</configuration>
</plugin>

<!-- Plugins for integration test -->
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<id>add-integration-test-source</id>
<phase>generate-test-sources</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>test-compile</id>
<phase>test-compile</phase>
<goals>
<goal>test-compile</goal>
<goal>add-test-source</goal>
</goals>
<configuration>
<sources>
<source>src/integration-test/java</source>
</sources>
</configuration>
</execution>
</executions>
<configuration>
<jvmTarget>1.8</jvmTarget>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.22.0</version>
<configuration>
<skipITs>${skipITs}</skipITs>
</configuration>
<executions>
<execution>
<id>compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
</execution>
<execution>
<id>testCompile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>

</build>
<profiles>
<profile>
<id>no-integration-tests</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skipITs>true</skipITs>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<repositories>
<repository>
<id>github-maven-repo</id>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
<enabled>false</enabled>
</snapshots>
<url>https://github.com/Appdynamics/maven-repo/raw/master/releases</url>
</repository>
Expand Down
Loading

0 comments on commit d1ddd31

Please sign in to comment.