Downslice the interface necessary to fire Events

We don't need the entire Checkable interface here.

actions.go

@@ -38,13 +38,13 @@ func init() {
  An Action is something which is triggered when a rule is broken.  This is typically
  either a Notification or to Restart the service.
 */
-type ActionBuilder func(Checkable, *AlertRoute) (Action, error)
+type ActionBuilder func(Eventable, *AlertRoute) (Action, error)
 
 /*
  A Notifier is a route to send an alert somewhere else.  The global
  conf sets up the necessary params for the notification to work.
 */
-type NotifierBuilder func(Checkable, map[string]string) (Action, error)
+type NotifierBuilder func(Eventable, map[string]string) (Action, error)
 
 var (
 	Actions = map[string]ActionBuilder{
@@ -57,7 +57,7 @@ var (
 	}
 )
 
-func buildAlerter(check Checkable, route *AlertRoute) (Action, error) {
+func buildAlerter(check Eventable, route *AlertRoute) (Action, error) {
 	funk := Notifier[route.Channel]
 	if funk == nil {
 		// TODO Include valid channels
@@ -66,7 +66,7 @@ func buildAlerter(check Checkable, route *AlertRoute) (Action, error) {
 	return funk(check, route.Config)
 }
 
-func buildRestarter(check Checkable, _ *AlertRoute) (Action, error) {
+func buildRestarter(check Eventable, _ *AlertRoute) (Action, error) {
 	switch check.(type) {
 	case *Service:
 		return &Restarter{check.(*Service)}, nil
@@ -83,7 +83,7 @@ func (r Restarter) Trigger(event *Event) error {
 	return r.Service.Restart()
 }
 
-func buildEmailNotifier(check Checkable, config map[string]string) (Action, error) {
+func buildEmailNotifier(check Eventable, config map[string]string) (Action, error) {
 	en := &EmailNotifier{}
 	err := en.setup(config)
 	if err != nil {
@@ -92,7 +92,7 @@ func buildEmailNotifier(check Checkable, config map[string]string) (Action, erro
 	return en, nil
 }
 
-func buildGmailNotifier(check Checkable, params map[string]string) (Action, error) {
+func buildGmailNotifier(check Eventable, params map[string]string) (Action, error) {
 	params["smtp_server"] = "smtp.gmail.com"
 	return buildEmailNotifier(check, params)
 }

events.go

@@ -32,12 +32,16 @@ func (s EventType) String() string {
 
 type Event struct {
 	Type EventType
-	Checkable
+	Eventable
 	*Rule
 }
 
+func (e *Event) Thing() Eventable {
+	return e.Eventable
+}
+
 func (e *Event) Service() *Service {
-	return e.Checkable.(*Service)
+	return e.Eventable.(*Service)
 }
 
 func (e *Event) Hostname() string {
@@ -49,12 +53,12 @@ func (e *Event) Hostname() string {
 }
 
 func (e *Event) Target() string {
-	switch x := e.Checkable.(type) {
+	switch x := e.Eventable.(type) {
 	case *Service:
 		return fmt.Sprintf("%s[%s]", e.Hostname(), x.Name())
 	case *Host:
 		return fmt.Sprintf("%s", x.Name())
 	default:
-		return fmt.Sprintf("Unknown: %s", e.Checkable)
+		return fmt.Sprintf("Unknown: %s", e.Eventable)
 	}
 }

inq_parser.go

@@ -121,7 +121,7 @@ func convertRule(global *ConfigFile, check Checkable, inqrule ast.Rule) (*Rule,
 		op, inqrule.Threshold.Raw, float64(inqrule.Threshold.Parsed), 0, inqrule.CycleCount, 0, Ok, actions}, nil
 }
 
-func convertAction(global *ConfigFile, check Checkable, action ast.Action) (Action, error) {
+func convertAction(global *ConfigFile, check Eventable, action ast.Action) (Action, error) {
 	switch action.Name() {
 	case "alert":
 		route := global.AlertRoutes[""]

templates/email/ProcessDoesNotExist.txt

@@ -2,7 +2,7 @@ To: {{.Config.To}} <{{.Config.To}}>
 From: {{.Config.From}} <{{.Config.From}}>
 Subject: {{.Target}} does not exist.
 
-I can't locate a process for the {{.Checkable.Name}} service on {{.Hostname}}.
+I can't locate a process for the {{.Thing.Name}} service on {{.Hostname}}.
 
 Your Pal,
 Inspeqtor

templates/email/ProcessExists.txt

@@ -2,7 +2,7 @@ To: {{.Config.To}} <{{.Config.To}}>
 From: {{.Config.From}} <{{.Config.From}}>
 Subject: {{.Target}} is now running.
 
-The {{.Checkable.Name}} service is now running with PID {{.Service.Process.Pid}}
+The {{.Thing.Name}} service is now running with PID {{.Service.Process.Pid}}
 
 Your Pal,
 Inspeqtor

types.go

@@ -80,6 +80,11 @@ func (h *Host) Collect(silenced bool, completeCallback func(Checkable)) {
 	}
 }
 
+type Eventable interface {
+	Name() string
+	Parameter(string) string
+}
+
 type Checkable interface {
 	Name() string
 	Parameter(string) string