Skip to content

Commit

Permalink
Merge first release.
Browse files Browse the repository at this point in the history
  • Loading branch information
Ariane van der Steldt committed Aug 31, 2016
2 parents c9f12e8 + eb6d439 commit 8b8a590
Show file tree
Hide file tree
Showing 19 changed files with 154 additions and 77 deletions.
9 changes: 4 additions & 5 deletions api_server/pom.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-basepom</artifactId>
<version>1.36-SNAPSHOT</version>
<version>2.0</version>
</parent>
<artifactId>monsoon-api</artifactId>
<packaging>jar</packaging>
Expand All @@ -19,18 +19,17 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.javadoc.skip>true</maven.javadoc.skip>
<project.build.targetJdk>1.8</project.build.targetJdk>
</properties>

<dependencies>
<dependency>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-collector-base</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-lib</artifactId>
<version>${project.parent.version}</version>
</dependency>
Expand Down
5 changes: 2 additions & 3 deletions collectors/collectd/pom.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-collectors</artifactId>
<version>1.36-SNAPSHOT</version>
<version>2.0</version>
</parent>
<artifactId>monsoon-collector-collectd</artifactId>
<packaging>jar</packaging>
Expand All @@ -19,7 +19,6 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.javadoc.skip>true</maven.javadoc.skip>
<project.build.targetJdk>1.8</project.build.targetJdk>
</properties>

Expand Down
5 changes: 2 additions & 3 deletions collectors/http/pom.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-collectors</artifactId>
<version>1.36-SNAPSHOT</version>
<version>2.0</version>
</parent>
<artifactId>monsoon-collector-http</artifactId>
<packaging>jar</packaging>
Expand All @@ -19,7 +19,6 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.javadoc.skip>true</maven.javadoc.skip>
<project.build.targetJdk>1.8</project.build.targetJdk>
</properties>

Expand Down
5 changes: 2 additions & 3 deletions collectors/jmx/pom.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-collectors</artifactId>
<version>1.36-SNAPSHOT</version>
<version>2.0</version>
</parent>
<artifactId>monsoon-collector-jmx</artifactId>
<packaging>jar</packaging>
Expand All @@ -19,7 +19,6 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.javadoc.skip>true</maven.javadoc.skip>
<project.build.targetJdk>1.8</project.build.targetJdk>
</properties>

Expand Down
7 changes: 3 additions & 4 deletions collectors/pom.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-basepom</artifactId>
<version>1.36-SNAPSHOT</version>
<version>2.0</version>
</parent>
<artifactId>monsoon-collectors</artifactId>
<packaging>pom</packaging>
Expand All @@ -20,7 +20,6 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.javadoc.skip>true</maven.javadoc.skip>
<project.build.targetJdk>1.8</project.build.targetJdk>
</properties>

Expand All @@ -32,7 +31,7 @@

<dependencies>
<dependency>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-collector-base</artifactId>
<version>${project.parent.version}</version>
</dependency>
Expand Down
7 changes: 3 additions & 4 deletions exporter/pom.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-basepom</artifactId>
<version>1.36-SNAPSHOT</version>
<version>2.0</version>
</parent>
<artifactId>monsoon-export</artifactId>
<packaging>jar</packaging>
Expand All @@ -19,13 +19,12 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.javadoc.skip>true</maven.javadoc.skip>
<project.build.targetJdk>1.8</project.build.targetJdk>
</properties>

<dependencies>
<dependency>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-history</artifactId>
<version>${project.parent.version}</version>
</dependency>
Expand Down
7 changes: 3 additions & 4 deletions file_convert/pom.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-basepom</artifactId>
<version>1.36-SNAPSHOT</version>
<version>2.0</version>
</parent>
<artifactId>monsoon-file_convert</artifactId>
<packaging>jar</packaging>
Expand All @@ -19,13 +19,12 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.javadoc.skip>true</maven.javadoc.skip>
<project.build.targetJdk>1.8</project.build.targetJdk>
</properties>

<dependencies>
<dependency>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-history</artifactId>
<version>${project.parent.version}</version>
</dependency>
Expand Down
9 changes: 4 additions & 5 deletions history/pom.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-basepom</artifactId>
<version>1.36-SNAPSHOT</version>
<version>2.0</version>
</parent>
<artifactId>monsoon-history</artifactId>
<packaging>jar</packaging>
Expand All @@ -19,18 +19,17 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.javadoc.skip>true</maven.javadoc.skip>
<project.build.targetJdk>1.8</project.build.targetJdk>
</properties>

<dependencies>
<dependency>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-collector-base</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-engine</artifactId>
<version>${project.parent.version}</version>
</dependency>
Expand Down
17 changes: 8 additions & 9 deletions impl/pom.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-basepom</artifactId>
<version>1.36-SNAPSHOT</version>
<version>2.0</version>
</parent>
<artifactId>monsoon-engine</artifactId>
<packaging>jar</packaging>
Expand All @@ -19,38 +19,37 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.javadoc.skip>true</maven.javadoc.skip>
<project.build.targetJdk>1.8</project.build.targetJdk>
</properties>

<dependencies>
<dependency>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-collector-base</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-lib</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-collector-http</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-collector-collectd</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-collector-jmx</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@
* Invoke a name resolver and convert its result to a metric value.
*
* If the Name Resolver yields:
* - [ "true" ] --> yield a boolean true value
* - [ "false" ] --> yield a boolean false value
* - [ integral-number] --> yield a metric value representing the number
* - [ FP-number ] --> yield a metric value representing the number
* - anything else --> yield a String metric value, separating components by dots ('.').
* - [ "true" ] --&gt; yield a boolean true value
* - [ "false" ] --&gt; yield a boolean false value
* - [ integral-number] --&gt; yield a metric value representing the number
* - [ FP-number ] --&gt; yield a metric value representing the number
* - anything else --&gt; yield a String metric value, separating components by dots ('.').
*/
@Value
public class NameExpression implements TimeSeriesMetricExpression {
Expand Down
7 changes: 3 additions & 4 deletions intf/pom.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-basepom</artifactId>
<version>1.36-SNAPSHOT</version>
<version>2.0</version>
</parent>
<artifactId>monsoon-collector-base</artifactId>
<packaging>jar</packaging>
Expand All @@ -19,7 +19,6 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.javadoc.skip>true</maven.javadoc.skip>
<project.build.targetJdk>1.8</project.build.targetJdk>
</properties>

Expand All @@ -35,7 +34,7 @@
<version>19.0</version>
</dependency>
<dependency>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-lib</artifactId>
<version>${project.parent.version}</version>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion intf/src/main/java/com/groupon/lex/metrics/Histogram.java
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public Histogram(Stream<RangeWithCount> items) {
}

/**
* Returns a map of range -> event count.
* Returns a map of range -&gt; event count.
* The elements of the stream are a mutable copy of the internal data.
*/
public Stream<RangeWithCount> stream() {
Expand Down
5 changes: 2 additions & 3 deletions lib/pom.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.groupon.lex</groupId>
<groupId>com.github.groupon.monsoon</groupId>
<artifactId>monsoon-basepom</artifactId>
<version>1.36-SNAPSHOT</version>
<version>2.0</version>
</parent>
<artifactId>monsoon-lib</artifactId>
<packaging>jar</packaging>
Expand All @@ -19,7 +19,6 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.javadoc.skip>true</maven.javadoc.skip>
<project.build.targetJdk>1.8</project.build.targetJdk>
</properties>

Expand Down
Loading

0 comments on commit 8b8a590

Please sign in to comment.