upstream/icingadb
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb.git synced 2026-05-28 04:35:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Heartbeat: Add nodeName & remove configDumpInProgress

Browse source
This commit is contained in:
Noah Hilverling 2019-09-20 17:25:52 +02:00
parent 078999fa0d
commit c6b361eaee
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ha/heartbeat.go
View file

@ -11,7 +11,7 @@ import (
type Environment struct {
ID []byte
Name string
configDumpInProgress bool
NodeName string
}
// Compute SHA1
@ -26,8 +26,7 @@ func IcingaHeartbeatListener(rdb *connection.RDBWrapper, chEnv chan *Environment
subscription := rdb.Subscribe()
defer subscription.Close()
if err := subscription.Subscribe(
"icinga:stats"); err != nil {
if err := subscription.Subscribe("icinga:stats"); err != nil {
return err
}
@ -45,8 +44,8 @@ func IcingaHeartbeatListener(rdb *connection.RDBWrapper, chEnv chan *Environment
}
environment := unJson.(map[string]interface{})["IcingaApplication"].(map[string]interface{})["status"].(map[string]interface{})["icingaapplication"].(map[string]interface{})["app"].(map[string]interface{})["environment"].(string)
configDumpInProgress := unJson.(map[string]interface{})["config_dump_in_progress"].(bool)
env := &Environment{Name: environment, ID: Sha1bytes([]byte(environment)), configDumpInProgress: configDumpInProgress}
nodeName := unJson.(map[string]interface{})["IcingaApplication"].(map[string]interface{})["status"].(map[string]interface{})["icingaapplication"].(map[string]interface{})["app"].(map[string]interface{})["node_name"].(string)
env := &Environment{Name: environment, ID: Sha1bytes([]byte(environment)), NodeName: nodeName}
chEnv <- env
}
}

3
ha/heartbeat_test.go
View file

@ -12,7 +12,8 @@ var icingastate = "{\"IcingaApplication\":" +
"{\"status\": " +
"{\"icingaapplication\":" +
"{\"app\":{" +
"\"environment\": \"\"" +
"\"environment\": \"\"," +
"\"node_name\": \"master1.icinga.test.com\"" +
"}}}}, \"config_dump_in_progress\": false}"
func TestIcingaHeartbeatListener(t *testing.T) {