Permalink
Browse files

Merge with master

  • Loading branch information...
1 parent 9c24ae0 commit f1c7e4e08cf1d79d22bdaa41ed0507cf70382a9e @trink trink committed May 9, 2013
View
@@ -4,7 +4,6 @@
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
project(heka C)
-
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Heka")
set(CPACK_PACKAGE_VERSION_MAJOR 0)
set(CPACK_PACKAGE_VERSION_MINOR 2)
View
@@ -4,7 +4,7 @@ HERE = $(shell pwd)
BIN = $(HERE)/bin
GOBIN = $(HERE)/bin/go
HGBIN = $(HERE)/pythonVE/bin/hg
-GOCMD = LD_LIBRARY_PATH=${BIN} DYLD_LIBRARY_PATH=${BIN} GOPATH=$(HERE) $(GOBIN)
+GOCMD = GOPATH=$(HERE) $(GOBIN)
GOPATH = $GOPATH:$(HERE)
ifeq ($(MAKECMDGOALS),test-bench)
@@ -23,7 +23,7 @@ clean-src:
rm -rf src/*
clean-heka:
- rm -f bin/hekad bin/libsandbox.so
+ rm -f bin/hekad
clean-all: clean-go clean-src clean-heka
@@ -63,7 +63,7 @@ build/go:
$(HGBIN) clone -u 0a4f1eb9372f https://code.google.com/p/go
$(GOBIN): build/go
- cd build/go/src && \
+ PATH="$(BIN):$(HERE)/pythonVE/bin:$(PATH)" cd build/go/src && \
./all.bash
cp build/go/bin/go $(HERE)/bin/go
@@ -143,6 +143,16 @@ rpms: moz-plugins build docs
debs: moz-plugins build docs
./scripts/make_pkgs.sh deb
+osx: build docs
+ mkdir -p osxproto/lib
+ mkdir -p osxproto/bin
+ mkdir -p osxproto/share/man/man1
+ mkdir -p osxproto/share/man/man5
+ cp bin/hekad osxproto/bin/
+ cp bin/libsandbox.dylib osxproto/lib/
+ cp src/github.com/mozilla-services/heka/docs/build/man/*.1 osxproto/share/man/man1/
+ cp src/github.com/mozilla-services/heka/docs/build/man/*.5 osxproto/share/man/man5/
+
dev: heka-source
cd src/github.com/mozilla-services/heka && \
git config remote.origin.url git@github.com:mozilla-services/heka.git && \
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1 @@
+<pkg-contents spec="1.12"><f n="osxproto" o="root" g="admin" p="16877" pt="../osxproto" m="false" t="file"><f n="bin" o="root" g="admin" p="16877"><f n="hekad" o="root" g="admin" p="33261"/></f><f n="lib" o="root" g="admin" p="16877"><f n="libsandbox.dylib" o="root" g="admin" p="33261"/></f><f n="share" o="root" g="admin" p="16877"><f n="man" o="root" g="admin" p="16877"><f n="man1" o="root" g="admin" p="16877"><f n="hekad.1" o="root" g="admin" p="33188"/></f><f n="man5" o="root" g="admin" p="16877"><f n="hekad.config.5" o="root" g="admin" p="33188"/><f n="hekad.plugin.5" o="root" g="admin" p="33188"/></f></f></f></f></pkg-contents>
@@ -0,0 +1 @@
+<pkgref spec="1.12" uuid="102A8467-8D19-435E-9A07-357BDCEED5DF"><config><identifier>com.mozilla.hekad.pkg</identifier><version>0.2.0b1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">../osxproto</installFrom><installTo mod="true">/usr/local</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>installTo.path</mod><mod>installTo</mod><mod>version</mod><mod>parent</mod><mod>identifier</mod><mod>relocatable</mod></config><contents><file-list>01osxproto-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,37 +0,0 @@
-{
- "inputs": [
- {"name": "udp:5566",
- "type": "UdpInput",
- "address": "127.0.0.1:5566"
- }
- ],
- "decoders": [
- {"name": "json", "type": "JsonDecoder", "default": true}
- ],
- "outputs": [
- {"name": "myapp_logfile", "type": "FileOutput",
- "path": "/var/log/myapp.log",
- "prefix_ts": true
- },
- {"name": "myapp_json", "type": "FileOutput",
- "path": "/var/log/myapp.json",
- "format": "json"
- },
- {"name": "statsd", "type": "StatsdOutput",
- "url": "127.0.0.1:8125"
- },
- {"name": "counter", "type": "CounterOutput"},
- {"name": "debug", "type": "LogOutput"}
- ],
- "chains": {
- "default": {"outputs": ["myapp_json"]},
- "text": {
- "message_type": ["logging"],
- "outputs": ["myapp_logfile"]
- },
- "statsd": {
- "message_type": ["timer", "counter"],
- "outputs": ["statsd"]
- }
- }
-}
View
@@ -0,0 +1,38 @@
+[StatsdInput]
+address = "127.0.0.1:8125"
+flushinterval = 1
+
+[TcpInput]
+address = "127.0.0.1:5565"
+
+[TcpInput2]
+type = "TcpInput"
+address = "127.0.0.1:5566"
+
+[CounterFilter]
+message_matcher = "Type != 'heka.counter-output'"
+ticker_interval = 1
+
+[StatsdFileOutput]
+type = "FileOutput"
+path = "log/statsdonly.log"
+format = "json"
+
+[CounterFileOutput]
+type = "FileOutput"
+path = "log/counter.log"
+message_matcher = "Type == 'heka.counter-output'"
+
+[LogOutput]
+message_matcher = "Type == 'heka.counter-output'"
+payload_only = true
+
+[WhisperOutput]
+basepath = "/var/run/hekad/whisper/db"
+message_matcher = "Type == 'statmetric'"
+defaultaggmethod = 1
+defaultarchiveinfo = [ [0, 30, 1440], [0, 900, 192], [0, 3600, 168], [0, 43200, 1456] ]
+
+[DashboardOutput]
+message_matcher = "Type == 'heka.all-report' || Type == 'heka.sandbox-output' || Type == 'heka.sandbox-terminated'"
+ticker_interval = 5
View
@@ -15,16 +15,18 @@ mkdir -p $ROOT/usr/bin
mkdir -p $ROOT/etc
mkdir -p $ROOT/usr/share/man/man1
mkdir -p $ROOT/usr/share/man/man5
+mkdir -p $ROOT/usr/lib
mkdir -p $1s
VERSION=`./bin/hekad -version`
cp bin/hekad $ROOT/usr/bin
-cp sample/hekad.json $ROOT/etc/hekad.json.sample
+cp bin/libsandbox.so $ROOT/usr/lib
+cp sample/hekad.toml $ROOT/etc/hekad.toml.sample
cp src/github.com/mozilla-services/heka/docs/build/man/hekad.1 $ROOT/usr/share/man/man1
cp src/github.com/mozilla-services/heka/docs/build/man/hekad.*.5 $ROOT/usr/share/man/man5
gzip $ROOT/usr/share/man/man1/hekad.1
gzip $ROOT/usr/share/man/man5/hekad.*
cd $ROOT
-fpm -s dir -t $1 -n "hekad" -v $VERSION --iteration ${ITERATION:-1} .
+fpm -s dir -t $1 -n "hekad" -v $VERSION --iteration ${ITERATION:-1} --license "MPLv2.0" --vendor Mozilla -m "<services-dev@mozilla.org>" --url "http://hekad.readthedocs.org" --description "High performance data gathering, analysis, monitoring, and reporting." .
mv hekad*$VERSION-$ITERATION*.$1 ../$1s
cd ..
rm -fr tmp_pkg_root

0 comments on commit f1c7e4e

Please sign in to comment.