From 24e3ff856d808fce07a8c7ea958faa46dd4e18f5 Mon Sep 17 00:00:00 2001
From: Fabian Reinartz <fab.reinartz@gmail.com>
Date: Thu, 1 Oct 2015 15:25:12 +0200
Subject: [PATCH] Standardize color handling

---
 config/notifies.go | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/config/notifies.go b/config/notifies.go
index 63955eb6..975dc5f2 100644
--- a/config/notifies.go
+++ b/config/notifies.go
@@ -19,13 +19,13 @@ import (
 
 var (
 	DefaultHipchatConfig = HipchatConfig{
-		Color:         "purple",
+		ColorFiring:   "purple",
 		ColorResolved: "green",
 		MessageFormat: HipchatFormatHTML,
 	}
 
 	DefaultSlackConfig = SlackConfig{
-		Color:         "warning",
+		ColorFiring:   "warning",
 		ColorResolved: "good",
 	}
 )
@@ -116,10 +116,8 @@ type HipchatConfig struct {
 	// HipChat room id, (https://www.hipchat.com/rooms/ids).
 	RoomID int `yaml:"room_id"`
 
-	// Color of message when triggered.
-	Color string `yaml:"color"`
-
-	// Color of message when resolved.
+	// The message colors.
+	ColorFiring   string `yaml:"color_firing"`
 	ColorResolved string `yaml:"color_resolved"`
 
 	// Should this message notify or not.
@@ -160,7 +158,7 @@ type SlackConfig struct {
 	Channel string `yaml:"channel"`
 
 	// The message colors.
-	ColorFiring   string `yaml:"color"`
+	ColorFiring   string `yaml:"color_firing"`
 	ColorResolved string `yaml:"color_resolved"`
 
 	// Catches all undefined fields and must be empty after parsing.