GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — feat: Added support for enabling metrics in Feast Operator (#5317) · jfw-ppi/feast@ce374c6

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • infra/feast-operator
    • api/v1alpha1
      • featurestore_types.go
      • zz_generated.deepcopy.go
    • config/crd/bases
      • feast.dev_featurestores.yaml
    • dist
      • install.yaml
    • docs/api/markdown
      • ref.md
    • internal/controller/services
      • services.go
      • services_test.go
      • services_types.go
  • sdk/python/feast/infra
    • key_encoding_utils.py
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎infra/feast-operator/api/v1alpha1/featurestore_types.go‎

Copy file name to clipboardExpand all lines: infra/feast-operator/api/v1alpha1/featurestore_types.go
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,8 @@ type ServerConfigs struct {
504504
// Allowed values: "debug", "info", "warning", "error", "critical".
505505
// +kubebuilder:validation:Enum=debug;info;warning;error;critical
506506
LogLevel *string `json:"logLevel,omitempty"`
507+
// Metrics exposes Prometheus-compatible metrics for the Feast server when enabled.
508+
Metrics *bool `json:"metrics,omitempty"`
507509
// VolumeMounts defines the list of volumes that should be mounted into the feast container.
508510
// This allows attaching persistent storage, config files, secrets, or other resources
509511
// required by the Feast components. Ensure that each volume mount has a corresponding
Collapse file

‎infra/feast-operator/api/v1alpha1/zz_generated.deepcopy.go‎

Copy file name to clipboardExpand all lines: infra/feast-operator/api/v1alpha1/zz_generated.deepcopy.go
+5Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Collapse file

‎infra/feast-operator/config/crd/bases/feast.dev_featurestores.yaml‎

Copy file name to clipboardExpand all lines: infra/feast-operator/config/crd/bases/feast.dev_featurestores.yaml
+32Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,6 +1041,10 @@ spec:
10411041
- error
10421042
- critical
10431043
type: string
1044+
metrics:
1045+
description: Metrics exposes Prometheus-compatible metrics
1046+
for the Feast server when enabled.
1047+
type: boolean
10441048
nodeSelector:
10451049
additionalProperties:
10461050
type: string
@@ -1500,6 +1504,10 @@ spec:
15001504
- error
15011505
- critical
15021506
type: string
1507+
metrics:
1508+
description: Metrics exposes Prometheus-compatible metrics
1509+
for the Feast server when enabled.
1510+
type: boolean
15031511
nodeSelector:
15041512
additionalProperties:
15051513
type: string
@@ -1970,6 +1978,10 @@ spec:
19701978
- error
19711979
- critical
19721980
type: string
1981+
metrics:
1982+
description: Metrics exposes Prometheus-compatible
1983+
metrics for the Feast server when enabled.
1984+
type: boolean
19731985
nodeSelector:
19741986
additionalProperties:
19751987
type: string
@@ -2469,6 +2481,10 @@ spec:
24692481
- error
24702482
- critical
24712483
type: string
2484+
metrics:
2485+
description: Metrics exposes Prometheus-compatible metrics
2486+
for the Feast server when enabled.
2487+
type: boolean
24722488
nodeSelector:
24732489
additionalProperties:
24742490
type: string
@@ -5042,6 +5058,10 @@ spec:
50425058
- error
50435059
- critical
50445060
type: string
5061+
metrics:
5062+
description: Metrics exposes Prometheus-compatible
5063+
metrics for the Feast server when enabled.
5064+
type: boolean
50455065
nodeSelector:
50465066
additionalProperties:
50475067
type: string
@@ -5509,6 +5529,10 @@ spec:
55095529
- error
55105530
- critical
55115531
type: string
5532+
metrics:
5533+
description: Metrics exposes Prometheus-compatible
5534+
metrics for the Feast server when enabled.
5535+
type: boolean
55125536
nodeSelector:
55135537
additionalProperties:
55145538
type: string
@@ -5991,6 +6015,10 @@ spec:
59916015
- error
59926016
- critical
59936017
type: string
6018+
metrics:
6019+
description: Metrics exposes Prometheus-compatible
6020+
metrics for the Feast server when enabled.
6021+
type: boolean
59946022
nodeSelector:
59956023
additionalProperties:
59966024
type: string
@@ -6500,6 +6528,10 @@ spec:
65006528
- error
65016529
- critical
65026530
type: string
6531+
metrics:
6532+
description: Metrics exposes Prometheus-compatible metrics
6533+
for the Feast server when enabled.
6534+
type: boolean
65036535
nodeSelector:
65046536
additionalProperties:
65056537
type: string
Collapse file

‎infra/feast-operator/dist/install.yaml‎

Copy file name to clipboardExpand all lines: infra/feast-operator/dist/install.yaml
+32Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,6 +1049,10 @@ spec:
10491049
- error
10501050
- critical
10511051
type: string
1052+
metrics:
1053+
description: Metrics exposes Prometheus-compatible metrics
1054+
for the Feast server when enabled.
1055+
type: boolean
10521056
nodeSelector:
10531057
additionalProperties:
10541058
type: string
@@ -1508,6 +1512,10 @@ spec:
15081512
- error
15091513
- critical
15101514
type: string
1515+
metrics:
1516+
description: Metrics exposes Prometheus-compatible metrics
1517+
for the Feast server when enabled.
1518+
type: boolean
15111519
nodeSelector:
15121520
additionalProperties:
15131521
type: string
@@ -1978,6 +1986,10 @@ spec:
19781986
- error
19791987
- critical
19801988
type: string
1989+
metrics:
1990+
description: Metrics exposes Prometheus-compatible
1991+
metrics for the Feast server when enabled.
1992+
type: boolean
19811993
nodeSelector:
19821994
additionalProperties:
19831995
type: string
@@ -2477,6 +2489,10 @@ spec:
24772489
- error
24782490
- critical
24792491
type: string
2492+
metrics:
2493+
description: Metrics exposes Prometheus-compatible metrics
2494+
for the Feast server when enabled.
2495+
type: boolean
24802496
nodeSelector:
24812497
additionalProperties:
24822498
type: string
@@ -5050,6 +5066,10 @@ spec:
50505066
- error
50515067
- critical
50525068
type: string
5069+
metrics:
5070+
description: Metrics exposes Prometheus-compatible
5071+
metrics for the Feast server when enabled.
5072+
type: boolean
50535073
nodeSelector:
50545074
additionalProperties:
50555075
type: string
@@ -5517,6 +5537,10 @@ spec:
55175537
- error
55185538
- critical
55195539
type: string
5540+
metrics:
5541+
description: Metrics exposes Prometheus-compatible
5542+
metrics for the Feast server when enabled.
5543+
type: boolean
55205544
nodeSelector:
55215545
additionalProperties:
55225546
type: string
@@ -5999,6 +6023,10 @@ spec:
59996023
- error
60006024
- critical
60016025
type: string
6026+
metrics:
6027+
description: Metrics exposes Prometheus-compatible
6028+
metrics for the Feast server when enabled.
6029+
type: boolean
60026030
nodeSelector:
60036031
additionalProperties:
60046032
type: string
@@ -6508,6 +6536,10 @@ spec:
65086536
- error
65096537
- critical
65106538
type: string
6539+
metrics:
6540+
description: Metrics exposes Prometheus-compatible metrics
6541+
for the Feast server when enabled.
6542+
type: boolean
65116543
nodeSelector:
65126544
additionalProperties:
65136545
type: string
Collapse file

‎infra/feast-operator/docs/api/markdown/ref.md‎

Copy file name to clipboardExpand all lines: infra/feast-operator/docs/api/markdown/ref.md
+1Lines changed: 1 addition & 0 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,7 @@ _Appears in:_
762762
| `tls` _[TlsConfigs](#tlsconfigs)_ | |
763763
| `logLevel` _string_ | LogLevel sets the logging level for the server
764764
Allowed values: "debug", "info", "warning", "error", "critical". |
765+
| `metrics` _boolean_ | Metrics exposes Prometheus-compatible metrics for the Feast server when enabled. |
765766
| `volumeMounts` _[VolumeMount](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#volumemount-v1-core) array_ | VolumeMounts defines the list of volumes that should be mounted into the feast container.
766767
This allows attaching persistent storage, config files, secrets, or other resources
767768
required by the Feast components. Ensure that each volume mount has a corresponding
Collapse file

‎infra/feast-operator/internal/controller/services/services.go‎

Copy file name to clipboardExpand all lines: infra/feast-operator/internal/controller/services/services.go
+35-1Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,13 @@ func (feast *FeastServices) setContainer(containers *[]corev1.Container, feastTy
470470
ContainerPort: getTargetPort(feastType, tls),
471471
Protocol: corev1.ProtocolTCP,
472472
})
473+
if feastType == OnlineFeastType && feast.isMetricsEnabled(feastType) {
474+
container.Ports = append(container.Ports, corev1.ContainerPort{
475+
Name: "metrics",
476+
ContainerPort: MetricsPort,
477+
Protocol: corev1.ProtocolTCP,
478+
})
479+
}
473480
}
474481

475482
container.StartupProbe = &corev1.Probe{
@@ -565,6 +572,10 @@ func (feast *FeastServices) getContainerCommand(feastType FeastServiceType) []st
565572
}
566573

567574
deploySettings := FeastServiceConstants[feastType]
575+
deploySettings.Args = append([]string{}, deploySettings.Args...)
576+
if feastType == OnlineFeastType && feast.isMetricsEnabled(feastType) {
577+
deploySettings.Args = append([]string{deploySettings.Args[0], "--metrics"}, deploySettings.Args[1:]...)
578+
}
568579
targetPort := deploySettings.TargetHttpPort
569580
tls := feast.getTlsConfigs(feastType)
570581

@@ -732,6 +743,15 @@ func (feast *FeastServices) setService(svc *corev1.Service, feastType FeastServi
732743
},
733744
}
734745

746+
if feastType == OnlineFeastType && feast.isMetricsEnabled(feastType) {
747+
svc.Spec.Ports = append(svc.Spec.Ports, corev1.ServicePort{
748+
Name: "metrics",
749+
Port: MetricsPort,
750+
Protocol: corev1.ProtocolTCP,
751+
TargetPort: intstr.FromInt(int(MetricsPort)),
752+
})
753+
}
754+
735755
return controllerutil.SetControllerReference(feast.Handler.FeatureStore, svc, feast.Handler.Scheme)
736756
}
737757

