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

Add interface names into NSM metrics #1560

Closed
wants to merge 1 commit into from
Closed

Add interface names into NSM metrics #1560

wants to merge 1 commit into from

Conversation

dualBreath
Copy link
Contributor

Description

Add interface names into NSM metrics

This change works for NSC and NSE:
metrixNew drawio (1)

Issue link

Task: networkservicemesh/sdk-vpp#768

How Has This Been Tested?

  • Added unit testing to cover
  • Tested manually
  • Tested by integration testing
  • Have not tested

Types of changes

  • Bug fix
  • New functionality
  • Documentation
  • Refactoring
  • CI

Task:768 Add interface names into NSM metrics
f96b2f5 
Signed-off-by: Alexander Peretyatko <alexander.peretyatko@xored.com>
This was referenced Nov 24, 2023
Closed
Open
@codecov Codecov
Copy link

codecov bot commented Nov 24, 2023 •
edited
Loading

Codecov Report

Attention: Patch coverage is 21.42857% with 55 lines in your changes missing coverage. Please review.

Please upload report for BASE (main@d109337). Learn more about missing BASE report.

Files with missing lines Patch % Lines
pkg/networkservice/common/mechanisms/common.go 0.00% 33 Missing ⚠️
pkg/networkservice/common/mechanisms/client.go 42.10% 8 Missing and 3 partials ⚠️
pkg/networkservice/common/mechanisms/server.go 38.88% 8 Missing and 3 partials ⚠️
Additional details and impacted files 
@@           Coverage Diff           @@
##             main    #1560   +/-   ##
=======================================
  Coverage        ?   66.65%           
=======================================
  Files           ?      260           
  Lines           ?    12382           
  Branches        ?        0           
=======================================
  Hits            ?     8253           
  Misses          ?     3605           
  Partials        ?      524

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dualBreath dualBreath mentioned this pull request Nov 24, 2023
Closed
@dualBreath
Copy link
Contributor Author

Looks like failed test 'TestRecvfd/TestRecvfdClosesSingleFile' is unstable and unrelated to current changes: https://github.com/networkservicemesh/sdk/actions/runs/6977107882/job/18986490270?pr=1560#step:5:777

@dualBreath
Copy link
Contributor Author

I've tested these changes on several use cases to make sure they all work as expected.
Kernel2Kernel

{
    "id": "alpine-1dfb4a65-b355-4fb8-a353-0694ced7ddc8-0",
    "network_service": "kernel2kernel",
    "mechanism": {
        ...
    },
    "context": {
        ...
    },
    "labels": {
        ...
    },
    "path": {
        "path_segments": [
            {
                "name": "alpine-1dfb4a65-b355-4fb8-a353-0694ced7ddc8",
                ...
                "metrics": {
                    "client_interface": "KERNEL/nsm-1"
                }
            },
            {
                "name": "nsmgr-t4r9n",
                ...
            },
            {
                "name": "forwarder-vpp-7hvrp",
                ...
                "metrics": {
                    "client_drops": "3",
                    "client_interface": "VIRTIO/tap0",
                    "client_rx_bytes": "516",
                    "client_rx_packets": "6",
                    "client_tx_bytes": "516",
                    "client_tx_packets": "6",
                    "server_drops": "0",
                    "server_interface": "VIRTIO/tap1",
                    "server_rx_bytes": "586",
                    "server_rx_packets": "7",
                    "server_tx_bytes": "320",
                    "server_tx_packets": "4"
                }
            },
            {
                "name": "nse-kernel-7fc79bb799-fx7sh",
                ...
                "metrics": {
                    "server_interface": "KERNEL/kernel2ker-3a13"
                }
            }
        ]
    },
    "network_service_endpoint_name": "nse-kernel-7fc79bb799-fx7sh",
    "payload": "ETHERNET"
}

Memif2Memif

{
    "id": "nsc-memif-76699ccbc7-x9xhf-0",
    "network_service": "memif2memif",
    "mechanism": {
        ...
    },
    "context": {
        ...
    },
    "labels": {
        ...
    },
    "path": {
        "path_segments": [
            {
                "name": "nsc-memif-76699ccbc7-x9xhf",
                ...
                "metrics": {
                    "client_interface": "MEMIF/nsm-1"
                }
            },
            {
                "name": "nsmgr-t529n",
                ...
            },
            {
                "name": "forwarder-vpp-7tjb2",
                ...
            },
            {
                "name": "nse-memif-7ccff8bf8-2wghn",
                ...
                "metrics": {
                    "server_interface": "MEMIF/memif1013904223/0"
                }
            }
        ]
    },
    "network_service_endpoint_name": "nse-memif-7ccff8bf8-2wghn",
    "payload": "ETHERNET"
}

