Skip to content

[DRAFT] Proxy access_logs logs to l7-log-collector #3974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
LorcanMcVeigh wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

[DRAFT] Proxy access_logs logs to l7-log-collector #3974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
404da50
add L7 log collection and forwarding to envoy gateway
electricjesus Mar 15, 2025
a93091b
monitor: policy on envoygateway port 19001, add podmonitors
electricjesus Apr 3, 2025
78af42c
fix log collector missing image
electricjesus Apr 3, 2025
f68240a
fix service/pod monitor
electricjesus Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 135 additions & 2 deletions pkg/render/gateway_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
rcomp "github.com/tigera/operator/pkg/render/common/components"
rmeta "github.com/tigera/operator/pkg/render/common/meta"
"github.com/tigera/operator/pkg/render/common/secret"
"github.com/tigera/operator/pkg/render/common/securitycontext"
appsv1 "k8s.io/api/apps/v1"
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
Expand All @@ -35,6 +36,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
gapi "sigs.k8s.io/gateway-api/apis/v1"
gwapiv1 "sigs.k8s.io/gateway-api/apis/v1"
"sigs.k8s.io/yaml" // gopkg.in/yaml.v2 didn't parse all the fields but this package did
)

Expand Down Expand Up @@ -78,6 +80,8 @@ const (
EnvoyGatewayConfigKey = "envoy-gateway.yaml"
EnvoyGatewayDeploymentContainerName = "envoy-gateway"
EnvoyGatewayJobContainerName = "envoy-gateway-certgen"
EnvoyGatewayNamespace = "tigera-gateway"
FelixSync = "felix-sync"
)

func GatewayAPIResourcesGetter() func() *gatewayAPIResources {
Expand Down Expand Up @@ -336,6 +340,7 @@ type gatewayAPIImplementationComponent struct {
envoyGatewayImage string
envoyProxyImage string
envoyRatelimitImage string
logCollectorImage string
}

func GatewayAPIImplementationComponent(cfg *GatewayAPIImplementationConfig) Component {
Expand Down Expand Up @@ -377,6 +382,12 @@ func (pr *gatewayAPIImplementationComponent) ResolveImages(is *operatorv1.ImageS
return err
}
}

pr.logCollectorImage, err = components.GetReference(components.ComponentL7Collector, reg, path, prefix, is)
if err != nil {
return err
}

return nil
}

