influxdb->influxdata

wuyuanyi135 · Jan 7, 2016 · 1ef32d4 · 1ef32d4
1 parent 7560397
commit 1ef32d4
Show file tree

Hide file tree

Showing 62 changed files with 165 additions and 160 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Release Notes
 
 ### Features
+- [#138](https://github.com/influxdata/kapacitor/issues/138): Change over to influxdata github org.
 
 ### Bugfixes
 
@@ -13,16 +14,16 @@
 ### Release Notes
 
 ### Features
-- [#118](https://github.com/influxdb/kapacitor/issues/118): Can now define multiple handlers of the same type on an AlertNode.
-- [#119](https://github.com/influxdb/kapacitor/issues/119): HipChat support thanks! @ericiles *2
-- [#113](https://github.com/influxdb/kapacitor/issues/113): OpsGenie support thanks! @ericiles
-- [#107](https://github.com/influxdb/kapacitor/issues/107): Enable TICKscript variables to be defined and then referenced from lambda expressions.
+- [#118](https://github.com/influxdata/kapacitor/issues/118): Can now define multiple handlers of the same type on an AlertNode.
+- [#119](https://github.com/influxdata/kapacitor/issues/119): HipChat support thanks! @ericiles *2
+- [#113](https://github.com/influxdata/kapacitor/issues/113): OpsGenie support thanks! @ericiles
+- [#107](https://github.com/influxdata/kapacitor/issues/107): Enable TICKscript variables to be defined and then referenced from lambda expressions.
         Also fixes various bugs around using regexes.
 
 ### Bugfixes
-- [#124](https://github.com/influxdb/kapacitor/issues/124): Fix panic where there is an error starting a task.
-- [#122](https://github.com/influxdb/kapacitor/issues/122): Fixes panic when using WhereNode.
-- [#128](https://github.com/influxdb/kapacitor/issues/128): Fix not sending emails when using recipient list from config.
+- [#124](https://github.com/influxdata/kapacitor/issues/124): Fix panic where there is an error starting a task.
+- [#122](https://github.com/influxdata/kapacitor/issues/122): Fixes panic when using WhereNode.
+- [#128](https://github.com/influxdata/kapacitor/issues/128): Fix not sending emails when using recipient list from config.
 
 ## v0.2.3 [2015-12-22]
 
@@ -33,12 +34,12 @@ Now POSTing a recording request will start the recording and immediately return.
 a GET for the recording info and it will block until its complete. The kapacitor cli has been updated accordingly.
 
 ### Features
-- [#96](https://github.com/influxdb/kapacitor/issues/96): Use KAPACITOR_URL env var for setting the kapacitord url in the client.
-- [#109](https://github.com/influxdb/kapacitor/pull/109): Add throughput counts to DOT format in `kapacitor show` command, if task is executing.
+- [#96](https://github.com/influxdata/kapacitor/issues/96): Use KAPACITOR_URL env var for setting the kapacitord url in the client.
+- [#109](https://github.com/influxdata/kapacitor/pull/109): Add throughput counts to DOT format in `kapacitor show` command, if task is executing.
 
 ### Bugfixes
-- [#102](https://github.com/influxdb/kapacitor/issues/102): Fix race when start/stoping timeTicker in batch.go
-- [#106](https://github.com/influxdb/kapacitor/pull/106): Fix hang when replaying stream recording.
+- [#102](https://github.com/influxdata/kapacitor/issues/102): Fix race when start/stoping timeTicker in batch.go
+- [#106](https://github.com/influxdata/kapacitor/pull/106): Fix hang when replaying stream recording.
 
 
 ## v0.2.2 [2015-12-16]
@@ -48,12 +49,12 @@ a GET for the recording info and it will block until its complete. The kapacitor
 Some bug fixes including one that cause Kapacitor to deadlock.
 
 ### Features
-- [#83](https://github.com/influxdb/kapacitor/pull/83): Use enterprise usage client, remove deprecated enterprise register and reporting features.
+- [#83](https://github.com/influxdata/kapacitor/pull/83): Use enterprise usage client, remove deprecated enterprise register and reporting features.
 
 ### Bugfixes
 
-- [#86](https://github.com/influxdb/kapacitor/issues/86): Fix dealock form errors in tasks. Also fixes issue where task failures did not get logged.
-- [#95](https://github.com/influxdb/kapacitor/pull/95): Fix race in bolt usage when starting enabled tasks at startup.
+- [#86](https://github.com/influxdata/kapacitor/issues/86): Fix dealock form errors in tasks. Also fixes issue where task failures did not get logged.
+- [#95](https://github.com/influxdata/kapacitor/pull/95): Fix race in bolt usage when starting enabled tasks at startup.
 
 ## v0.2.0 [2015-12-8]
 

diff --git a/Dockerfile b/Dockerfile
@@ -20,10 +20,14 @@ RUN apt-get install -y \
 RUN gem install fpm
 
 # Install go
-RUN wget https://storage.googleapis.com/golang/go1.5.1.linux-amd64.tar.gz; tar -C /usr/local/ -xf /go1.5.1.linux-amd64.tar.gz ; rm /go1.5.1.linux-amd64.tar.gz
-ENV PATH $PATH:/usr/local/go/bin
+ENV GO_VERSION 1.5.2
+ENV GO_ARCH amd64
+RUN wget https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \
+   tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz ; \
+   rm /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz
+ENV PATH /usr/local/go/bin:$PATH
 ENV GOPATH /gopath
-ENV PROJECT_PATH $GOPATH/src/github.com/influxdb/kapacitor
+ENV PROJECT_PATH $GOPATH/src/github.com/influxdata/kapacitor
 RUN mkdir -p $PROJECT_PATH
 
 WORKDIR $PROJECT_PATH

diff --git a/alert.go b/alert.go
@@ -12,11 +12,11 @@ import (
 	"text/template"
 	"time"
 
+	"github.com/influxdata/kapacitor/models"
+	"github.com/influxdata/kapacitor/pipeline"
+	"github.com/influxdata/kapacitor/tick"
 	"github.com/influxdb/influxdb/influxql"
 	imodels "github.com/influxdb/influxdb/models"
-	"github.com/influxdb/kapacitor/models"
-	"github.com/influxdb/kapacitor/pipeline"
-	"github.com/influxdb/kapacitor/tick"
 )
 
 // The newest state change is weighted 'weightDiff' times more than oldest state change.

diff --git a/batch.go b/batch.go
@@ -7,10 +7,10 @@ import (
 	"time"
 
 	"github.com/gorhill/cronexpr"
+	"github.com/influxdata/kapacitor/models"
+	"github.com/influxdata/kapacitor/pipeline"
 	"github.com/influxdb/influxdb/client"
 	"github.com/influxdb/influxdb/influxql"
-	"github.com/influxdb/kapacitor/models"
-	"github.com/influxdb/kapacitor/pipeline"
 )
 
 type SourceBatchNode struct {

diff --git a/build.py b/build.py
@@ -32,7 +32,7 @@
 
 # META-PACKAGE VARIABLES
 PACKAGE_LICENSE = "MIT"
-PACKAGE_URL = "github.com/influxdb/kapacitor"
+PACKAGE_URL = "github.com/influxdata/kapacitor"
 MAINTAINER = "[email protected]"
 VENDOR = "InfluxData"
 DESCRIPTION = "Time series data processing engine"

diff --git a/build.sh b/build.sh
@@ -9,12 +9,12 @@ cd $DIR
 
 
 # Build new docker image
-docker build -t influxdb/kapacitor-builder $DIR
+docker build -t influxdata/kapacitor-builder $DIR
 echo "Running build.py"
 # Run docker
 docker run --rm \
     -e AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID" \
     -e AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY" \
-    -v $DIR:/gopath/src/github.com/influxdb/kapacitor \
-    influxdb/kapacitor-builder \
+    -v $DIR:/gopath/src/github.com/influxdata/kapacitor \
+    influxdata/kapacitor-builder \
     "$@"
diff --git a/circle.yml b/circle.yml
@@ -2,7 +2,7 @@
 #checkout:
 #  post:
 #    - rm -rf ~/kapacitor
-#    - git clone [email protected]:influxdb/kapacitor.git ~/kapacitor
+#    - git clone [email protected]:influxdata/kapacitor.git ~/kapacitor
 
 machine:
   services:
@@ -16,8 +16,8 @@ dependencies:
     - "~/docker"
   override:
     - if [[ -e ~/docker/kapacitor-builder.tar ]]; then docker load -i ~/docker/kapacitor-builder.tar; fi
-    - docker build -t influxdb/kapacitor-builder .
-    - mkdir -p ~/docker; docker save influxdb/kapacitor-builder > ~/docker/kapacitor-builder.tar
+    - docker build -t influxdata/kapacitor-builder .
+    - mkdir -p ~/docker; docker save influxdata/kapacitor-builder > ~/docker/kapacitor-builder.tar
 
 test:
   override:

diff --git a/clock/clock_test.go b/clock/clock_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/influxdb/kapacitor/clock"
+	"github.com/influxdata/kapacitor/clock"
 )
 
 func TestClockUntilSleepFirst(t *testing.T) {

diff --git a/cmd/kapacitor/main.go b/cmd/kapacitor/main.go
@@ -17,9 +17,9 @@ import (
 	"time"
 
 	"github.com/dustin/go-humanize"
-	"github.com/influxdb/kapacitor"
-	"github.com/influxdb/kapacitor/services/replay"
-	"github.com/influxdb/kapacitor/services/task_store"
+	"github.com/influxdata/kapacitor"
+	"github.com/influxdata/kapacitor/services/replay"
+	"github.com/influxdata/kapacitor/services/task_store"
 )
 
 // These variables are populated via the Go linker.

diff --git a/cmd/kapacitord/main.go b/cmd/kapacitord/main.go
@@ -12,9 +12,9 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/influxdb/kapacitor/cmd/kapacitord/help"
-	"github.com/influxdb/kapacitor/cmd/kapacitord/run"
-	"github.com/influxdb/kapacitor/wlog"
+	"github.com/influxdata/kapacitor/cmd/kapacitord/help"
+	"github.com/influxdata/kapacitor/cmd/kapacitord/run"
+	"github.com/influxdata/kapacitor/wlog"
 )
 
 // These variables are populated via the Go linker.

diff --git a/cmd/kapacitord/run/command.go b/cmd/kapacitord/run/command.go
@@ -12,7 +12,7 @@ import (
 	"strconv"
 
 	"github.com/BurntSushi/toml"
-	"github.com/influxdb/kapacitor/services/logging"
+	"github.com/influxdata/kapacitor/services/logging"
 )
 
 const logo = `

diff --git a/cmd/kapacitord/run/config.go b/cmd/kapacitord/run/config.go
@@ -10,20 +10,20 @@ import (
 	"strings"
 	"time"
 
-	"github.com/influxdb/kapacitor/services/hipchat"
-	"github.com/influxdb/kapacitor/services/httpd"
-	"github.com/influxdb/kapacitor/services/influxdb"
-	"github.com/influxdb/kapacitor/services/logging"
-	"github.com/influxdb/kapacitor/services/opsgenie"
-	"github.com/influxdb/kapacitor/services/pagerduty"
-	"github.com/influxdb/kapacitor/services/replay"
-	"github.com/influxdb/kapacitor/services/reporting"
-	"github.com/influxdb/kapacitor/services/slack"
-	"github.com/influxdb/kapacitor/services/smtp"
-	"github.com/influxdb/kapacitor/services/stats"
-	"github.com/influxdb/kapacitor/services/task_store"
-	"github.com/influxdb/kapacitor/services/udp"
-	"github.com/influxdb/kapacitor/services/victorops"
+	"github.com/influxdata/kapacitor/services/hipchat"
+	"github.com/influxdata/kapacitor/services/httpd"
+	"github.com/influxdata/kapacitor/services/influxdb"
+	"github.com/influxdata/kapacitor/services/logging"
+	"github.com/influxdata/kapacitor/services/opsgenie"
+	"github.com/influxdata/kapacitor/services/pagerduty"
+	"github.com/influxdata/kapacitor/services/replay"
+	"github.com/influxdata/kapacitor/services/reporting"
+	"github.com/influxdata/kapacitor/services/slack"
+	"github.com/influxdata/kapacitor/services/smtp"
+	"github.com/influxdata/kapacitor/services/stats"
+	"github.com/influxdata/kapacitor/services/task_store"
+	"github.com/influxdata/kapacitor/services/udp"
+	"github.com/influxdata/kapacitor/services/victorops"
 
 	"github.com/influxdb/influxdb/services/collectd"
 	"github.com/influxdb/influxdb/services/graphite"

diff --git a/cmd/kapacitord/run/config_test.go b/cmd/kapacitord/run/config_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/BurntSushi/toml"
-	"github.com/influxdb/kapacitor/cmd/kapacitord/run"
+	"github.com/influxdata/kapacitor/cmd/kapacitord/run"
 )
 
 // Ensure the configuration can be parsed.

diff --git a/cmd/kapacitord/run/server.go b/cmd/kapacitord/run/server.go
@@ -13,27 +13,27 @@ import (
 	"strings"
 	"time"
 
+	"github.com/influxdata/kapacitor"
+	"github.com/influxdata/kapacitor/services/hipchat"
+	"github.com/influxdata/kapacitor/services/httpd"
+	"github.com/influxdata/kapacitor/services/influxdb"
+	"github.com/influxdata/kapacitor/services/logging"
+	"github.com/influxdata/kapacitor/services/opsgenie"
+	"github.com/influxdata/kapacitor/services/pagerduty"
+	"github.com/influxdata/kapacitor/services/replay"
+	"github.com/influxdata/kapacitor/services/reporting"
+	"github.com/influxdata/kapacitor/services/slack"
+	"github.com/influxdata/kapacitor/services/smtp"
+	"github.com/influxdata/kapacitor/services/stats"
+	"github.com/influxdata/kapacitor/services/task_store"
+	"github.com/influxdata/kapacitor/services/udp"
+	"github.com/influxdata/kapacitor/services/victorops"
+	"github.com/influxdata/kapacitor/wlog"
 	"github.com/influxdb/influxdb/influxql"
 	"github.com/influxdb/influxdb/meta"
 	"github.com/influxdb/influxdb/services/collectd"
 	"github.com/influxdb/influxdb/services/graphite"
 	"github.com/influxdb/influxdb/services/opentsdb"
-	"github.com/influxdb/kapacitor"
-	"github.com/influxdb/kapacitor/services/hipchat"
-	"github.com/influxdb/kapacitor/services/httpd"
-	"github.com/influxdb/kapacitor/services/influxdb"
-	"github.com/influxdb/kapacitor/services/logging"
-	"github.com/influxdb/kapacitor/services/opsgenie"
-	"github.com/influxdb/kapacitor/services/pagerduty"
-	"github.com/influxdb/kapacitor/services/replay"
-	"github.com/influxdb/kapacitor/services/reporting"
-	"github.com/influxdb/kapacitor/services/slack"
-	"github.com/influxdb/kapacitor/services/smtp"
-	"github.com/influxdb/kapacitor/services/stats"
-	"github.com/influxdb/kapacitor/services/task_store"
-	"github.com/influxdb/kapacitor/services/udp"
-	"github.com/influxdb/kapacitor/services/victorops"
-	"github.com/influxdb/kapacitor/wlog"
 	"github.com/twinj/uuid"
 )
 

diff --git a/cmd/kapacitord/run/server_helper_test.go b/cmd/kapacitord/run/server_helper_test.go
@@ -17,11 +17,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/influxdata/kapacitor"
+	"github.com/influxdata/kapacitor/cmd/kapacitord/run"
+	"github.com/influxdata/kapacitor/services/task_store"
+	"github.com/influxdata/kapacitor/wlog"
 	"github.com/influxdb/influxdb/client"
-	"github.com/influxdb/kapacitor"
-	"github.com/influxdb/kapacitor/cmd/kapacitord/run"
-	"github.com/influxdb/kapacitor/services/task_store"
-	"github.com/influxdb/kapacitor/wlog"
 )
 
 // Server represents a test wrapper for run.Server.

diff --git a/cmd/kapacitord/run/server_test.go b/cmd/kapacitord/run/server_test.go
@@ -13,10 +13,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/influxdata/kapacitor"
 	"github.com/influxdb/influxdb/client"
 	"github.com/influxdb/influxdb/influxql"
 	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/kapacitor"
 )
 
 func TestServer_Ping(t *testing.T) {

diff --git a/derivative.go b/derivative.go
@@ -3,8 +3,8 @@ package kapacitor
 import (
 	"time"
 
-	"github.com/influxdb/kapacitor/models"
-	"github.com/influxdb/kapacitor/pipeline"
+	"github.com/influxdata/kapacitor/models"
+	"github.com/influxdata/kapacitor/pipeline"
 )
 
 type DerivativeNode struct {

diff --git a/edge.go b/edge.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/influxdb/kapacitor/models"
-	"github.com/influxdb/kapacitor/pipeline"
-	"github.com/influxdb/kapacitor/wlog"
+	"github.com/influxdata/kapacitor/models"
+	"github.com/influxdata/kapacitor/pipeline"
+	"github.com/influxdata/kapacitor/wlog"
 )
 
 const (

diff --git a/eval.go b/eval.go
@@ -3,9 +3,9 @@ package kapacitor
 import (
 	"errors"
 
-	"github.com/influxdb/kapacitor/models"
-	"github.com/influxdb/kapacitor/pipeline"
-	"github.com/influxdb/kapacitor/tick"
+	"github.com/influxdata/kapacitor/models"
+	"github.com/influxdata/kapacitor/pipeline"
+	"github.com/influxdata/kapacitor/tick"
 )
 
 type EvalNode struct {

diff --git a/expr.go b/expr.go
@@ -3,8 +3,8 @@ package kapacitor
 import (
 	"fmt"
 
-	"github.com/influxdb/kapacitor/models"
-	"github.com/influxdb/kapacitor/tick"
+	"github.com/influxdata/kapacitor/models"
+	"github.com/influxdata/kapacitor/tick"
 )
 
 // Evaluate a given expression as a boolean predicate against a set of fields and tags

diff --git a/functions.go b/functions.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/influxdata/kapacitor/models"
+	"github.com/influxdata/kapacitor/pipeline"
 	"github.com/influxdb/influxdb/tsdb"
-	"github.com/influxdb/kapacitor/models"
-	"github.com/influxdb/kapacitor/pipeline"
 )
 
 type influxqlMapReducers struct{}

diff --git a/group_by.go b/group_by.go
@@ -3,9 +3,9 @@ package kapacitor
 import (
 	"sort"
 
-	"github.com/influxdb/kapacitor/models"
-	"github.com/influxdb/kapacitor/pipeline"
-	"github.com/influxdb/kapacitor/tick"
+	"github.com/influxdata/kapacitor/models"
+	"github.com/influxdata/kapacitor/pipeline"
+	"github.com/influxdata/kapacitor/tick"
 )
 
 type GroupByNode struct {