Set theme jekyll-theme-minimal

* 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
  ...

.gitignore

@@ -1,3 +1,2 @@
-/config.yml
+gin-bin
-/config.json
+example.config.local.json
-examples/

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/

_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

api.go

@@ -1,79 +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")
-	}
-
-	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)
-	}
-}
-
-// 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)
-
-	return res, body, err
-}

cli/main.go

@@ -3,123 +3,89 @@ package main
 import (
 	"encoding/json"
 	"errors"
+	"flag"
+	"fmt"
 	"io/ioutil"
+	"log"
 	"net/http"
 	"net/url"
 	"os"
 	"os/signal"
-	"strings"
 	"sync"
 
-	"github.com/Sirupsen/logrus"
 	cachet "github.com/castawaylabs/cachet-monitor"
-	docopt "github.com/docopt/docopt-go"
-	"github.com/mitchellh/mapstructure"
-	"gopkg.in/yaml.v2"
 )
 
-const usage = `cachet-monitor
+var configPath string
-
+var systemName string
-Usage:
+var logPath string
-  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`
 
 func main() {
-	arguments, _ := docopt.Parse(usage, nil, true, "cachet-monitor", 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 {
+	if len(systemName) > 0 {
-		cfg.Immediate = immediate.(bool)
+		cfg.SystemName = systemName
 	}
-
+	if len(logPath) > 0 {
-	if name := arguments["--name"]; name != nil {
+		cfg.LogPath = logPath
-		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")
+		cfg.APIToken = os.Getenv("CACHET_TOKEN")
-	}
-	if len(os.Getenv("CACHET_DEV")) > 0 {
-		logrus.SetLevel(logrus.DebugLevel)
 	}
 
-	if valid := cfg.Validate(); !valid {
+	if err := cfg.ValidateConfiguration(); err != nil {
-		logrus.Errorf("Invalid configuration")
+		panic(err)
-		os.Exit(1)
 	}
 
-	logrus.Debug("Configuration valid")
+	cfg.Logger.Printf("System: %s\nAPI: %s\nMonitors: %d\n\n", cfg.SystemName, cfg.APIUrl, len(cfg.Monitors))
-	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")
 
 	wg := &sync.WaitGroup{}
-	for index, monitor := range cfg.Monitors {
+	for _, mon := range cfg.Monitors {
-		logrus.Infof("Starting Monitor #%d: ", index)
+		go mon.Start(cfg, wg)
-		logrus.Infof("Features: \n - %v", strings.Join(monitor.Describe(), "\n - "))
-
-		go monitor.ClockStart(cfg, monitor, 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 {
+func getLogger(logPath string) *log.Logger {
-	if logPath == nil || len(logPath.(string)) == 0 {
+	var logWriter = os.Stdout
-		return 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))
+	flags := log.Llongfile | log.Ldate | log.Ltime
-	if err != nil {
+	if len(os.Getenv("CACHET_DEV")) > 0 {
-		logrus.Errorf("Unable to open file '%v' for logging: \n%v", logPath, err)
+		flags = 0
-		os.Exit(1)
 	}
 
-	return file
+	return log.New(logWriter, "", flags)
 }
 
 func getConfiguration(path string) (*cachet.CachetMonitor, error) {
@@ -132,65 +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, errors.New("Cannot download network config: " + err.Error())
-			return nil, err
 		}
 
 		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") {
+	if err := json.Unmarshal(data, &cfg); err != nil {
-		err = yaml.Unmarshal(data, &cfg)
+		fmt.Println(err)
-	} else {
+		return nil, errors.New("Cannot parse config!")
-		err = json.Unmarshal(data, &cfg)
 	}
 
-	if err != nil {
+	cfg.Logger = getLogger(cfg.LogPath)
-		logrus.Warnf("Unable to parse configuration file")
-	}
 
-	cfg.Monitors = make([]cachet.MonitorInterface, len(cfg.RawMonitors))
+	return &cfg, nil
-	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
-		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
 }

config.go

@@ -1,89 +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"`
+	Logger *log.Logger `json:"-"`
-	DateFormat  string                   `json:"date_format" yaml:"date_format"`
-	API         CachetAPI                `json:"api"`
-	RawMonitors []map[string]interface{} `json:"monitors" yaml:"monitors"`
 
-	Monitors  []MonitorInterface `json:"-" yaml:"-"`
+	APIUrl      string `json:"api_url"`
-	Immediate bool               `json:"-" yaml:"-"`
+	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) ValidateConfiguration() error {
-func (cfg *CachetMonitor) Validate() bool {
+	if cfg.Logger == nil {
-	valid := true
+		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 {
+	if len(cfg.APIToken) == 0 || len(cfg.APIUrl) == 0 {
-		cfg.DateFormat = DefaultTimeFormat
+		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.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.Monitors) == 0 {
-		logrus.Warnf("No monitors defined!\nSee help for example configuration")
+		return errors.New("No monitors defined!\nSee sample configuration: https://github.com/castawaylabs/cachet-monitor/blob/master/example.config.json\n")
-		valid = false
 	}
 
-	for index, monitor := range cfg.Monitors {
+	for _, monitor := range cfg.Monitors {
-		if errs := monitor.Validate(); len(errs) > 0 {
+		if err := monitor.ValidateConfiguration(); err != nil {
-			logrus.Warnf("Monitor validation errors (index %d): %v", index, "\n - "+strings.Join(errs, "\n - "))
+			return err
-			valid = false
 		}
 	}
 
-	return valid
+	return nil
 }
 
 // getHostname returns id of the current system
 func getHostname() string {
 	hostname, err := os.Hostname()
-	if err == nil && len(hostname) > 0 {
+	if err != nil || len(hostname) == 0 {
-		return hostname
+		addrs, err := net.InterfaceAddrs()
+
+		if err != nil {
+			return "unknown"
+		}
+
+		for _, addr := range addrs {
+			return addr.String()
+		}
 	}
 
-	addrs, err := net.InterfaceAddrs()
+	return hostname
-	if err != nil || len(addrs) == 0 {
-		return "unknown"
-	}
-
-	return addrs[0].String()
-}
-
-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),
-	}
 }

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")
-	}
-}

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
-}

example.config.json

@@ -1,59 +1,17 @@
 {
-  "api": {
+  "api_url": "https://demo.cachethq.io/api/v1",
-    "url": "https://demo.cachethq.io/api/v1",
+  "api_token": "9yMHsdioQosnyVK4iCVR",
-    "token": "9yMHsdioQosnyVK4iCVR",
+  "interval": 5,
-    "insecure": false
-  },
-  "date_format": "02/01/2006 15:04:05 MST",
   "monitors": [
     {
-      "name": "google",
+      "name": "nodegear frontend",
-      "target": "https://google.com",
+      "url": "https://nodegear.io/ping",
-      "strict": true,
+      "metric_id": 1,
-      "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": {
+      "component_id": null,
-        "Authorization": "Basic <hash>"
-      },
       "expected_status_code": 200,
-      "expected_body": "P.*NG"
+      "strict_tls": true
-    },
-    {
-      "name": "dns",
-      "target": "matej.me.",
-      "question": "mx",
-      "type": "dns",
-      "component_id": 2,
-      "interval": 1,
-      "timeout": 1,
-      "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."
-        }
-      ]
     }
-  ]
+  ],
+  "insecure_api": false
 }

example.config.yml

@@ -1,65 +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
-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.

http.go

@@ -1,125 +1,58 @@
 package cachet
 
 import (
+	"bytes"
 	"crypto/tls"
+	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
-	"regexp"
 	"strconv"
-	"strings"
 	"time"
 )
 
-// Investigating template
+func (monitor *CachetMonitor) makeRequest(requestType string, url string, reqBody []byte) (*http.Response, []byte, error) {
-var defaultHTTPInvestigatingTpl = MessageTemplate{
+	req, err := http.NewRequest(requestType, monitor.APIUrl+url, bytes.NewBuffer(reqBody))
-	Subject: `{{ .Monitor.Name }} - {{ .SystemName }}`,
-	Message: `{{ .Monitor.Name }} check **failed** (server time: {{ .now }})
 
-{{ .FailReason }}`,
+	req.Header.Set("Content-Type", "application/json")
-}
+	req.Header.Set("X-Cachet-Token", monitor.APIToken)
 
-// Fixed template
+	client := &http.Client{}
-var defaultHTTPFixedTpl = MessageTemplate{
+	if monitor.InsecureAPI == true {
-	Subject: `{{ .Monitor.Name }} - {{ .SystemName }}`,
+		client.Transport = &http.Transport{
-	Message: `**Resolved** - {{ .now }}
+			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-
+		}
-- - -
-
-{{ .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
-}
-
-// TODO: test
-func (monitor *HTTPMonitor) test() bool {
-	req, err := http.NewRequest(monitor.Method, monitor.Target, nil)
-	for k, v := range monitor.Headers {
-		req.Header.Add(k, v)
 	}
 
-	transport := http.DefaultTransport.(*http.Transport)
+	res, err := client.Do(req)
-	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)
 	if err != nil {
-		monitor.lastFailReason = err.Error()
+		return nil, []byte{}, err
-		return false
 	}
 
-	defer resp.Body.Close()
+	defer res.Body.Close()
+	body, _ := ioutil.ReadAll(res.Body)
 
-	if monitor.ExpectedStatusCode > 0 && resp.StatusCode != monitor.ExpectedStatusCode {
+	return res, body, nil
-		monitor.lastFailReason = "Expected HTTP response status: " + strconv.Itoa(monitor.ExpectedStatusCode) + ", got: " + strconv.Itoa(resp.StatusCode)
-		return false
-	}
-
-	if monitor.bodyRegexp != nil {
-		// check response body
-		responseBody, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			monitor.lastFailReason = err.Error()
-			return false
-		}
-
-		if !monitor.bodyRegexp.Match(responseBody) {
-			monitor.lastFailReason = "Unexpected body: " + string(responseBody) + ".\nExpected to match: " + monitor.ExpectedBody
-			return false
-		}
-	}
-
-	return true
 }
 
-// TODO: test
+// SendMetric sends lag metric point
-func (mon *HTTPMonitor) Validate() []string {
+func (monitor *Monitor) SendMetric(delay int64) error {
-	mon.Template.Investigating.SetDefault(defaultHTTPInvestigatingTpl)
+	if monitor.MetricID == 0 {
-	mon.Template.Fixed.SetDefault(defaultHTTPFixedTpl)
+		return nil
-
-	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
-		}
 	}
 
-	if len(mon.ExpectedBody) == 0 && mon.ExpectedStatusCode == 0 {
+	jsonBytes, _ := json.Marshal(&map[string]interface{}{
-		errs = append(errs, "Both 'expected_body' and 'expected_status_code' fields empty")
+		"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)
+	return nil
-	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
 }
 
-func (mon *HTTPMonitor) Describe() []string {
+func getMs() int64 {
-	features := mon.AbstractMonitor.Describe()
+	return time.Now().UnixNano() / int64(time.Millisecond)
-	features = append(features, "Method: "+mon.Method)
-
-	return features
 }

incident.go

@@ -4,8 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"strconv"
-
-	"github.com/Sirupsen/logrus"
 )
 
 // Incident Cachet data model
@@ -35,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
@@ -51,19 +49,21 @@ 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 {
+	if err := json.Unmarshal(body, &data); err != nil {
-		return fmt.Errorf("Cannot parse incident body: %v, %v", err, string(body.Data))
+		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!")
 	}
@@ -72,7 +72,7 @@ func (incident *Incident) Send(cfg *CachetMonitor) error {
 }
 
 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
 	}
@@ -82,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 {
+	if err := json.Unmarshal(body, &data); err != nil {
-		return 0, fmt.Errorf("Cannot parse component body: %v. Err = %v", string(body.Data), err)
+		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

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.

monitor.go

@@ -1,59 +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 HttpTimeout = time.Duration(time.Second)
-const DefaultTimeout = time.Second
+const DefaultInterval = 60
 const DefaultTimeFormat = "15:04:05 Jan 2 MST"
-const HistorySize = 10
 
-type MonitorInterface interface {
+// Monitor data model
-	ClockStart(*CachetMonitor, MonitorInterface, *sync.WaitGroup)
+type Monitor struct {
-	ClockStop()
+	Name          string        `json:"name"`
-	tick(MonitorInterface)
+	URL           string        `json:"url"`
-	test() bool
+	Method        string        `json:"method"`
+	StrictTLS     bool          `json:"strict_tls"`
+	CheckInterval time.Duration `json:"interval"`
 
-	Validate() []string
+	MetricID    int `json:"metric_id"`
-	GetMonitor() *AbstractMonitor
+	ComponentID int `json:"component_id"`
-	Describe() []string
-}
 
-// AbstractMonitor data model
+	// Threshold = percentage
-type AbstractMonitor struct {
+	Threshold          float32 `json:"threshold"`
-	Name   string
+	ExpectedStatusCode int     `json:"expected_status_code"`
-	Target string
+	// compiled to Regexp
+	ExpectedBody string `json:"expected_body"`
+	bodyRegexp   *regexp.Regexp
 
-	// (default)http / dns
+	history        []bool
-	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
 	lastFailReason string
 	incident       *Incident
 	config         *CachetMonitor
@@ -62,67 +44,34 @@ type AbstractMonitor struct {
 	stopC chan bool
 }
 
-func (mon *AbstractMonitor) Validate() []string {
+func (mon *Monitor) Start(cfg *CachetMonitor, wg *sync.WaitGroup) {
-	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)
-	}
-
-	return features
-}
-
-func (mon *AbstractMonitor) ClockStart(cfg *CachetMonitor, iface MonitorInterface, 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)
 	}
 
-	ticker := time.NewTicker(mon.Interval * time.Second)
+	mon.Tick()
+
+	ticker := time.NewTicker(mon.CheckInterval * time.Second)
 	for {
 		select {
 		case <-ticker.C:
-			mon.tick(iface)
+			mon.Tick()
 		case <-mon.stopC:
 			wg.Done()
 			return
@@ -130,123 +79,174 @@ func (mon *AbstractMonitor) ClockStart(cfg *CachetMonitor, iface MonitorInterfac
 	}
 }
 
-func (mon *AbstractMonitor) ClockStop() {
+func (monitor *Monitor) Stop() {
-	select {
+	if monitor.Stopped() {
-	case <-mon.stopC:
 		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 (monitor *Monitor) Tick() {
-
-func (mon *AbstractMonitor) tick(iface MonitorInterface) {
 	reqStart := getMs()
-	up := iface.test()
+	isUp := monitor.doRequest()
 	lag := getMs() - reqStart
 
-	histSize := HistorySize
+	if len(monitor.history) == 9 {
-	if mon.ThresholdCount {
+		monitor.config.Logger.Printf("%v is now saturated\n", monitor.Name)
-		histSize = int(mon.Threshold)
 	}
+	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 {
+	if isUp == true && monitor.MetricID > 0 {
-		logrus.Warnf("%v is now saturated", mon.Name)
+		monitor.SendMetric(lag)
-	}
-	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)
 	}
 }
 
-// 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
+	t := (float32(numDown) / float32(len(monitor.history))) * 100
-	l := logrus.WithFields(logrus.Fields{
+	monitor.config.Logger.Printf("%s %.2f%%/%.2f%% down at %v\n", monitor.Name, t, monitor.Threshold, time.Now().UnixNano()/int64(time.Second))
-		"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)
-	}
 
-	histSize := HistorySize
+	if len(monitor.history) != 10 {
-	if mon.ThresholdCount {
-		histSize = int(mon.Threshold)
-	}
-
-	if len(mon.history) != histSize {
 		// not saturated
 		return
 	}
 
-	triggered := (mon.ThresholdCount && numDown == int(mon.Threshold)) || (!mon.ThresholdCount && t > mon.Threshold)
+	if t > monitor.Threshold && monitor.incident == nil {
-
+		monitor.incident = &Incident{
-	if triggered && mon.incident == nil {
+			Name:        monitor.Name + " - " + monitor.config.SystemName,
-		// create incident
+			ComponentID: monitor.ComponentID,
-		tplData := getTemplateData(mon)
+			Message:     monitor.Name + " check **failed** - " + time.Now().Format(DefaultTimeFormat),
-		tplData["FailReason"] = mon.lastFailReason
-
-		subject, message := mon.Template.Investigating.Exec(tplData)
-		mon.incident = &Incident{
-			Name:        subject,
-			ComponentID: mon.ComponentID,
-			Message:     message,
 			Notify:      true,
 		}
 
-		// is down, create an incident
+		if len(monitor.lastFailReason) > 0 {
-		l.Warnf("creating incident. Monitor is down: %v", mon.lastFailReason)
+			monitor.incident.Message += "\n\n `" + monitor.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)
 		}
 
-		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 {
+func (monitor *Monitor) ValidateConfiguration() error {
-		return
+	if len(monitor.ExpectedBody) > 0 {
-	}
+		exp, err := regexp.Compile(monitor.ExpectedBody)
-
+		if err != nil {
-	// was down, created an incident, its now ok, make it resolved.
+			return err
-	l.Warn("Resolving incident")
+		}
-
+
-	// resolve incident
+		monitor.bodyRegexp = exp
-	tplData := getTemplateData(mon)
+	}
-	tplData["incident"] = mon.incident
+
-
+	if len(monitor.ExpectedBody) == 0 && monitor.ExpectedStatusCode == 0 {
-	subject, message := mon.Template.Fixed.Exec(tplData)
+		return errors.New("Nothing to check, both 'expected_body' and 'expected_status_code' fields empty")
-	mon.incident.Name = subject
+	}
-	mon.incident.Message = message
+
-	mon.incident.SetFixed()
+	if monitor.CheckInterval < 1 {
-	if err := mon.incident.Send(mon.config); err != nil {
+		monitor.CheckInterval = DefaultInterval
-		l.Printf("Error sending incident: %v", err)
+	}
-	}
+
-
+	monitor.Method = strings.ToUpper(monitor.Method)
-	mon.lastFailReason = ""
+	switch monitor.Method {
-	mon.incident = nil
+	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
 }

monitor_test.go

@@ -1,7 +0,0 @@
-package cachet
-
-import (
-	"testing"
-)
-
-func TestAnalyseData(t *testing.T) {}

readme.md

@@ -1,187 +1,91 @@
 ![screenshot](https://castawaylabs.github.io/cachet-monitor/screenshot.png)
 
-## Features
+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] 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
 
-## Example Configuration
+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
+  // URL for the API. Note: Must end with /api/v1
-api:
+  "api_url": "https://<cachet domain>/api/v1",
-  # cachet url
+  // Your API token for Cachet
-  url: https://demo.cachethq.io/api/v1
+  "api_token": "<cachet api token>",
-  # cachet api token
+  // optional, false default, set if your certificate is self-signed/untrusted
-  token: 9yMHsdioQosnyVK4iCVR
+  "insecure_api": false,
-  insecure: false
+  "monitors": [{
-# https://golang.org/src/time/format.go#L57
+    // required, friendly name for your monitor
-date_format: 02/01/2006 15:04:05 MST
+    "name": "Name of your monitor",
-monitors:
+    // required, url to probe
-  # http monitor example
+    "url": "Ping URL",
-  - name: google
+    // optional, http method (defaults GET)
-    # test url
+    "method": "get",
-    target: https://google.com
+    // self-signed ssl certificate
-    # strict certificate checking for https
+    "strict_tls": true,
-    strict: true
+    // seconds between checks
-    # HTTP method
+    "interval": 10,
-    method: POST
+    // post lag to cachet metric (graph)
-    
+    // note either metric ID or component ID are required
-    # set to update component (either component_id or metric_id are required)
+    "metric_id": <metric id>,
-    component_id: 1
+    // post incidents to this component
-    # set to post lag to cachet metric (graph)
+    "component_id": <component id>,
-    metric_id: 4
+    // If % of downtime is over this threshold, open an incident
-
+    "threshold": 80,
-    # custom templates (see readme for details)
+    // optional, expected status code (either status code or body must be supplied)
-    template:
+    "expected_status_code": 200,
-      investigating:
+    // optional, regular expression to match body content
-        subject: "{{ .Monitor.Name }} - {{ .SystemName }}"
+    "expected_body": "P.*NG"
-        message: "{{ .Monitor.Name }} check **failed** (server time: {{ .now }})\n\n{{ .FailReason }}"
+  }],
-      fixed:
+  // optional, system name to identify bot (uses hostname by default)
-        subject: "I HAVE BEEN FIXED"
+  "system_name": "",
-    
+  // optional, defaults to stdout
-    # seconds between checks
+  "log_path": ""
-    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
+Installation
+------------
 
 1. Download binary from [release page](https://github.com/CastawayLabs/cachet-monitor/releases)
-2. Create a configuration
+2. Create your configuration ([example](https://raw.githubusercontent.com/CastawayLabs/cachet-monitor/master/example.config.json))
-3. `cachet-monitor -c /etc/cachet-monitor.yaml`
+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 &`
 
 ```
-Usage:
+Usage of cachet-monitor:
-  cachet-monitor (-c PATH | --config PATH) [--log=LOGPATH] [--name=NAME] [--immediate]
+  -c="/etc/cachet-monitor.config.json": Config path
-  cachet-monitor -h | --help | --version
+  -log="": Log path
-
+  -name="": System Name
-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
+Environment variables
+---------------------
 
-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)
+| 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              |
 
-The following variables are available:
+Vision and goals
-
+----------------
-| 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
+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 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.

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;
+}
+

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;
+}

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;}

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) { }
+

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)
-}