From 19966aeedc3c05c0984599682842c628e98f4b93 Mon Sep 17 00:00:00 2001
From: Dan Bason <colonel.dan@gmail.com>
Date: Thu, 16 Feb 2023 20:11:01 +1300
Subject: [PATCH] Various fixes for logging

---
 apis/logging/v1beta1/logadapter_webhook.go | 6 +++---
 plugins/logging/pkg/agent/stream.go        | 2 +-
 plugins/logging/pkg/gateway/plugin.go      | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/apis/logging/v1beta1/logadapter_webhook.go b/apis/logging/v1beta1/logadapter_webhook.go
index fcfe64e4c1..6d9e68ead1 100644
--- a/apis/logging/v1beta1/logadapter_webhook.go
+++ b/apis/logging/v1beta1/logadapter_webhook.go
@@ -33,11 +33,11 @@ import (
 var (
 	DefaultFluentbitImage = loggingv1beta1.ImageSpec{
 		Repository: "rancher/mirrored-fluent-fluent-bit",
-		Tag:        "1.7.4",
+		Tag:        "1.9.5",
 	}
 	DefaultFluentdImage = loggingv1beta1.ImageSpec{
-		Repository: "quay.io/dbason/banzaicloud-fluentd",
-		Tag:        "alpine-1.13-2",
+		Repository: "rancher/mirrored-banzaicloud-fluentd",
+		Tag:        "v1.14.6-alpine-5",
 	}
 	DefaultConfigReloaderImage = loggingv1beta1.ImageSpec{
 		Repository: "rancher/mirrored-jimmidyson-configmap-reload",
diff --git a/plugins/logging/pkg/agent/stream.go b/plugins/logging/pkg/agent/stream.go
index 22e792369f..80b0ba0299 100644
--- a/plugins/logging/pkg/agent/stream.go
+++ b/plugins/logging/pkg/agent/stream.go
@@ -16,7 +16,7 @@ func (p *Plugin) StreamServers() []streamext.Server {
 		},
 		{
 			Desc: &collogspb.LogsService_ServiceDesc,
-			Impl: &p.otelForwarder,
+			Impl: p.otelForwarder,
 		},
 	}
 }
diff --git a/plugins/logging/pkg/gateway/plugin.go b/plugins/logging/pkg/gateway/plugin.go
index b17c1689dc..9f138b705d 100644
--- a/plugins/logging/pkg/gateway/plugin.go
+++ b/plugins/logging/pkg/gateway/plugin.go
@@ -10,6 +10,8 @@ import (
 	"github.com/nats-io/nats.go"
 	"github.com/rancher/opni/apis"
 	"go.uber.org/zap"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
 	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -175,6 +177,7 @@ func NewPlugin(ctx context.Context, opts ...PluginOption) *Plugin {
 		otelForwarder: loggingutil.NewOTELForwarder(
 			loggingutil.WithLogger(lg.Named("otel-forwarder")),
 			loggingutil.WithAddress(fmt.Sprintf("http://%s:%d", OpniPreprocessingAddress, OpniPreprocessingPort)),
+			loggingutil.WithDialOptions(grpc.WithTransportCredentials(insecure.NewCredentials())),
 		),
 		clusterDriver: clusterDriver,
 	}