fixup

otterize · Dec 10, 2024 · b011696 · b011696
1 parent 8d98a0c
commit b011696
Show file tree

Hide file tree

Showing 6 changed files with 210 additions and 19 deletions.
diff --git a/src/mapper/pkg/graph/generated/generated.go b/src/mapper/pkg/graph/generated/generated.go
diff --git a/src/mapper/pkg/graph/model/models_gen.go b/src/mapper/pkg/graph/model/models_gen.go
diff --git a/src/mapper/pkg/kubefinder/kubefinder.go b/src/mapper/pkg/kubefinder/kubefinder.go
@@ -439,6 +439,7 @@ func (k *KubeFinder) ResolveOtterizeIdentityForService(ctx context.Context, svc
 	resolutionData := model.IdentityResolutionData{
 		IsService: lo.ToPtr(true),
 		ExtraInfo: lo.ToPtr("ResolveOtterizeIdentityForService"),
+		LastSeen:  lo.ToPtr(lastSeen.String()),
 	}
 
 	if len(pods) == 0 {
@@ -468,6 +469,9 @@ func (k *KubeFinder) ResolveOtterizeIdentityForService(ctx context.Context, svc
 		return model.OtterizeServiceIdentity{}, false, errors.Wrap(err)
 	}
 
+	resolutionData.PodHostname = lo.ToPtr(pod.Name)
+	resolutionData.Uptime = lo.ToPtr(time.Since(pod.CreationTimestamp.Time).String())
+
 	dstSvcIdentity := model.OtterizeServiceIdentity{
 		Name:           dstService.Name,
 		Namespace:      pod.Namespace,

diff --git a/src/mapper/pkg/resolvers/helpers.go b/src/mapper/pkg/resolvers/helpers.go
@@ -8,6 +8,7 @@ import (
 	"github.com/samber/lo"
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
+	"time"
 )
 
 func (r *Resolver) discoverInternalSrcIdentity(ctx context.Context, src *model.RecordedDestinationsForSrc) (model.OtterizeServiceIdentity, error) {
@@ -44,7 +45,12 @@ func (r *Resolver) discoverInternalSrcIdentity(ctx context.Context, src *model.R
 	// It may cause a bug because the function will not be able to modify the "src" object of the caller.
 	r.filterTargetsAccordingToPodCreationTime(src, srcPod)
 
-	return r.resolveInClusterIdentity(ctx, srcPod)
+	svcIdentity, err := r.resolveInClusterIdentity(ctx, srcPod)
+	if err != nil {
+		return model.OtterizeServiceIdentity{}, errors.Wrap(err)
+	}
+	svcIdentity.ResolutionData.ProcfsHostname = lo.ToPtr(src.SrcHostname)
+	return svcIdentity, nil
 }
 
 func (r *Resolver) filterTargetsAccordingToPodCreationTime(src *model.RecordedDestinationsForSrc, srcPod *corev1.Pod) {
@@ -78,6 +84,7 @@ func (r *Resolver) resolveInClusterIdentity(ctx context.Context, pod *corev1.Pod
 			PodHostname: lo.ToPtr(pod.Name),
 			IsService:   lo.ToPtr(false),
 			ExtraInfo:   lo.ToPtr("resolveInClusterIdentity"),
+			Uptime:      lo.ToPtr(time.Since(pod.CreationTimestamp.Time).String()),
 		},
 	}
 	if svcIdentity.OwnerObject != nil {

diff --git a/src/mapper/pkg/resolvers/schema.helpers.resolvers.go b/src/mapper/pkg/resolvers/schema.helpers.resolvers.go
@@ -68,12 +68,9 @@ func (r *Resolver) resolveDestIdentity(ctx context.Context, dest model.Destinati
 			return model.OtterizeServiceIdentity{}, false, errors.Wrap(err)
 		}
 		if ok {
-			dstSvcIdentity.ResolutionData = &model.IdentityResolutionData{
-				Host:      lo.ToPtr(dest.Destination),
-				Port:      dest.DestinationPort,
-				IsService: lo.ToPtr(true),
-				ExtraInfo: lo.ToPtr("resolveDestIdentity"),
-			}
+			dstSvcIdentity.ResolutionData.Host = lo.ToPtr(dest.Destination)
+			dstSvcIdentity.ResolutionData.Port = dest.DestinationPort
+			dstSvcIdentity.ResolutionData.ExtraInfo = lo.ToPtr("resolveDestIdentity")
 			return dstSvcIdentity, true, nil
 		}
 	}
@@ -113,6 +110,8 @@ func (r *Resolver) resolveDestIdentity(ctx context.Context, dest model.Destinati
 			Port:      dest.DestinationPort,
 			IsService: lo.ToPtr(false),
 			ExtraInfo: lo.ToPtr("resolveDestIdentity"),
+			LastSeen:  lo.ToPtr(dest.LastSeen.String()),
+			Uptime:    lo.ToPtr(time.Since(destPod.CreationTimestamp.Time).String()),
 		},
 	}
 	if dstService.OwnerObject != nil {
@@ -182,8 +181,20 @@ func (r *Resolver) addSocketScanPodIntent(ctx context.Context, srcSvcIdentity mo
 	if err != nil {
 		return errors.Wrap(err)
 	}
-
-	dstSvcIdentity := &model.OtterizeServiceIdentity{Name: dstService.Name, Namespace: destPod.Namespace, Labels: kubefinder.PodLabelsToOtterizeLabels(destPod)}
+	dstSvcIdentity := &model.OtterizeServiceIdentity{
+		Name:      dstService.Name,
+		Namespace: destPod.Namespace,
+		Labels:    kubefinder.PodLabelsToOtterizeLabels(destPod),
+		ResolutionData: &model.IdentityResolutionData{
+			Host:        lo.ToPtr(dest.Destination),
+			PodHostname: lo.ToPtr(destPod.Name),
+			Port:        dest.DestinationPort,
+			IsService:   lo.ToPtr(false),
+			ExtraInfo:   lo.ToPtr("addSocketScanPodIntent"),
+			LastSeen:    lo.ToPtr(dest.LastSeen.String()),
+			Uptime:      lo.ToPtr(time.Since(destPod.CreationTimestamp.Time).String()),
+		},
+	}
 	if dstService.OwnerObject != nil {
 		dstSvcIdentity.PodOwnerKind = model.GroupVersionKindFromKubeGVK(dstService.OwnerObject.GetObjectKind().GroupVersionKind())
 	}
@@ -414,6 +425,7 @@ func (r *Resolver) resolveOtterizeIdentityForExternalAccessDestination(ctx conte
 	}
 
 	dstSvcIdentity, ok, err := r.kubeFinder.ResolveOtterizeIdentityForService(ctx, destService, dest.LastSeen)
+	dstSvcIdentity.ResolutionData.Host = lo.ToPtr(destIP)
 	if err != nil {
 		return model.OtterizeServiceIdentity{}, false, errors.Wrap(err)
 	}

diff --git a/src/mappergraphql/schema.graphql b/src/mappergraphql/schema.graphql
@@ -42,8 +42,11 @@ type GroupVersionKind {
 type IdentityResolutionData {
     host: String
     podHostname: String
+    procfsHostname: String
     port: Int
     isService: Boolean
+    uptime: String
+    lastSeen: String
     extraInfo: String
 }