Kernel2Memif

{
    "id": "alpine-395ed7f9-30fd-41aa-af2d-1c5d6ca8889b-0",
    "network_service": "kernel2memif",
    "mechanism": {
        ...
    },
    "context": {
        ...
    },
    "labels": {
        ...
    },
    "path": {
        "path_segments": [
            {
                "name": "alpine-395ed7f9-30fd-41aa-af2d-1c5d6ca8889b",
                ...
                "metrics": {
                    "client_interface": "KERNEL/nsm-1"
                }
            },
            {
                "name": "nsmgr-8ckqf",
                ...
            },
            {
                "name": "forwarder-vpp-5x4ck",
                ...
                "metrics": {
                    "client_drops": "0",
                    "client_interface": "MEMIF/memif1013904223/0",
                    "client_rx_bytes": "0",
                    "client_rx_packets": "0",
                    "client_tx_bytes": "516",
                    "client_tx_packets": "6",
                    "server_drops": "0",
                    "server_interface": "VIRTIO/tap0",
                    "server_rx_bytes": "516",
                    "server_rx_packets": "6",
                    "server_tx_bytes": "0",
                    "server_tx_packets": "0"
                }
            },
            {
                "name": "nse-memif-7948d8d869-mwnq8",
                ...
                "metrics": {
                    "server_interface": "MEMIF/memif1013904223/0"
                }
            }
        ]
    },
    "network_service_endpoint_name": "nse-memif-7948d8d869-mwnq8",
    "payload": "ETHERNET"
}

Memif2Kernel

{
    "id": "nsc-memif-5cbd8d6db5-c66br-0",
    "network_service": "memif2kernel",
    "mechanism": {
        ...
    },
    "context": {
        ...
    },
    "labels": {
        ...
    },
    "path": {
        "path_segments": [
            {
                "name": "nsc-memif-5cbd8d6db5-c66br",
                ...
                "metrics": {
                    "client_interface": "MEMIF/nsm-1"
                }
            },
            {
                "name": "nsmgr-bb6sk",
                ...
            },
            {
                "name": "forwarder-vpp-vjfqr",
                ...
                "metrics": {
                    "client_drops": "0",
                    "client_interface": "VIRTIO/tap0",
                    "client_rx_bytes": "0",
                    "client_rx_packets": "0",
                    "client_tx_bytes": "0",
                    "client_tx_packets": "0",
                    "server_drops": "0",
                    "server_interface": "MEMIF/memif1013904223/0",
                    "server_rx_bytes": "0",
                    "server_rx_packets": "0",
                    "server_tx_bytes": "0",
                    "server_tx_packets": "0"
                }
            },
            {
                "name": "nse-kernel-7d54cdb6d6-h496c",
                ...
                "metrics": {
                    "server_interface": "KERNEL/memif2kern-672c"
                }
            }
        ]
    },
    "network_service_endpoint_name": "nse-kernel-7d54cdb6d6-h496c",
    "payload": "ETHERNET"
}

Kernel2Ethernet2Kernel

{
    "id": "alpine-3578be48-1aa9-4215-b5f3-fbd65b489281-0",
    "network_service": "kernel2ethernet2kernel",
    "mechanism": {
        ...
    },
    "context": {
        ...
    },
    "labels": {
        ...
    },
    "path": {
        "path_segments": [
            {
                "name": "alpine-3578be48-1aa9-4215-b5f3-fbd65b489281",
                ...
                "metrics": {
                    "client_interface": "KERNEL/nsm-1"
                }
            },
            {
                "name": "nsmgr-rkgmr",
                ...            },
            {
                "name": "forwarder-vpp-r8gcx",
                ...
                "metrics": {
                    "client_drops": "2",
                    "client_interface": "VXLAN/vxlan_tunnel0",
                    "client_rx_bytes": "426",
                    "client_rx_packets": "5",
                    "client_tx_bytes": "838",
                    "client_tx_packets": "7",
                    "server_drops": "0",
                    "server_interface": "VIRTIO/tap0",
                    "server_rx_bytes": "586",
                    "server_rx_packets": "7",
                    "server_tx_bytes": "250",
                    "server_tx_packets": "3"
                }
            },
            {
                "name": "nsmgr-25v2p",
                ...
            },
            {
                "name": "forwarder-vpp-7qvbl",
                ...
                "metrics": {
                    "client_drops": "1",
                    "client_interface": "VIRTIO/tap0",
                    "client_rx_bytes": "516",
                    "client_rx_packets": "6",
                    "client_tx_bytes": "516",
                    "client_tx_packets": "6",
                    "server_drops": "0",
                    "server_interface": "VXLAN/vxlan_tunnel0",
                    "server_rx_bytes": "586",
                    "server_rx_packets": "7",
                    "server_tx_bytes": "606",
                    "server_tx_packets": "5"
                }
            },
            {
                "name": "nse-kernel-7cc795b5fd-8bnsq",
                ...
                "metrics": {
                    "server_interface": "KERNEL/kernel2eth-b008"
                }
            }
        ]
    },
    "network_service_endpoint_name": "nse-kernel-7cc795b5fd-8bnsq",
    "payload": "ETHERNET"
}

