Alerts active after refactor

- added testalert command to test authentication credentials

- Added build for makefile

- Changed default initconfig settings

.gitignore

@@ -0,0 +1 @@
+.docker-alertd.yaml

.travis.yml

@@ -5,5 +5,6 @@ services:
   - docker
 
 script:
-  - go test
+  - go test ./cmd
+  - go test 
   - go install

Makefile

@@ -0,0 +1,9 @@
+DIR=~/docker-alertd-dist
+
+build:
+	@rm -r $(DIR)
+	@mkdir -p $(DIR)/osx $(DIR)/linux $(DIR)/windows
+	@go build -o ~/dist/osx/docker-alertd
+	@GOOS=linux go build -o ~/dist/linux/docker-alertd
+	@GOOS=windows go build -o ~/dist/windows/docker-alertd.exe
+

README.md

@@ -151,3 +151,9 @@ Refer to the [launchd plist example file](https://github.com/deltaskelta/docker-
 ### With Sys V Init (various Linux systems without systemd)
 
 Refer to this [Sys V Init tutorial](https://www.cyberciti.biz/tips/linux-write-sys-v-init-script-to-start-stop-service.html)
+
+### Testing Alert Authentication
+
+Docker-Alertd comes with a `testalert` command which will search for a nonexistant
+container name and send an alert to the appropriate places, use this for testing that
+smtp or other authentication settings are correct

cmd/alertd_container_test.go

@@ -105,9 +105,9 @@ func Teardown(t *testing.T, cnt []TestContainer) {
 	}
 }
 
-func CheckHasErr(e []error, s string) bool {
-	for _, msg := range e {
-		if ErrIsErr(msg, s) {
+func CheckHasErr(e []error, s error) bool {
+	for _, err := range e {
+		if ErrContainsErr(err, s) {
 			return true
 		}
 	}
@@ -210,7 +210,7 @@ func TestCheckExists(t *testing.T) {
 			}
 
 			if test.ExpectedAlert != nil {
-				gotErr := CheckHasErr(a.Messages, test.ExpectedAlert.Error())
+				gotErr := CheckHasErr(a.Messages, test.ExpectedAlert)
 				if !gotErr {
 					t.Errorf("expected error message: %s not found in error messages", test.ExpectedAlert.Error())
 					t.Error(a.Messages)
@@ -330,7 +330,7 @@ func TestCheckRunning(t *testing.T) {
 			}
 
 			if test.ExpectedAlert != nil {
-				gotErr := CheckHasErr(a.Messages, test.ExpectedAlert.Error())
+				gotErr := CheckHasErr(a.Messages, test.ExpectedAlert)
 				if !gotErr {
 					t.Errorf("expected error message: %s not found in error messages", test.ExpectedAlert.Error())
 					t.Error(a.Messages)
@@ -453,7 +453,7 @@ func TestCheckCPUUsage(t *testing.T) {
 			}
 
 			if test.ExpectedAlert != nil {
-				gotErr := CheckHasErr(a.Messages, test.ExpectedAlert.Error())
+				gotErr := CheckHasErr(a.Messages, test.ExpectedAlert)
 				if !gotErr {
 					t.Errorf("expected error message: %s not found in error messages", test.ExpectedAlert.Error())
 					t.Error(a.Messages)
@@ -576,7 +576,7 @@ func TestCheckMemory(t *testing.T) {
 			}
 
 			if test.ExpectedAlert != nil {
-				gotErr := CheckHasErr(a.Messages, test.ExpectedAlert.Error())
+				gotErr := CheckHasErr(a.Messages, test.ExpectedAlert)
 				if !gotErr {
 					t.Errorf("expected error message: %s not found in error messages", test.ExpectedAlert.Error())
 					t.Error(a.Messages)
@@ -707,7 +707,7 @@ func TestCheckPID(t *testing.T) {
 			}
 
 			if test.ExpectedAlert != nil {
-				gotErr := CheckHasErr(a.Messages, test.ExpectedAlert.Error())
+				gotErr := CheckHasErr(a.Messages, test.ExpectedAlert)
 				if !gotErr {
 					t.Errorf("expected error message: %s not found in error messages", test.ExpectedAlert.Error())
 					t.Error(a.Messages)

cmd/initconfig.go

@@ -86,8 +86,7 @@ containers:
 # If email settings are present and active, then email alerts will be sent when an alert
 # is triggered.
 emailSettings:
-  active: true
-  smtp: smtp.someserver.com
+  smtp: smtp.nonexistantserver.com
   password: s00p3rS33cret
   port: 587
   from: auto@freshpowpow.com

cmd/monitor.go

@@ -118,18 +118,14 @@ func Monitor(c *Conf, a *Alert) {
 		for {
 			a.Clear()
 			CheckContainers(cnt, cli, a)
-			if a.ShouldSend() {
-				a.Alert()
-			}
+			a.Evaluate()
 			time.Sleep(time.Duration(c.Duration) * time.Millisecond)
 		}
 	default:
 		for i := int64(0); i < c.Iterations; i++ {
 			a.Clear()
 			CheckContainers(cnt, cli, a)
-			if a.ShouldSend() {
-				a.Alert()
-			}
+			a.Evaluate()
 			time.Sleep(time.Duration(c.Duration) * time.Millisecond)
 		}
 	}

cmd/root.go

@@ -42,7 +42,7 @@ the docker api.`,
 	// has an action associated with it:
 	Run: func(cmd *cobra.Command, args []string) {
 
-		log.Println(Config)
+		//log.Println(Config)
 		err := Config.Validate()
 		if err != nil {
 			log.Println(err)

cmd/testalert.go

@@ -0,0 +1,61 @@
+// Copyright © 2017 NAME HERE <EMAIL ADDRESS>
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cmd
+
+import (
+	"log"
+	"os"
+
+	"github.com/spf13/cobra"
+)
+
+// testalertCmd represents the testalert command
+var testalertCmd = &cobra.Command{
+	Use:   "testalert",
+	Short: "send a test alert to test auth credentials",
+	Long:  `Use the authentication credentials in the config file to send a test alert`,
+	Run: func(cmd *cobra.Command, args []string) {
+		Config.Containers = []Container{
+			Container{
+				Name: "fd42c70222be1d96224ffeb28416d4b61ffa431c0aa97818cf5ef67e9317a7d8",
+			},
+		}
+
+		Config.EmailSettings.Subject = "TEST: DOCKER-ALERTD"
+
+		err := Config.Validate()
+		if err != nil {
+			log.Println(err)
+			os.Exit(1)
+		}
+
+		Start(&Config)
+	},
+}
+
+func init() {
+	RootCmd.AddCommand(testalertCmd)
+
+	// Here you will define your flags and configuration settings.
+
+	// Cobra supports Persistent Flags which will work for this command
+	// and all subcommands, e.g.:
+	// testalertCmd.PersistentFlags().String("foo", "", "A help for foo")
+
+	// Cobra supports local flags which will only run when this command
+	// is called directly, e.g.:
+	// testalertCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+
+}