Set theme jekyll-theme-minimal

Update index.md
Update
2017-02-12 20:00:53 -08:00 · 2017-02-12 19:59:45 -08:00 · 2017-02-12 19:59:10 -08:00 · 2017-02-12 19:59:02 -08:00 · 2016-05-19 19:31:03 +01:00 · 2016-05-19 19:30:49 +01:00
35 changed files with 2241 additions and 1831 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,2 @@
-/config.yml
-/config.json
-examples/
-/cachet-monitor
-/cli
-build
+gin-bin
+example.config.local.json
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at management@castawaylabs.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017 Castaway Labs LLC
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/_config.yml
+++ b/_config.yml
@@ -0,0 +1,8 @@
+title: Cachet-monitor
+description: Distributed monitoring plugin for CachetHQ
+google_analytics: 
+show_downloads: true
+theme: jekyll-theme-minimal
+
+gems:
+  - jekyll-mentions
--- a/api.go
+++ b/api.go
@@ -1,85 +0,0 @@
-package cachet
-
-import (
-	"bytes"
-	"crypto/tls"
-	"encoding/json"
-	"errors"
-	"net/http"
-	"strconv"
-	"time"
-
-	"github.com/sirupsen/logrus"
-)
-
-type CachetAPI struct {
-	URL      string `json:"url"`
-	Token    string `json:"token"`
-	Insecure bool   `json:"insecure"`
-}
-
-type CachetResponse struct {
-	Data json.RawMessage `json:"data"`
-}
-
-// TODO: test
-func (api CachetAPI) Ping() error {
-	resp, _, err := api.NewRequest("GET", "/ping", nil)
-	if err != nil {
-		return err
-	}
-
-	if resp.StatusCode != 200 {
-		return errors.New("API Responded with non-200 status code")
-	}
-
-	defer resp.Body.Close()
-
-	return nil
-}
-
-// SendMetric adds a data point to a cachet monitor
-func (api CachetAPI) SendMetric(id int, lag int64) {
-	logrus.Debugf("Sending lag metric ID:%d RTT %vms", id, lag)
-
-	jsonBytes, _ := json.Marshal(map[string]interface{}{
-		"value":     lag,
-		"timestamp": time.Now().Unix(),
-	})
-
-	resp, _, err := api.NewRequest("POST", "/metrics/"+strconv.Itoa(id)+"/points", jsonBytes)
-	if err != nil || resp.StatusCode != 200 {
-		logrus.Warnf("Could not log metric! ID: %d, err: %v", id, err)
-	}
-
-	defer resp.Body.Close()
-}
-
-// TODO: test
-// NewRequest wraps http.NewRequest
-func (api CachetAPI) NewRequest(requestType, url string, reqBody []byte) (*http.Response, CachetResponse, error) {
-	req, err := http.NewRequest(requestType, api.URL+url, bytes.NewBuffer(reqBody))
-
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("X-Cachet-Token", api.Token)
-
-	transport := http.DefaultTransport.(*http.Transport)
-	transport.TLSClientConfig = &tls.Config{InsecureSkipVerify: api.Insecure}
-	client := &http.Client{
-		Transport: transport,
-	}
-
-	res, err := client.Do(req)
-	if err != nil {
-		return nil, CachetResponse{}, err
-	}
-
-	var body struct {
-		Data json.RawMessage `json:"data"`
-	}
-	err = json.NewDecoder(res.Body).Decode(&body)
-
-	defer req.Body.Close()
-
-	return res, body, err
-}
--- a/cli/Dockerfile
+++ b/cli/Dockerfile
@@ -1,12 +0,0 @@
-# build stage
-FROM golang:alpine AS build-env
-RUN set -eux; \
-    apk add --no-cache --virtual .build-deps \
-    git gcc libc-dev;
-ENV GO111MODULE on
-WORKDIR /go/main
-ADD go.mod go.sum ./
-RUN go mod download
-# WORKDIR /go/src/status-monitor
-ADD main.go ./
-RUN CGO_ENABLED=0 GOOS=linux go build -ldflags="-s -w" -a -installsuffix cgo -o main main.go
--- a/cli/Makefile
+++ b/cli/Makefile
@@ -1,3 +0,0 @@
-build:
-	docker build .
-
--- a/cli/go.mod
+++ b/cli/go.mod
@@ -1,12 +0,0 @@
-module main
-
-go 1.13
-
-require (
-	github.com/castawaylabs/cachet-monitor v1.1.0 // indirect
-	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
-	github.com/milkinteractive/cachet-monitor v1.1.0
-	github.com/mitchellh/mapstructure v1.1.2
-	github.com/sirupsen/logrus v1.4.2
-	gopkg.in/yaml.v2 v2.2.7
-)
--- a/cli/go.sum
+++ b/cli/go.sum
@@ -1,20 +0,0 @@
-github.com/castawaylabs/cachet-monitor v1.1.0 h1:T8NshhwHjEIbdlWkeRBuYdnU2ktpBnZpwgh6nxrp62w=
-github.com/castawaylabs/cachet-monitor v1.1.0/go.mod h1:FBK1+4+fLd80wd/+U4Zy8YshPlpgWEvup79AoapOZ2E=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ=
-github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/milkinteractive/cachet-monitor v1.1.0 h1:IyX/gYVDfSEwO4kbNMs9W4hLt5FXIV/ig/4c1nFVlfU=
-github.com/milkinteractive/cachet-monitor v1.1.0/go.mod h1:Y+g0f0C8fAj2ub5RhfQgh/oU85pYx6QbL/56WMFkmVo=
-github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
-gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
--- a/cli/main.go
+++ b/cli/main.go
@@ -3,130 +3,89 @@ package main
 import (
 	"encoding/json"
 	"errors"
+	"flag"
+	"fmt"
 	"io/ioutil"
+	"log"
 	"net/http"
 	"net/url"
 	"os"
 	"os/signal"
-	"strings"
 	"sync"

-	docopt "github.com/docopt/docopt-go"
-	cachet "github.com/milkinteractive/cachet-monitor"
-	"github.com/mitchellh/mapstructure"
-	"github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v2"
+	cachet "github.com/castawaylabs/cachet-monitor"
 )

