Support v2alpha1 and v1 Otterize CRD version; Report istio destination services (in addition to dst workload); Report workload kinds in order to support kind specification for clientIntents (#221)

Author: omris94

helm-charts

@@ -42,6 +42,7 @@ func ToGraphQLIstioConnections(connections map[ConnectionWithPath]time.Time) []m
 				SrcWorkloadNamespace: connWithPath.SourceNamespace,
 				DstWorkload:          connWithPath.DestinationWorkload,
 				DstWorkloadNamespace: connWithPath.DestinationNamespace,
+				DstServiceName:       connWithPath.DestinationServiceName,
 				Path:                 connWithPath.RequestPath,
 				LastSeen:             timestamp,
 			}

src/go.mod

@@ -53,19 +53,21 @@ var (
 		"source_workload",
 		"source_workload_namespace",
 		"destination_workload",
+		"destination_service_name",
 		"destination_workload_namespace",
 		"request_method",
 		"request_path",
 	}
 )
 
 type ConnectionWithPath struct {
-	SourceWorkload       string `json:"source_workload"`
-	SourceNamespace      string `json:"source_workload_namespace"`
-	DestinationWorkload  string `json:"destination_workload"`
-	DestinationNamespace string `json:"destination_workload_namespace"`
-	RequestPath          string `json:"request_path"`
-	RequestMethod        string `json:"request_method"`
+	SourceWorkload         string `json:"source_workload"`
+	SourceNamespace        string `json:"source_workload_namespace"`
+	DestinationWorkload    string `json:"destination_workload"`
+	DestinationServiceName string `json:"destination_service_name"`
+	DestinationNamespace   string `json:"destination_workload_namespace"`
+	RequestPath            string `json:"request_path"`
+	RequestMethod          string `json:"request_method"`
 }
 
 type IstioWatcher struct {
@@ -311,6 +313,8 @@ func extractRegexGroups(inputString string, groupNames []string) (*ConnectionWit
 			connection.RequestPath = groupValue
 		case "request_method":
 			connection.RequestMethod = groupValue
+		case "destination_service_name":
+			connection.DestinationServiceName = groupValue
 		default:
 			return nil, errors.Errorf("unknown group name: %s", groupName)
 		}

src/go.sum

@@ -2,16 +2,16 @@ package main
 
 import (
 	"context"
-	"github.com/otterize/intents-operator/src/shared"
-	"github.com/otterize/intents-operator/src/shared/errors"
-	"github.com/otterize/intents-operator/src/shared/telemetries/componentinfo"
-	"github.com/otterize/network-mapper/src/shared/componentutils"
-
 	"fmt"
 	"github.com/bombsimon/logrusr/v3"
 	"github.com/labstack/echo-contrib/echoprometheus"
 	"github.com/labstack/echo/v4"
+	"github.com/otterize/intents-operator/src/shared"
+	"github.com/otterize/intents-operator/src/shared/clusterutils"
+	"github.com/otterize/intents-operator/src/shared/errors"
+	"github.com/otterize/intents-operator/src/shared/telemetries/componentinfo"
 	"github.com/otterize/intents-operator/src/shared/telemetries/errorreporter"
+	"github.com/otterize/intents-operator/src/shared/telemetries/telemetrysender"
 	"github.com/otterize/network-mapper/src/kafka-watcher/pkg/config"
 	logwatcher2 "github.com/otterize/network-mapper/src/kafka-watcher/pkg/logwatcher"
 	"github.com/otterize/network-mapper/src/kafka-watcher/pkg/mapperclient"
@@ -36,19 +36,22 @@ func main() {
 	logrus.SetFormatter(&logrus.JSONFormatter{
 		TimestampFormat: time.RFC3339,
 	})
-	errorreporter.Init("kafka-watcher", version.Version(), viper.GetString(sharedconfig.TelemetryErrorsAPIKeyKey))
+	errgrp, errGroupCtx := errgroup.WithContext(signals.SetupSignalHandler())
+	clusterUID, err := clusterutils.GetOrCreateClusterUID(errGroupCtx)
+	if err != nil {
+		logrus.WithError(err).Panic("Failed fetching cluster UID")
+	}
+	componentinfo.SetGlobalContextId(telemetrysender.Anonymize(clusterUID))
+	errorreporter.Init("kafka-watcher", version.Version())
 	defer errorreporter.AutoNotify()
 	shared.RegisterPanicHandlers()
 
 	ctrl.SetLogger(logrusr.New(logrus.StandardLogger()))
-	componentutils.SetCloudClientId()
-	componentinfo.SetGlobalComponentInstanceId()
 
 	mapperClient := mapperclient.NewMapperClient(viper.GetString(sharedconfig.MapperApiUrlKey))
 
 	mode := viper.GetString(config.KafkaLogReadModeKey)
 
-	var err error
 	var watcher logwatcher2.Watcher
 
 	switch mode {
@@ -103,7 +106,6 @@ func main() {
 	metricsServer.HideBanner = true
 
 	metricsServer.GET("/metrics", echoprometheus.NewHandler())
-	errgrp, errGroupCtx := errgroup.WithContext(signals.SetupSignalHandler())
 	errgrp.Go(func() error {
 		defer errorreporter.AutoNotify()
 		return metricsServer.Start(fmt.Sprintf(":%d", viper.GetInt(sharedconfig.PrometheusMetricsPortKey)))

src/istio-watcher/pkg/watcher/helpers.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"github.com/bombsimon/logrusr/v3"
 	"github.com/labstack/echo-contrib/echoprometheus"
+	otterizev2alpha1 "github.com/otterize/intents-operator/src/operator/api/v2alpha1"
 	mutatingwebhookconfiguration "github.com/otterize/intents-operator/src/operator/controllers/mutating_webhook_controller"
 	"github.com/otterize/intents-operator/src/shared"
 	"github.com/otterize/intents-operator/src/shared/clusterutils"
@@ -35,6 +36,7 @@ import (
 
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
+	otterizev1 "github.com/otterize/intents-operator/src/operator/api/v1"
 	otterizev1alpha2 "github.com/otterize/intents-operator/src/operator/api/v1alpha2"
 	otterizev1alpha3 "github.com/otterize/intents-operator/src/operator/api/v1alpha3"
 	"github.com/otterize/intents-operator/src/shared/serviceidresolver"
@@ -67,6 +69,8 @@ func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 	utilruntime.Must(otterizev1alpha2.AddToScheme(scheme))
 	utilruntime.Must(otterizev1alpha3.AddToScheme(scheme))
+	utilruntime.Must(otterizev1.AddToScheme(scheme))
+	utilruntime.Must(otterizev2alpha1.AddToScheme(scheme))
 }
 
 func getClusterDomainOrDefault() string {
@@ -88,7 +92,16 @@ func main() {
 	logrus.SetFormatter(&logrus.JSONFormatter{
 		TimestampFormat: time.RFC3339,
 	})
-	errorreporter.Init("network-mapper", version.Version(), viper.GetString(sharedconfig.TelemetryErrorsAPIKeyKey))
+	signalHandlerCtx := ctrl.SetupSignalHandler()
+
+	clusterUID, err := clusterutils.GetOrCreateClusterUID(signalHandlerCtx)
+	if err != nil {
+		logrus.WithError(err).Panic("Failed fetching cluster UID")
+	}
+
+	componentinfo.SetGlobalContextId(telemetrysender.Anonymize(clusterUID))
+
+	errorreporter.Init("network-mapper", version.Version())
 	defer errorreporter.AutoNotify()
 	shared.RegisterPanicHandlers()
 
@@ -111,7 +124,6 @@ func main() {
 	if err != nil {
 		logrus.Panicf("unable to set up overall controller manager: %s", err)
 	}
-	signalHandlerCtx := ctrl.SetupSignalHandler()
 
 	errgrp, errGroupCtx := errgroup.WithContext(signalHandlerCtx)
 
@@ -143,13 +155,6 @@ func main() {
 		return nil
 	})
 
-	clusterUID, err := clusterutils.GetOrCreateClusterUID(signalHandlerCtx)
-	if err != nil {
-		logrus.WithError(err).Panic("Failed fetching cluster UID")
-	}
-
-	componentinfo.SetGlobalContextId(telemetrysender.Anonymize(clusterUID))
-
 	// start API server
 	mapperServer.GET("/healthz", func(c echo.Context) error {
 		return c.NoContent(http.StatusOK)
@@ -302,7 +307,6 @@ func main() {
 		return nil
 	})
 
-	componentinfo.SetGlobalVersion(version.Version())
 	telemetrysender.SendNetworkMapper(telemetriesgql.EventTypeStarted, 1)
 	telemetrysender.NetworkMapperRunActiveReporter(errGroupCtx)