Skip to content

Commit

Permalink
merge main
Browse files Browse the repository at this point in the history
Signed-off-by: adarsh0728 <[email protected]>
  • Loading branch information
adarsh0728 committed Dec 19, 2024
2 parents df09aff + f41e6ff commit 7d28085
Show file tree
Hide file tree
Showing 62 changed files with 1,540 additions and 986 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## v1.4.2 (2024-12-11)

* [c9dc38f4](https://github.com/numaproj/numaflow/commit/c9dc38f4cce2b5db598536a7539f2a35febcf1ca) Update manifests to v1.4.2
* [fea792b3](https://github.com/numaproj/numaflow/commit/fea792b36bd342adcdcdd96768b6fdd68921bfd2) fix: set max decode size of proto message (#2275)

### Contributors

* Sidhant Kohli

## v1.4.1 (2024-12-05)

* [346f2a73](https://github.com/numaproj/numaflow/commit/346f2a7321d158fa9ce9392cfdcc76d671d6f577) Update manifests to v1.4.1
Expand Down
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ COPY --from=base /bin/numaflow /bin/numaflow
COPY --from=base /bin/numaflow-rs /bin/numaflow-rs
COPY ui/build /ui/build

COPY ./rust/serving/config config

ENTRYPOINT [ "/bin/numaflow" ]

####################################################################################################
Expand All @@ -89,4 +87,4 @@ RUN chmod +x /bin/e2eapi
####################################################################################################
FROM scratch AS e2eapi
COPY --from=testbase /bin/e2eapi .
ENTRYPOINT ["/e2eapi"]
ENTRYPOINT ["/e2eapi"]
87 changes: 56 additions & 31 deletions config/advanced-install/namespaced-numaflow-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -143,33 +143,71 @@ data:
# example for local prometheus service
# url: http://prometheus-operated.monitoring.svc.cluster.local:9090
patterns:
- name: vertex_gauge
object: vertex
title: Vertex Pending Messages
description: This query is the total number of pending messages for the vertex
expr: |
sum($metric_name{$filters}) by ($dimension, period)
params:
- name: start_time
required: false
- name: end_time
required: false
metrics:
- metric_name: vertex_pending_messages
required_filters:
- namespace
- pipeline
- vertex
dimensions:
- name: pod
# expr: optional expression for prometheus query
# overrides the default expression
filters:
- name: pod
required: false
- name: period
required: false
- name: vertex
# expr: optional expression for prometheus query
# overrides the default expression
filters:
- name: period
required: false
- name: mono_vertex_gauge
object: mono-vertex
title: Pending Messages Lag
description: This query is the total number of pending messages for the mono vertex
expr: |
$metric_name{$filters}
sum($metric_name{$filters}) by ($dimension, period)
params:
- name: start_time
required: false
- name: end_time
required: false
metrics:
- metric_name: monovtx_pending
required_filters:
- namespace
- mvtx_name
dimensions:
- name: pod
filters:
- name: pod
required: false
- name: period
required: false
- name: mono-vertex
filters:
- name: period
required: false
- metric_name: monovtx_pending
required_filters:
- namespace
- mvtx_name
dimensions:
- name: pod
# expr: optional expression for prometheus query
# overrides the default expression
filters:
- name: pod
required: false
- name: period
required: false
- name: mono-vertex
# expr: optional expression for prometheus query
# overrides the default expression
filters:
- name: period
required: false
- name: mono_vertex_histogram
object: mono-vertex
title: Processing Time Latency
Expand All @@ -192,11 +230,7 @@ data:
- mvtx_name
dimensions:
- name: mono-vertex
# expr: optional expression for prometheus query
# overrides the default expression
- name: pod
# expr: optional expression for prometheus query
# overrides the default expression
filters:
- name: pod
required: false
Expand All @@ -206,15 +240,11 @@ data:
- mvtx_name
dimensions:
- name: mono-vertex
# expr: optional expression for prometheus query
# overrides the default expression
- name: pod
# expr: optional expression for prometheus query
# overrides the default expression
filters:
- name: pod
required: false
# Add histogram metrics similar to the pattern above
- name: vertex_throughput
object: vertex
title: Vertex Throughput and Message Rates
Expand All @@ -235,12 +265,11 @@ data:
- vertex
dimensions:
- name: vertex
# expr: optional expression for prometheus query
# overrides the default expression
- name: pod
filters:
- name: pod
required: false
- name: mono_vertex_throughput
object: mono-vertex
title: Mono-Vertex Throughput and Message Rates
Expand All @@ -260,11 +289,7 @@ data:
- mvtx_name
dimensions:
- name: mono-vertex
# expr: optional expression for prometheus query
# overrides the default expression
- name: pod
# expr: optional expression for prometheus query
# overrides the default expression
filters:
- name: pod
required: false
Expand Down
87 changes: 56 additions & 31 deletions config/advanced-install/numaflow-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -150,33 +150,71 @@ data:
# example for local prometheus service
# url: http://prometheus-operated.monitoring.svc.cluster.local:9090
patterns:
- name: vertex_gauge
object: vertex
title: Vertex Pending Messages
description: This query is the total number of pending messages for the vertex
expr: |
sum($metric_name{$filters}) by ($dimension, period)
params:
- name: start_time
required: false
- name: end_time
required: false
metrics:
- metric_name: vertex_pending_messages
required_filters:
- namespace
- pipeline
- vertex
dimensions:
- name: pod
# expr: optional expression for prometheus query
# overrides the default expression
filters:
- name: pod
required: false
- name: period
required: false
- name: vertex
# expr: optional expression for prometheus query
# overrides the default expression
filters:
- name: period
required: false
- name: mono_vertex_gauge
object: mono-vertex
title: Pending Messages Lag
description: This query is the total number of pending messages for the mono vertex
expr: |
$metric_name{$filters}
sum($metric_name{$filters}) by ($dimension, period)
params:
- name: start_time
required: false
- name: end_time
required: false
metrics:
- metric_name: monovtx_pending
required_filters:
- namespace
- mvtx_name
dimensions:
- name: pod
filters:
- name: pod
required: false
- name: period
required: false
- name: mono-vertex
filters:
- name: period
required: false
- metric_name: monovtx_pending
required_filters:
- namespace
- mvtx_name
dimensions:
- name: pod
# expr: optional expression for prometheus query
# overrides the default expression
filters:
- name: pod
required: false
- name: period
required: false
- name: mono-vertex
# expr: optional expression for prometheus query
# overrides the default expression
filters:
- name: period
required: false
- name: mono_vertex_histogram
object: mono-vertex
title: Processing Time Latency
Expand All @@ -199,11 +237,7 @@ data:
- mvtx_name
dimensions:
- name: mono-vertex
# expr: optional expression for prometheus query
# overrides the default expression
- name: pod
# expr: optional expression for prometheus query
# overrides the default expression
filters:
- name: pod
required: false
Expand All @@ -213,15 +247,11 @@ data:
- mvtx_name
dimensions:
- name: mono-vertex
# expr: optional expression for prometheus query
# overrides the default expression
- name: pod
# expr: optional expression for prometheus query
# overrides the default expression
filters:
- name: pod
required: false
# Add histogram metrics similar to the pattern above
- name: vertex_throughput
object: vertex
title: Vertex Throughput and Message Rates
Expand All @@ -242,12 +272,11 @@ data:
- vertex
dimensions:
- name: vertex
# expr: optional expression for prometheus query
# overrides the default expression
- name: pod
filters:
- name: pod
required: false
- name: mono_vertex_throughput
object: mono-vertex
title: Mono-Vertex Throughput and Message Rates
Expand All @@ -267,11 +296,7 @@ data:
- mvtx_name
dimensions:
- name: mono-vertex
# expr: optional expression for prometheus query
# overrides the default expression
- name: pod
# expr: optional expression for prometheus query
# overrides the default expression
filters:
- name: pod
required: false
Expand Down
Loading

0 comments on commit 7d28085

Please sign in to comment.