-const usage = `cachet-monitor
-
-Usage:
-  cachet-monitor (-c PATH | --config PATH) [--log=LOGPATH] [--name=NAME] [--immediate] [--restarted]
-  cachet-monitor -h | --help | --version
-
-Arguments:
-  PATH     path to config.json
-  LOGPATH  path to log output (defaults to STDOUT)
-  NAME     name of this logger
-
-Examples:
-  cachet-monitor -c /root/cachet-monitor.json
-  cachet-monitor -c /root/cachet-monitor.json --log=/var/log/cachet-monitor.log --name="development machine"
-
-Options:
-  -c PATH.json --config PATH     Path to configuration file
-  -h --help                      Show this screen.
-  --version                      Show version
-  --immediate                    Tick immediately (by default waits for first defined interval)
-  --restarted                    Get open incidents before start monitoring (if monitor died or restarted)
-  
-Environment varaibles:
-  CACHET_API      override API url from configuration
-  CACHET_TOKEN    override API token from configuration
-  CACHET_DEV      set to enable dev logging`
-
-var version string
+var configPath string
+var systemName string
+var logPath string

 func main() {
-	arguments, _ := docopt.Parse(usage, nil, true, version, false)
+	flag.StringVar(&configPath, "c", "/etc/cachet-monitor.config.json", "Config path")
+	flag.StringVar(&systemName, "name", "", "System Name")
+	flag.StringVar(&logPath, "log", "", "Log path")
+	flag.Parse()

-	cfg, err := getConfiguration(arguments["--config"].(string))
+	cfg, err := getConfiguration(configPath)
 	if err != nil {
-		logrus.Panicf("Unable to start (reading config): %v", err)
+		panic(err)
 	}

-	if immediate, ok := arguments["--immediate"]; ok {
-		cfg.Immediate = immediate.(bool)
+	if len(systemName) > 0 {
+		cfg.SystemName = systemName
 	}
-
-	if restarted, ok := arguments["--restarted"]; ok {
-		cfg.Restarted = restarted.(bool)
+	if len(logPath) > 0 {
+		cfg.LogPath = logPath
 	}

-	if name := arguments["--name"]; name != nil {
-		cfg.SystemName = name.(string)
-	}
-	logrus.SetOutput(getLogger(arguments["--log"]))
-
 	if len(os.Getenv("CACHET_API")) > 0 {
-		cfg.API.URL = os.Getenv("CACHET_API")
+		cfg.APIUrl = os.Getenv("CACHET_API")
 	}
 	if len(os.Getenv("CACHET_TOKEN")) > 0 {
-		cfg.API.Token = os.Getenv("CACHET_TOKEN")
-	}
-	if len(os.Getenv("CACHET_DEV")) > 0 {
-		logrus.SetLevel(logrus.DebugLevel)
+		cfg.APIToken = os.Getenv("CACHET_TOKEN")
 	}

-	if valid := cfg.Validate(); !valid {
-		logrus.Errorf("Invalid configuration")
-		os.Exit(1)
+	if err := cfg.ValidateConfiguration(); err != nil {
+		panic(err)
 	}

-	logrus.Debug("Configuration valid")
-	logrus.Infof("System: %s", cfg.SystemName)
-	logrus.Infof("API: %s", cfg.API.URL)
-	logrus.Infof("Monitors: %d\n", len(cfg.Monitors))
-
-	logrus.Infof("Pinging cachet")
-	if err := cfg.API.Ping(); err != nil {
-		logrus.Errorf("Cannot ping cachet!\n%v", err)
-		os.Exit(1)
-	}
-	logrus.Infof("Ping OK")
+	cfg.Logger.Printf("System: %s\nAPI: %s\nMonitors: %d\n\n", cfg.SystemName, cfg.APIUrl, len(cfg.Monitors))

 	wg := &sync.WaitGroup{}
-	for index, monitor := range cfg.Monitors {
-		logrus.Infof("Starting Monitor #%d: ", index)
-		logrus.Infof("Features: \n - %v", strings.Join(monitor.Describe(), "\n - "))
-
-		go monitor.ClockStart(cfg, monitor, wg)
+	for _, mon := range cfg.Monitors {
+		go mon.Start(cfg, wg)
 	}

 	signals := make(chan os.Signal, 1)
 	signal.Notify(signals, os.Interrupt, os.Kill)
 	<-signals

-	logrus.Warnf("Abort: Waiting monitors to finish")
+	cfg.Logger.Println("Abort: Waiting monitors to finish")
 	for _, mon := range cfg.Monitors {
-		mon.GetMonitor().ClockStop()
+		mon.Stop()
 	}

 	wg.Wait()
 }

-func getLogger(logPath interface{}) *os.File {
-	if logPath == nil || len(logPath.(string)) == 0 {
-		return os.Stdout
+func getLogger(logPath string) *log.Logger {
+	var logWriter = os.Stdout
+	var err error
+
+	if len(logPath) > 0 {
+		logWriter, err = os.Create(logPath)
+		if err != nil {
+			fmt.Printf("Unable to open file '%v' for logging\n", logPath)
+			os.Exit(1)
+		}
 	}

-	file, err := os.Create(logPath.(string))
-	if err != nil {
-		logrus.Errorf("Unable to open file '%v' for logging: \n%v", logPath, err)
-		os.Exit(1)
+	flags := log.Llongfile | log.Ldate | log.Ltime
+	if len(os.Getenv("CACHET_DEV")) > 0 {
+		flags = 0
 	}

-	return file
+	return log.New(logWriter, "", flags)
 }

 func getConfiguration(path string) (*cachet.CachetMonitor, error) {
@@ -139,74 +98,26 @@ func getConfiguration(path string) (*cachet.CachetMonitor, error) {
 		// download config
 		response, err := http.Get(path)
 		if err != nil {
-			logrus.Warn("Unable to download network configuration")
-			return nil, err
+			return nil, errors.New("Cannot download network config: " + err.Error())
 		}

 		defer response.Body.Close()
 		data, _ = ioutil.ReadAll(response.Body)

-		logrus.Info("Downloaded network configuration.")
+		fmt.Println("Downloaded network configuration.")
 	} else {
 		data, err = ioutil.ReadFile(path)
 		if err != nil {
-			return nil, errors.New("Unable to open file: '" + path + "'")
+			return nil, errors.New("Config file '" + path + "' missing!")
 		}
 	}

-	if strings.HasSuffix(path, ".yaml") || strings.HasSuffix(path, ".yml") {
-		err = yaml.Unmarshal(data, &cfg)
-	} else {
-		err = json.Unmarshal(data, &cfg)
+	if err := json.Unmarshal(data, &cfg); err != nil {
+		fmt.Println(err)
+		return nil, errors.New("Cannot parse config!")
 	}

-	if err != nil {
-		logrus.Warnf("Unable to parse configuration file")
-	}
+	cfg.Logger = getLogger(cfg.LogPath)

-	cfg.Monitors = make([]cachet.MonitorInterface, len(cfg.RawMonitors))
-	for index, rawMonitor := range cfg.RawMonitors {
-		var t cachet.MonitorInterface
-		var err error
-
-		// get default type
-		monType := cachet.GetMonitorType("")
-		if t, ok := rawMonitor["type"].(string); ok {
-			monType = cachet.GetMonitorType(t)
-		}
-
-		switch monType {
-			case "http":
-				var s cachet.HTTPMonitor
-				err = mapstructure.Decode(rawMonitor, &s)
-				t = &s
-			case "dns":
-				var s cachet.DNSMonitor
-				err = mapstructure.Decode(rawMonitor, &s)
-				t = &s
-			case "tcp":
-				var s cachet.TCPMonitor
-				err = mapstructure.Decode(rawMonitor, &s)
-				t = &s
-			
-			case "icmp":
-				var s cachet.ICMPMonitor
-				err = mapstructure.Decode(rawMonitor, &s)
-				t = &s
-			default:
-				logrus.Errorf("Invalid monitor type (index: %d) %v", index, monType)
-				continue
-		}
-
-		t.GetMonitor().Type = monType
-
-		if err != nil {
-			logrus.Errorf("Unable to unmarshal monitor to type (index: %d): %v", index, err)
-			continue
-		}
-
-		cfg.Monitors[index] = t
-		}
-
-	return &cfg, err
+	return &cfg, nil
 }
--- a/config.go
+++ b/config.go
@@ -1,97 +1,65 @@
 package cachet

 import (
+	"errors"
+	"log"
 	"net"
 	"os"
-	"strings"
-	"time"
-
-	"github.com/sirupsen/logrus"
 )

 type CachetMonitor struct {
-	SystemName  string                   `json:"system_name" yaml:"system_name"`
-	DateFormat  string                   `json:"date_format" yaml:"date_format"`
-	SlackWebhook string                  `json:"slack_webhook" yaml:"slack_webhook"`
-	API         CachetAPI                `json:"api"`
-	RawMonitors []map[string]interface{} `json:"monitors" yaml:"monitors"`
+	Logger *log.Logger `json:"-"`

-	Monitors  []MonitorInterface `json:"-" yaml:"-"`
-	Immediate bool               `json:"-" yaml:"-"`
-	Restarted bool               `json:"-" yaml:"-"`
+	APIUrl      string `json:"api_url"`
+	APIToken    string `json:"api_token"`
+	SystemName  string `json:"system_name"`
+	LogPath     string `json:"log_path"`
+	InsecureAPI bool   `json:"insecure_api"`
+
+	Monitors []*Monitor `json:"monitors"`
 }

-// Validate configuration
-func (cfg *CachetMonitor) Validate() bool {
-	valid := true
+func (cfg *CachetMonitor) ValidateConfiguration() error {
+	if cfg.Logger == nil {
+		cfg.Logger = log.New(os.Stdout, "", log.Llongfile|log.Ldate|log.Ltime)
+	}

 	if len(cfg.SystemName) == 0 {
 		// get hostname
 		cfg.SystemName = getHostname()
 	}

-	if len(cfg.DateFormat) == 0 {
-		cfg.DateFormat = DefaultTimeFormat
-	}
-
-	if len(cfg.API.Token) == 0 || len(cfg.API.URL) == 0 {
-		logrus.Warnf("API URL or API Token missing.\nGet help at https://github.com/castawaylabs/cachet-monitor")
-		valid = false
+	if len(cfg.APIToken) == 0 || len(cfg.APIUrl) == 0 {
+		return errors.New("API URL or API Token not set. cachet-monitor won't be able to report incidents.\n\nPlease set:\n CACHET_API and CACHET_TOKEN environment variable to override settings.\n\nGet help at https://github.com/castawaylabs/cachet-monitor\n")
 	}

 	if len(cfg.Monitors) == 0 {
-		logrus.Warnf("No monitors defined!\nSee help for example configuration")
-		valid = false
+		return errors.New("No monitors defined!\nSee sample configuration: https://github.com/castawaylabs/cachet-monitor/blob/master/example.config.json\n")
 	}

-	for index, monitor := range cfg.Monitors {
-		if errs := monitor.Validate(); len(errs) > 0 {
-			logrus.Warnf("Monitor validation errors (index %d): %v", index, "\n - "+strings.Join(errs, "\n - "))
-			valid = false
+	for _, monitor := range cfg.Monitors {
+		if err := monitor.ValidateConfiguration(); err != nil {
+			return err
 		}
 	}

-	return valid
+	return nil
 }

 // getHostname returns id of the current system
 func getHostname() string {
 	hostname, err := os.Hostname()
-	if err == nil && len(hostname) > 0 {
-		return hostname
+	if err != nil || len(hostname) == 0 {
+		addrs, err := net.InterfaceAddrs()
+
+		if err != nil {
+			return "unknown"
+		}
+
+		for _, addr := range addrs {
+			return addr.String()
+		}
 	}

-	addrs, err := net.InterfaceAddrs()
-	if err != nil || len(addrs) == 0 {
-		return "unknown"
-	}
-
-	return addrs[0].String()
+	return hostname
 }
-
-func getMs() int64 {
-	return time.Now().UnixNano() / int64(time.Millisecond)
-}
-
-func GetMonitorType(t string) string {
-	if len(t) == 0 {
-		return "http"
-	}
-
-	return strings.ToLower(t)
-}
-
-func getTemplateData(monitor *AbstractMonitor) map[string]interface{} {
-	return map[string]interface{}{
-		"SystemName": monitor.config.SystemName,
-		"API":        monitor.config.API,
-		"Monitor":    monitor,
-		"now":        time.Now().Format(monitor.config.DateFormat),
-	}
-}
-
-func MainUrl(cfg *CachetMonitor) string {
-	var url = cfg.API.URL
-	var index = strings.Index(url,"/api/")
-	return url[0:index]
-}
--- a/config_test.go
+++ b/config_test.go
@@ -1,15 +0,0 @@
-package cachet
-
-import (
-	"testing"
-)
-
-func TestGetMonitorType(t *testing.T) {
-	if monType := GetMonitorType(""); monType != "http" {
-		t.Error("monitor type `` should default to http")
-	}
-
-	if mt := GetMonitorType("HTTP"); mt != "http" {
-		t.Error("does not return correct monitor type")
-	}
-}
--- a/dns.go
+++ b/dns.go
@@ -1,121 +0,0 @@
-package cachet
-
-import (
-	"net"
-	"regexp"
-	"strings"
-
-	"github.com/sirupsen/logrus"
-	"github.com/miekg/dns"
-)
-
-type DNSAnswer struct {
-	Regex  string
-	regexp *regexp.Regexp
-	Exact  string
-}
-
-type DNSMonitor struct {
-	AbstractMonitor `mapstructure:",squash"`
-
-	// IP:port format or blank to use system defined DNS
-	DNS string
-
-	// A(default), AAAA, MX, ...
-	Question string
-	question uint16
-
-	Answers []DNSAnswer
-}
-
-func (monitor *DNSMonitor) Validate() []string {
-	errs := monitor.AbstractMonitor.Validate()
-
-	if len(monitor.DNS) == 0 {
-		config, _ := dns.ClientConfigFromFile("/etc/resolv.conf")
-		if len(config.Servers) > 0 {
-			monitor.DNS = net.JoinHostPort(config.Servers[0], config.Port)
-		}
-	}
-
-	if len(monitor.DNS) == 0 {
-		monitor.DNS = "8.8.8.8:53"
-	}
-
-	if len(monitor.Question) == 0 {
-		monitor.Question = "A"
-	}
-	monitor.Question = strings.ToUpper(monitor.Question)
-
-	monitor.question = findDNSType(monitor.Question)
-	if monitor.question == 0 {
-		errs = append(errs, "Could not look up DNS question type")
-	}
-
-	for i, a := range monitor.Answers {
-		if len(a.Regex) > 0 {
-			monitor.Answers[i].regexp, _ = regexp.Compile(a.Regex)
-		}
-	}
-
-	return errs
-}
-
-func (monitor *DNSMonitor) test() bool {
-	m := new(dns.Msg)
-	m.SetQuestion(dns.Fqdn(monitor.Target), monitor.question)
-	m.RecursionDesired = true
-
-	c := new(dns.Client)
-	r, _, err := c.Exchange(m, monitor.DNS)
-	if err != nil {
-		logrus.Warnf("DNS error: %v", err)
-		return false
-	}
-
-	if r.Rcode != dns.RcodeSuccess {
-		return false
-	}
-
-	for _, check := range monitor.Answers {
-		found := false
-		for _, answer := range r.Answer {
-			found = matchAnswer(answer, check)
-			if found {
-				break
-			}
-		}
-
-		if !found {
-			logrus.Warnf("DNS check failed: %v. Not found in any of %v", check, r.Answer)
-			return false
-		}
-	}
-
-	return true
-}
-
-func findDNSType(t string) uint16 {
-	for rr, strType := range dns.TypeToString {
-		if t == strType {
-			return rr
-		}
-	}
-
-	return 0
-}
-
-func matchAnswer(answer dns.RR, check DNSAnswer) bool {
-	fields := []string{}
-	for i := 0; i < dns.NumField(answer); i++ {
-		fields = append(fields, dns.Field(answer, i+1))
-	}
-
-	str := strings.Join(fields, " ")
-
-	if check.regexp != nil {
-		return check.regexp.Match([]byte(str))
-	}
-
-	return str == check.Exact
-}
--- a/example.cachet-monitor.service
+++ b/example.cachet-monitor.service
@@ -1,20 +0,0 @@
-[Unit]
-Description=Cachet Monitor
-After=syslog.target
-After=network.target
-#After=mysqld.service
-#After=postgresql.service
-#After=memcached.service
-#After=redis.service
-
-[Service]
-Type=simple
-User=root
-Group=root
-WorkingDirectory=/root
-ExecStart=/root/cachet-monitor -c /etc/cachet-monitor.yaml
-Restart=always
-Environment=USER=root HOME=/root
-
-[Install]
-WantedBy=multi-user.target
--- a/example.config.json
+++ b/example.config.json
@@ -1,71 +1,17 @@
 {
-  "api": {
-    "url": "https://demo.cachethq.io/api/v1",
-    "token": "9yMHsdioQosnyVK4iCVR",
-    "insecure": false
-  },
-  "date_format": "02/01/2006 15:04:05 MST",
+  "api_url": "https://demo.cachethq.io/api/v1",
+  "api_token": "9yMHsdioQosnyVK4iCVR",
+  "interval": 5,
  "monitors": [
    {
-      "active": false,
-      "name": "google",
-      "target": "https://google.com",
-      "strict": true,
-      "method": "POST",
-      "component_id": 1,
-      "metric_id": 4,
-      "template": {
-        "investigating": {
-          "subject": "{{ .Monitor.Name }} - {{ .SystemName }}",
-          "message": "{{ .Monitor.Name }} check **failed** (server time: {{ .now }})\n\n{{ .FailReason }}"
-        },
-        "fixed": {
-          "subject": "I HAVE BEEN FIXED"
-        }
-      },
-      "interval": 1,
-      "timeout": 1,
+      "name": "nodegear frontend",
+      "url": "https://nodegear.io/ping",
+      "metric_id": 1,
      "threshold": 80,
-      "headers": {
-        "Authorization": "Basic <hash>"
-      },
+      "component_id": null,
      "expected_status_code": 200,
-      "expected_body": "P.*NG"
-    },
-    {
-      "type": "dns",
-      "active": true,
-      "name": "dns",
-      "target": "opnsense.bennetg.dev.",
-      "question": "a",
-      "component_id": 2,
-      "interval": 1,
-      "timeout": 1,
-      "dns": "10.0.0.60:53",
-      "answers": [
-        {
-          "exact": "10.0.0.1"
-        }
-      ]
-    },
-    {
-      "type": "tcp",
-      "name": "TCP",
-      "active": false,
-      "target": "10.0.0.1",
-      "interval": 10,
-      "timeout": 1,
-      "port": "443",
-      "component_id": 4
-    },
-    {
-      "active": true,
-      "type": "icmp",
-      "name": "icmp",
-      "target": "10.0.0.1",
-      "component_id": 4,
-      "interval": 10,
-      "timeout": 3
+      "strict_tls": true
    }
-  ]
+  ],
+  "insecure_api": false
 }
--- a/example.config.yml
+++ b/example.config.yml
@@ -1,70 +0,0 @@
-api:
-  # cachet url
-  url: https://demo.cachethq.io/api/v1
-  # cachet api token
-  token: 9yMHsdioQosnyVK4iCVR
-  insecure: false
-# https://golang.org/src/time/format.go#L57
-date_format: 02/01/2006 15:04:05 MST
-slack_webhook: https://hooks.slack.com/services/T00000000/B00000000/XXXXXXXXXXXXXXXXXXXXXXXX
-monitors:
-  # http monitor example
-  - name: google
-    # test url
-    target: https://google.com
-    # strict certificate checking for https
-    strict: true
-    # HTTP method
-    method: POST
-
-    # set to update component (either component_id or metric_id are required)
-    component_id: 1
-    # set to post lag to cachet metric (graph)
-    metric_id: 4
-
-    # custom templates (see readme for details)
-    template:
-      investigating:
-        subject: "{{ .Monitor.Name }} - {{ .SystemName }}"
-        message: "{{ .Monitor.Name }} check **failed** (server time: {{ .now }})\n\n{{ .FailReason }}"
-      fixed:
-        subject: "I HAVE BEEN FIXED"
-
-    # seconds between checks
-    interval: 1
-    # seconds for timeout
-    timeout: 1
-    # If % of downtime is over this threshold, open an incident
-    threshold: 80
-
-    # custom HTTP headers
-    headers:
-      Authorization: Basic <hash>
-    # expected status code (either status code or body must be supplied)
-    expected_status_code: 200
-    # regex to match body
-    expected_body: "P.*NG"
-  # dns monitor example
-  - name: dns
-    # fqdn
-    target: matej.me.
-    # question type (A/AAAA/CNAME/...)
-    question: mx
-    type: dns
-    # set component_id/metric_id
-    component_id: 2
-    # poll every 1s
-    interval: 1
-    timeout: 1
-    # custom DNS server (defaults to system)
-    dns: 8.8.4.4:53
-    answers:
-      - regex: [1-9] alt[1-9].aspmx.l.google.com.
-      - exact: 10 aspmx2.googlemail.com.
-      - exact: 1 aspmx.l.google.com.
-      - exact: 10 aspmx3.googlemail.com.
-  - name: smtpnine
-    target: smtp.nine.ch
-    type: tcp
-    port: 25
-    component_id: 4
--- a/example.upstart.conf
+++ b/example.upstart.conf
@@ -1,14 +0,0 @@
-description "Cachet Monitor"
-
-start on startup
-
-env USER=root
-env HOME=/root
-
-setuid root
-setgid root
-chdir /root
-
-script
-	exec cachet-monitor -c /cachet-monitor.json --immediate
-end script
--- a/go-executable-build.sh
+++ b/go-executable-build.sh
@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-
-package=$1
-if [[ -z "$package" ]]; then
-    echo "usage: $0 <package-name>"
-    exit 1
-fi
-package_name=$package
-
-#the full list of the platforms: https://golang.org/doc/install/source#environment
-platforms=(
-    # "darwin/386"
-    # "darwin/amd64"
-    # "darwin/arm"
-    # "darwin/arm64"
-    # "dragonfly/amd64"
-    # "freebsd/386"
-    # "freebsd/amd64"
-    # "freebsd/arm"
-    # "linux/386"
-    "linux/amd64"
-    # "linux/arm"
-    # "linux/arm64"
-    # "netbsd/386"
-    # "netbsd/amd64"
-    # "netbsd/arm"
-    # "openbsd/386"
-    # "openbsd/amd64"
-    # "openbsd/arm"
-    # "plan9/386"
-    # "plan9/amd64"
-    # "solaris/amd64"
-    # "windows/amd64"
-    # "windows/386"
-)
-
-for platform in "${platforms[@]}"; do
-    platform_split=(${platform//\// })
-    GOOS=${platform_split[0]}
-    GOARCH=${platform_split[1]}
-    output_name=build/$package_name'-'$GOOS'-'$GOARCH
-    if [ $GOOS = "windows" ]; then
-        output_name+='.exe'
-    fi
-
-    env CGO_ENABLED=1 GOOS=$GOOS GOARCH=$GOARCH go build -o $output_name $package
-done
--- a/go.mod
+++ b/go.mod
@@ -1,18 +0,0 @@
-module github.com/milkinteractive/cachet-monitor
-
-go 1.13
-
-require (
-	github.com/chenjiandongx/yap v0.2.0 // indirect
-	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
-	github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
-	github.com/miekg/dns v1.1.53
-	github.com/mitchellh/mapstructure v1.1.2
-	github.com/prometheus-community/pro-bing v0.1.0 // indirect
-	github.com/sirupsen/logrus v1.9.0
-	github.com/stretchr/objx v0.1.1 // indirect
-	golang.org/x/crypto v0.8.0 // indirect
-	golang.org/x/tools v0.8.0 // indirect
-	golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898 // indirect
-	gopkg.in/yaml.v2 v2.2.7
-)
--- a/go.sum
+++ b/go.sum
@@ -1,146 +0,0 @@
-github.com/chenjiandongx/yap v0.2.0 h1:QggNKR8wJdvHGFCWAWwRgPb5O4oTG3BnTqg03ukrKvg=
-github.com/chenjiandongx/yap v0.2.0/go.mod h1:gCZjg9aqv/RcLpWictmDlDSUk+vBS/GAxoJbLJnSw48=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ=
-github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
-github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
-github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/miekg/dns v1.1.27 h1:aEH/kqUzUxGJ/UHcEKdJY+ugH6WEzsEBBSPa8zuy1aM=
-github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
-github.com/miekg/dns v1.1.29 h1:xHBEhR+t5RzcFJjBLJlax2daXOrTYtr9z4WdKEfWFzg=
-github.com/miekg/dns v1.1.29/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
-github.com/miekg/dns v1.1.34 h1:SgTzfkN+oLoIHF1bgUP+C71mzuDl3AhLApHzCCIAMWM=
-github.com/miekg/dns v1.1.34/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
-github.com/miekg/dns v1.1.53 h1:ZBkuHr5dxHtB1caEOlZTLPo7D3L3TWckgUUs/RHfDxw=
-github.com/miekg/dns v1.1.53/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
-github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus-community/pro-bing v0.1.0 h1:zjzLGhfNPP0bP1OlzGB+SJcguOViw7df12LPg2vUJh8=
-github.com/prometheus-community/pro-bing v0.1.0/go.mod h1:BpWlHurD9flHtzq8wrh8QGWYz9ka9z9ZJAyOel8ej58=
-github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q=
-github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo=
-github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200108215511-5d647ca15757 h1:pJ9H8lzdBh301qPX4VpwJ8TRpLt1IhNK1PxVOICyP54=
-golang.org/x/crypto v0.0.0-20200108215511-5d647ca15757/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200117160349-530e935923ad h1:Jh8cai0fqIK+f6nG0UgPW5wFk8wmiMhM3AyciDBdtQg=
-golang.org/x/crypto v0.0.0-20200117160349-530e935923ad/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59 h1:3zb4D3T4G8jdExgVU/95+vQXfpEPiMdCaZgmGVxjNHM=
-golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E=
-golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
-golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
-golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
-golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0 h1:5kGOVHlq0euqwzgTC9Vu15p6fV1Wi0ArVi8da2urnVg=
-golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220615171555-694bf12d69de/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
-golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe h1:6fAMxZRR6sl1Uq8U61gxU+kPTs2tR8uOySCbBP7BN/M=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200107162124-548cf772de50 h1:YvQ10rzcqWXLlJZ3XCUoO25savxmscf4+SC+ZqiCHhA=
-golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9 h1:1/DFK4b7JH8DmkqhUk48onnSfrPzImPoVxuomtbT2nk=
-golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200327173247-9dae0f8f5775 h1:TC0v2RSO1u2kn1ZugjrFXkRZAEaqMN/RW+OTZkBzmLE=
-golang.org/x/sys v0.0.0-20200327173247-9dae0f8f5775/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13 h1:5jaG59Zhd+8ZXe8C+lgiAGqkOaZBruqrWclLkgAww34=
-golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
-golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y=
-golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
-gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/http.go
+++ b/http.go
@@ -1,156 +1,58 @@
 package cachet

 import (
-	"crypto/md5"
+	"bytes"
 	"crypto/tls"
+	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"net/http"
-	"regexp"
 	"strconv"
-	"strings"
 	"time"
 )

-// Investigating template
-var defaultHTTPInvestigatingTpl = MessageTemplate{
-	Subject: `{{ .Monitor.Name }} - {{ .SystemName }}`,
-	Message: `{{ .Monitor.Name }} check **failed** (server time: {{ .now }})
+func (monitor *CachetMonitor) makeRequest(requestType string, url string, reqBody []byte) (*http.Response, []byte, error) {
+	req, err := http.NewRequest(requestType, monitor.APIUrl+url, bytes.NewBuffer(reqBody))

-{{ .FailReason }}`,
-}
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("X-Cachet-Token", monitor.APIToken)

-// Fixed template
-var defaultHTTPFixedTpl = MessageTemplate{
-	Subject: `{{ .Monitor.Name }} - {{ .SystemName }}`,
-	Message: `**Resolved** - {{ .now }}
-
- - -
-
-{{ .incident.Message }}`,
-}
-
-type HTTPMonitor struct {
-	AbstractMonitor `mapstructure:",squash"`
-
-	Method             string
-	ExpectedStatusCode int `mapstructure:"expected_status_code"`
-	Headers            map[string]string
-
-	// compiled to Regexp
-	ExpectedBody string `mapstructure:"expected_body"`
-	bodyRegexp   *regexp.Regexp
-
-	// content check
-	ExpectedMd5Sum string `mapstructure:"expected_md5sum"`
-	ExpectedLength int    `mapstructure:"expected_length"`
-
-	// data
-	Data string `mapstructure:"data"`
-}
-
-// TODO: test
-func (monitor *HTTPMonitor) test() bool {
-	var req *http.Request
-	var err error
-
-	if monitor.Data != "" {
-		dataBuffer := strings.NewReader(monitor.Data)
-		req, err = http.NewRequest(monitor.Method, monitor.Target, dataBuffer)
-	} else {
-		req, err = http.NewRequest(monitor.Method, monitor.Target, nil)
+	client := &http.Client{}
+	if monitor.InsecureAPI == true {
+		client.Transport = &http.Transport{
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+		}
 	}

-	for k, v := range monitor.Headers {
-		req.Header.Add(k, v)
-	}
-
-	transport := http.DefaultTransport.(*http.Transport)
-	transport.TLSClientConfig = &tls.Config{InsecureSkipVerify: monitor.Strict == false}
-	client := &http.Client{
-		Timeout:   time.Duration(monitor.Timeout * time.Second),
-		Transport: transport,
-	}
-
-	resp, err := client.Do(req)
+	res, err := client.Do(req)
 	if err != nil {
-		monitor.lastFailReason = err.Error()
-		return false
+		return nil, []byte{}, err
 	}

-	defer resp.Body.Close()
+	defer res.Body.Close()
+	body, _ := ioutil.ReadAll(res.Body)

-	if monitor.ExpectedStatusCode > 0 && resp.StatusCode != monitor.ExpectedStatusCode {
-		monitor.lastFailReason = "Expected HTTP response status: " + strconv.Itoa(monitor.ExpectedStatusCode) + ", got: " + strconv.Itoa(resp.StatusCode)
-		return false
-	}
-
-	responseBody, err := ioutil.ReadAll(resp.Body)
-	responseLength := len(string(responseBody))
-	if err != nil {
-		monitor.lastFailReason = err.Error()
-		return false
-	}
-
-	if monitor.ExpectedLength > 0 && responseLength != monitor.ExpectedLength {
-		monitor.lastFailReason = "Expected response body length: " + strconv.Itoa(monitor.ExpectedLength) + ", got: " + strconv.Itoa(responseLength)
-		return false
-	}
-
-	if monitor.ExpectedMd5Sum != "" {
-		sum := fmt.Sprintf("%x", (md5.Sum(responseBody)))
-		if strings.Compare(sum, monitor.ExpectedMd5Sum) != 0 {
-			monitor.lastFailReason = "Expected respsone body MD5 checksum: " + monitor.ExpectedMd5Sum + ", got: " + sum
-			return false
-		}
-	}
-
-	if monitor.bodyRegexp != nil {
-		if !monitor.bodyRegexp.Match(responseBody) {
-			monitor.lastFailReason = "Unexpected body: " + string(responseBody) + ".\nExpected to match: " + monitor.ExpectedBody
-			return false
-		}
-	}
-
-	return true
+	return res, body, nil
 }

-// TODO: test
-func (mon *HTTPMonitor) Validate() []string {
-	mon.Template.Investigating.SetDefault(defaultHTTPInvestigatingTpl)
-	mon.Template.Fixed.SetDefault(defaultHTTPFixedTpl)
-
-	errs := mon.AbstractMonitor.Validate()
-
-	if len(mon.ExpectedBody) > 0 {
-		exp, err := regexp.Compile(mon.ExpectedBody)
-		if err != nil {
-			errs = append(errs, "Regexp compilation failure: "+err.Error())
-		} else {
-			mon.bodyRegexp = exp
-		}
+// SendMetric sends lag metric point
+func (monitor *Monitor) SendMetric(delay int64) error {
+	if monitor.MetricID == 0 {
+		return nil
 	}

-	if len(mon.ExpectedBody) == 0 && mon.ExpectedStatusCode == 0 {
-		errs = append(errs, "Both 'expected_body' and 'expected_status_code' fields empty")
+	jsonBytes, _ := json.Marshal(&map[string]interface{}{
+		"value": delay,
+	})
+
+	resp, _, err := monitor.config.makeRequest("POST", "/metrics/"+strconv.Itoa(monitor.MetricID)+"/points", jsonBytes)
+	if err != nil || resp.StatusCode != 200 {
+		return fmt.Errorf("Could not log data point!\n%v\n", err)
 	}

-	mon.Method = strings.ToUpper(mon.Method)
-	switch mon.Method {
-	case "GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS", "HEAD":
-		break
-	case "":
-		mon.Method = "GET"
-	default:
-		errs = append(errs, "Unsupported HTTP method: "+mon.Method)
-	}
-
-	return errs
+	return nil
 }

-func (mon *HTTPMonitor) Describe() []string {
-	features := mon.AbstractMonitor.Describe()
-	features = append(features, "Method: "+mon.Method)
-
-	return features
+func getMs() int64 {
+	return time.Now().UnixNano() / int64(time.Millisecond)
 }
--- a/icmp.go
+++ b/icmp.go
@@ -1,77 +0,0 @@
-// Thanks go to https://github.com/Soontao/cachet-monitor/blob/master/tcp.go
-package cachet
-
-import (
-	"fmt"
-
-	"github.com/chenjiandongx/yap"
-)
-
-// Investigating template
-var defaultICMPInvestigatingTpl = MessageTemplate{
-	Subject: `{{ .Monitor.Name }} - {{ .SystemName }}`,
-	Message: `{{ .Monitor.Name }} check **failed** (server time: {{ .now }})
-
-{{ .FailReason }}`,
-}
-
-// Fixed template
-var defaultICMPFixedTpl = MessageTemplate{
-	Subject: `{{ .Monitor.Name }} - {{ .SystemName }}`,
-	Message: `**Resolved** - {{ .now }}
-
-Down seconds: {{ .downSeconds }}s`,
-}
-
-// ICMPMonitor struct
-type ICMPMonitor struct {
-	AbstractMonitor `mapstructure:",squash"`
-}
-
-// CheckICMPAlive func
-func CheckICMPAlive(ip string, timeout int) (bool, error) {
-
-	pg, err := yap.NewPinger()
-	if err != nil {
-		defer pg.Close()
-	}
-
-	response := pg.Call(yap.Request{
-		Target:  ip,
-		Count:   1,
-		Timeout: timeout * 1000})
-
-	if response.Error != nil {
-		return false, response.Error
-	} else {
-		return true, nil
-	}
-
-}
-
-// test if it available
-func (m *ICMPMonitor) test() bool {
-	if alive, e := CheckICMPAlive(m.Target, int(m.Timeout)); alive {
-		return true
-	} else {
-		m.lastFailReason = fmt.Sprintf("ICMP check failed: %v", e)
-		return false
-	}
-}
-
-// Validate configuration
-func (m *ICMPMonitor) Validate() []string {
-
-	// set incident temp
-	m.Template.Investigating.SetDefault(defaultICMPInvestigatingTpl)
-	m.Template.Fixed.SetDefault(defaultICMPFixedTpl)
-
-	// super.Validate()
-	errs := m.AbstractMonitor.Validate()
-
-	if m.Target == "" {
-		errs = append(errs, "Target is required")
-	}
-
-	return errs
-}
--- a/incident.go
+++ b/incident.go
@@ -4,9 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"strconv"
-	"time"
-
-	"github.com/sirupsen/logrus"
 )

 // Incident Cachet data model
@@ -15,39 +12,13 @@ type Incident struct {
 	Name    string `json:"name"`
 	Message string `json:"message"`
 	Status  int    `json:"status"`
-	Visible int    `json:"visible"`
+	Visible int    `json"visible"`
 	Notify  bool   `json:"notify"`

 	ComponentID     int `json:"component_id"`
 	ComponentStatus int `json:"component_status"`
 }

-//Get the last still open incident
-func (mon *AbstractMonitor) Get(cfg *CachetMonitor) (*Incident, error) {
-	requestType := "GET"
-	requestURL := fmt.Sprintf("/incidents?component_id=%d", mon.ComponentID)
-	_, body, err := cfg.API.NewRequest(requestType, requestURL, nil)
-	if err != nil {
-		return nil, err
-	}
-	data := make([]Incident, 0)
-	if err := json.Unmarshal(body.Data, &data); err != nil {
-		return nil, fmt.Errorf("Cannot parse incident body: %v, %v", err, string(body.Data))
-	}
-	//filter out resolved incidents
-	openIncidents := make([]Incident, 0)
-	for _, i := range data {
-		if i.Status < 4 {
-			openIncidents = append(openIncidents, i)
-		}
-	}
-	if len(openIncidents) == 0 {
-		return nil, nil
-	}
-	return &openIncidents[0], nil
-
-}
-
 // Send - Create or Update incident
 func (incident *Incident) Send(cfg *CachetMonitor) error {
 	switch incident.Status {
@@ -62,7 +33,7 @@ func (incident *Incident) Send(cfg *CachetMonitor) error {
 		}

 		if err != nil {
-			logrus.Warnf("cannot fetch component: %v", err)
+			cfg.Logger.Printf("cannot fetch component: %v", err)
 		}
 	case 4:
 		// fixed
@@ -78,31 +49,30 @@ func (incident *Incident) Send(cfg *CachetMonitor) error {

 	jsonBytes, _ := json.Marshal(incident)

-	resp, body, err := cfg.API.NewRequest(requestType, requestURL, jsonBytes)
+	resp, body, err := cfg.makeRequest(requestType, requestURL, jsonBytes)
 	if err != nil {
 		return err
 	}

 	var data struct {
-		ID int `json:"id"`
+		Incident struct {
+			ID int `json:"id"`
+		} `json:"data"`
 	}
-	if err := json.Unmarshal(body.Data, &data); err != nil {
-		return fmt.Errorf("Cannot parse incident body: %v, %v", err, string(body.Data))
+	if err := json.Unmarshal(body, &data); err != nil {
+		return fmt.Errorf("Cannot parse incident body: %v, %v", err, string(body))
 	}

-	incident.ID = data.ID
+	incident.ID = data.Incident.ID
 	if resp.StatusCode != 200 {
-		return fmt.Errorf("Could not create/update incident")
-	}
-	// send slack message
-	if cfg.SlackWebhook != "" {
-		incident.sendSlack(cfg)
+		return fmt.Errorf("Could not create/update incident!")
 	}
+
 	return nil
 }

 func (incident *Incident) GetComponentStatus(cfg *CachetMonitor) (int, error) {
-	resp, body, err := cfg.API.NewRequest("GET", "/components/"+strconv.Itoa(incident.ComponentID), nil)
+	resp, body, err := cfg.makeRequest("GET", "/components/"+strconv.Itoa(incident.ComponentID), nil)
 	if err != nil {
 		return 0, err
 	}
@@ -112,13 +82,15 @@ func (incident *Incident) GetComponentStatus(cfg *CachetMonitor) (int, error) {
 	}

 	var data struct {
-		Status int `json:"status"`
+		Component struct {
+			Status int `json:"status"`
+		} `json:"data"`
 	}
-	if err := json.Unmarshal(body.Data, &data); err != nil {
-		return 0, fmt.Errorf("Cannot parse component body: %v. Err = %v", string(body.Data), err)
+	if err := json.Unmarshal(body, &data); err != nil {
+		return 0, fmt.Errorf("Cannot parse component body: %v. Err = %v", string(body), err)
 	}

-	return data.Status, nil
+	return data.Component.Status, nil
 }

 // SetInvestigating sets status to Investigating
@@ -140,30 +112,3 @@ func (incident *Incident) SetWatching() {
 func (incident *Incident) SetFixed() {
 	incident.Status = 4
 }
-
-// Send slack message
-func (incident *Incident) sendSlack(cfg *CachetMonitor) {
-	color := "#bf1932" //red
-	if incident.ComponentStatus == 1 {
-		color = "#36a64f" //green
-	}
-	titleLink := MainUrl(cfg) + "/dashboard/incidents/" + strconv.Itoa(incident.ID)
-	slack := Slack{
-		WebhookURL: cfg.SlackWebhook,
-		Attachments: []Attachments{
-			Attachments{
-				Fallback:   incident.Name,
-				Color:      color,
-				Title:      incident.Name,
-				TitleLink:  titleLink,
-				Text:       incident.Message,
-				Footer:     "Cachet Monitor",
-				FooterIcon: "https://i.imgur.com/spck1w6.png",
-				Ts:         time.Now().Unix(),
-			},
-		}}
-	err := slack.SendSlackNotification()
-	if err != nil {
-		fmt.Errorf("Cannot send slack message. Err = %v", err)
-	}
-}
--- a/index.md
+++ b/index.md
@@ -0,0 +1,187 @@
+![screenshot](https://castawaylabs.github.io/cachet-monitor/screenshot.png)
+
+## Features
+
+- [x] Creates & Resolves Incidents
+- [x] Posts monitor lag to cachet graphs
+- [x] HTTP Checks (body/status code)
+- [x] DNS Checks
+- [x] Updates Component to Partial Outage
+- [x] Updates Component to Major Outage if already in Partial Outage (works with distributed monitors)
+- [x] Can be run on multiple servers and geo regions
+
+## Example Configuration
+
+**Note:** configuration can be in json or yaml format. [`example.config.json`](https://github.com/CastawayLabs/cachet-monitor/blob/master/example.config.json), [`example.config.yaml`](https://github.com/CastawayLabs/cachet-monitor/blob/master/example.config.yml) files.
+
+```yaml
+api:
+  # cachet url
+  url: https://demo.cachethq.io/api/v1
+  # cachet api token
+  token: 9yMHsdioQosnyVK4iCVR
+  insecure: false
+# https://golang.org/src/time/format.go#L57
+date_format: 02/01/2006 15:04:05 MST
+monitors:
+  # http monitor example
+  - name: google
+    # test url
+    target: https://google.com
+    # strict certificate checking for https
+    strict: true
+    # HTTP method
+    method: POST
+    
+    # set to update component (either component_id or metric_id are required)
+    component_id: 1
+    # set to post lag to cachet metric (graph)
+    metric_id: 4
+
+    # custom templates (see readme for details)
+    template:
+      investigating:
+        subject: "{{ .Monitor.Name }} - {{ .SystemName }}"
+        message: "{{ .Monitor.Name }} check **failed** (server time: {{ .now }})\n\n{{ .FailReason }}"
+      fixed:
+        subject: "I HAVE BEEN FIXED"
+    
+    # seconds between checks
+    interval: 1
+    # seconds for timeout
+    timeout: 1
+    # If % of downtime is over this threshold, open an incident
+    threshold: 80
+
+    # custom HTTP headers
+    headers:
+      Authorization: Basic <hash>
+    # expected status code (either status code or body must be supplied)
+    expected_status_code: 200
+    # regex to match body
+    expected_body: "P.*NG"
+  # dns monitor example
+  - name: dns
+    # fqdn
+    target: matej.me.
+    # question type (A/AAAA/CNAME/...)
+    question: mx
+    type: dns
+    # set component_id/metric_id
+    component_id: 2
+    # poll every 1s
+    interval: 1
+    timeout: 1
+    # custom DNS server (defaults to system)
+    dns: 8.8.4.4:53
+    answers:
+      # exact/regex check
+      - regex: [1-9] alt[1-9].aspmx.l.google.com.
+      - exact: 10 aspmx2.googlemail.com.
+      - exact: 1 aspmx.l.google.com.
+      - exact: 10 aspmx3.googlemail.com.
+```
+
+## Installation
+
+1. Download binary from [release page](https://github.com/CastawayLabs/cachet-monitor/releases)
+2. Create a configuration
+3. `cachet-monitor -c /etc/cachet-monitor.yaml`
+
+pro tip: run in background using `nohup cachet-monitor 2>&1 > /var/log/cachet-monitor.log &`
+
+```
+Usage:
+  cachet-monitor (-c PATH | --config PATH) [--log=LOGPATH] [--name=NAME] [--immediate]
+  cachet-monitor -h | --help | --version
+
+Arguments:
+  PATH     path to config.json
+  LOGPATH  path to log output (defaults to STDOUT)
+  NAME     name of this logger
+
+Examples:
+  cachet-monitor -c /root/cachet-monitor.json
+  cachet-monitor -c /root/cachet-monitor.json --log=/var/log/cachet-monitor.log --name="development machine"
+
+Options:
+  -c PATH.json --config PATH     Path to configuration file
+  -h --help                      Show this screen.
+  --version                      Show version
+  --immediate                    Tick immediately (by default waits for first defined interval)
+  
+Environment varaibles:
+  CACHET_API      override API url from configuration
+  CACHET_TOKEN    override API token from configuration
+  CACHET_DEV      set to enable dev logging
+```
+
+## Templates
+
+This package makes use of [`text/template`](https://godoc.org/text/template). [Default HTTP template](https://github.com/CastawayLabs/cachet-monitor/blob/master/http.go#L14)
+
+The following variables are available:
+
+| Root objects  |
+| ------------- | -----------------
+| `.SystemName` | system name
+| `.API`        | `api` object from configuration
+| `.Monitor`    | `monitor` object from configuration
+| `.now`        | formatted date string
+
+| Monitor variables  |
+| ------------------ |
+| `.Name`            |
+| `.Target`          |
+| `.Type`            |
+| `.Strict`          |
+| `.MetricID`        |
+| ...                |
+
+All monitor variables are available from `monitor.go`
+
+## Vision and goals
+
+We made this tool because we felt the need to have our own monitoring software (leveraging on Cachet).
+The idea is a stateless program which collects data and pushes it to a central cachet instance.
+
+This gives us power to have an army of geographically distributed loggers and reveal issues in both latency & downtime on client websites.
+
+## Package usage
+
+When using `cachet-monitor` as a package in another program, you should follow what `cli/main.go` does. It is important to call `Validate` on `CachetMonitor` and all the monitors inside.
+
+[API Documentation](https://godoc.org/github.com/CastawayLabs/cachet-monitor)
+
+# Contributions welcome
+
+We'll happily accept contributions for the following (non exhaustive list).
+
+- Implement ICMP check
+- Implement TCP check
+- Any bug fixes / code improvements
+- Test cases
+
+## License
+
+MIT License
+
+Copyright (c) 2016 Castaway Labs LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/monitor.go
+++ b/monitor.go
@@ -1,60 +1,41 @@
 package cachet

 import (
+	"crypto/tls"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"regexp"
+	"strconv"
+	"strings"
 	"sync"
 	"time"
-
-	"github.com/sirupsen/logrus"
 )

-const DefaultInterval = time.Second * 60
-const DefaultTimeout = time.Second
+const HttpTimeout = time.Duration(time.Second)
+const DefaultInterval = 60
 const DefaultTimeFormat = "15:04:05 Jan 2 MST"
-const HistorySize = 10

-type MonitorInterface interface {
-	ClockStart(*CachetMonitor, MonitorInterface, *sync.WaitGroup)
-	ClockStop()
-	tick(MonitorInterface)
-	test() bool
+// Monitor data model
+type Monitor struct {
+	Name          string        `json:"name"`
+	URL           string        `json:"url"`
+	Method        string        `json:"method"`
+	StrictTLS     bool          `json:"strict_tls"`
+	CheckInterval time.Duration `json:"interval"`

-	Validate() []string
-	GetMonitor() *AbstractMonitor
-	Describe() []string
-}
+	MetricID    int `json:"metric_id"`
+	ComponentID int `json:"component_id"`

-// AbstractMonitor data model
-type AbstractMonitor struct {
-	Name   string
-	Target string
-	Active bool
+	// Threshold = percentage
+	Threshold          float32 `json:"threshold"`
+	ExpectedStatusCode int     `json:"expected_status_code"`
+	// compiled to Regexp
+	ExpectedBody string `json:"expected_body"`
+	bodyRegexp   *regexp.Regexp

-	// (default)http / dns
-	Type   string
-	Strict bool
-
-	Interval time.Duration
-	Timeout  time.Duration
-
-	MetricID    int `mapstructure:"metric_id"`
-	ComponentID int `mapstructure:"component_id"`
-
-	// Templating stuff
-	Template struct {
-		Investigating MessageTemplate
-		Fixed         MessageTemplate
-	}
-
-	// Threshold = percentage / number of down incidents
-	Threshold      float32
-	ThresholdCount bool `mapstructure:"threshold_count"`
-
-	// lag / average(lagHistory) * 100 = percentage above average lag
-	// PerformanceThreshold sets the % limit above which this monitor will trigger degraded-performance
-	// PerformanceThreshold float32
-
-	history []bool
-	// lagHistory     []float32
+	history        []bool
 	lastFailReason string
 	incident       *Incident
 	config         *CachetMonitor
@@ -63,84 +44,34 @@ type AbstractMonitor struct {
 	stopC chan bool
 }

-func (mon *AbstractMonitor) Validate() []string {
-	errs := []string{}
-
-	if len(mon.Name) == 0 {
-		errs = append(errs, "Name is required")
-	}
-
-	if mon.Interval < 1 {
-		mon.Interval = DefaultInterval
-	}
-	if mon.Timeout < 1 {
-		mon.Timeout = DefaultTimeout
-	}
-
-	if mon.Timeout > mon.Interval {
-		errs = append(errs, "Timeout greater than interval")
-	}
-
-	if mon.ComponentID == 0 && mon.MetricID == 0 {
-		errs = append(errs, "component_id & metric_id are unset")
-	}
-
-	if mon.Threshold <= 0 {
-		mon.Threshold = 100
-	}
-
-	if err := mon.Template.Fixed.Compile(); err != nil {
-		errs = append(errs, "Could not compile \"fixed\" template: "+err.Error())
-	}
-	if err := mon.Template.Investigating.Compile(); err != nil {
-		errs = append(errs, "Could not compile \"investigating\" template: "+err.Error())
-	}
-
-	return errs
-}
-func (mon *AbstractMonitor) GetMonitor() *AbstractMonitor {
-	return mon
-}
-func (mon *AbstractMonitor) Describe() []string {
-	features := []string{"Type: " + mon.Type}
-
-	if len(mon.Name) > 0 {
-		features = append(features, "Name: "+mon.Name)
-	}
-
-	if !mon.Active {
-		features = append(features, "Active: No")
-	}
-
-	return features
-}
-
-func (mon *AbstractMonitor) ClockStart(cfg *CachetMonitor, iface MonitorInterface, wg *sync.WaitGroup) {
-	if !mon.Active {
-		return
-	};
+func (mon *Monitor) Start(cfg *CachetMonitor, wg *sync.WaitGroup) {
 	wg.Add(1)
 	mon.config = cfg
 	mon.stopC = make(chan bool)
-	if cfg.Immediate {
-		mon.tick(iface)
+
+	mon.config.Logger.Printf(" Starting %s: %d seconds check interval\n - %v %s", mon.Name, mon.CheckInterval, mon.Method, mon.URL)
+
+	// print features
+	if mon.ExpectedStatusCode > 0 {
+		mon.config.Logger.Printf(" - Expect HTTP %d", mon.ExpectedStatusCode)
+	}
+	if len(mon.ExpectedBody) > 0 {
+		mon.config.Logger.Printf(" - Expect Body to match \"%v\"", mon.ExpectedBody)
+	}
+	if mon.MetricID > 0 {
+		mon.config.Logger.Printf(" - Log lag to metric id %d\n", mon.MetricID)
+	}
+	if mon.ComponentID > 0 {
+		mon.config.Logger.Printf(" - Update component id %d\n\n", mon.ComponentID)
 	}

-	if cfg.Restarted {
-		initialIncident, err := mon.Get(cfg)
-		if err != nil {
-			logrus.Warn("could not fetch initial incident: %v", err)
-		}
-		if initialIncident != nil {
-			mon.incident = initialIncident
-		}
-	}
+	mon.Tick()

-	ticker := time.NewTicker(mon.Interval * time.Second)
+	ticker := time.NewTicker(mon.CheckInterval * time.Second)
 	for {
 		select {
 		case <-ticker.C:
-			mon.tick(iface)
+			mon.Tick()
 		case <-mon.stopC:
 			wg.Done()
 			return
@@ -148,123 +79,174 @@ func (mon *AbstractMonitor) ClockStart(cfg *CachetMonitor, iface MonitorInterfac
 	}
 }

-func (mon *AbstractMonitor) ClockStop() {
-	select {
-	case <-mon.stopC:
+func (monitor *Monitor) Stop() {
+	if monitor.Stopped() {
 		return
+	}
+
+	close(monitor.stopC)
+}
+
+func (monitor *Monitor) Stopped() bool {
+	select {
+	case <-monitor.stopC:
+		return true
 	default:
-		close(mon.stopC)
+		return false
 	}
 }

-func (mon *AbstractMonitor) test() bool { return false }
-
-func (mon *AbstractMonitor) tick(iface MonitorInterface) {
+func (monitor *Monitor) Tick() {
 	reqStart := getMs()
-	up := iface.test()
+	isUp := monitor.doRequest()
 	lag := getMs() - reqStart

-	histSize := HistorySize
-	if mon.ThresholdCount {
-		histSize = int(mon.Threshold)
+	if len(monitor.history) == 9 {
+		monitor.config.Logger.Printf("%v is now saturated\n", monitor.Name)
 	}
+	if len(monitor.history) >= 10 {
+		monitor.history = monitor.history[len(monitor.history)-9:]
+	}
+	monitor.history = append(monitor.history, isUp)
+	monitor.AnalyseData()

-	if len(mon.history) == histSize-1 {
-		logrus.Warnf("%v is now saturated", mon.Name)
-	}
-	if len(mon.history) >= histSize {
-		mon.history = mon.history[len(mon.history)-(histSize-1):]
-	}
-	mon.history = append(mon.history, up)
-	mon.AnalyseData()
-
-	// report lag
-	if mon.MetricID > 0 {
-		go mon.config.API.SendMetric(mon.MetricID, lag)
+	if isUp == true && monitor.MetricID > 0 {
+		monitor.SendMetric(lag)
 	}
 }

-// TODO: test
+func (monitor *Monitor) doRequest() bool {
+	client := &http.Client{
+		Timeout: HttpTimeout,
+	}
+	if monitor.StrictTLS == false {
+		client.Transport = &http.Transport{
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+		}
+	}
+
+	resp, err := client.Get(monitor.URL)
+	if err != nil {
+		monitor.lastFailReason = err.Error()
+
+		return false
+	}
+
+	defer resp.Body.Close()
+
+	if monitor.ExpectedStatusCode > 0 && resp.StatusCode != monitor.ExpectedStatusCode {
+		monitor.lastFailReason = "Unexpected response code: " + strconv.Itoa(resp.StatusCode) + ". Expected " + strconv.Itoa(monitor.ExpectedStatusCode)
+
+		return false
+	}
+
+	if monitor.bodyRegexp != nil {
+		// check body
+		responseBody, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			monitor.lastFailReason = err.Error()
+
+			return false
+		}
+
+		match := monitor.bodyRegexp.Match(responseBody)
+		if !match {
+			monitor.lastFailReason = "Unexpected body: " + string(responseBody) + ". Expected to match " + monitor.ExpectedBody
+		}
+
+		return match
+	}
+
+	return true
+}
+
 // AnalyseData decides if the monitor is statistically up or down and creates / resolves an incident
-func (mon *AbstractMonitor) AnalyseData() {
+func (monitor *Monitor) AnalyseData() {
 	// look at the past few incidents
 	numDown := 0
-	for _, wasUp := range mon.history {
+	for _, wasUp := range monitor.history {
 		if wasUp == false {
 			numDown++
 		}
 	}

-	t := (float32(numDown) / float32(len(mon.history))) * 100
-	l := logrus.WithFields(logrus.Fields{
-		"monitor": mon.Name,
-		"time":    time.Now().Format(mon.config.DateFormat),
-	})
-	if numDown == 0 {
-		l.Printf("monitor is up")
-	} else if mon.ThresholdCount {
-		l.Printf("monitor down %d/%d", numDown, int(mon.Threshold))
-	} else {
-		l.Printf("monitor down %.2f%%/%.2f%%", t, mon.Threshold)
-	}
+	t := (float32(numDown) / float32(len(monitor.history))) * 100
+	monitor.config.Logger.Printf("%s %.2f%%/%.2f%% down at %v\n", monitor.Name, t, monitor.Threshold, time.Now().UnixNano()/int64(time.Second))

-	histSize := HistorySize
-	if mon.ThresholdCount {
-		histSize = int(mon.Threshold)
-	}
-
-	if len(mon.history) != histSize {
+	if len(monitor.history) != 10 {
 		// not saturated
 		return
 	}

-	triggered := (mon.ThresholdCount && numDown == int(mon.Threshold)) || (!mon.ThresholdCount && t > mon.Threshold)
-
-	if triggered && mon.incident == nil {
-		// create incident
-		tplData := getTemplateData(mon)
-		tplData["FailReason"] = mon.lastFailReason
-
-		subject, message := mon.Template.Investigating.Exec(tplData)
-		mon.incident = &Incident{
-			Name:        subject,
-			ComponentID: mon.ComponentID,
-			Message:     message,
+	if t > monitor.Threshold && monitor.incident == nil {
+		monitor.incident = &Incident{
+			Name:        monitor.Name + " - " + monitor.config.SystemName,
+			ComponentID: monitor.ComponentID,
+			Message:     monitor.Name + " check **failed** - " + time.Now().Format(DefaultTimeFormat),
 			Notify:      true,
 		}

-		// is down, create an incident
-		l.Warnf("creating incident. Monitor is down: %v", mon.lastFailReason)
-		// set investigating status
-		mon.incident.SetInvestigating()
-		// create/update incident
-		if err := mon.incident.Send(mon.config); err != nil {
-			l.Printf("Error sending incident: %v", err)
+		if len(monitor.lastFailReason) > 0 {
+			monitor.incident.Message += "\n\n `" + monitor.lastFailReason + "`"
 		}

-		return
+		// is down, create an incident
+		monitor.config.Logger.Printf("%v creating incident. Monitor is down: %v", monitor.Name, monitor.lastFailReason)
+		// set investigating status
+		monitor.incident.SetInvestigating()
+		// create/update incident
+		if err := monitor.incident.Send(monitor.config); err != nil {
+			monitor.config.Logger.Printf("Error sending incident: %v\n", err)
+		}
+	} else if t < monitor.Threshold && monitor.incident != nil {
+		// was down, created an incident, its now ok, make it resolved.
+		monitor.config.Logger.Printf("%v resolved downtime incident", monitor.Name)
+
+		// resolve incident
+		monitor.incident.Message = "\n**Resolved** - " + time.Now().Format(DefaultTimeFormat) + "\n\n - - - \n\n" + monitor.incident.Message
+		monitor.incident.SetFixed()
+		monitor.incident.Send(monitor.config)
+
+		monitor.lastFailReason = ""
+		monitor.incident = nil
 	}
-
-	// still triggered or no incident
-	if triggered || mon.incident == nil {
-		return
-	}
-
-	// was down, created an incident, its now ok, make it resolved.
-	l.Warn("Resolving incident")
-
-	// resolve incident
-	tplData := getTemplateData(mon)
-	tplData["incident"] = mon.incident
-
-	subject, message := mon.Template.Fixed.Exec(tplData)
-	mon.incident.Name = subject
-	mon.incident.Message = message
-	mon.incident.SetFixed()
-	if err := mon.incident.Send(mon.config); err != nil {
-		l.Printf("Error sending incident: %v", err)
-	}
-
-	mon.lastFailReason = ""
-	mon.incident = nil
+}
+
+func (monitor *Monitor) ValidateConfiguration() error {
+	if len(monitor.ExpectedBody) > 0 {
+		exp, err := regexp.Compile(monitor.ExpectedBody)
+		if err != nil {
+			return err
+		}
+
+		monitor.bodyRegexp = exp
+	}
+
+	if len(monitor.ExpectedBody) == 0 && monitor.ExpectedStatusCode == 0 {
+		return errors.New("Nothing to check, both 'expected_body' and 'expected_status_code' fields empty")
+	}
+
+	if monitor.CheckInterval < 1 {
+		monitor.CheckInterval = DefaultInterval
+	}
+
+	monitor.Method = strings.ToUpper(monitor.Method)
+	switch monitor.Method {
+	case "GET", "POST", "DELETE", "OPTIONS", "HEAD":
+		break
+	case "":
+		monitor.Method = "GET"
+	default:
+		return fmt.Errorf("Unsupported check method: %v", monitor.Method)
+	}
+
+	if monitor.ComponentID == 0 && monitor.MetricID == 0 {
+		return errors.New("component_id & metric_id are unset")
+	}
+
+	if monitor.Threshold <= 0 {
+		monitor.Threshold = 100
+	}
+
+	return nil
 }
--- a/monitor_test.go
+++ b/monitor_test.go
@@ -1,7 +0,0 @@
-package cachet
-
-import (
-	"testing"
-)
-
-func TestAnalyseData(t *testing.T) {}
--- a/readme.md
+++ b/readme.md
@@ -1,212 +1,91 @@
-# cachet-monitor
+![screenshot](https://castawaylabs.github.io/cachet-monitor/screenshot.png)

-a fork of the cachet-monitor project originally developed by CastawayLabs but abandoned. Extended with new features needed by the people.
+Features
+--------

-## Features
+- [x] Creates & Resolves Incidents
+- [x] Posts monitor lag to cachet graphs
+- [x] Updates Component to Partial Outage
+- [x] Updates Component to Major Outage if already in Partial Outage (works well with distributed monitoring)
+- [x] Can be run on multiple servers and geo regions

-:heavy_check_mark: Interval based checking of predefined Resources  
-:heavy_check_mark: Posts monitor lag to cachet graphs  
-:heavy_check_mark: Creates & Resolves Incidents  
-:heavy_check_mark: Updates Component to Partial Outage  
-:heavy_check_mark: Updates Component to Major Outage if already in Partial Outage (works with distributed monitors)  
-:heavy_check_mark: Can be run on multiple servers and geo regions  
-:heavy_check_mark: HTTP Checks (body/status code)  
-:heavy_check_mark: DNS Checks  
-:heavy_check_mark: TCP Checks  
-:heavy_check_mark: ICMP Checks
+Configuration
+-------------

-## Quick Start
-
-Configuration can be done in either yaml or json format. An example JSON-File would look something like this:
-
-```json
+```
 {
-  "api": {
-    "url": "https://demo.cachethq.io/api/v1",
-    "token": "9yMHsdioQosnyVK4iCVR",
-    "insecure": false
-  },
-  "date_format": "02/01/2006 15:04:05 MST",
-  "monitors": [
-    {
-      "active": false,
-      "name": "google",
-      "target": "https://google.com",
-      "strict": true,
-      "method": "POST",
-      "component_id": 1,
-      "metric_id": 4,
-      "template": {
-        "investigating": {
-          "subject": "{{ .Monitor.Name }} - {{ .SystemName }}",
-          "message": "{{ .Monitor.Name }} check **failed** (server time: {{ .now }})\n\n{{ .FailReason }}"
-        },
-        "fixed": {
-          "subject": "I HAVE BEEN FIXED"
-        }
-      },
-      "interval": 1,
-      "timeout": 1,
-      "threshold": 80,
-      "headers": {
-        "Authorization": "Basic <hash>"
-      },
-      "expected_status_code": 200,
-      "expected_body": "P.*NG"
-    }
-  ]
+  // URL for the API. Note: Must end with /api/v1
+  "api_url": "https://<cachet domain>/api/v1",
+  // Your API token for Cachet
+  "api_token": "<cachet api token>",
+  // optional, false default, set if your certificate is self-signed/untrusted
+  "insecure_api": false,
+  "monitors": [{
+    // required, friendly name for your monitor
+    "name": "Name of your monitor",
+    // required, url to probe
+    "url": "Ping URL",
+    // optional, http method (defaults GET)
+    "method": "get",
+    // self-signed ssl certificate
+    "strict_tls": true,
+    // seconds between checks
+    "interval": 10,
+    // post lag to cachet metric (graph)
+    // note either metric ID or component ID are required
+    "metric_id": <metric id>,
+    // post incidents to this component
+    "component_id": <component id>,
+    // If % of downtime is over this threshold, open an incident
+    "threshold": 80,
+    // optional, expected status code (either status code or body must be supplied)
+    "expected_status_code": 200,
+    // optional, regular expression to match body content
+    "expected_body": "P.*NG"
+  }],
+  // optional, system name to identify bot (uses hostname by default)
+  "system_name": "",
+  // optional, defaults to stdout
+  "log_path": ""
 }
 ```

-## Installation
+Installation
+------------

-1. Download binary from [release page](https://github.com/bennetgallein/cachet-monitor/releases)
-2. Add the binary to an executable path (/usr/bin, etc.)
-3. Create a configuration following provided examples
-4. `cachet-monitor -c /etc/cachet-monitor.json`
+1. Download binary from [release page](https://github.com/CastawayLabs/cachet-monitor/releases)
+2. Create your configuration ([example](https://raw.githubusercontent.com/CastawayLabs/cachet-monitor/master/example.config.json))
+3. `cachet-monitor -c /etc/cachet-monitor.config.json`

-pro tip: run in background using `nohup cachet-monitor 2>&1 > /var/log/cachet-monitor.log &`, or use a tmux/screen session
+pro tip: run in background using `nohup cachet-monitor 2>&1 > /var/log/cachet-monitor.log &`

 ```
-Usage:
-  cachet-monitor (-c PATH | --config PATH) [--log=LOGPATH] [--name=NAME] [--immediate]
-  cachet-monitor -h | --help | --version
-
-Arguments:
-  PATH     path to config.json
-  LOGPATH  path to log output (defaults to STDOUT)
-  NAME     name of this logger
-
-Examples:
-  cachet-monitor -c /root/cachet-monitor.json
-  cachet-monitor -c /root/cachet-monitor.json --log=/var/log/cachet-monitor.log --name="development machine"
-
-Options:
-  -c PATH.json --config PATH     Path to configuration file
-  -h --help                      Show this screen.
-  --version                      Show version
-  --immediate                    Tick immediately (by default waits for first defined interval)
-  --restarted                    Get open incidents before start monitoring (if monitor died or restarted)
-
-Environment varaibles:
-  CACHET_API      override API url from configuration
-  CACHET_TOKEN    override API token from configuration
-  CACHET_DEV      set to enable dev logging
+Usage of cachet-monitor:
+  -c="/etc/cachet-monitor.config.json": Config path
+  -log="": Log path
+  -name="": System Name
 ```

-## Init script
+Environment variables
+---------------------

-If your system is running systemd (like Debian, Ubuntu 16.04, Fedora, RHEL7, or Archlinux) you can use the provided example file: [example.cachet-monitor.service](https://github.com/bennetgallein/cachet-monitor/blob/master/example.cachet-monitor.service).
+| Name         | Example Value                  | Description                 |
+| ------------ | ------------------------------ | --------------------------- |
+| CACHET_API   | http://demo.cachethq.io/api/v1 | URL endpoint for cachet api |
+| CACHET_TOKEN | APIToken123                    | API Authentication token    |
+| CACHET_DEV   | 1                              | Strips logging              |

-1. Simply put it in the right place with `cp example.cachet-monitor.service /etc/systemd/system/cachet-monitor.service`
-2. Then do a `systemctl daemon-reload` in your terminal to update Systemd configuration
-3. Finally you can start cachet-monitor on every startup with `systemctl enable cachet-monitor.service`! 👍
-
-## Templates
-
-This package makes use of [`text/template`](https://godoc.org/text/template). [Default HTTP template](https://github.com/CastawayLabs/cachet-monitor/blob/master/http.go#L14)
-
-The following variables are available:
-
-| Root objects  | Description                         |
-| ------------- | ----------------------------------- |
-| `.SystemName` | system name                         |
-| `.API`        | `api` object from configuration     |
-| `.Monitor`    | `monitor` object from configuration |
-| `.now`        | formatted date string               |
-
-| Monitor variables |
-| ----------------- |
-| `.Name`           |
-| `.Target`         |
-| `.Type`           |
-| `.Strict`         |
-| `.MetricID`       |
-| ...               |
-
-All monitor variables are available from `monitor.go`
-
-## Monitor Types
-
-We support a variety of monitor-types. Here are the configuration parameters for each of them
-
-Also, the following parameters are shared for all monitors.
-
-| Key                     | Description                                                                    |
-| ----------------------- | ------------------------------------------------------------------------------ |
-| name                    | a friendly name for the monitor                                                |
-| target                  | target for the check (e.g. a domain or IP)                                     |
-| active                  | a boolean wether or not this test is currently active                          |
-| type                    | type type of the check, see supported types above or below                     |
-| interval                | the interval in seconds in which to check the monitor                          |
-| timeout                 | the timeout for each check. Needs to be smaller than the interval              |
-| metric_id               | the ID of the metric. Metrics are used for graphing values                     |
-| component_id            | the ID of the component inside of Cachet. Used for creating incidents          |
-| templates.investigating | template to use as a message for when the check enters the investigating stage |
-| templates.fixed         | template to use as a message for when the check enters the fixed stage         |
-| threshold               | If % of downtime is over this threshold, open an incident                      |
-| threshold_count         | the number of checks that count into the threshold (defaults to 10)            |
-
-### HTTP
-
-Either expected_body or expected_status_code needs to be set.
-
-| Key                  | Description                                                                                 |
-| -------------------- | ------------------------------------------------------------------------------------------- |
-| method               | the HTTP Request method to use (Defaults to GET)                                            |
-| headers              | a key-value array of additional headers to use for the request                              |
-| expected_status_code | the expected status-code returned from the request                                          |
-| expected_body        | a regex or normal string that will be used to test against the returned body of the request |
-| expected_md5sum      | a md5 checksum of the body, which will be checked against                                   |
-| expected_length      | the length of the string of the response body                                               |
-| data                 | body-data for a post request                                                                |
-
-### DNS
-
-| Key      | Description                                                                                          |
-| -------- | ---------------------------------------------------------------------------------------------------- |
-| dns      | set a custom DNS-Resolver (IP:Port format)                                                           |
-| question | the type of DNS-Request to execute (e.g. A, MX, CNAME...). Can also be a List (['A', 'MX', 'CNAME']) |
-| answers  | an array of response objects. see below                                                              |
-
-#### Answer Object
-
-| Key   | Description                                                           |
-| ----- | --------------------------------------------------------------------- |
-| regex | if you want to use a regexp, use this key and the regexp as the value |
-| exact | exact match for the response value                                    |
-
-### TCP
-
-| Key  | Description                        |
-| ---- | ---------------------------------- |
-| port | the port to do a tcp connection to |
-
-### ICMP
-
-_No special variables needed_
-
-## Vision and goals
+Vision and goals
+----------------

 We made this tool because we felt the need to have our own monitoring software (leveraging on Cachet).
 The idea is a stateless program which collects data and pushes it to a central cachet instance.

 This gives us power to have an army of geographically distributed loggers and reveal issues in both latency & downtime on client websites.

-## Package usage
+Package usage
+-------------

-When using `cachet-monitor` as a package in another program, you should follow what `cli/main.go` does. It is important to call `Validate` on `CachetMonitor` and all the monitors inside.
+When using `cachet-monitor` as a package in another program, you should follow what `cli/main.go` does. It is important to call `ValidateConfiguration` on `CachetMonitor` and all the monitors inside.

 [API Documentation](https://godoc.org/github.com/CastawayLabs/cachet-monitor)
-
-# Contributions welcome
-
-We'll happily accept contributions for anything usefull.
-
-# Build on Linux/MacOS
-
-1. Read and install with https://ahmadawais.com/install-go-lang-on-macos-with-homebrew/
-2. Test in console with `go get -u` and `go build cli/main.go`
-3. Run `./go-executable-build.sh cli/main.go`
-4. This will create a `build/cli/main.go-linux-amd64`-file, which is the executable binary
-5. `mv build/cli/main.go-linux-amd64 /usr/bin/cachet-monitor`
--- a/screenshot.png
+++ b/screenshot.png
--- a/slack.go
+++ b/slack.go
@@ -1,80 +0,0 @@
-package cachet
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"log"
-	"net/http"
-	"time"
-)
-
-type Slack struct {
-	WebhookURL  string
-	Attachments []Attachments `json:"attachments"`
-}
-type Fields struct {
-	Title string `json:"title"`
-	Value string `json:"value"`
-	Short bool   `json:"short"`
-}
-type Attachments struct {
-	Fallback   string   `json:"fallback"`
-	Color      string   `json:"color"`
-	Pretext    string   `json:"pretext"`
-	Title      string   `json:"title"`
-	TitleLink  string   `json:"title_link"`
-	Text       string   `json:"text"`
-	Fields     []Fields `json:"fields"`
-	ThumbURL   string   `json:"thumb_url"`
-	Footer     string   `json:"footer"`
-	FooterIcon string   `json:"footer_icon"`
-	Ts         int64    `json:"ts"`
-}
-
-func test() {
-	slack := Slack{
-		Attachments: []Attachments{
-			Attachments{
-				Fallback:   "Required plain-text summary of the attachment.",
-				Color:      "#36a64f",
-				Title:      "Slack API Documentation",
-				TitleLink:  "https://status.easyship.com",
-				Text:       "Optional text that appears within the attachment",
-				Footer:     "Cachet Monitor",
-				FooterIcon: "https://i.imgur.com/spck1w6.png",
-				Ts:         time.Now().Unix(),
-			},
-		}}
-	slack.WebhookURL = "https://hooks.slack.com/services/0000000/00000000/xxxxxxxxxxxxxxxxxxx"
-	err := slack.SendSlackNotification()
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
-// SendSlackNotification will post to an 'Incoming Webook' url setup in Slack Apps. It accepts
-// some text and the slack channel is saved within Slack.
-func (slack *Slack) SendSlackNotification() error {
-
-	slackBody, _ := json.Marshal(slack)
-	req, err := http.NewRequest(http.MethodPost, slack.WebhookURL, bytes.NewBuffer(slackBody))
-	if err != nil {
-		return err
-	}
-
-	req.Header.Add("Content-Type", "application/json")
-
-	client := &http.Client{Timeout: 10 * time.Second}
-	resp, err := client.Do(req)
-	if err != nil {
-		return err
-	}
-
-	buf := new(bytes.Buffer)
-	buf.ReadFrom(resp.Body)
-	if buf.String() != "ok" {
-		return errors.New("Non-ok response returned from Slack")
-	}
-	return nil
-}
--- a/stylesheets/github-light.css
+++ b/stylesheets/github-light.css
@@ -0,0 +1,124 @@
+/*
+The MIT License (MIT)
+
+Copyright (c) 2015 GitHub, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+*/
+
+.pl-c /* comment */ {
+  color: #969896;
+}
+
+.pl-c1      /* constant, markup.raw, meta.diff.header, meta.module-reference, meta.property-name, support, support.constant, support.variable, variable.other.constant */,
+.pl-s .pl-v /* string variable */ {
+  color: #0086b3;
+}
+
+.pl-e  /* entity */,
+.pl-en /* entity.name */ {
+  color: #795da3;
+}
+
+.pl-s .pl-s1 /* string source */,
+.pl-smi      /* storage.modifier.import, storage.modifier.package, storage.type.java, variable.other, variable.parameter.function */ {
+  color: #333;
+}
+
+.pl-ent /* entity.name.tag */ {
+  color: #63a35c;
+}
+
+.pl-k /* keyword, storage, storage.type */ {
+  color: #a71d5d;
+}
+
+.pl-pds              /* punctuation.definition.string, string.regexp.character-class */,
+.pl-s                /* string */,
+.pl-s .pl-pse .pl-s1 /* string punctuation.section.embedded source */,
+.pl-sr               /* string.regexp */,
+.pl-sr .pl-cce       /* string.regexp constant.character.escape */,
+.pl-sr .pl-sra       /* string.regexp string.regexp.arbitrary-repitition */,
+.pl-sr .pl-sre       /* string.regexp source.ruby.embedded */ {
+  color: #183691;
+}
+
+.pl-v /* variable */ {
+  color: #ed6a43;
+}
+
+.pl-id /* invalid.deprecated */ {
+  color: #b52a1d;
+}
+
+.pl-ii /* invalid.illegal */ {
+  background-color: #b52a1d;
+  color: #f8f8f8;
+}
+
+.pl-sr .pl-cce /* string.regexp constant.character.escape */ {
+  color: #63a35c;
+  font-weight: bold;
+}
+
+.pl-ml /* markup.list */ {
+  color: #693a17;
+}
+
+.pl-mh        /* markup.heading */,
+.pl-mh .pl-en /* markup.heading entity.name */,
+.pl-ms        /* meta.separator */ {
+  color: #1d3e81;
+  font-weight: bold;
+}
+
+.pl-mq /* markup.quote */ {
+  color: #008080;
+}
+
+.pl-mi /* markup.italic */ {
+  color: #333;
+  font-style: italic;
+}
+
+.pl-mb /* markup.bold */ {
+  color: #333;
+  font-weight: bold;
+}
+
+.pl-md /* markup.deleted, meta.diff.header.from-file */ {
+  background-color: #ffecec;
+  color: #bd2c00;
+}
+
+.pl-mi1 /* markup.inserted, meta.diff.header.to-file */ {
+  background-color: #eaffea;
+  color: #55a532;
+}
+
+.pl-mdr /* meta.diff.range */ {
+  color: #795da3;
+  font-weight: bold;
+}
+
+.pl-mo /* meta.output */ {
+  color: #1d3e81;
+}
+
--- a/stylesheets/normalize.css
+++ b/stylesheets/normalize.css
@@ -0,0 +1,424 @@
+/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
+
+/**
+ * 1. Set default font family to sans-serif.
+ * 2. Prevent iOS text size adjust after orientation change, without disabling
+ *    user zoom.
+ */
+
+html {
+  font-family: sans-serif; /* 1 */
+  -ms-text-size-adjust: 100%; /* 2 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/**
+ * Remove default margin.
+ */
+
+body {
+  margin: 0;
+}
+
+/* HTML5 display definitions
+   ========================================================================== */
+
+/**
+ * Correct `block` display not defined for any HTML5 element in IE 8/9.
+ * Correct `block` display not defined for `details` or `summary` in IE 10/11
+ * and Firefox.
+ * Correct `block` display not defined for `main` in IE 11.
+ */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+menu,
+nav,
+section,
+summary {
+  display: block;
+}
+
+/**
+ * 1. Correct `inline-block` display not defined in IE 8/9.
+ * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
+ */
+
+audio,
+canvas,
+progress,
+video {
+  display: inline-block; /* 1 */
+  vertical-align: baseline; /* 2 */
+}
+
+/**
+ * Prevent modern browsers from displaying `audio` without controls.
+ * Remove excess height in iOS 5 devices.
+ */
+
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+
+/**
+ * Address `[hidden]` styling not present in IE 8/9/10.
+ * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
+ */
+
+[hidden],
+template {
+  display: none;
+}
+
+/* Links
+   ========================================================================== */
+
+/**
+ * Remove the gray background color from active links in IE 10.
+ */
+
+a {
+  background-color: transparent;
+}
+
+/**
+ * Improve readability when focused and also mouse hovered in all browsers.
+ */
+
+a:active,
+a:hover {
+  outline: 0;
+}
+
+/* Text-level semantics
+   ========================================================================== */
+
+/**
+ * Address styling not present in IE 8/9/10/11, Safari, and Chrome.
+ */
+
+abbr[title] {
+  border-bottom: 1px dotted;
+}
+
+/**
+ * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
+ */
+
+b,
+strong {
+  font-weight: bold;
+}
+
+/**
+ * Address styling not present in Safari and Chrome.
+ */
+
+dfn {
+  font-style: italic;
+}
+
+/**
+ * Address variable `h1` font-size and margin within `section` and `article`
+ * contexts in Firefox 4+, Safari, and Chrome.
+ */
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/**
+ * Address styling not present in IE 8/9.
+ */
+
+mark {
+  background: #ff0;
+  color: #000;
+}
+
+/**
+ * Address inconsistent and variable font size in all browsers.
+ */
+
+small {
+  font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` affecting `line-height` in all browsers.
+ */
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sup {
+  top: -0.5em;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+/* Embedded content
+   ========================================================================== */
+
+/**
+ * Remove border when inside `a` element in IE 8/9/10.
+ */
+
+img {
+  border: 0;
+}
+
+/**
+ * Correct overflow not hidden in IE 9/10/11.
+ */
+
+svg:not(:root) {
+  overflow: hidden;
+}
+
+/* Grouping content
+   ========================================================================== */
+
+/**
+ * Address margin not present in IE 8/9 and Safari.
+ */
+
+figure {
+  margin: 1em 40px;
+}
+
+/**
+ * Address differences between Firefox and other browsers.
+ */
+
+hr {
+  box-sizing: content-box;
+  height: 0;
+}
+
+/**
+ * Contain overflow in all browsers.
+ */
+
+pre {
+  overflow: auto;
+}
+
+/**
+ * Address odd `em`-unit font size rendering in all browsers.
+ */
+
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+
+/* Forms
+   ========================================================================== */
+
+/**
+ * Known limitation: by default, Chrome and Safari on OS X allow very limited
+ * styling of `select`, unless a `border` property is set.
+ */
+
+/**
+ * 1. Correct color not being inherited.
+ *    Known issue: affects color of disabled elements.
+ * 2. Correct font properties not being inherited.
+ * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  color: inherit; /* 1 */
+  font: inherit; /* 2 */
+  margin: 0; /* 3 */
+}
+
+/**
+ * Address `overflow` set to `hidden` in IE 8/9/10/11.
+ */
+
+button {
+  overflow: visible;
+}
+
+/**
+ * Address inconsistent `text-transform` inheritance for `button` and `select`.
+ * All other form control elements do not inherit `text-transform` values.
+ * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
+ * Correct `select` style inheritance in Firefox.
+ */
+
+button,
+select {
+  text-transform: none;
+}
+
+/**
+ * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+ *    and `video` controls.
+ * 2. Correct inability to style clickable `input` types in iOS.
+ * 3. Improve usability and consistency of cursor style between image-type
+ *    `input` and others.
+ */
+
+button,
+html input[type="button"], /* 1 */
+input[type="reset"],
+input[type="submit"] {
+  -webkit-appearance: button; /* 2 */
+  cursor: pointer; /* 3 */
+}
+
+/**
+ * Re-set default cursor for disabled elements.
+ */
+
+button[disabled],
+html input[disabled] {
+  cursor: default;
+}
+
+/**
+ * Remove inner padding and border in Firefox 4+.
+ */
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+
+/**
+ * Address Firefox 4+ setting `line-height` on `input` using `!important` in
+ * the UA stylesheet.
+ */
+
+input {
+  line-height: normal;
+}
+
+/**
+ * It's recommended that you don't attempt to style these elements.
+ * Firefox's implementation doesn't respect box-sizing, padding, or width.
+ *
+ * 1. Address box sizing set to `content-box` in IE 8/9/10.
+ * 2. Remove excess padding in IE 8/9/10.
+ */
+
+input[type="checkbox"],
+input[type="radio"] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Fix the cursor style for Chrome's increment/decrement buttons. For certain
+ * `font-size` values of the `input`, it causes the cursor style of the
+ * decrement button to change from `default` to `text`.
+ */
+
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * 1. Address `appearance` set to `searchfield` in Safari and Chrome.
+ * 2. Address `box-sizing` set to `border-box` in Safari and Chrome
+ *    (include `-moz` to future-proof).
+ */
+
+input[type="search"] {
+  -webkit-appearance: textfield; /* 1 */ /* 2 */
+  box-sizing: content-box;
+}
+
+/**
+ * Remove inner padding and search cancel button in Safari and Chrome on OS X.
+ * Safari (but not Chrome) clips the cancel button when the search input has
+ * padding (and `textfield` appearance).
+ */
+
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * Define consistent border, margin, and padding.
+ */
+
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+
+/**
+ * 1. Correct `color` not being inherited in IE 8/9/10/11.
+ * 2. Remove padding so people aren't caught out if they zero out fieldsets.
+ */
+
+legend {
+  border: 0; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Remove default vertical scrollbar in IE 8/9/10/11.
+ */
+
+textarea {
+  overflow: auto;
+}
+
+/**
+ * Don't inherit the `font-weight` (applied by a rule above).
+ * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
+ */
+
+optgroup {
+  font-weight: bold;
+}
+
+/* Tables
+   ========================================================================== */
+
+/**
+ * Remove most spacing between table cells.
+ */
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+td,
+th {
+  padding: 0;
+}
--- a/stylesheets/print.css
+++ b/stylesheets/print.css
@@ -0,0 +1,228 @@
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  padding: 0;
+  margin: 0;
+  font: inherit;
+  font-size: 100%;
+  vertical-align: baseline;
+  border: 0;
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+  display: block;
+}
+body {
+  line-height: 1;
+}
+ol, ul {
+  list-style: none;
+}
+blockquote, q {
+  quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+  content: '';
+  content: none;
+}
+table {
+  border-spacing: 0;
+  border-collapse: collapse;
+}
+body {
+  font-family: 'Helvetica Neue', Helvetica, Arial, serif;
+  font-size: 13px;
+  line-height: 1.5;
+  color: #000;
+}
+
+a {
+  font-weight: bold;
+  color: #d5000d;
+}
+
+header {
+  padding-top: 35px;
+  padding-bottom: 10px;
+}
+
+header h1 {
+  font-size: 48px;
+  font-weight: bold;
+  line-height: 1.2;
+  color: #303030;
+  letter-spacing: -1px;
+}
+
+header h2 {
+  font-size: 24px;
+  font-weight: normal;
+  line-height: 1.3;
+  color: #aaa;
+  letter-spacing: -1px;
+}
+#downloads {
+  display: none;
+}
+#main_content {
+  padding-top: 20px;
+}
+
+code, pre {
+  margin-bottom: 30px;
+  font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal;
+  font-size: 12px;
+  color: #222;
+}
+
+code {
+  padding: 0 3px;
+}
+
+pre {
+  padding: 20px;
+  overflow: auto;
+  border: solid 1px #ddd;
+}
+pre code {
+  padding: 0;
+}
+
+ul, ol, dl {
+  margin-bottom: 20px;
+}
+
+
+/* COMMON STYLES */
+
+table {
+  width: 100%;
+  border: 1px solid #ebebeb;
+}
+
+th {
+  font-weight: 500;
+}
+
+td {
+  font-weight: 300;
+  text-align: center;
+  border: 1px solid #ebebeb;
+}
+
+form {
+  padding: 20px;
+  background: #f2f2f2;
+
+}
+
+
+/* GENERAL ELEMENT TYPE STYLES */
+
+h1 {
+  font-size: 2.8em;
+}
+
+h2 {
+  margin-bottom: 8px;
+  font-size: 22px;
+  font-weight: bold;
+  color: #303030;
+}
+
+h3 {
+  margin-bottom: 8px;
+  font-size: 18px;
+  font-weight: bold;
+  color: #d5000d;
+}
+
+h4 {
+  font-size: 16px;
+  font-weight: bold;
+  color: #303030;
+}
+
+h5 {
+  font-size: 1em;
+  color: #303030;
+}
+
+h6 {
+  font-size: .8em;
+  color: #303030;
+}
+
+p {
+  margin-bottom: 20px;
+  font-weight: 300;
+}
+
+a {
+  text-decoration: none;
+}
+
+p a {
+  font-weight: 400;
+}
+
+blockquote {
+  padding: 0 0 0 30px;
+  margin-bottom: 20px;
+  font-size: 1.6em;
+  border-left: 10px solid #e9e9e9;
+}
+
+ul li {
+  padding-left: 20px;
+  list-style-position: inside;
+  list-style: disc;
+}
+
+ol li {
+  padding-left: 3px;
+  list-style-position: inside;
+  list-style: decimal;
+}
+
+dl dd {
+  font-style: italic;
+  font-weight: 100;
+}
+
+footer {
+  padding-top: 20px;
+  padding-bottom: 30px;
+  margin-top: 40px;
+  font-size: 13px;
+  color: #aaa;
+}
+
+footer a {
+  color: #666;
+}
+
+/* MISC */
+.clearfix:after {
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+  content: '.';
+}
+
+.clearfix {display: inline-block;}
+* html .clearfix {height: 1%;}
+.clearfix {display: block;}
--- a/stylesheets/stylesheet.css
+++ b/stylesheets/stylesheet.css
@@ -0,0 +1,881 @@
+/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
+
+/**
+ * 1. Set default font family to sans-serif.
+ * 2. Prevent iOS text size adjust after orientation change, without disabling
+ *    user zoom.
+ */
+
+html {
+  font-family: sans-serif; /* 1 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+  -ms-text-size-adjust: 100%; /* 2 */
+}
+
+/**
+ * Remove default margin.
+ */
+
+body {
+  margin: 0;
+}
+
+/* HTML5 display definitions
+   ========================================================================== */
+
+/**
+ * Correct `block` display not defined for any HTML5 element in IE 8/9.
+ * Correct `block` display not defined for `details` or `summary` in IE 10/11
+ * and Firefox.
+ * Correct `block` display not defined for `main` in IE 11.
+ */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+menu,
+nav,
+section,
+summary {
+  display: block;
+}
+
+/**
+ * 1. Correct `inline-block` display not defined in IE 8/9.
+ * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
+ */
+
+audio,
+canvas,
+progress,
+video {
+  display: inline-block; /* 1 */
+  vertical-align: baseline; /* 2 */
+}
+
+/**
+ * Prevent modern browsers from displaying `audio` without controls.
+ * Remove excess height in iOS 5 devices.
+ */
+
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+
+/**
+ * Address `[hidden]` styling not present in IE 8/9/10.
+ * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
+ */
+
+[hidden],
+template {
+  display: none;
+}
+
+/* Links
+   ========================================================================== */
+
+/**
+ * Remove the gray background color from active links in IE 10.
+ */
+
+a {
+  background-color: transparent;
+}
+
+/**
+ * Improve readability when focused and also mouse hovered in all browsers.
+ */
+
+a:active,
+a:hover {
+  outline: 0;
+}
+
+/* Text-level semantics
+   ========================================================================== */
+
+/**
+ * Address styling not present in IE 8/9/10/11, Safari, and Chrome.
+ */
+
+abbr[title] {
+  border-bottom: 1px dotted;
+}
+
+/**
+ * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
+ */
+
+b,
+strong {
+  font-weight: bold;
+}
+
+/**
+ * Address styling not present in Safari and Chrome.
+ */
+
+dfn {
+  font-style: italic;
+}
+
+/**
+ * Address variable `h1` font-size and margin within `section` and `article`
+ * contexts in Firefox 4+, Safari, and Chrome.
+ */
+
+h1 {
+  margin: 0.67em 0;
+  font-size: 2em;
+}
+
+/**
+ * Address styling not present in IE 8/9.
+ */
+
+mark {
+  color: #000;
+  background: #ff0;
+}
+
+/**
+ * Address inconsistent and variable font size in all browsers.
+ */
+
+small {
+  font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` affecting `line-height` in all browsers.
+ */
+
+sub,
+sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+
+sup {
+  top: -0.5em;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+/* Embedded content
+   ========================================================================== */
+
+/**
+ * Remove border when inside `a` element in IE 8/9/10.
+ */
+
+img {
+  border: 0;
+}
+
+/**
+ * Correct overflow not hidden in IE 9/10/11.
+ */
+
+svg:not(:root) {
+  overflow: hidden;
+}
+
+/* Grouping content
+   ========================================================================== */
+
+/**
+ * Address margin not present in IE 8/9 and Safari.
+ */
+
+figure {
+  margin: 1em 40px;
+}
+
+/**
+ * Address differences between Firefox and other browsers.
+ */
+
+hr {
+  height: 0;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+}
+
+/**
+ * Contain overflow in all browsers.
+ */
+
+pre {
+  overflow: auto;
+}
+
+/**
+ * Address odd `em`-unit font size rendering in all browsers.
+ */
+
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+
+/* Forms
+   ========================================================================== */
+
+/**
+ * Known limitation: by default, Chrome and Safari on OS X allow very limited
+ * styling of `select`, unless a `border` property is set.
+ */
+
+/**
+ * 1. Correct color not being inherited.
+ *    Known issue: affects color of disabled elements.
+ * 2. Correct font properties not being inherited.
+ * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  margin: 0; /* 3 */
+  font: inherit; /* 2 */
+  color: inherit; /* 1 */
+}
+
+/**
+ * Address `overflow` set to `hidden` in IE 8/9/10/11.
+ */
+
+button {
+  overflow: visible;
+}
+
+/**
+ * Address inconsistent `text-transform` inheritance for `button` and `select`.
+ * All other form control elements do not inherit `text-transform` values.
+ * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
+ * Correct `select` style inheritance in Firefox.
+ */
+
+button,
+select {
+  text-transform: none;
+}
+
+/**
+ * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+ *    and `video` controls.
+ * 2. Correct inability to style clickable `input` types in iOS.
+ * 3. Improve usability and consistency of cursor style between image-type
+ *    `input` and others.
+ */
+
+button,
+html input[type="button"], /* 1 */
+input[type="reset"],
+input[type="submit"] {
+  -webkit-appearance: button; /* 2 */
+  cursor: pointer; /* 3 */
+}
+
+/**
+ * Re-set default cursor for disabled elements.
+ */
+
+button[disabled],
+html input[disabled] {
+  cursor: default;
+}
+
+/**
+ * Remove inner padding and border in Firefox 4+.
+ */
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+
+/**
+ * Address Firefox 4+ setting `line-height` on `input` using `!important` in
+ * the UA stylesheet.
+ */
+
+input {
+  line-height: normal;
+}
+
+/**
+ * It's recommended that you don't attempt to style these elements.
+ * Firefox's implementation doesn't respect box-sizing, padding, or width.
+ *
+ * 1. Address box sizing set to `content-box` in IE 8/9/10.
+ * 2. Remove excess padding in IE 8/9/10.
+ */
+
+input[type="checkbox"],
+input[type="radio"] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Fix the cursor style for Chrome's increment/decrement buttons. For certain
+ * `font-size` values of the `input`, it causes the cursor style of the
+ * decrement button to change from `default` to `text`.
+ */
+
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * 1. Address `appearance` set to `searchfield` in Safari and Chrome.
+ * 2. Address `box-sizing` set to `border-box` in Safari and Chrome
+ *    (include `-moz` to future-proof).
+ */
+
+input[type="search"] {
+  -webkit-box-sizing: content-box; /* 2 */
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  -webkit-appearance: textfield; /* 1 */
+}
+
+/**
+ * Remove inner padding and search cancel button in Safari and Chrome on OS X.
+ * Safari (but not Chrome) clips the cancel button when the search input has
+ * padding (and `textfield` appearance).
+ */
+
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * Define consistent border, margin, and padding.
+ */
+
+fieldset {
+  padding: 0.35em 0.625em 0.75em;
+  margin: 0 2px;
+  border: 1px solid #c0c0c0;
+}
+
+/**
+ * 1. Correct `color` not being inherited in IE 8/9/10/11.
+ * 2. Remove padding so people aren't caught out if they zero out fieldsets.
+ */
+
+legend {
+  padding: 0; /* 2 */
+  border: 0; /* 1 */
+}
+
+/**
+ * Remove default vertical scrollbar in IE 8/9/10/11.
+ */
+
+textarea {
+  overflow: auto;
+}
+
+/**
+ * Don't inherit the `font-weight` (applied by a rule above).
+ * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
+ */
+
+optgroup {
+  font-weight: bold;
+}
+
+/* Tables
+   ========================================================================== */
+
+/**
+ * Remove most spacing between table cells.
+ */
+
+table {
+  border-spacing: 0;
+  border-collapse: collapse;
+}
+
+td,
+th {
+  padding: 0;
+}
+
+/* LAYOUT STYLES */
+body {
+  font-family: 'Helvetica Neue', Helvetica, Arial, serif;
+  font-size: 15px;
+  font-weight: 400;
+  line-height: 1.5;
+  color: #666;
+  background: #fafafa url(../images/body-bg.jpg) 0 0 repeat;
+}
+
+p {
+  margin-top: 0;
+}
+
+a {
+  color: #2879d0;
+}
+a:hover {
+  color: #2268b2;
+}
+
+header {
+  padding-top: 40px;
+  padding-bottom: 40px;
+  font-family: 'Architects Daughter', 'Helvetica Neue', Helvetica, Arial, serif;
+  background: #2e7bcf url(../images/header-bg.jpg) 0 0 repeat-x;
+  border-bottom: solid 1px #275da1;
+}
+
+header h1 {
+  width: 540px;
+  margin-top: 0;
+  margin-bottom: 0.2em;
+  font-size: 72px;
+  font-weight: normal;
+  line-height: 1;
+  color: #fff;
+  letter-spacing: -1px;
+}
+
+header h2 {
+  width: 540px;
+  margin-top: 0;
+  margin-bottom: 0;
+  font-size: 26px;
+  font-weight: normal;
+  line-height: 1.3;
+  color: #9ddcff;
+  letter-spacing: 0;
+}
+
+.inner {
+  position: relative;
+  width: 940px;
+  margin: 0 auto;
+}
+
+#content-wrapper {
+  padding-top: 30px;
+  border-top: solid 1px #fff;
+}
+
+#main-content {
+  float: left;
+  width: 690px;
+}
+
+#main-content img {
+  max-width: 100%;
+}
+
+aside#sidebar {
+  float: right;
+  width: 200px;
+  min-height: 504px;
+  padding-left: 20px;
+  font-size: 12px;
+  line-height: 1.3;
+  background: transparent url(../images/sidebar-bg.jpg) 0 0 no-repeat;
+}
+
+aside#sidebar p.repo-owner,
+aside#sidebar p.repo-owner a {
+  font-weight: bold;
+}
+
+#downloads {
+  margin-bottom: 40px;
+}
+
+a.button {
+  width: 134px;
+  height: 58px;
+  padding-top: 22px;
+  padding-left: 68px;
+  font-family: 'Architects Daughter', 'Helvetica Neue', Helvetica, Arial, serif;
+  font-size: 23px;
+  line-height: 1.2;
+  color: #fff;
+}
+a.button small {
+  display: block;
+  font-size: 11px;
+}
+header a.button {
+  position: absolute;
+  top: 0;
+  right: 0;
+  background: transparent url(../images/github-button.png) 0 0 no-repeat;
+}
+aside a.button {
+  display: block;
+  width: 138px;
+  padding-left: 64px;
+  margin-bottom: 20px;
+  font-size: 21px;
+  background: transparent url(../images/download-button.png) 0 0 no-repeat;
+}
+
+code, pre {
+  margin-bottom: 30px;
+  font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace;
+  font-size: 13px;
+  color: #222;
+}
+
+code {
+  padding: 0 3px;
+  background-color: #f2f8fc;
+  border: solid 1px #dbe7f3;
+}
+
+pre {
+  padding: 20px;
+  overflow: auto;
+  text-shadow: none;
+  background: #fff;
+  border: solid 1px #f2f2f2;
+}
+pre code {
+  padding: 0;
+  color: #2879d0;
+  background-color: #fff;
+  border: none;
+}
+
+ul, ol, dl {
+  margin-bottom: 20px;
+}
+
+
+/* COMMON STYLES */
+
+hr {
+  height: 0;
+  margin-top: 1em;
+  margin-bottom: 1em;
+  border: 0;
+  border-top: solid 1px #ddd;
+}
+
+table {
+  width: 100%;
+  border: 1px solid #ebebeb;
+}
+
+th {
+  font-weight: 500;
+}
+
+td {
+  font-weight: 300;
+  text-align: center;
+  border: 1px solid #ebebeb;
+}
+
+form {
+  padding: 20px;
+  background: #f2f2f2;
+
+}
+
+
+/* GENERAL ELEMENT TYPE STYLES */
+
+#main-content h1 {
+  margin-top: 0;
+  margin-bottom: 0;
+  font-family: 'Architects Daughter', 'Helvetica Neue', Helvetica, Arial, serif;
+  font-size: 2.8em;
+  font-weight: normal;
+  color: #474747;
+  text-indent: 6px;
+  letter-spacing: -1px;
+}
+
+#main-content h1:before {
+  padding-right: 0.3em;
+  margin-left: -0.9em;
+  color: #9ddcff;
+  content: "/";
+}
+
+#main-content h2 {
+  margin-bottom: 8px;
+  font-family: 'Architects Daughter', 'Helvetica Neue', Helvetica, Arial, serif;
+  font-size: 22px;
+  font-weight: bold;
+  color: #474747;
+  text-indent: 4px;
+}
+#main-content h2:before {
+  padding-right: 0.3em;
+  margin-left: -1.5em;
+  content: "//";
+  color: #9ddcff;
+}
+
+#main-content h3 {
+  margin-top: 24px;
+  margin-bottom: 8px;
+  font-family: 'Architects Daughter', 'Helvetica Neue', Helvetica, Arial, serif;
+  font-size: 18px;
+  font-weight: bold;
+  color: #474747;
+  text-indent: 3px;
+}
+
+#main-content h3:before {
+  padding-right: 0.3em;
+  margin-left: -2em;
+  content: "///";
+  color: #9ddcff;
+}
+
+#main-content h4 {
+  margin-bottom: 8px;
+  font-family: 'Architects Daughter', 'Helvetica Neue', Helvetica, Arial, serif;
+  font-size: 15px;
+  font-weight: bold;
+  color: #474747;
+  text-indent: 3px;
+}
+
+h4:before {
+  padding-right: 0.3em;
+  margin-left: -2.8em;
+  content: "////";
+  color: #9ddcff;
+}
+
+#main-content h5 {
+  margin-bottom: 8px;
+  font-family: 'Architects Daughter', 'Helvetica Neue', Helvetica, Arial, serif;
+  font-size: 14px;
+  color: #474747;
+  text-indent: 3px;
+}
+h5:before {
+  padding-right: 0.3em;
+  margin-left: -3.2em;
+  content: "/////";
+  color: #9ddcff;
+}
+
+#main-content h6 {
+  margin-bottom: 8px;
+  font-family: 'Architects Daughter', 'Helvetica Neue', Helvetica, Arial, serif;
+  font-size: .8em;
+  color: #474747;
+  text-indent: 3px;
+}
+h6:before {
+  padding-right: 0.3em;
+  margin-left: -3.7em;
+  content: "//////";
+  color: #9ddcff;
+}
+
+p {
+  margin-bottom: 20px;
+}
+
+a {
+  text-decoration: none;
+}
+
+p a {
+  font-weight: 400;
+}
+
+blockquote {
+  padding: 0 0 0 30px;
+  margin-bottom: 20px;
+  font-size: 1.6em;
+  border-left: 10px solid #e9e9e9;
+}
+
+ul {
+  list-style-position: inside;
+  list-style: disc;
+  padding-left: 20px;
+}
+
+ol {
+  list-style-position: inside;
+  list-style: decimal;
+  padding-left: 3px;
+}
+
+dl dd {
+  font-style: italic;
+  font-weight: 100;
+}
+
+footer {
+  padding-top: 20px;
+  padding-bottom: 30px;
+  margin-top: 40px;
+  font-size: 13px;
+  color: #aaa;
+  background: transparent url('../images/hr.png') 0 0 no-repeat;
+}
+
+footer a {
+  color: #666;
+}
+footer a:hover {
+  color: #444;
+}
+
+/* MISC */
+.clearfix:after {
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+  content: '.';
+}
+
+.clearfix {display: inline-block;}
+* html .clearfix {height: 1%;}
+.clearfix {display: block;}
+
+/* #Media Queries
+================================================== */
+
+/* Smaller than standard 960 (devices and browsers) */
+@media only screen and (max-width: 959px) { }
+
+/* Tablet Portrait size to standard 960 (devices and browsers) */
+@media only screen and (min-width: 768px) and (max-width: 959px) {
+  .inner {
+    width: 740px;
+  }
+  header h1, header h2 {
+    width: 340px;
+  }
+  header h1 {
+    font-size: 60px;
+  }
+  header h2 {
+    font-size: 30px;
+  }
+  #main-content {
+    width: 490px;
+  }
+  #main-content h1:before,
+  #main-content h2:before,
+  #main-content h3:before,
+  #main-content h4:before,
+  #main-content h5:before,
+  #main-content h6:before {
+    padding-right: 0;
+    margin-left: 0;
+    content: none;
+  }
+}
+
+/* All Mobile Sizes (devices and browser) */
+@media only screen and (max-width: 767px) {
+  .inner {
+    width: 93%;
+  }
+  header {
+    padding: 20px 0;
+  }
+  header .inner {
+    position: relative;
+  }
+  header h1, header h2 {
+    width: 100%;
+  }
+  header h1 {
+    font-size: 48px;
+  }
+  header h2 {
+    font-size: 24px;
+  }
+  header a.button {
+    position: relative;
+    display: inline-block;
+    width: auto;
+    height: auto;
+    padding: 5px 10px;
+    margin-top: 15px;
+    font-size: 13px;
+    line-height: 1;
+    color: #2879d0;
+    text-align: center;
+    background-color: #9ddcff;
+    background-image: none;
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+  }
+  header a.button small {
+    display: inline;
+    font-size: 13px;
+  }
+  #main-content,
+  aside#sidebar {
+    float: none;
+    width: 100% ! important;
+  }
+  aside#sidebar {
+    min-height: 0;
+    padding: 20px 0;
+    margin-top: 20px;
+    background-image: none;
+    border-top: solid 1px #ddd;
+  }
+  aside#sidebar a.button {
+    display: none;
+  }
+  #main-content h1:before,
+  #main-content h2:before,
+  #main-content h3:before,
+  #main-content h4:before,
+  #main-content h5:before,
+  #main-content h6:before {
+    padding-right: 0;
+    margin-left: 0;
+    content: none;
+  }
+}
+
+/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */
+@media only screen and (min-width: 480px) and (max-width: 767px) { }
+
+/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
+@media only screen and (max-width: 479px) { }
+
--- a/tcp.go
+++ b/tcp.go
@@ -1,76 +0,0 @@
-// Thanks go to https://github.com/Soontao/cachet-monitor/blob/master/tcp.go
-package cachet
-
-import (
-	"fmt"
-	"net"
-	"time"
-)
-
-// Investigating template
-var defaultTCPInvestigatingTpl = MessageTemplate{
-	Subject: `{{ .Monitor.Name }} - {{ .SystemName }}`,
-	Message: `{{ .Monitor.Name }} check **failed** (server time: {{ .now }})
-
-{{ .FailReason }}`,
-}
-
-// Fixed template
-var defaultTCPFixedTpl = MessageTemplate{
-	Subject: `{{ .Monitor.Name }} - {{ .SystemName }}`,
-	Message: `**Resolved** - {{ .now }}
-
-Down seconds: {{ .downSeconds }}s`,
-}
-
-// TCPMonitor struct
-type TCPMonitor struct {
-	AbstractMonitor `mapstructure:",squash"`
-	Port            string
-}
-
-// CheckTCPPortAlive func
-func CheckTCPPortAlive(ip, port string, timeout int64) (bool, error) {
-
-	conn, err := net.DialTimeout("tcp", net.JoinHostPort(ip, port), time.Duration(timeout)*time.Second)
-	if conn != nil {
-		defer conn.Close()
-	}
-	if err != nil {
-		return false, err
-	} else {
-		return true, nil
-	}
-
-}
-
-// test if it available
-func (m *TCPMonitor) test() bool {
-	if alive, e := CheckTCPPortAlive(m.Target, m.Port, int64(m.Timeout)); alive {
-		return true
-	} else {
-		m.lastFailReason = fmt.Sprintf("TCP check failed: %v", e)
-		return false
-	}
-}
-
-// Validate configuration
-func (m *TCPMonitor) Validate() []string {
-
-	// set incident temp
-	m.Template.Investigating.SetDefault(defaultTCPInvestigatingTpl)
-	m.Template.Fixed.SetDefault(defaultTCPFixedTpl)
-
-	// super.Validate()
-	errs := m.AbstractMonitor.Validate()
-
-	if m.Target == "" {
-		errs = append(errs, "Target is required")
-	}
-
-	if m.Port == "" {
-		errs = append(errs, "Port is required")
-	}
-
-	return errs
-}
--- a/template.go
+++ b/template.go
@@ -1,53 +0,0 @@
-package cachet
-
-import (
-	"bytes"
-	"text/template"
-)
-
-type MessageTemplate struct {
-	Subject string `json:"subject"`
-	Message string `json:"message"`
-
-	subjectTpl *template.Template
-	messageTpl *template.Template
-}
-
-func (t *MessageTemplate) SetDefault(d MessageTemplate) {
-	if len(t.Subject) == 0 {
-		t.Subject = d.Subject
-	}
-	if len(t.Message) == 0 {
-		t.Message = d.Message
-	}
-}
-
-// TODO: test
-func (t *MessageTemplate) Compile() error {
-	var err error
-
-	if len(t.Subject) > 0 {
-		t.subjectTpl, err = compileTemplate(t.Subject)
-	}
-
-	if err == nil && len(t.Message) > 0 {
-		t.messageTpl, err = compileTemplate(t.Message)
-	}
-
-	return err
-}
-
-func (t *MessageTemplate) Exec(data interface{}) (string, string) {
-	return t.exec(t.subjectTpl, data), t.exec(t.messageTpl, data)
-}
-
-func (t *MessageTemplate) exec(tpl *template.Template, data interface{}) string {
-	buf := new(bytes.Buffer)
-
-	tpl.Execute(buf, data)
-	return buf.String()
-}
-
-func compileTemplate(text string) (*template.Template, error) {
-	return template.New("").Parse(text)
-}
Author	SHA1	Message	Date
Matej Kramny	137cc389a7	Set theme jekyll-theme-minimal	2017-02-12 20:00:53 -08:00
Matej Kramny	12c54177d4	Update index.md	2017-02-12 19:59:45 -08:00
Matej Kramny	ca11aff020	Update	2017-02-12 19:59:10 -08:00
Matej Kramny	dc44979952	Set theme jekyll-theme-architect and migrate Page Generator content	2017-02-12 19:59:02 -08:00
Matej Kramny	da2abf6585	update screenshot	2016-05-19 19:31:03 +01:00
Matej Kramny	13df66aa7e	Merge branch 'master' into gh-pages * master: (40 commits) Add to readme, remove comment Update documentation More config options, markdown in incidents Update readme refactoring Vision readme better packaging Update go install guide update readme Implement 'inteval' config parameter -> number of seconds between checks Fix configuration example in README Update documentation for api url Fix v1 api url Add screenshot to readme Report new incident and set as fixed Update interval to 5 secs Update example config with default values Improve fail reasons, fix api crashes Add time interval Improve readme, Dockerfile ...	2016-05-19 19:30:49 +01:00
Matej Kramny	184625088b	Create gh-pages branch via GitHub	2016-05-19 19:27:52 +01:00
Matej Kramny	b30c46546d	Create gh-pages branch via GitHub	2015-07-19 21:39:19 +01:00
Matej Kramny	466e4c05af	Add Screenshot	2015-07-19 21:37:15 +01:00
Matej Kramny	ab4ee52859	Create gh-pages branch via GitHub	2015-07-19 21:35:56 +01:00