From vagrant@home.indolore.net  Sun Sep 29 17:42:13 2013
Return-Path: <vagrant@home.indolore.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 692DBA3A
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 29 Sep 2013 17:42:13 +0000 (UTC)
	(envelope-from vagrant@home.indolore.net)
Received: from home.indolore.net (ip-183.net-89-3-106.rev.numericable.fr [89.3.106.183])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 9D7DD2076
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 29 Sep 2013 17:42:11 +0000 (UTC)
Received: from home.indolore.net (localhost [127.0.0.1])
	by home.indolore.net (8.14.5/8.14.5) with ESMTP id r8THgAsT023385
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 29 Sep 2013 17:42:10 GMT
	(envelope-from vagrant@home.indolore.net)
Received: (from vagrant@localhost)
	by home.indolore.net (8.14.5/8.14.5/Submit) id r8THgASl023384;
	Sun, 29 Sep 2013 17:42:10 GMT
	(envelope-from vagrant)
Message-Id: <201309291742.r8THgASl023384@home.indolore.net>
Date: Sun, 29 Sep 2013 17:42:10 GMT
From: "Regis A. Despres" <regis.despres@gmail.com>
Reply-To: "Regis A. Despres" <regis.despres@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Upgrade logstash to version 1.2.1 and add some sample conf tweak
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         182492
>Category:       ports
>Synopsis:       Upgrade sysutils/logstash to version 1.2.1 and add some sample conf tweak
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    madpilot
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 29 17:50:00 UTC 2013
>Closed-Date:    Thu Nov 21 12:35:37 UTC 2013
>Last-Modified:  Thu Nov 21 12:40:00 UTC 2013
>Originator:     Regis A. Despres
>Release:        FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD fbsd-test 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64


>Description:

	- Upgrade to version 1.2.1 see https://github.com/logstash/logstash/blob/master/CHANGELOG. Thanks to Daniel's inputs
	- Removed not needed backend option from logsatsh_args. 
	- Moved logstash_log_options to the right place from logsatsh_args. 
	- Moved logdir declaration before it is used. Thanks to Daniel's input
	- Changed logstash config sample in order to default to a working IRL BSD syslog to elasticsearch example

>How-To-Repeat:
	
	N//A	
>Fix:

	Patch  attached :

--- logstash.head.diff begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 328708)
+++ Makefile	(working copy)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	logstash
-PORTVERSION=	1.1.13
+PORTVERSION=	1.2.1
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://logstash.objects.dreamhost.com/release/ \
-		http://semicomplete.com/files/logstash/
+		https://download.elasticsearch.org/logstash/logstash/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-flatjar
 EXTRACT_SUFX=	.jar
 EXTRACT_ONLY=