Expand Down Expand Up @@ -494,6 +505,9 @@ func (pr *gatewayAPIImplementationComponent) Objects() ([]client.Object, []clien

objs = append(objs, certgenJob)

// Provision the log collector deployment and service.
objs = append(objs, pr.logCollectorDeploymentAndService()...)

// Provision a GatewayClass that references the EnvoyProxy config and the controllerName
// that the gateway controller expects.
objs = append(objs, pr.gatewayClass(envoyGatewayConfig.Gateway.ControllerName, proxyConfig))
Expand All @@ -506,9 +520,10 @@ func (pr *gatewayAPIImplementationComponent) envoyProxyConfig() *envoyapi.EnvoyP
TypeMeta: metav1.TypeMeta{Kind: "EnvoyProxy", APIVersion: "gateway.envoyproxy.io/v1alpha1"},
ObjectMeta: metav1.ObjectMeta{
Name: "envoy-proxy-config",
Namespace: "tigera-gateway",
Namespace: EnvoyGatewayNamespace,
},
Spec: envoyapi.EnvoyProxySpec{
Telemetry: pr.proxyTelemetrySettings(),
Provider: &envoyapi.EnvoyProxyProvider{
Type: envoyapi.ProviderTypeKubernetes,
Kubernetes: &envoyapi.EnvoyProxyKubernetesProvider{
Expand All @@ -530,12 +545,130 @@ func (pr *gatewayAPIImplementationComponent) envoyProxyConfig() *envoyapi.EnvoyP
return envoyProxy
}

func (pr *gatewayAPIImplementationComponent) logCollectorVolumes() []corev1.Volume {
return []corev1.Volume{
{
Name: FelixSync,
VolumeSource: corev1.VolumeSource{
CSI: &corev1.CSIVolumeSource{
Driver: "csi.tigera.io",
},
},
},
}
}

func (pr *gatewayAPIImplementationComponent) logCollectorEnv() []corev1.EnvVar {
envs := []corev1.EnvVar{
{Name: "LOG_LEVEL", Value: "Debug"},
{Name: "FELIX_DIAL_TARGET", Value: "/var/run/felix/nodeagent/socket"},
// only use ALS gRPC endpoint
{Name: "LISTEN_ADDRESS", Value: ":8080"},
{Name: "LISTEN_NETWORK", Value: "tcp"},
}
return envs
}

func (pr *gatewayAPIImplementationComponent) logCollectorVolMounts() []corev1.VolumeMount {
return []corev1.VolumeMount{
{Name: FelixSync, MountPath: "/var/run/felix"},
}
}

func (pr *gatewayAPIImplementationComponent) logCollectorDeploymentAndService() []client.Object {
var replicas int32 = 2

return []client.Object{
// The log collector deployment.
&appsv1.Deployment{
TypeMeta: metav1.TypeMeta{Kind: "Deployment", APIVersion: "v1"},
ObjectMeta: metav1.ObjectMeta{
Name: "tigera-l7-log-collector",
Namespace: EnvoyGatewayNamespace,
},
Spec: appsv1.DeploymentSpec{
Replicas: &replicas,
Selector: &metav1.LabelSelector{
MatchLabels: map[string]string{"app": "tigera-l7-log-collector"},
},
Template: corev1.PodTemplateSpec{
ObjectMeta: metav1.ObjectMeta{Labels: map[string]string{"app": "tigera-l7-log-collector"}},
Spec: corev1.PodSpec{
Volumes: pr.logCollectorVolumes(),
Containers: []corev1.Container{
{
Name: "tigera-l7-log-collector",
Image: pr.logCollectorImage,
Env: pr.logCollectorEnv(),
SecurityContext: securitycontext.NewRootContext(false),
VolumeMounts: pr.logCollectorVolMounts(),
},
},
},
},
},
},
// The log collector service.
&corev1.Service{
TypeMeta: metav1.TypeMeta{Kind: "Service", APIVersion: "v1"},
ObjectMeta: metav1.ObjectMeta{
Name: "tigera-l7-log-collector-service",
Namespace: EnvoyGatewayNamespace,
},
Spec: corev1.ServiceSpec{
Selector: map[string]string{"app": "tigera-l7-log-collector"},
Ports: []corev1.ServicePort{
{
Name: "https",
Port: 8080,
},
},
},
},
}
}

func (pr *gatewayAPIImplementationComponent) proxyTelemetrySettings() *envoyapi.ProxyTelemetry {
// The log collector service that the envoy proxy will send logs to.
logCollectSvcName := gwapiv1.ObjectName("tigera-l7-log-collector-service")
logCollectSvcNamespace := gwapiv1.Namespace(EnvoyGatewayNamespace)
logCollectSvcPort := gwapiv1.PortNumber(8080)

return &envoyapi.ProxyTelemetry{
AccessLog: &envoyapi.ProxyAccessLog{
Settings: []envoyapi.ProxyAccessLogSetting{
{
Sinks: []envoyapi.ProxyAccessLogSink{
{
Type: envoyapi.ProxyAccessLogSinkTypeALS,
ALS: &envoyapi.ALSEnvoyProxyAccessLog{
Type: envoyapi.ALSEnvoyProxyAccessLogTypeHTTP,
BackendCluster: envoyapi.BackendCluster{
BackendRefs: []envoyapi.BackendRef{
{
BackendObjectReference: gwapiv1.BackendObjectReference{
Name: logCollectSvcName,
Namespace: &logCollectSvcNamespace,
Port: &logCollectSvcPort,
},
},
},
},
},
},
},
},
},
},
}
}

func (pr *gatewayAPIImplementationComponent) gatewayClass(controllerName string, proxyConfig *envoyapi.EnvoyProxy) *gapi.GatewayClass {
return &gapi.GatewayClass{
TypeMeta: metav1.TypeMeta{Kind: "GatewayClass", APIVersion: "gateway.networking.k8s.io/v1"},
ObjectMeta: metav1.ObjectMeta{
Name: "tigera-gateway-class",
Namespace: "tigera-gateway",
Namespace: EnvoyGatewayNamespace,
},
Spec: gapi.GatewayClassSpec{
ControllerName: gapi.GatewayController(controllerName),
Expand Down
80 changes: 80 additions & 0 deletions pkg/render/monitor/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ const (

bearerTokenFile = "/var/run/secrets/kubernetes.io/serviceaccount/token"
KubeControllerMetrics = "calico-kube-controllers-metrics"

TigeraGatewayServiceMonitor = "tigera-gateway-service-monitor"
TigeraGatewayPodsProxiesMonitor = "tigera-gateway-pod-proxies-monitor"
TigeraGatewayComponentsMetricsPort = 19001
TigeraGatewayNamespace = "tigera-gateway"
)

var alertManagerSelector = fmt.Sprintf(
Expand Down Expand Up @@ -223,6 +228,8 @@ func (mc *monitorComponent) Objects() ([]client.Object, []client.Object) {
mc.serviceMonitorFluentd(),
mc.serviceMonitorQueryServer(),
mc.serviceMonitorCalicoKubeControllers(),
mc.serviceMonitorTigeraGatewayAPIController(),
mc.podMonitorTigeraGatewayGateways(),
)

if mc.cfg.KeyValidatorConfig != nil {
Expand Down Expand Up @@ -817,6 +824,71 @@ func (mc *monitorComponent) prometheusRule() *monitoringv1.PrometheusRule {
}
}

func (mc *monitorComponent) serviceMonitorTigeraGatewayAPIController() *monitoringv1.ServiceMonitor {
return &monitoringv1.ServiceMonitor{
TypeMeta: metav1.TypeMeta{Kind: monitoringv1.ServiceMonitorsKind, APIVersion: MonitoringAPIVersion},
ObjectMeta: metav1.ObjectMeta{
Name: TigeraGatewayServiceMonitor,
Namespace: common.TigeraPrometheusNamespace,
Labels: map[string]string{
"team": "network-operators",
},
},
Spec: monitoringv1.ServiceMonitorSpec{
Selector: metav1.LabelSelector{
MatchLabels: map[string]string{
"app.kubernetes.io/instance": "tigera-gateway-api",
},
},
NamespaceSelector: monitoringv1.NamespaceSelector{
MatchNames: []string{TigeraGatewayNamespace},
},
Endpoints: []monitoringv1.Endpoint{
{
Port: "metrics",
ScrapeTimeout: "5s",
Interval: "5s",
Scheme: "http",
HonorLabels: true,
},
},
},
}
}

func (mc *monitorComponent) podMonitorTigeraGatewayGateways() *monitoringv1.PodMonitor {
return &monitoringv1.PodMonitor{
TypeMeta: metav1.TypeMeta{Kind: monitoringv1.PodMonitorsKind, APIVersion: MonitoringAPIVersion},
ObjectMeta: metav1.ObjectMeta{
Name: TigeraGatewayPodsProxiesMonitor,
Namespace: common.TigeraPrometheusNamespace,
Labels: map[string]string{
"team": "network-operators",
},
},
Spec: monitoringv1.PodMonitorSpec{
Selector: metav1.LabelSelector{
MatchLabels: map[string]string{
"app.kubernetes.io/component": "proxy",
},
},
NamespaceSelector: monitoringv1.NamespaceSelector{
MatchNames: []string{TigeraGatewayNamespace},
},
PodMetricsEndpoints: []monitoringv1.PodMetricsEndpoint{
{
Port: "metrics",
ScrapeTimeout: "5s",
Interval: "5s",
Scheme: "http",
HonorLabels: true,
Path: "/stats/prometheus",
},
},
},
}
}

func (mc *monitorComponent) serviceMonitorCalicoNode() *monitoringv1.ServiceMonitor {
endpoints := []monitoringv1.Endpoint{
{
Expand Down Expand Up @@ -1204,6 +1276,14 @@ func allowTigeraPrometheusPolicy(cfg *Config) *v3.NetworkPolicy {
Ports: networkpolicy.Ports(AlertmanagerPort),
},
},
{
Action: v3.Allow,
Protocol: &networkpolicy.TCPProtocol,
Destination: v3.EntityRule{
// Egress access for Gateway Prometheus metrics
Ports: networkpolicy.Ports(TigeraGatewayComponentsMetricsPort),
},
},
{
Action: v3.Allow,
Protocol: &networkpolicy.TCPProtocol,
Expand Down
Loading