* Changed the plugin to take an interval for a sampling aggregator ra…

.gitignore

@@ -1,2 +1,3 @@
 node_modules
-test-results
+test-results
+package-lock.json

Gopkg.toml

@@ -0,0 +1,42 @@
+# Gopkg.toml example
+#
+# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#   name = "github.com/x/y"
+#   version = "2.4.0"
+#
+# [prune]
+#   non-go = false
+#   go-tests = true
+#   unused-packages = true
+
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/grafana/grafana_plugin_model"
+
+[[constraint]]
+  name = "github.com/hashicorp/go-hclog"
+  version = "0.9.2"
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/net"
+
+[prune]
+  go-tests = true
+  unused-packages = true

Makefile

@@ -0,0 +1,10 @@
+all: frontend backend
+
+frontend:
+	grunt
+
+backend:
+	go build -o ./dist/grafana-kairosdb-datasource_darwin_amd64 ./pkg
+
+clean:
+	rm -r ./dist/*

README.md

@@ -2,26 +2,48 @@ Starting in Grafana 3.x the KairosDB data source is no longer included out of th
 
 But it is easy to install this plugin!
 
+## Overview
+This plugin consists of two components: a frontend and a backend
+
+The backend plugin provides support for [alerts](https://grafana.com/docs/alerting/rules), but is not required to use the frontend portion.
+
 ## Installation
-Either clone this repo into your grafana plugins directory (default /var/lib/grafana/plugins if your installing grafana with package). Then run grunt to compile typescript.
-Restart grafana-server and the plugin should be automatically detected and used.
+### Install to plugins directory
+
+If you only need the frontend component you may clone the project directly into your Grafana plugin directory 
+(defaults to /var/lib/grafana/plugins if you're installing grafana with package). 
 
+Then simply compile the code and restart Grafana:
 ```
 git clone https://github.com/grafana/kairosdb-datasource
+cd kairosdb-datasource
 npm install
-grunt
+make frontend
 sudo service grafana-server restart
 ```
 
-## Clone into a directory of your choice
+### Install with Alerts
+If you wish to build the backend plugin, as well, your project must be setup within a [Go workspace](https://golang.org/doc/code.html#Workspaces).
+
+Ensure your GOPATH environment variable points to your workspace:
+```
+export GOPATH=$HOME/go
+cd $GOPATH/src/github.com/grafana
+git clone https://github.com/grafana/kairosdb-datasource
+```
+
 
-Then edit your grafana.ini config file (Default location is at /etc/grafana/grafana.ini) and add this:
+Edit your grafana.ini config file (Default location is at /etc/grafana/grafana.ini) to include the path to your clone. 
+Be aware that grafana-server needs read access to the project directory.
 
 ```ini
 [plugin.kairosdb]
-path = /home/your/clone/dir/datasource-plugin-kairosdb
+path = $GOPATH/src/github.com/grafana/kairosdb-datasource
 ```
 
-Note that if you clone it into the grafana plugins directory you do not need to add the above config option. That is only
-if you want to place the plugin in a directory outside the standard plugins directory. Be aware that grafana-server
-needs read access to the directory.
+Then compile the code and restart Grafana:
+```
+npm install
+make
+sudo service grafana-server restart
+```

dist/README.md

@@ -2,26 +2,48 @@ Starting in Grafana 3.x the KairosDB data source is no longer included out of th
 
 But it is easy to install this plugin!
 
+## Overview
+This plugin consists of two components: a frontend and a backend
+
+The backend plugin provides support for [alerts](https://grafana.com/docs/alerting/rules), but is not required to use the frontend portion.
+
 ## Installation
-Either clone this repo into your grafana plugins directory (default /var/lib/grafana/plugins if your installing grafana with package). Then run grunt to compile typescript.
-Restart grafana-server and the plugin should be automatically detected and used.
+### Install to plugins directory
+
+If you only need the frontend component you may clone the project directly into your Grafana plugin directory 
+(defaults to /var/lib/grafana/plugins if you're installing grafana with package). 
 
+Then simply compile the code and restart Grafana:
 ```
 git clone https://github.com/grafana/kairosdb-datasource
+cd kairosdb-datasource
 npm install
-grunt
+make frontend
 sudo service grafana-server restart
 ```
 
-## Clone into a directory of your choice
+### Install with Alerts
+If you wish to build the backend plugin, as well, your project must be setup within a [Go workspace](https://golang.org/doc/code.html#Workspaces).
+
+Ensure your GOPATH environment variable points to your workspace:
+```
+export GOPATH=$HOME/go
+cd $GOPATH/src/github.com/kairosdb
+git clone https://github.com/grafana/kairosdb-datasource
+```
+
 
-Then edit your grafana.ini config file (Default location is at /etc/grafana/grafana.ini) and add this:
+Edit your grafana.ini config file (Default location is at /etc/grafana/grafana.ini) to include the path to your clone. 
+Be aware that grafana-server needs read access to the project directory.
 
 ```ini
 [plugin.kairosdb]
-path = /home/your/clone/dir/datasource-plugin-kairosdb
+path = $GOPATH/src/github.com/kairosdb/kairosdb-datasource
 ```
 
-Note that if you clone it into the grafana plugins directory you do not need to add the above config option. That is only
-if you want to place the plugin in a directory outside the standard plugins directory. Be aware that grafana-server
-needs read access to the directory.
+Then compile the code and restart Grafana:
+```
+npm install
+make
+sudo service grafana-server restart
+```