Index: distinfo
===================================================================
--- distinfo	(revision 328708)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (logstash-1.1.13-flatjar.jar) = 5ba0639ff4da064c2a4f6a04bd7006b1997a6573859d3691e210b6855e1e47f1
-SIZE (logstash-1.1.13-flatjar.jar) = 69485313
+SHA256 (logstash-1.2.1-flatjar.jar) = d0b8a56fb1aa71d54c2bab71709d900b359fdf8c6d7d6ff15578423a0d86ee23
+SIZE (logstash-1.2.1-flatjar.jar) = 81648562
Index: files/logstash.conf.sample
===================================================================
--- files/logstash.conf.sample	(revision 328708)
+++ files/logstash.conf.sample	(working copy)
@@ -1,27 +1,42 @@
 input {
-  file {
-    type => "system logs"
 
-  #  # Wildcards work, here :)
-  #  path => [ "/var/log/*.log", "/var/log/messages", "/var/log/syslog" ]
-    path => [ "/var/log/messages" ]
+	file {
+		type => "syslog"
+	    #  # Wildcards work, here :)
+	    #  path => [ "/var/log/*.log", "/var/log/messages", "/var/log/syslog" ]
+	    path => "/var/log/mesages"
+	    start_position => "beginning"
+	}
+}
+
+filter {
+  if [type] == "syslog" {
+	grok {
+	  match => { "message" => "%{SYSLOGTIMESTAMP:syslog_timestamp} %{SYSLOGHOST:syslog_hostname} (%{DATA:syslog_program}(?:\[%{POSINT:syslog_pid}\])?: %{GREEDYDATA:syslog_message}|%{GREEDYDATA:syslog_message})" }
+	  add_field => [ "received_at", "%{@timestamp}" ]
+	  add_field => [ "received_from", "%{@source_host}" ]
+	}
+    
+    if !("_grokparsefailure" in [tags]) {
+      mutate {
+        replace => [ "@source_host", "%{syslog_hostname}" ]
+        replace => [ "@message", "%{syslog_message}" ]
+      }
+    }
+    mutate {
+      remove_field => [ "syslog_hostname", "syslog_message" ]
+    }
+    date {
+      match => [ "syslog_timestamp","MMM  d HH:mm:ss", "MMM dd HH:mm:ss", "ISO8601" ] 
+    }
+	syslog_pri { }
   }
-
-  #file {
-  #  type => "Hudson-access"
-  #  path => "/var/log/www/hudson.ish.com.au-access_log"
-  #}
-
-  #file {
-  #          type => "Syslog"
-  #  path => "/var/log/messages"
-  #}
 }
 
 output {
   # Emit events to stdout for easy debugging of what is going through
   # logstash.
-  #stdout { }
+  #stdout { debug => "true" }
 
   # This will use elasticsearch to store your logs.
   # The 'embedded' option will cause logstash to run the elasticsearch
Index: files/logstash.in
===================================================================
--- files/logstash.in	(revision 328708)
+++ files/logstash.in	(working copy)
@@ -33,6 +33,8 @@
 
 load_rc_config ${name}
 
+logdir="/var/log"
+
 : ${logstash_enable="NO"}
 : ${logstash_home="%%LOGSTASH_HOME%%"}
 : ${logstash_config="%%PREFIX%%/etc/${name}/${name}.conf"}
@@ -52,7 +54,6 @@
 	mkdir -p $piddir
 fi
 
-logdir="/var/log"
 command="/usr/sbin/daemon"
 
 java_cmd="${logstash_java_home}/bin/java"
@@ -67,12 +68,12 @@
 fi
 
 if [ ${logstash_mode} = "standalone" ]; then
-	logstash_args="agent -f ${logstash_config} -- web --port ${logstash_port} --backend elasticsearch:///?local ${logstash_log_options}"
+	logstash_args="agent -f ${logstash_config} ${logstash_log_options} -- web --port ${logstash_port}"
 	logstash_elastic_options="-Des.path.data=${logstash_elastic_datadir}"
 elif [ ${logstash_mode} = "agent" ]; then
 	logstash_args="agent -f ${logstash_config} ${logstash_log_options}"
 elif [ ${logstash_mode} = "web" ]; then
-	logstash_args="web --port ${logstash_port} --backend elasticsearch://${logstash_elastic_backend}/ ${logstash_log_options}"
+	logstash_args="web --port ${logstash_port} ${logstash_log_options}"
 fi
 
 command_args="-f -p ${pidfile} ${java_cmd} ${logstash_elastic_options} -jar ${logstash_jar} ${logstash_args}"
--- logstash.head.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->madpilot 
Responsible-Changed-By: madpilot 
Responsible-Changed-When: Sun Sep 29 18:10:00 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182492 

From: Guido Falsi <madpilot@FreeBSD.org>
To: bug-followup@FreeBSD.org, regis.despres@gmail.com
Cc:  
Subject: Re: ports/182492: Upgrade sysutils/logstash to version 1.2.1 and
 add some sample conf tweak
Date: Tue, 15 Oct 2013 18:19:37 +0200

 This is a multi-part message in MIME format.
 --------------010400070902070202090304
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Hi,
 
 I have modified the port to also support staging.
 
 Please test attached patch and report back if you can approve it.
 
 Regarding the instability of this version you reported to me via email, 
 do you have any news? Did you get some feedback from upstream?
 
 Thanks.
 
 -- 
 Guido Falsi <madpilot@FreeBSD.org>
 
 --------------010400070902070202090304
 Content-Type: text/x-diff;
  name="logstash.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="logstash.diff"
 
 Index: Makefile
 ===================================================================
 --- Makefile	(revision 330404)
 +++ Makefile	(working copy)
 @@ -2,10 +2,10 @@
  # $FreeBSD$
  
  PORTNAME=	logstash
 -PORTVERSION=	1.1.13
 +PORTVERSION=	1.2.1
  CATEGORIES=	sysutils java
  MASTER_SITES=	https://logstash.objects.dreamhost.com/release/ \
 -		http://semicomplete.com/files/logstash/
 +		https://download.elasticsearch.org/logstash/logstash/
  DISTNAME=	${PORTNAME}-${PORTVERSION}-flatjar
  EXTRACT_SUFX=	.jar
  EXTRACT_ONLY=
 @@ -32,20 +32,11 @@
  		LOGSTASH_RUN=${LOGSTASH_RUN} \
  		LOGSTASH_DATA_DIR=${LOGSTASH_DATA_DIR}
  
 -NO_STAGE=	yes
  do-install:
 -	${MKDIR} ${LOGSTASH_RUN}
 -	${MKDIR} ${ETCDIR}
 -	${MKDIR} ${LOGSTASH_HOME}
 -	${MKDIR} ${LOGSTASH_DATA_DIR}
 -	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${LOGSTASH_JAR} ${LOGSTASH_HOME}
 -	${INSTALL_DATA} ${FILESDIR}/logstash.conf.sample ${ETCDIR}
 -	@if [ ! -f ${ETCDIR}/logstash.conf ]; then \
 -		${CP} -p ${ETCDIR}/logstash.conf.sample ${ETCDIR}/logstash.conf ; \
 -	fi
 -	${INSTALL_DATA} ${FILESDIR}/elasticsearch.yml.sample ${ETCDIR}
 -	@if [ ! -f ${ETCDIR}/elasticsearch.yml ]; then \
 -		${CP} -p ${ETCDIR}/elasticsearch.yml.sample ${ETCDIR}/elasticsearch.yml ; \
 -	fi
 +	${MKDIR} ${STAGEDIR}${ETCDIR}
 +	${MKDIR} ${STAGEDIR}${LOGSTASH_HOME}
 +	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${LOGSTASH_JAR} ${STAGEDIR}${LOGSTASH_HOME}
 +	${INSTALL_DATA} ${FILESDIR}/logstash.conf.sample ${STAGEDIR}${ETCDIR}
 +	${INSTALL_DATA} ${FILESDIR}/elasticsearch.yml.sample ${STAGEDIR}${ETCDIR}
  
  .include <bsd.port.mk>
 Index: distinfo
 ===================================================================
 --- distinfo	(revision 330404)
 +++ distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (logstash-1.1.13-flatjar.jar) = 5ba0639ff4da064c2a4f6a04bd7006b1997a6573859d3691e210b6855e1e47f1
 -SIZE (logstash-1.1.13-flatjar.jar) = 69485313
 +SHA256 (logstash-1.2.1-flatjar.jar) = d0b8a56fb1aa71d54c2bab71709d900b359fdf8c6d7d6ff15578423a0d86ee23
 +SIZE (logstash-1.2.1-flatjar.jar) = 81648562
 Index: files/logstash.conf.sample
 ===================================================================
 --- files/logstash.conf.sample	(revision 330404)
 +++ files/logstash.conf.sample	(working copy)
 @@ -1,27 +1,42 @@
  input {
 -  file {
 -    type => "system logs"
  
 -  #  # Wildcards work, here :)
 -  #  path => [ "/var/log/*.log", "/var/log/messages", "/var/log/syslog" ]
 -    path => [ "/var/log/messages" ]
 +	file {
 +		type => "syslog"
 +	    #  # Wildcards work, here :)
 +	    #  path => [ "/var/log/*.log", "/var/log/messages", "/var/log/syslog" ]
 +	    path => "/var/log/mesages"
 +	    start_position => "beginning"
 +	}
 +}
 +
 +filter {
 +  if [type] == "syslog" {
 +	grok {
 +	  match => { "message" => "%{SYSLOGTIMESTAMP:syslog_timestamp} %{SYSLOGHOST:syslog_hostname} (%{DATA:syslog_program}(?:\[%{POSINT:syslog_pid}\])?: %{GREEDYDATA:syslog_message}|%{GREEDYDATA:syslog_message})" }
 +	  add_field => [ "received_at", "%{@timestamp}" ]
 +	  add_field => [ "received_from", "%{@source_host}" ]
 +	}
 +    
 +    if !("_grokparsefailure" in [tags]) {
 +      mutate {
 +        replace => [ "@source_host", "%{syslog_hostname}" ]
 +        replace => [ "@message", "%{syslog_message}" ]
 +      }
 +    }
 +    mutate {
 +      remove_field => [ "syslog_hostname", "syslog_message" ]
 +    }
 +    date {
 +      match => [ "syslog_timestamp","MMM  d HH:mm:ss", "MMM dd HH:mm:ss", "ISO8601" ] 
 +    }
 +	syslog_pri { }
    }
 -
 -  #file {
 -  #  type => "Hudson-access"
 -  #  path => "/var/log/www/hudson.ish.com.au-access_log"
 -  #}
 -
 -  #file {
 -  #          type => "Syslog"
 -  #  path => "/var/log/messages"
 -  #}
  }
  
  output {
    # Emit events to stdout for easy debugging of what is going through
    # logstash.
 -  #stdout { }
 +  #stdout { debug => "true" }
  
    # This will use elasticsearch to store your logs.
    # The 'embedded' option will cause logstash to run the elasticsearch
 Index: files/logstash.in
 ===================================================================
 --- files/logstash.in	(revision 330404)
 +++ files/logstash.in	(working copy)
 @@ -33,6 +33,8 @@
  
  load_rc_config ${name}
  
 +logdir="/var/log"
 +
  : ${logstash_enable="NO"}
  : ${logstash_home="%%LOGSTASH_HOME%%"}
  : ${logstash_config="%%PREFIX%%/etc/${name}/${name}.conf"}
 @@ -52,7 +54,6 @@
  	mkdir -p $piddir
  fi
  
 -logdir="/var/log"
  command="/usr/sbin/daemon"
  
  java_cmd="${logstash_java_home}/bin/java"
 @@ -67,15 +68,14 @@
  fi
  
  if [ ${logstash_mode} = "standalone" ]; then
 -	logstash_args="agent -f ${logstash_config} -- web --port ${logstash_port} --backend elasticsearch:///?local ${logstash_log_options}"
 +	logstash_args="agent -f ${logstash_config} ${logstash_log_options} -- web --port ${logstash_port}"
  	logstash_elastic_options="-Des.path.data=${logstash_elastic_datadir}"
  elif [ ${logstash_mode} = "agent" ]; then
  	logstash_args="agent -f ${logstash_config} ${logstash_log_options}"
  elif [ ${logstash_mode} = "web" ]; then
 -	logstash_args="web --port ${logstash_port} --backend elasticsearch://${logstash_elastic_backend}/ ${logstash_log_options}"
 +	logstash_args="web --port ${logstash_port} ${logstash_log_options}"
  fi
  
 -command_args="-f -p ${pidfile} ${java_cmd} ${logstash_elastic_options} -jar ${logstash_jar} ${logstash_args}"
 -required_files="${java_cmd} ${logstash_config}"
 +command_args="-f -p ${pidfile} ${java_cmd} ${logstash_elastic_options} -jar ${logstash_jar} ${logstash_args}"required_files="${java_cmd} ${logstash_config}"
  
  run_rc_command "$1"
 Index: pkg-plist
 ===================================================================
 --- pkg-plist	(revision 330404)
 +++ pkg-plist	(working copy)
 @@ -7,7 +7,7 @@
  @unexec if cmp -s %D/%%ETCDIR%%/elasticsearch.yml.sample %D/%%ETCDIR%%/elasticsearch.yml; then rm -f %D/%%ETCDIR%%/elasticsearch.yml; fi
  %%ETCDIR%%/elasticsearch.yml.sample
  @exec if [ ! -f  %D/%%ETCDIR%%/elasticsearch.yml ] ; then cp -p %D/%F %B/elasticsearch.yml; fi
 -@dirrmtry %%LOGSTASH_DATA_DIR%%
  @dirrmtry %%LOGSTASH_HOME%%
  @dirrmtry %%ETCDIR%%
 -@dirrmtry %%LOGSTASH_RUN%%
 +@exec rmdir %%LOGSTASH_DATA_DIR%% 2>/dev/null || true
 +@exec rmdir %%LOGSTASH_RUN%% 2>/dev/null || true
 
 --------------010400070902070202090304--

From: "Regis A. Despres" <regis.despres@gmail.com>
To: Guido Falsi <madpilot@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/182492: Upgrade sysutils/logstash to version 1.2.1 and add some sample conf tweak
Date: Tue, 15 Oct 2013 20:11:29 +0200

 Hey Guido,
 
 
 Cool, I'll look into it within 1 week ; hard time @work.
 
 
 Thanks & regards,
 
 
 
 --=20
 Regis A. Despres
 
 On Oct 15, 2013, at 6:19 PM, Guido Falsi <madpilot@FreeBSD.org> wrote:
 
 > Hi,
 >=20
 > I have modified the port to also support staging.
 >=20
 > Please test attached patch and report back if you can approve it.
 >=20
 > Regarding the instability of this version you reported to me via =
 email, do you have any news? Did you get some feedback from upstream?
 >=20
 > Thanks.
 >=20
 > --=20
 > Guido Falsi <madpilot@FreeBSD.org>
 > <logstash.diff>
 

From: "Regis A. Despres" <rdespres@indolore.net>
To: Guido Falsi <madpilot@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/182492: Upgrade sysutils/logstash to version 1.2.1 and add some sample conf tweak
Date: Wed, 6 Nov 2013 10:39:49 +0100

 --Apple-Mail=_253050BD-AEBE-4316-9D4B-CFCD815A849A
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain;
 	charset=windows-1252
 
 Hi there,
 
 Since staging implementation I=92ve found that LOGSTASH_RUN isn=92t =
 populated, i=92ve tried to modify Makefile w/a line ${MKDIR} =
 ${STAGEDIR}${LOGSTASH_RUN} without success.
 The quick and =93dirty=94? way to handle the no valid pid file rc.d =
 script error is to switch piddir=3D/var/run/${name} w/ piddir=3D/var/run/ =
 .
 We might also remove the es config sample ; if someone need more es =
 control let=92s install es package.
 Let me know if this ok for you.
 
 
 Regards,
 
 
 
 =97
 Regis A. Despres
 
 =20
 On 15 Oct 2013, at 18:19, Guido Falsi <madpilot@FreeBSD.org> wrote:
 
 > Hi,
 >=20
 > I have modified the port to also support staging.
 >=20
 > Please test attached patch and report back if you can approve it.
 >=20
 > Regarding the instability of this version you reported to me via =
 email, do you have any news? Did you get some feedback from upstream?
 >=20
 > Thanks.
 >=20
 > --=20
 > Guido Falsi <madpilot@FreeBSD.org>
 > <logstash.diff>
 
 
 --Apple-Mail=_253050BD-AEBE-4316-9D4B-CFCD815A849A
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename=signature.asc
 Content-Type: application/pgp-signature;
 	name=signature.asc
 Content-Description: Message signed with OpenPGP using GPGMail
 
 -----BEGIN PGP SIGNATURE-----
 
 iQEcBAEBCgAGBQJSeg5lAAoJECZJ41caFQEDFQ0H/A4gC9leTQeg7p8zxiTQy+HQ
 LnwcKddgtZv+7kstecSpgeQrwVDdH/sdk3ekMIo4H/hODxZ7XLRp87Zs8DTxIiMy
 UEsOjw67LnJ84wKMby+T1L2mGDLkO1UG80wchKAEsnSyEtyIDzCTpA/h4ZtWvbSz
 zU7cu9qvBWdPXY0d9ydOrKKJb4ArAOJG7ZMbQQcXocPmteArRRqNIV2azWj0kziw
 XJ1wLo+gQRq3DJke+EsYLMcjBBigmqd88ve2eZ6QGAl4Im33/ufMAXzeo/HwAvfN
 hP06FLNp8pJUHH1TaRBLRwk+jTO8sRHbUx1jV/2weIXSubnHKWom4z1G7KjYhmY=
 =39j+
 -----END PGP SIGNATURE-----
 
 --Apple-Mail=_253050BD-AEBE-4316-9D4B-CFCD815A849A--

From: Guido Falsi <madpilot@FreeBSD.org>
To: bug-followup@FreeBSD.org, regis.despres@gmail.com
Cc:  
Subject: Re: ports/182492: Upgrade sysutils/logstash to version 1.2.1 and
 add some sample conf tweak
Date: Thu, 07 Nov 2013 10:07:04 +0100

 This is a multi-part message in MIME format.
 --------------040107090608090403060801
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 I'm sorry my previous patch actually contained an error, which prevented 
 those directories from being created.
 
 Here is a fixed patch.
 
 -- 
 Guido Falsi <madpilot@FreeBSD.org>
 
 --------------040107090608090403060801
 Content-Type: text/x-diff;
  name="logstash.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="logstash.diff"
 
 Index: Makefile
 ===================================================================
 --- Makefile	(revision 333072)
 +++ Makefile	(working copy)
 @@ -2,10 +2,10 @@
  # $FreeBSD$
  
  PORTNAME=	logstash
 -PORTVERSION=	1.1.13
 +PORTVERSION=	1.2.1
  CATEGORIES=	sysutils java
  MASTER_SITES=	https://logstash.objects.dreamhost.com/release/ \
 -		http://semicomplete.com/files/logstash/
 +		https://download.elasticsearch.org/logstash/logstash/
  DISTNAME=	${PORTNAME}-${PORTVERSION}-flatjar
  EXTRACT_SUFX=	.jar
  EXTRACT_ONLY=
 @@ -32,20 +32,13 @@
  		LOGSTASH_RUN=${LOGSTASH_RUN} \
  		LOGSTASH_DATA_DIR=${LOGSTASH_DATA_DIR}
  
 -NO_STAGE=	yes
  do-install:
 -	${MKDIR} ${LOGSTASH_RUN}
 -	${MKDIR} ${ETCDIR}
 -	${MKDIR} ${LOGSTASH_HOME}
 -	${MKDIR} ${LOGSTASH_DATA_DIR}
 -	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${LOGSTASH_JAR} ${LOGSTASH_HOME}
 -	${INSTALL_DATA} ${FILESDIR}/logstash.conf.sample ${ETCDIR}
 -	@if [ ! -f ${ETCDIR}/logstash.conf ]; then \
 -		${CP} -p ${ETCDIR}/logstash.conf.sample ${ETCDIR}/logstash.conf ; \
 -	fi
 -	${INSTALL_DATA} ${FILESDIR}/elasticsearch.yml.sample ${ETCDIR}
 -	@if [ ! -f ${ETCDIR}/elasticsearch.yml ]; then \
 -		${CP} -p ${ETCDIR}/elasticsearch.yml.sample ${ETCDIR}/elasticsearch.yml ; \
 -	fi
 +	${MKDIR} ${STAGEDIR}${ETCDIR}
 +	${MKDIR} ${STAGEDIR}${LOGSTASH_HOME}
 +	${MKDIR} ${STAGEDIR}${LOGSTASH_RUN}
 +	${MKDIR} ${STAGEDIR}${LOGSTASH_DATA_DIR}
 +	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${LOGSTASH_JAR} ${STAGEDIR}${LOGSTASH_HOME}
 +	${INSTALL_DATA} ${FILESDIR}/logstash.conf.sample ${STAGEDIR}${ETCDIR}
 +	${INSTALL_DATA} ${FILESDIR}/elasticsearch.yml.sample ${STAGEDIR}${ETCDIR}
  
  .include <bsd.port.mk>
 Index: distinfo
 ===================================================================
 --- distinfo	(revision 333072)
 +++ distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (logstash-1.1.13-flatjar.jar) = 5ba0639ff4da064c2a4f6a04bd7006b1997a6573859d3691e210b6855e1e47f1
 -SIZE (logstash-1.1.13-flatjar.jar) = 69485313
 +SHA256 (logstash-1.2.1-flatjar.jar) = d0b8a56fb1aa71d54c2bab71709d900b359fdf8c6d7d6ff15578423a0d86ee23
 +SIZE (logstash-1.2.1-flatjar.jar) = 81648562
 Index: files/logstash.conf.sample
 ===================================================================
 --- files/logstash.conf.sample	(revision 333072)
 +++ files/logstash.conf.sample	(working copy)
 @@ -1,27 +1,42 @@
  input {
 -  file {
 -    type => "system logs"
  
 -  #  # Wildcards work, here :)
 -  #  path => [ "/var/log/*.log", "/var/log/messages", "/var/log/syslog" ]
 -    path => [ "/var/log/messages" ]
 +	file {
 +		type => "syslog"
 +	    #  # Wildcards work, here :)
 +	    #  path => [ "/var/log/*.log", "/var/log/messages", "/var/log/syslog" ]
 +	    path => "/var/log/mesages"
 +	    start_position => "beginning"
 +	}
 +}
 +
 +filter {
 +  if [type] == "syslog" {
 +	grok {
 +	  match => { "message" => "%{SYSLOGTIMESTAMP:syslog_timestamp} %{SYSLOGHOST:syslog_hostname} (%{DATA:syslog_program}(?:\[%{POSINT:syslog_pid}\])?: %{GREEDYDATA:syslog_message}|%{GREEDYDATA:syslog_message})" }
 +	  add_field => [ "received_at", "%{@timestamp}" ]
 +	  add_field => [ "received_from", "%{@source_host}" ]
 +	}
 +    
 +    if !("_grokparsefailure" in [tags]) {
 +      mutate {
 +        replace => [ "@source_host", "%{syslog_hostname}" ]
 +        replace => [ "@message", "%{syslog_message}" ]
 +      }
 +    }
 +    mutate {
 +      remove_field => [ "syslog_hostname", "syslog_message" ]
 +    }
 +    date {
 +      match => [ "syslog_timestamp","MMM  d HH:mm:ss", "MMM dd HH:mm:ss", "ISO8601" ] 
 +    }
 +	syslog_pri { }
    }
 -
 -  #file {
 -  #  type => "Hudson-access"
 -  #  path => "/var/log/www/hudson.ish.com.au-access_log"
 -  #}
 -
 -  #file {
 -  #          type => "Syslog"
 -  #  path => "/var/log/messages"
 -  #}
  }
  
  output {
    # Emit events to stdout for easy debugging of what is going through
    # logstash.
 -  #stdout { }
 +  #stdout { debug => "true" }
  
    # This will use elasticsearch to store your logs.
    # The 'embedded' option will cause logstash to run the elasticsearch
 Index: files/logstash.in
 ===================================================================
 --- files/logstash.in	(revision 333072)
 +++ files/logstash.in	(working copy)
 @@ -33,6 +33,8 @@
  
  load_rc_config ${name}
  
 +logdir="/var/log"
 +
  : ${logstash_enable="NO"}
  : ${logstash_home="%%LOGSTASH_HOME%%"}
  : ${logstash_config="%%PREFIX%%/etc/${name}/${name}.conf"}
 @@ -52,7 +54,6 @@
  	mkdir -p $piddir
  fi
  
 -logdir="/var/log"
  command="/usr/sbin/daemon"
  
  java_cmd="${logstash_java_home}/bin/java"
 @@ -67,15 +68,14 @@
  fi
  
  if [ ${logstash_mode} = "standalone" ]; then
 -	logstash_args="agent -f ${logstash_config} -- web --port ${logstash_port} --backend elasticsearch:///?local ${logstash_log_options}"
 +	logstash_args="agent -f ${logstash_config} ${logstash_log_options} -- web --port ${logstash_port}"
  	logstash_elastic_options="-Des.path.data=${logstash_elastic_datadir}"
  elif [ ${logstash_mode} = "agent" ]; then
  	logstash_args="agent -f ${logstash_config} ${logstash_log_options}"
  elif [ ${logstash_mode} = "web" ]; then
 -	logstash_args="web --port ${logstash_port} --backend elasticsearch://${logstash_elastic_backend}/ ${logstash_log_options}"
 +	logstash_args="web --port ${logstash_port} ${logstash_log_options}"
  fi
  
 -command_args="-f -p ${pidfile} ${java_cmd} ${logstash_elastic_options} -jar ${logstash_jar} ${logstash_args}"
 -required_files="${java_cmd} ${logstash_config}"
 +command_args="-f -p ${pidfile} ${java_cmd} ${logstash_elastic_options} -jar ${logstash_jar} ${logstash_args}"required_files="${java_cmd} ${logstash_config}"
  
  run_rc_command "$1"
 Index: pkg-plist
 ===================================================================
 --- pkg-plist	(revision 333072)
 +++ pkg-plist	(working copy)
 @@ -7,7 +7,7 @@
  @unexec if cmp -s %D/%%ETCDIR%%/elasticsearch.yml.sample %D/%%ETCDIR%%/elasticsearch.yml; then rm -f %D/%%ETCDIR%%/elasticsearch.yml; fi
  %%ETCDIR%%/elasticsearch.yml.sample
  @exec if [ ! -f  %D/%%ETCDIR%%/elasticsearch.yml ] ; then cp -p %D/%F %B/elasticsearch.yml; fi
 -@dirrmtry %%LOGSTASH_DATA_DIR%%
  @dirrmtry %%LOGSTASH_HOME%%
  @dirrmtry %%ETCDIR%%
 -@dirrmtry %%LOGSTASH_RUN%%
 +@unexec rmdir %%LOGSTASH_DATA_DIR%% 2>/dev/null || true
 +@unexec rmdir %%LOGSTASH_RUN%% 2>/dev/null || true
 
 --------------040107090608090403060801--

From: "Regis A. Despres" <regis.despres@gmail.com>
To: bug-followup@FreeBSD.org,
 Guido Falsi <madpilot@FreeBSD.org>
Cc:  
Subject: Re: ports/182492: Upgrade sysutils/logstash to version 1.2.1 and add some sample conf tweak
Date: Thu, 21 Nov 2013 01:56:06 +0100

 --Apple-Mail=_60B27CA7-8AF8-4A89-B8F5-8ACEAE63501F
 Content-Type: multipart/mixed;
 	boundary="Apple-Mail=_C0F6FBD1-C3A0-42C0-92B6-E03587AD39FC"
 
 
 --Apple-Mail=_C0F6FBD1-C3A0-42C0-92B6-E03587AD39FC
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain;
 	charset=windows-1252
 
 Hi there,
 
 
 Finally had some time to sort it out !
 Confirmed that all files and directories are inline in "staging mode=94.
 Added a missing carriage return into rc script and a filename typo conf =
 sample into diff attached.
 We=92re all good =3D)
 
 
 Regards,
 
 
 
 =97=20
 Regis A. Despres
 
 --Apple-Mail=_C0F6FBD1-C3A0-42C0-92B6-E03587AD39FC
 Content-Disposition: attachment;
 	filename=20131111.logstash.1.2.1.upgrade.diff
 Content-Type: application/octet-stream;
 	name="20131111.logstash.1.2.1.upgrade.diff"
 Content-Transfer-Encoding: 7bit
 
 Index: Makefile
 ===================================================================
 --- Makefile	(revision 334464)
 +++ Makefile	(working copy)
 @@ -2,10 +2,10 @@
  # $FreeBSD$
  
  PORTNAME=	logstash
 -PORTVERSION=	1.1.13
 +PORTVERSION=	1.2.1
  CATEGORIES=	sysutils java
  MASTER_SITES=	https://logstash.objects.dreamhost.com/release/ \
 -		http://semicomplete.com/files/logstash/
 +		https://download.elasticsearch.org/logstash/logstash/
  DISTNAME=	${PORTNAME}-${PORTVERSION}-flatjar
  EXTRACT_SUFX=	.jar
  EXTRACT_ONLY=
 @@ -32,20 +32,13 @@
  		LOGSTASH_RUN=${LOGSTASH_RUN} \
  		LOGSTASH_DATA_DIR=${LOGSTASH_DATA_DIR}
  
 -NO_STAGE=	yes
  do-install:
 -	${MKDIR} ${LOGSTASH_RUN}
 -	${MKDIR} ${ETCDIR}
 -	${MKDIR} ${LOGSTASH_HOME}
 -	${MKDIR} ${LOGSTASH_DATA_DIR}
 -	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${LOGSTASH_JAR} ${LOGSTASH_HOME}
 -	${INSTALL_DATA} ${FILESDIR}/logstash.conf.sample ${ETCDIR}
 -	@if [ ! -f ${ETCDIR}/logstash.conf ]; then \
 -		${CP} -p ${ETCDIR}/logstash.conf.sample ${ETCDIR}/logstash.conf ; \
 -	fi
 -	${INSTALL_DATA} ${FILESDIR}/elasticsearch.yml.sample ${ETCDIR}
 -	@if [ ! -f ${ETCDIR}/elasticsearch.yml ]; then \
 -		${CP} -p ${ETCDIR}/elasticsearch.yml.sample ${ETCDIR}/elasticsearch.yml ; \
 -	fi
 +	${MKDIR} ${STAGEDIR}${ETCDIR}
 +	${MKDIR} ${STAGEDIR}${LOGSTASH_HOME}
 +	${MKDIR} ${STAGEDIR}${LOGSTASH_RUN}
 +	${MKDIR} ${STAGEDIR}${LOGSTASH_DATA_DIR}
 +	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${LOGSTASH_JAR} ${STAGEDIR}${LOGSTASH_HOME}
 +	${INSTALL_DATA} ${FILESDIR}/logstash.conf.sample ${STAGEDIR}${ETCDIR}
 +	${INSTALL_DATA} ${FILESDIR}/elasticsearch.yml.sample ${STAGEDIR}${ETCDIR}
  
  .include <bsd.port.mk>
 Index: distinfo
 ===================================================================
 --- distinfo	(revision 334464)
 +++ distinfo	(working copy)
 @@ -1,2 +1,2 @@
 -SHA256 (logstash-1.1.13-flatjar.jar) = 5ba0639ff4da064c2a4f6a04bd7006b1997a6573859d3691e210b6855e1e47f1
 -SIZE (logstash-1.1.13-flatjar.jar) = 69485313
 +SHA256 (logstash-1.2.1-flatjar.jar) = d0b8a56fb1aa71d54c2bab71709d900b359fdf8c6d7d6ff15578423a0d86ee23
 +SIZE (logstash-1.2.1-flatjar.jar) = 81648562
 Index: files/logstash.conf.sample
 ===================================================================
 --- files/logstash.conf.sample	(revision 334464)
 +++ files/logstash.conf.sample	(working copy)
 @@ -1,27 +1,42 @@
  input {
 -  file {
 -    type => "system logs"
  
 -  #  # Wildcards work, here :)
 -  #  path => [ "/var/log/*.log", "/var/log/messages", "/var/log/syslog" ]
 -    path => [ "/var/log/messages" ]
 +	file {
 +		type => "syslog"
 +	    #  # Wildcards work, here :)
 +	    #  path => [ "/var/log/*.log", "/var/log/messages", "/var/log/syslog" ]
 +	    path => "/var/log/messages"
 +	    start_position => "beginning"
 +	}
 +}
 +
 +filter {
 +  if [type] == "syslog" {
 +	grok {
 +	  match => { "message" => "%{SYSLOGTIMESTAMP:syslog_timestamp} %{SYSLOGHOST:syslog_hostname} (%{DATA:syslog_program}(?:\[%{POSINT:syslog_pid}\])?: %{GREEDYDATA:syslog_message}|%{GREEDYDATA:syslog_message})" }
 +	  add_field => [ "received_at", "%{@timestamp}" ]
 +	  add_field => [ "received_from", "%{@source_host}" ]
 +	}
 +    
 +    if !("_grokparsefailure" in [tags]) {
 +      mutate {
 +        replace => [ "@source_host", "%{syslog_hostname}" ]
 +        replace => [ "@message", "%{syslog_message}" ]
 +      }
 +    }
 +    mutate {
 +      remove_field => [ "syslog_hostname", "syslog_message" ]
 +    }
 +    date {
 +      match => [ "syslog_timestamp","MMM  d HH:mm:ss", "MMM dd HH:mm:ss", "ISO8601" ] 
 +    }
 +	syslog_pri { }
    }
 -
 -  #file {
 -  #  type => "Hudson-access"
 -  #  path => "/var/log/www/hudson.ish.com.au-access_log"
 -  #}
 -
 -  #file {
 -  #          type => "Syslog"
 -  #  path => "/var/log/messages"
 -  #}
  }
  
  output {
    # Emit events to stdout for easy debugging of what is going through
    # logstash.
 -  #stdout { }
 +  #stdout { debug => "true" }
  
    # This will use elasticsearch to store your logs.
    # The 'embedded' option will cause logstash to run the elasticsearch
 Index: files/logstash.in
 ===================================================================
 --- files/logstash.in	(revision 334464)
 +++ files/logstash.in	(working copy)
 @@ -33,6 +33,8 @@
  
  load_rc_config ${name}
  
 +logdir="/var/log"
 +
  : ${logstash_enable="NO"}
  : ${logstash_home="%%LOGSTASH_HOME%%"}
  : ${logstash_config="%%PREFIX%%/etc/${name}/${name}.conf"}
 @@ -52,7 +54,6 @@
  	mkdir -p $piddir
  fi
  
 -logdir="/var/log"
  command="/usr/sbin/daemon"
  
  java_cmd="${logstash_java_home}/bin/java"
 @@ -67,12 +68,12 @@
  fi
  
  if [ ${logstash_mode} = "standalone" ]; then
 -	logstash_args="agent -f ${logstash_config} -- web --port ${logstash_port} --backend elasticsearch:///?local ${logstash_log_options}"
 +	logstash_args="agent -f ${logstash_config} ${logstash_log_options} -- web --port ${logstash_port}"
  	logstash_elastic_options="-Des.path.data=${logstash_elastic_datadir}"
  elif [ ${logstash_mode} = "agent" ]; then
  	logstash_args="agent -f ${logstash_config} ${logstash_log_options}"
  elif [ ${logstash_mode} = "web" ]; then
 -	logstash_args="web --port ${logstash_port} --backend elasticsearch://${logstash_elastic_backend}/ ${logstash_log_options}"
 +	logstash_args="web --port ${logstash_port} ${logstash_log_options}"
  fi
  
  command_args="-f -p ${pidfile} ${java_cmd} ${logstash_elastic_options} -jar ${logstash_jar} ${logstash_args}"
 Index: pkg-plist
 ===================================================================
 --- pkg-plist	(revision 334464)
 +++ pkg-plist	(working copy)
 @@ -7,7 +7,7 @@
  @unexec if cmp -s %D/%%ETCDIR%%/elasticsearch.yml.sample %D/%%ETCDIR%%/elasticsearch.yml; then rm -f %D/%%ETCDIR%%/elasticsearch.yml; fi
  %%ETCDIR%%/elasticsearch.yml.sample
  @exec if [ ! -f  %D/%%ETCDIR%%/elasticsearch.yml ] ; then cp -p %D/%F %B/elasticsearch.yml; fi
 -@dirrmtry %%LOGSTASH_DATA_DIR%%
  @dirrmtry %%LOGSTASH_HOME%%
  @dirrmtry %%ETCDIR%%
 -@dirrmtry %%LOGSTASH_RUN%%
 +@unexec rmdir %%LOGSTASH_DATA_DIR%% 2>/dev/null || true
 +@unexec rmdir %%LOGSTASH_RUN%% 2>/dev/null || true
 
 --Apple-Mail=_C0F6FBD1-C3A0-42C0-92B6-E03587AD39FC
 Content-Transfer-Encoding: 7bit
 Content-Type: text/plain;
 	charset=us-ascii
 
 
 
 
 
 --Apple-Mail=_C0F6FBD1-C3A0-42C0-92B6-E03587AD39FC--
 
 --Apple-Mail=_60B27CA7-8AF8-4A89-B8F5-8ACEAE63501F
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename=signature.asc
 Content-Type: application/pgp-signature;
 	name=signature.asc
 Content-Description: Message signed with OpenPGP using GPGMail
 
 -----BEGIN PGP SIGNATURE-----
 
 iQEcBAEBCgAGBQJSjVonAAoJECZJ41caFQEDxBgH/0PXzNKWwU+MVaFlqOJrXjBk
 yHVQD+53f+5Qpftsdj+mQfyoEFD8OCFQyihmNDqQzmFvQ9s1tZiAnUmlrDMULpPW
 aS3341voRSPVsb5elambzF0b3BGwp9cUAv7z5jyGDbLED5Ad3yyoViSZpH5i/cGJ
 8+sS7hq41jHfMohL0mGB53XT9Db4gVPwluDjrJ7gxBWGYuzFAFulNkF4mg/jvlnl
 ws/sGtEibl+F/SFAlc0zU+sPu05S4V6ppmCxsHn3x+AYp5rJon/+WPFEGw63rZuZ
 zs8wEudPoV+ytXcQsfoeLXGoUn14n5tRGApi2mOmQvIRHe968xybjakL0KuQOsY=
 =e5Yu
 -----END PGP SIGNATURE-----
 
 --Apple-Mail=_60B27CA7-8AF8-4A89-B8F5-8ACEAE63501F--
State-Changed-From-To: open->closed 
State-Changed-By: madpilot 
State-Changed-When: Thu Nov 21 12:35:36 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182492 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182492: commit references a PR
Date: Thu, 21 Nov 2013 12:35:32 +0000 (UTC)

 Author: madpilot
 Date: Thu Nov 21 12:35:12 2013
 New Revision: 334480
 URL: http://svnweb.freebsd.org/changeset/ports/334480
 
 Log:
   - Upgrade to 1.2.1
   - Make sample config file work with BSD syslog
   - Startup script fixes
   - Convert to staging
   
   PR:		ports/182492
   Submitted by:	Regis A. Despres <regis.despres@gmail.com> (maintainer)
 
 Modified:
   head/sysutils/logstash/Makefile
   head/sysutils/logstash/distinfo   (contents, props changed)
   head/sysutils/logstash/files/logstash.conf.sample   (contents, props changed)
   head/sysutils/logstash/files/logstash.in
   head/sysutils/logstash/pkg-plist   (contents, props changed)
 
 Modified: head/sysutils/logstash/Makefile
 ==============================================================================
 --- head/sysutils/logstash/Makefile	Thu Nov 21 12:28:29 2013	(r334479)
 +++ head/sysutils/logstash/Makefile	Thu Nov 21 12:35:12 2013	(r334480)
 @@ -2,10 +2,10 @@
  # $FreeBSD$
  
  PORTNAME=	logstash
 -PORTVERSION=	1.1.13
 +PORTVERSION=	1.2.1
  CATEGORIES=	sysutils java
  MASTER_SITES=	https://logstash.objects.dreamhost.com/release/ \
 -		http://semicomplete.com/files/logstash/
 +		https://download.elasticsearch.org/logstash/logstash/
  DISTNAME=	${PORTNAME}-${PORTVERSION}-flatjar
  EXTRACT_SUFX=	.jar
  EXTRACT_ONLY=
 @@ -32,20 +32,13 @@ PLIST_SUB+=	LOGSTASH_HOME=${LOGSTASH_HOM
  		LOGSTASH_RUN=${LOGSTASH_RUN} \
  		LOGSTASH_DATA_DIR=${LOGSTASH_DATA_DIR}
  
 -NO_STAGE=	yes
  do-install:
 -	${MKDIR} ${LOGSTASH_RUN}
 -	${MKDIR} ${ETCDIR}
 -	${MKDIR} ${LOGSTASH_HOME}
 -	${MKDIR} ${LOGSTASH_DATA_DIR}
 -	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${LOGSTASH_JAR} ${LOGSTASH_HOME}
 -	${INSTALL_DATA} ${FILESDIR}/logstash.conf.sample ${ETCDIR}
 -	@if [ ! -f ${ETCDIR}/logstash.conf ]; then \
 -		${CP} -p ${ETCDIR}/logstash.conf.sample ${ETCDIR}/logstash.conf ; \
 -	fi
 -	${INSTALL_DATA} ${FILESDIR}/elasticsearch.yml.sample ${ETCDIR}
 -	@if [ ! -f ${ETCDIR}/elasticsearch.yml ]; then \
 -		${CP} -p ${ETCDIR}/elasticsearch.yml.sample ${ETCDIR}/elasticsearch.yml ; \
 -	fi
 +	${MKDIR} ${STAGEDIR}${ETCDIR}
 +	${MKDIR} ${STAGEDIR}${LOGSTASH_HOME}
 +	${MKDIR} ${STAGEDIR}${LOGSTASH_RUN}
 +	${MKDIR} ${STAGEDIR}${LOGSTASH_DATA_DIR}
 +	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${LOGSTASH_JAR} ${STAGEDIR}${LOGSTASH_HOME}
 +	${INSTALL_DATA} ${FILESDIR}/logstash.conf.sample ${STAGEDIR}${ETCDIR}
 +	${INSTALL_DATA} ${FILESDIR}/elasticsearch.yml.sample ${STAGEDIR}${ETCDIR}
  
  .include <bsd.port.mk>
 
 Modified: head/sysutils/logstash/distinfo
 ==============================================================================
 --- head/sysutils/logstash/distinfo	Thu Nov 21 12:28:29 2013	(r334479)
 +++ head/sysutils/logstash/distinfo	Thu Nov 21 12:35:12 2013	(r334480)
 @@ -1,2 +1,2 @@
 -SHA256 (logstash-1.1.13-flatjar.jar) = 5ba0639ff4da064c2a4f6a04bd7006b1997a6573859d3691e210b6855e1e47f1
 -SIZE (logstash-1.1.13-flatjar.jar) = 69485313
 +SHA256 (logstash-1.2.1-flatjar.jar) = d0b8a56fb1aa71d54c2bab71709d900b359fdf8c6d7d6ff15578423a0d86ee23
 +SIZE (logstash-1.2.1-flatjar.jar) = 81648562
 
 Modified: head/sysutils/logstash/files/logstash.conf.sample
 ==============================================================================
 --- head/sysutils/logstash/files/logstash.conf.sample	Thu Nov 21 12:28:29 2013	(r334479)
 +++ head/sysutils/logstash/files/logstash.conf.sample	Thu Nov 21 12:35:12 2013	(r334480)
 @@ -1,27 +1,42 @@
  input {
 -  file {
 -    type => "system logs"
  
 -  #  # Wildcards work, here :)
 -  #  path => [ "/var/log/*.log", "/var/log/messages", "/var/log/syslog" ]
 -    path => [ "/var/log/messages" ]
 -  }
 -
 -  #file {
 -  #  type => "Hudson-access"
 -  #  path => "/var/log/www/hudson.ish.com.au-access_log"
 -  #}
 +	file {
 +		type => "syslog"
 +	    #  # Wildcards work, here :)
 +	    #  path => [ "/var/log/*.log", "/var/log/messages", "/var/log/syslog" ]
 +	    path => "/var/log/messages"
 +	    start_position => "beginning"
 +	}
 +}
  
 -  #file {
 -  #          type => "Syslog"
 -  #  path => "/var/log/messages"
 -  #}
 +filter {
 +  if [type] == "syslog" {
 +	grok {
 +	  match => { "message" => "%{SYSLOGTIMESTAMP:syslog_timestamp} %{SYSLOGHOST:syslog_hostname} (%{DATA:syslog_program}(?:\[%{POSINT:syslog_pid}\])?: %{GREEDYDATA:syslog_message}|%{GREEDYDATA:syslog_message})" }
 +	  add_field => [ "received_at", "%{@timestamp}" ]
 +	  add_field => [ "received_from", "%{@source_host}" ]
 +	}
 +    
 +    if !("_grokparsefailure" in [tags]) {
 +      mutate {
 +        replace => [ "@source_host", "%{syslog_hostname}" ]
 +        replace => [ "@message", "%{syslog_message}" ]
 +      }
 +    }
 +    mutate {
 +      remove_field => [ "syslog_hostname", "syslog_message" ]
 +    }
 +    date {
 +      match => [ "syslog_timestamp","MMM  d HH:mm:ss", "MMM dd HH:mm:ss", "ISO8601" ] 
 +    }
 +	syslog_pri { }
 +  }
  }
  
  output {
    # Emit events to stdout for easy debugging of what is going through
    # logstash.
 -  #stdout { }
 +  #stdout { debug => "true" }
  
    # This will use elasticsearch to store your logs.
    # The 'embedded' option will cause logstash to run the elasticsearch
 
 Modified: head/sysutils/logstash/files/logstash.in
 ==============================================================================
 --- head/sysutils/logstash/files/logstash.in	Thu Nov 21 12:28:29 2013	(r334479)
 +++ head/sysutils/logstash/files/logstash.in	Thu Nov 21 12:35:12 2013	(r334480)
 @@ -33,6 +33,8 @@ rcvar=logstash_enable
  
  load_rc_config ${name}
  
 +logdir="/var/log"
 +
  : ${logstash_enable="NO"}
  : ${logstash_home="%%LOGSTASH_HOME%%"}
  : ${logstash_config="%%PREFIX%%/etc/${name}/${name}.conf"}
 @@ -52,7 +54,6 @@ if [ -d $piddir ]; then
  	mkdir -p $piddir
  fi
  
 -logdir="/var/log"
  command="/usr/sbin/daemon"
  
  java_cmd="${logstash_java_home}/bin/java"
 @@ -67,12 +68,12 @@ if checkyesno logstash_log; then
  fi
  
  if [ ${logstash_mode} = "standalone" ]; then
 -	logstash_args="agent -f ${logstash_config} -- web --port ${logstash_port} --backend elasticsearch:///?local ${logstash_log_options}"
 +	logstash_args="agent -f ${logstash_config} ${logstash_log_options} -- web --port ${logstash_port}"
  	logstash_elastic_options="-Des.path.data=${logstash_elastic_datadir}"
  elif [ ${logstash_mode} = "agent" ]; then
  	logstash_args="agent -f ${logstash_config} ${logstash_log_options}"
  elif [ ${logstash_mode} = "web" ]; then
 -	logstash_args="web --port ${logstash_port} --backend elasticsearch://${logstash_elastic_backend}/ ${logstash_log_options}"
 +	logstash_args="web --port ${logstash_port} ${logstash_log_options}"
  fi
  
  command_args="-f -p ${pidfile} ${java_cmd} ${logstash_elastic_options} -jar ${logstash_jar} ${logstash_args}"
 
 Modified: head/sysutils/logstash/pkg-plist
 ==============================================================================
 --- head/sysutils/logstash/pkg-plist	Thu Nov 21 12:28:29 2013	(r334479)
 +++ head/sysutils/logstash/pkg-plist	Thu Nov 21 12:35:12 2013	(r334480)
 @@ -7,7 +7,7 @@
  @unexec if cmp -s %D/%%ETCDIR%%/elasticsearch.yml.sample %D/%%ETCDIR%%/elasticsearch.yml; then rm -f %D/%%ETCDIR%%/elasticsearch.yml; fi
  %%ETCDIR%%/elasticsearch.yml.sample
  @exec if [ ! -f  %D/%%ETCDIR%%/elasticsearch.yml ] ; then cp -p %D/%F %B/elasticsearch.yml; fi
 -@dirrmtry %%LOGSTASH_DATA_DIR%%
  @dirrmtry %%LOGSTASH_HOME%%
  @dirrmtry %%ETCDIR%%
 -@dirrmtry %%LOGSTASH_RUN%%
 +@unexec rmdir %%LOGSTASH_DATA_DIR%% 2>/dev/null || true
 +@unexec rmdir %%LOGSTASH_RUN%% 2>/dev/null || true
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