@@ -800,6 +820,18 @@ func (feast *FeastServices) getLogLevelForType(feastType FeastServiceType) *stri
800820
return nil
801821
}
802822

823+
func (feast *FeastServices) isMetricsEnabled(feastType FeastServiceType) bool {
824+
if feastType != OnlineFeastType {
825+
return false
826+
}
827+
828+
if serviceConfigs := feast.getServerConfigs(feastType); serviceConfigs != nil && serviceConfigs.Metrics != nil {
829+
return *serviceConfigs.Metrics
830+
}
831+
832+
return false
833+
}
834+
803835
func (feast *FeastServices) getNodeSelectorForType(feastType FeastServiceType) *map[string]string {
804836
if serviceConfigs := feast.getServerConfigs(feastType); serviceConfigs != nil {
805837
return serviceConfigs.ContainerConfigs.OptionalCtrConfigs.NodeSelector
@@ -1100,7 +1132,9 @@ func (feast *FeastServices) initRoute(feastType FeastServiceType) *routev1.Route
11001132
}
11011133

11021134
func applyCtrConfigs(container *corev1.Container, containerConfigs feastdevv1alpha1.ContainerConfigs) {
1103-
container.Image = *containerConfigs.DefaultCtrConfigs.Image
1135+
if containerConfigs.DefaultCtrConfigs.Image != nil {
1136+
container.Image = *containerConfigs.DefaultCtrConfigs.Image
1137+
}
11041138
// apply optional container configs
11051139
if containerConfigs.OptionalCtrConfigs.Env != nil {
11061140
container.Env = envOverride(container.Env, *containerConfigs.OptionalCtrConfigs.Env)
Collapse file

‎infra/feast-operator/internal/controller/services/services_test.go‎

Copy file name to clipboardExpand all lines: infra/feast-operator/internal/controller/services/services_test.go
+44Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/feast-dev/feast/infra/feast-operator/internal/controller/handler"
2424
. "github.com/onsi/ginkgo/v2"
2525
. "github.com/onsi/gomega"
26+
corev1 "k8s.io/api/core/v1"
2627
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2728
"k8s.io/apimachinery/pkg/types"
2829
"k8s.io/apimachinery/pkg/util/intstr"
@@ -374,6 +375,49 @@ var _ = Describe("Registry Service", func() {
374375
Expect(deployment.Spec.Template.Spec.NodeSelector).To(Equal(expectedNodeSelector))
375376
})
376377

378+
It("should enable metrics on the online service when configured", func() {
379+
featureStore.Spec.Services.OnlineStore = &feastdevv1alpha1.OnlineStore{
380+
Server: &feastdevv1alpha1.ServerConfigs{Metrics: ptr(true)},
381+
}
382+
383+
Expect(k8sClient.Update(ctx, featureStore)).To(Succeed())
384+
Expect(feast.ApplyDefaults()).To(Succeed())
385+
applySpecToStatus(featureStore)
386+
feast.refreshFeatureStore(ctx, typeNamespacedName)
387+
388+
Expect(feast.deployFeastServiceByType(OnlineFeastType)).To(Succeed())
389+
390+
deployment := feast.initFeastDeploy()
391+
Expect(deployment).NotTo(BeNil())
392+
Expect(feast.setDeployment(deployment)).To(Succeed())
393+
394+
onlineContainer := GetOnlineContainer(*deployment)
395+
Expect(onlineContainer).NotTo(BeNil())
396+
Expect(onlineContainer.Command).To(Equal([]string{"feast", "serve", "--metrics", "-h", "0.0.0.0", "-p", "6566"}))
397+
Expect(onlineContainer.Ports).To(ContainElement(corev1.ContainerPort{
398+
Name: "metrics",
399+
ContainerPort: MetricsPort,
400+
Protocol: corev1.ProtocolTCP,
401+
}))
402+
metricsPortCount := 0
403+
for _, port := range onlineContainer.Ports {
404+
if port.Name == "metrics" {
405+
metricsPortCount++
406+
}
407+
}
408+
Expect(metricsPortCount).To(Equal(1))
409+
410+
svc := feast.initFeastSvc(OnlineFeastType)
411+
Expect(svc).NotTo(BeNil())
412+
Expect(feast.setService(svc, OnlineFeastType, false)).To(Succeed())
413+
Expect(svc.Spec.Ports).To(ContainElement(corev1.ServicePort{
414+
Name: "metrics",
415+
Port: MetricsPort,
416+
Protocol: corev1.ProtocolTCP,
417+
TargetPort: intstr.FromInt(int(MetricsPort)),
418+
}))
419+
})
420+
377421
It("should handle empty NodeSelector gracefully", func() {
378422
// Set empty NodeSelector
379423
emptyNodeSelector := map[string]string{}
Collapse file

‎infra/feast-operator/internal/controller/services/services_types.go‎

Copy file name to clipboardExpand all lines: infra/feast-operator/internal/controller/services/services_types.go
+4-3Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,10 @@ const (
5151
caBundleAnnotation = "config.openshift.io/inject-trusted-cabundle"
5252
caBundleName = "odh-trusted-ca-bundle"
5353

54-
DefaultOfflineStorageRequest = "20Gi"
55-
DefaultOnlineStorageRequest = "5Gi"
56-
DefaultRegistryStorageRequest = "5Gi"
54+
DefaultOfflineStorageRequest = "20Gi"
55+
DefaultOnlineStorageRequest = "5Gi"
56+
DefaultRegistryStorageRequest = "5Gi"
57+
MetricsPort int32 = 8000
5758

5859
AuthzFeastType FeastServiceType = "authorization"
5960
OfflineFeastType FeastServiceType = "offline"
Collapse file

‎sdk/python/feast/infra/key_encoding_utils.py‎

Copy file name to clipboardExpand all lines: sdk/python/feast/infra/key_encoding_utils.py
+10-3Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,16 @@ def serialize_entity_key(
142142
"Serialization of entity key with version < 3 is removed. Please use version 3 by setting entity_key_serialization_version=3."
143143
"To reserializa your online store featrues refer - https://github.com/feast-dev/feast/blob/master/docs/how-to-guides/entity-reserialization-of-from-v2-to-v3.md"
144144
)
145-
sorted_keys, sorted_values = zip(
146-
*sorted(zip(entity_key.join_keys, entity_key.entity_values))
147-
)
145+
146+
sorted_keys: List[str]
147+
sorted_values: List[ValueProto]
148+
if not entity_key.join_keys:
149+
sorted_keys = []
150+
sorted_values = []
151+
else:
152+
pairs = sorted(zip(entity_key.join_keys, entity_key.entity_values))
153+
sorted_keys = [k for k, _ in pairs]
154+
sorted_values = [v for _, v in pairs]
148155

149156
output: List[bytes] = []
150157
if entity_key_serialization_version > 2:

0 commit comments

Comments
0 (0)
You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.