Skip to content
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

Jump to bottom

NETOBSERV-1131: Filter for Duplicate=false in metrics #387

Merged
merged 2 commits into from
Jul 10, 2023
Merged

NETOBSERV-1131: Filter for Duplicate=false in metrics #387

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1f2c1a
NETOBSERV-1131: Filter for Duplicate=false in metrics
jotak Jun 29, 2023
c38b09d
bump flp
jotak Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions controllers/flowlogspipeline/metrics_definitions/node_egress_bytes_total.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ encode:
- name: node_egress_bytes_total
type: counter
valuekey: Bytes
filter:
key: FlowDirection
filters:
- key: FlowDirection
value: "1"
- key: Duplicate
value: "false"
labels:
- SrcK8S_HostName
- DstK8S_HostName
Expand Down
6 changes: 4 additions & 2 deletions controllers/flowlogspipeline/metrics_definitions/node_ingress_bytes_total.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ encode:
- name: node_ingress_bytes_total
type: counter
valuekey: Bytes
filter:
key: FlowDirection
filters:
- key: FlowDirection
value: "0"
- key: Duplicate
value: "false"
labels:
- SrcK8S_HostName
- DstK8S_HostName
Expand Down
6 changes: 4 additions & 2 deletions controllers/flowlogspipeline/metrics_definitions/workload_egress_bytes_total.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ encode:
- name: workload_egress_bytes_total
type: counter
valuekey: Bytes
filter:
key: FlowDirection
filters:
- key: FlowDirection
value: "1"
- key: Duplicate
value: "false"
labels:
- SrcK8S_Namespace
- DstK8S_Namespace
Expand Down
6 changes: 4 additions & 2 deletions controllers/flowlogspipeline/metrics_definitions/workload_egress_packets_total.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ encode:
- name: workload_egress_packets_total
type: counter
valuekey: Packets
filter:
key: FlowDirection
filters:
- key: FlowDirection
value: "1"
- key: Duplicate
value: "false"
labels:
- SrcK8S_Namespace
- DstK8S_Namespace
Expand Down
6 changes: 4 additions & 2 deletions controllers/flowlogspipeline/metrics_definitions/workload_ingress_bytes_total.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ encode:
- name: workload_ingress_bytes_total
type: counter
valuekey: Bytes
filter:
key: FlowDirection
filters:
- key: FlowDirection
value: "0"
- key: Duplicate
value: "false"
labels:
- SrcK8S_Namespace
- DstK8S_Namespace
Expand Down
6 changes: 4 additions & 2 deletions controllers/flowlogspipeline/metrics_definitions/workload_ingress_packets_total.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ encode:
- name: workload_ingress_packets_total
type: counter
valuekey: Packets
filter:
key: FlowDirection
filters:
- key: FlowDirection
value: "0"
- key: Duplicate
value: "false"
labels:
- SrcK8S_Namespace
- DstK8S_Namespace
Expand Down
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,5 @@ require (
)

replace github.com/prometheus/common v0.32.1 => github.com/netobserv/prometheus-common v0.31.2-0.20220720134304-43e74fd22881

replace github.com/netobserv/flowlogs-pipeline => ../flowlogs-pipeline
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,6 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
github.com/netobserv/flowlogs-pipeline v0.1.9 h1:6qDlGxW49rdN0BIyEtQov0XBx06H4od63cCqnXOG6Hw=
github.com/netobserv/flowlogs-pipeline v0.1.9/go.mod h1:Vxct8MkKFtT8iR60wpHFErBuTM04XFaLdQmDxoypCfs=
github.com/netobserv/loki-client-go v0.0.0-20220927092034-f37122a54500 h1:RmnoJe/ci5q+QdM7upFdxiU+D8F3L3qTd5wXCwwHefw=
github.com/netobserv/prometheus-common v0.31.2-0.20220720134304-43e74fd22881 h1:hx5bi6xBovRjmwUoVJBzhJ3EDo4K4ZUsqqKrJuQ2vMI=
github.com/netobserv/prometheus-common v0.31.2-0.20220720134304-43e74fd22881/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
Expand Down
20 changes: 14 additions & 6 deletions vendor/github.com/netobserv/flowlogs-pipeline/pkg/api/encode_prom.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions vendor/github.com/netobserv/flowlogs-pipeline/pkg/config/pipeline_builder.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions vendor/github.com/netobserv/flowlogs-pipeline/pkg/config/stage_params.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ github.com/munnerz/goautoneg
# github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
## explicit
github.com/mwitkow/go-conntrack
# github.com/netobserv/flowlogs-pipeline v0.1.9
# github.com/netobserv/flowlogs-pipeline v0.1.9 => ../flowlogs-pipeline
## explicit; go 1.18
github.com/netobserv/flowlogs-pipeline/pkg/api
github.com/netobserv/flowlogs-pipeline/pkg/confgen
Expand Down Expand Up @@ -691,3 +691,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
# sigs.k8s.io/yaml v1.3.0
## explicit; go 1.12
sigs.k8s.io/yaml
# github.com/netobserv/flowlogs-pipeline => ../flowlogs-pipeline