Kernel2Ethernet2Memif

{
    "id": "alpine-b35b9e79-76da-4210-a735-76e4b71723fd-0",
    "network_service": "kernel2ethernet2memif",
    "mechanism": {
        ...
    },
    "context": {
        ...
    },
    "labels": {
        ...
    },
    "path": {
        "path_segments": [
            {
                "name": "alpine-b35b9e79-76da-4210-a735-76e4b71723fd",
                ...
                "metrics": {
                    "client_interface": "KERNEL/nsm-1"
                }
            },
            {
                "name": "nsmgr-67wt9",
                ...
            },
            {
                "name": "forwarder-vpp-2t5xw",
                ...
                "metrics": {
                    "client_drops": "0",
                    "client_interface": "VXLAN/vxlan_tunnel0",
                    "client_rx_bytes": "0",
                    "client_rx_packets": "0",
                    "client_tx_bytes": "732",
                    "client_tx_packets": "6",
                    "server_drops": "0",
                    "server_interface": "VIRTIO/tap0",
                    "server_rx_bytes": "586",
                    "server_rx_packets": "7",
                    "server_tx_bytes": "0",
                    "server_tx_packets": "0"
                }
            },
            {
                "name": "nsmgr-bf65j",
                ...
            },
            {
                "name": "forwarder-vpp-64fgr",
                ...
                "metrics": {
                    "client_drops": "0",
                    "client_interface": "MEMIF/memif1013904223/0",
                    "client_rx_bytes": "0",
                    "client_rx_packets": "0",
                    "client_tx_bytes": "516",
                    "client_tx_packets": "6",
                    "server_drops": "0",
                    "server_interface": "VXLAN/vxlan_tunnel0",
                    "server_rx_bytes": "516",
                    "server_rx_packets": "6",
                    "server_tx_bytes": "0",
                    "server_tx_packets": "0"
                }
            },
            {
                "name": "nse-memif-6fbc6b969d-qrvtj",
                ...
                "metrics": {
                    "server_interface": "MEMIF/memif1013904223/0"
                }
            }
        ]
    },
    "network_service_endpoint_name": "nse-memif-6fbc6b969d-qrvtj",
    "payload": "ETHERNET"
}

Memif2Ethernet2Memif

{
    "id": "nsc-memif-65789dc458-qw4rq-0",
    "network_service": "memif2ethernet2memif",
    "mechanism": {
        ...
    },
    "context": {
        ...
    },
    "labels": {
        ...
    },
    "path": {
        "path_segments": [
            {
                "name": "nsc-memif-65789dc458-qw4rq",
                ...
                "metrics": {
                    "client_interface": "MEMIF/nsm-1"
                }
            },
            {
                "name": "nsmgr-d72sn",
                ...
            },
            {
                "name": "forwarder-vpp-mxrpr",
                ...
                "metrics": {
                    "client_drops": "0",
                    "client_interface": "VXLAN/vxlan_tunnel0",
                    "client_rx_bytes": "0",
                    "client_rx_packets": "0",
                    "client_tx_bytes": "0",
                    "client_tx_packets": "0",
                    "server_drops": "0",
                    "server_interface": "MEMIF/memif1013904223/0",
                    "server_rx_bytes": "0",
                    "server_rx_packets": "0",
                    "server_tx_bytes": "0",
                    "server_tx_packets": "0"
                }
            },
            {
                "name": "nsmgr-h9llj",
                ...
            },
            {
                "name": "forwarder-vpp-w7qds",
                ...
                "metrics": {
                    "client_drops": "0",
                    "client_interface": "MEMIF/memif1013904223/0",
                    "client_rx_bytes": "0",
                    "client_rx_packets": "0",
                    "client_tx_bytes": "0",
                    "client_tx_packets": "0",
                    "server_drops": "0",
                    "server_interface": "VXLAN/vxlan_tunnel0",
                    "server_rx_bytes": "0",
                    "server_rx_packets": "0",
                    "server_tx_bytes": "0",
                    "server_tx_packets": "0"
                }
            },
            {
                "name": "nse-memif-f9b75c999-nkx8j",
                ...
                "metrics": {
                    "server_interface": "MEMIF/memif1013904223/0"
                }
            }
        ]
    },
    "network_service_endpoint_name": "nse-memif-f9b75c999-nkx8j",
    "payload": "ETHERNET"
}

