feat: pktvisor opentelemetry setup (#67)

Author: leoparente

agent/backend/otel/utils.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"go.uber.org/zap"
+	"gopkg.in/yaml.v3"
 
 	"github.com/netboxlabs/orb-agent/agent/backend"
 )
@@ -89,11 +90,20 @@ func (d *openTelemetryBackend) request(url string, payload interface{}, method s
 		}
 	}
 
+	// Read and decode response body
 	if res.Body != nil {
-		err = json.NewDecoder(res.Body).Decode(&payload)
+		body, err := io.ReadAll(res.Body)
 		if err != nil {
-			return err
+			return fmt.Errorf("failed to read response body: %w", err)
+		}
+		if err = json.Unmarshal(body, &payload); err == nil {
+			return nil
+		}
+		var yamlErr error
+		if yamlErr = yaml.Unmarshal(body, &payload); yamlErr == nil {
+			return nil
 		}
+		return fmt.Errorf("failed to decode response as JSON: %w and YAML: %w", err, yamlErr)
 	}
 	return nil
 }

agent/backend/pktvisor/pktvisor.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"net"
 	"net/http"
 	"os/exec"
 	"strconv"
@@ -72,23 +71,6 @@ type pktvisorBackend struct {
 	otelReceiverPort int
 }
 
-func (p *pktvisorBackend) getFreePort() (int, error) {
-	addr, err := net.ResolveTCPAddr("tcp", "localhost:0")
-	if err != nil {
-		return 0, err
-	}
-	l, err := net.ListenTCP("tcp", addr)
-	if err != nil {
-		return 0, err
-	}
-	defer func() {
-		if err := l.Close(); err != nil {
-			p.logger.Error("failed to close socket", zap.Error(err))
-		}
-	}()
-	return l.Addr().(*net.TCPAddr).Port, nil
-}
-
 func (p *pktvisorBackend) GetStartTime() time.Time {
 	return p.startTime
 }
@@ -154,16 +136,11 @@ func (p *pktvisorBackend) Start(ctx context.Context, cancelFunc context.CancelFu
 		pvOptions = append(pvOptions, "--config", p.configFile)
 	}
 
-	pvOptions = append(pvOptions, "--otel")
-	pvOptions = append(pvOptions, "--otel-host", p.otelReceiverHost)
-	if p.otelReceiverPort == 0 {
-		p.otelReceiverPort, err = p.getFreePort()
-		if err != nil {
-			p.logger.Error("pktvisor otlp startup error", zap.Error(err))
-			return err
-		}
+	if p.otelReceiverHost != "" && p.otelReceiverPort != 0 {
+		pvOptions = append(pvOptions, "--otel")
+		pvOptions = append(pvOptions, "--otel-host", p.otelReceiverHost)
+		pvOptions = append(pvOptions, "--otel-port", strconv.Itoa(p.otelReceiverPort))
 	}
-	pvOptions = append(pvOptions, "--otel-port", strconv.Itoa(p.otelReceiverPort))
 
 	// the macros should be properly configured to enable crashpad
 	// pvOptions = append(pvOptions, "--cp-token", PKTVISOR_CP_TOKEN)
@@ -288,18 +265,12 @@ func (p *pktvisorBackend) Configure(logger *zap.Logger, repo policies.PolicyRepo
 	}
 	p.agentLabels = common.Otel.AgentLabels
 
-	p.otelReceiverHost = common.Otel.Host
-	p.otelReceiverPort = common.Otel.Port
-	if p.otelReceiverPort == 0 {
-		var err error
-		if p.otelReceiverPort, err = p.getFreePort(); err != nil {
-			p.logger.Error("pktvisor otlp startup error", zap.Error(err))
-			return err
-		}
+	if common.Otel.Host != "" && common.Otel.Port != 0 {
+		p.otelReceiverHost = common.Otel.Host
+		p.otelReceiverPort = common.Otel.Port
+		p.logger.Info("configured otel receiver host", zap.String("host", p.otelReceiverHost), zap.Int("port", p.otelReceiverPort))
 	}
 
-	p.logger.Info("configured otel receiver host", zap.String("host", p.otelReceiverHost), zap.Int("port", p.otelReceiverPort))
-
 	return nil
 }
 

agent/backend/pktvisor/vars.go

@@ -6,7 +6,7 @@ import (
 
 // RegisterBackendSpecificVariables registers the backend specific variables for the pktvisor backend
 func RegisterBackendSpecificVariables(v *viper.Viper) {
-	v.SetDefault("orb.backends.pktvisor.binary", "/usr/local/sbin/pktvisord")
+	v.SetDefault("orb.backends.pktvisor.binary", "/usr/local/bin/pktvisord")
 	v.SetDefault("orb.backends.pktvisor.config_file", "/opt/orb/agent.yaml")
 	v.SetDefault("orb.backends.pktvisor.api_host", "localhost")
 	v.SetDefault("orb.backends.pktvisor.api_port", "10853")

agent/docker/Dockerfile

@@ -32,25 +32,18 @@ RUN \
     apt install --yes --force-yes --no-install-recommends nmap openssh-client && \
     rm -rf /var/lib/apt
 
-RUN addgroup --system netdev && useradd -m --shell /bin/bash -G netdev appuser && echo "appuser ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
-
-# Create necessary directories and set ownership to appuser
-RUN mkdir -p /opt/orb && chown appuser:appuser /opt/orb \
-    && chown appuser:appuser /usr/local/bin \
-    && chown appuser:appuser /var/run
+RUN mkdir -p /opt/orb
 
 COPY --from=builder /build/orb-agent /usr/local/bin/orb-agent
 COPY --from=builder /src/orb-agent/agent/docker/agent_default.yaml /opt/orb/agent_default.yaml
 COPY --from=builder /src/orb-agent/agent/docker/orb-agent-entry.sh /usr/local/bin/orb-agent-entry.sh
 COPY --from=builder /src/orb-agent/agent/docker/run-agent.sh /run-agent.sh
 
-COPY --from=pktvisor /usr/local/sbin/pktvisord /usr/local/sbin/pktvisord
-COPY --from=pktvisor /usr/local/sbin/crashpad_handler /usr/local/sbin/crashpad_handler
+COPY --from=pktvisor /usr/local/sbin/pktvisord /usr/local/bin/pktvisord
+COPY --from=pktvisor /usr/local/sbin/crashpad_handler /usr/local/bin/crashpad_handler
 COPY --from=pktvisor /geo-db /geo-db
 COPY --from=pktvisor /iana /iana
 
-RUN  chown appuser:appuser /geo-db
-
 COPY --from=otlpinf /exe /usr/local/bin/otlpinf
 
 COPY --from=network-discovery /usr/local/bin/network-discovery /usr/local/bin/network-discovery
@@ -59,6 +52,4 @@ RUN pip3 install netboxlabs-device-discovery netboxlabs-orb-worker
 
 RUN chmod a+x /run-agent.sh
 
-USER appuser
-
 ENTRYPOINT [ "/usr/local/bin/orb-agent-entry.sh" ]