eventstream: HostServiceRuntimeAttributes real name field

Turns out, both Host and Service objects do have a real name field which
contains their name. Thus, the hacky __name field can be dropped.

Author: oxzi

internal/eventstream/api_responses.go

@@ -69,12 +69,8 @@ type Downtime struct {
 // When catching up potentially missed changes, the following fields seems to be the relevant ones which, fortunately,
 // are identical for Icinga 2 Host and Service objects.
 //
-// According to the documentation, neither the Host nor the Service name is part of the attributes for Host resp.
-// Service objects. However, next to being part of the wrapping API response, see ObjectQueriesResult, it is also
-// available in the "__name" attribute, reflected in the Name field. For Service objects, it is "${host}!${service}".
-// Furthermore, Service objects have a required non-empty reference to their Host.
-//
 // NOTE:
+//   - Name is either the Host or the Service name.
 //   - Host is empty for Host objects; Host contains the Service's Host object name for Services.
 //   - State might be 0 = UP, 1 = DOWN for hosts and 0 = OK, 1 = WARNING, 2 = CRITICAL, 3 = UNKNOWN for services.
 //   - StateType might be 0 = SOFT, 1 = HARD.
@@ -83,7 +79,7 @@ type Downtime struct {
 // https://icinga.com/docs/icinga-2/latest/doc/09-object-types/#host
 // https://icinga.com/docs/icinga-2/latest/doc/09-object-types/#service
 type HostServiceRuntimeAttributes struct {
-	Name                      string      `json:"__name"`
+	Name                      string      `json:"name"`
 	Host                      string      `json:"host_name,omitempty"`
 	Groups                    []string    `json:"groups"`
 	State                     int         `json:"state"`

internal/eventstream/api_responses_test.go

@@ -190,7 +190,7 @@ func TestObjectQueriesResult_UnmarshalJSON(t *testing.T) {
 				Name: "docker-master!ssh",
 				Type: "Service",
 				Attrs: &HostServiceRuntimeAttributes{
-					Name:      "docker-master!ssh",
+					Name:      "ssh",
 					Host:      "docker-master",
 					Groups:    []string{},
 					State:     2,

internal/eventstream/client_api.go

@@ -8,7 +8,6 @@ import (
 	"net/http"
 	"net/url"
 	"slices"
-	"strings"
 	"time"
 )
 
@@ -165,7 +164,7 @@ func (client *Client) checkMissedChanges(objType, filterExpr string, attrsCallba
 
 	for _, objQueriesResult := range objQueriesResults {
 		if client.Ctx.Err() != nil {
-			client.Logger.Info("Stopping %s API response processing as context is finished", objType)
+			client.Logger.Infof("Stopping %s API response processing as context is finished", objType)
 			return
 		}
 
@@ -181,12 +180,8 @@ func (client *Client) checkMissedChanges(objType, filterExpr string, attrsCallba
 			hostName = attrs.Name
 
 		case "Service":
-			if !strings.HasPrefix(attrs.Name, attrs.Host+"!") {
-				client.Logger.Errorf("Queried API Service object's name mismatches, %q is no prefix of %q", attrs.Host, attrs.Name)
-				continue
-			}
 			hostName = attrs.Host
-			serviceName = attrs.Name[len(attrs.Host+"!"):]
+			serviceName = attrs.Name
 
 		default:
 			client.Logger.Errorf("Querying API delivered a %q object when expecting %s", objQueriesResult.Type, objType)