Fix wording (reciver->address) and add address field to message

Author: Felix Breidenstein

alamos/alamos.go

@@ -12,6 +12,7 @@ type AlamosMessage struct {
 	Message   string            `json:"message"`
 	Type      string            `json:"type"`
 	Sender    string            `json:"sender"`
+	Address   string            `json:"address"`
 	Timestamp int64             `json:"timestamp"`
 	Data      map[string]string `json:"data"`
 }
@@ -37,9 +38,11 @@ func makeTimestamp() int64 {
 func (c *AlamosClient) newAlamosMessage() AlamosMessage {
 	m := AlamosMessage{
 		Timestamp: makeTimestamp(),
+		Sender:    c.Sender,
+		Address:   c.Address,
 	}
 	if c.Test {
-		m.Type = "Test"
+		m.Type = "TEST"
 	} else {
 		m.Type = "ALARM"
 	}
@@ -59,7 +62,6 @@ func NewClient(host string, sender string, address string, test bool) AlamosClie
 
 func (client *AlamosClient) SendAlert(alertMessage string) error {
 	message := client.newAlamosMessage()
-	message.Sender = client.Sender
 	message.Message = alertMessage
 
 	body, err := json.Marshal(message)

config_example.yaml

@@ -5,4 +5,4 @@ debug: True
 
 alamos_host: "localhost"
 alamos_sender: "prometheus-gateway"
-alamos_receiver: "admingroup42"
+alamos_address: "admingroup42"

main.go

@@ -19,7 +19,7 @@ import (
 type config struct {
 	AlamosHost string `yaml:"alamos_host"`
 	Sender     string `yaml:"alamos_sender"`
-	Receiver   string `yaml:"alamos_receiver"`
+	Address    string `yaml:"alamos_address"`
 	Debug      bool   `yaml:"debug"`
 	Listen     string `yaml:"listen"`
 }
@@ -77,7 +77,7 @@ func inputHandler(client *alamos.AlamosClient, debug bool) http.Handler {
 					}
 
 				default:
-					log.Printf("no action on severity: %s", severity)
+					fmt.Printf("no action on severity: %s", severity)
 				}
 
 			}
@@ -112,7 +112,9 @@ func main() {
 	flag.Parse()
 
 	cfg := readConfigFile()
-	client := alamos.NewClient(cfg.AlamosHost, cfg.Sender, cfg.Receiver, cfg.Debug)
+	client := alamos.NewClient(cfg.AlamosHost, cfg.Sender, cfg.Address, cfg.Debug)
+
+	fmt.Printf("Alamos Client: %+v\n", client)
 
 	http.Handle("/input", inputHandler(&client, cfg.Debug))