Memif2IP2Kernel

{
    "id": "nsc-memif-6bcb7d74bd-p2cv2-0",
    "network_service": "memif2ip2kernel",
    "mechanism": {
        ...
    },
    "context": {
        ...
    },
    "labels": {
        ...
    },
    "path": {
        "path_segments": [
            {
                "name": "nsc-memif-6bcb7d74bd-p2cv2",
                ...
                "metrics": {
                    "client_interface": "MEMIF/nsm-1"
                }
            },
            {
                "name": "nsmgr-kwp5z",
                ...
            },
            {
                "name": "forwarder-vpp-9hql8",
                ...
                "metrics": {
                    "client_drops": "0",
                    "client_interface": "WIREGUARD TUNNEL/wg0",
                    "client_rx_bytes": "0",
                    "client_rx_packets": "0",
                    "client_tx_bytes": "0",
                    "client_tx_packets": "0",
                    "server_drops": "0",
                    "server_interface": "MEMIF/memif1013904223/0",
                    "server_rx_bytes": "0",
                    "server_rx_packets": "0",
                    "server_tx_bytes": "0",
                    "server_tx_packets": "0"
                }
            },
            {
                "name": "nsmgr-rqj95",
                ...
            },
            {
                "name": "forwarder-vpp-hb7pl",
                ...
                "metrics": {
                    "client_drops": "0",
                    "client_interface": "VIRTIO/tun0",
                    "client_rx_bytes": "0",
                    "client_rx_packets": "0",
                    "client_tx_bytes": "0",
                    "client_tx_packets": "0",
                    "server_drops": "0",
                    "server_interface": "WIREGUARD TUNNEL/wg0",
                    "server_rx_bytes": "0",
                    "server_rx_packets": "0",
                    "server_tx_bytes": "0",
                    "server_tx_packets": "0"
                }
            },
            {
                "name": "nse-kernel-799c978868-s8s5r",
                ...
                "metrics": {
                    "server_interface": "KERNEL/memif2ip2k-6ee8"
                }
            }
        ]
    },
    "network_service_endpoint_name": "nse-kernel-799c978868-s8s5r",
    "payload": "IP"
}

@dualBreath dualBreath mentioned this pull request Nov 24, 2023
Open
@dualBreath
Copy link
Contributor Author

@NikitaSkrynnik @d-uzlov @denis-tingaikin @glazychev-art @VitalyGushin please review

1 similar comment
@dualBreath
Copy link
Contributor Author

@NikitaSkrynnik @d-uzlov @denis-tingaikin @glazychev-art @VitalyGushin please review

@NikitaSkrynnik NikitaSkrynnik mentioned this pull request Dec 29, 2023
Merged
9 tasks
@NikitaSkrynnik
Copy link
Contributor

Seems like we don't need this PR. #1572 is sufficient. We already have all interface names in path.

"path":{"path_segments":[
{"name":"alpine-43a1fd56-b916-45e9-b3ac-72e47f1d6321","id":"alpine-43a1fd56-b916-45e9-b3ac-72e47f1d6321-0", "metrics":{"client_interface":"KERNEL/nsm-1"}},

{"name":"nsmgr-7cnk4","id":"5f0a1fb7-2db2-44f6-982e-eff15f0ccfed"},

{"name":"forwarder-vpp-4pwq7","id":"4881a7ad-995c-442f-b5a0-f86c95f4d698", "metrics":{"client_interface":"VIRTIO/tap0", "server_interface":"VIRTIO/tap1"}},

{"name":"nse-kernel-658b86b75f-kvvfs","id":"d26c4b6f-9b2b-4d76-a071-8307b50e1dc1", "metrics":{"server_interface":"KERNEL/kernel2ker-4R1E"}}]}

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dualBreath @NikitaSkrynnik