fred/logparser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Upgrade to Grok 0.1.5

Browse Source
This commit is contained in:
Maxime Chassagneux
2017-02-01 17:32:15 +01:00
parent d57b9554f1
commit 1c7cee2d2c
2 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@@ -7,8 +7,8 @@
<description>logParser - send data to influxdb</description> <description>logParser - send data to influxdb</description>
<properties> <properties>
<maven.compiler.source>1.6</maven.compiler.source> <maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target> <maven.compiler.target>1.7</maven.compiler.target>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
@@ -19,7 +19,7 @@
<dependency> <dependency>
<groupId>io.thekraken</groupId> <groupId>io.thekraken</groupId>
<artifactId>grok</artifactId> <artifactId>grok</artifactId>
<version>0.1.3</version> <version>0.1.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>

61
src/main/java/com/airfrance/diqmqs/logparser/Parser.java
View File

@@ -9,9 +9,9 @@ import org.apache.commons.io.input.Tailer;
import org.apache.commons.io.input.TailerListenerAdapter; import org.apache.commons.io.input.TailerListenerAdapter;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import oi.thekraken.grok.api.Grok; import io.thekraken.grok.api.Grok;
import oi.thekraken.grok.api.Match; import io.thekraken.grok.api.Match;
import oi.thekraken.grok.api.exception.GrokException; import io.thekraken.grok.api.exception.GrokException;
public class Parser extends TailerListenerAdapter { public class Parser extends TailerListenerAdapter {
@@ -95,6 +95,34 @@ public class Parser extends TailerListenerAdapter {
} }
} }
hasDate = makeTimeStampFromDate(hasDate, cal, entry);
}
sb.append(" ");
//Field
sb.append(field);
// TimeStamp
sb.append(" ");
if (hasDate){
sb.append(cal.getTimeInMillis());
}
else {
sb.append(System.currentTimeMillis());
}
// Time is in nano second from epoch
sb.append(String.format("%06d",randomGenerator.nextInt(999999)));
log.debug("Line => " + line + " : Match add it to Queue ");
// Add to the queue
engine.addToQueue(sb.toString());
log.debug(gm.toJson());
}
}
private boolean makeTimeStampFromDate(boolean hasDate, Calendar cal, Map.Entry<String, Object> entry) {
try { try {
if ( tagName.equalsIgnoreCase("year") ) { if ( tagName.equalsIgnoreCase("year") ) {
hasDate = true; hasDate = true;
@@ -128,32 +156,7 @@ public class Parser extends TailerListenerAdapter {
{ {
log.error("Impossible de parser la date " + e.getMessage()); log.error("Impossible de parser la date " + e.getMessage());
} }
return hasDate;
}
sb.append(" ");
//Field
sb.append(field);
// TimeStamp
sb.append(" ");
if (hasDate){
sb.append(cal.getTimeInMillis());
}
else {
sb.append(System.currentTimeMillis());
}
// Time is in nano second from epoch
sb.append(String.format("%06d",randomGenerator.nextInt(999999)));
log.debug("Line => " + line + " : Match add it to Queue ");
// Add to the queue
engine.addToQueue(sb.toString());
log.debug(gm.toJson());
}
} }
String sanitizeString(String s) String sanitizeString(String s)