Added monitoring endpoint #100

p-strusiewiczsurmacki-mobica · 2024-02-28T16:37:03Z

This PR adds monitoring endpoints as described in #96.

show ip/ipv6 route (vrf <vrf>) <input> json (with/without longer-prefixes)
show bgp (vrf <vrf>) ipv4/ipv6 unicast <input> json (with/without longer-prefixes)
show evpn vni json
show evpn rmac vni <all|vrf> json
show evpn mac vni <all|vrf> json
show evpn next-hops vni <all|vrf> json
show bgp vrf <all|vrf> summary json

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

pkg/monitoring/endpoint.go

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

pkg/monitoring/endpoint.go

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

config/manager/service.yaml

config/rbac/role.yaml

pkg/monitoring/endpoint.go

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

pkg/monitoring/endpoint.go

schrej · 2024-04-17T15:06:49Z

pkg/monitoring/endpoint.go

+		return
+	}
+
+	data := e.cli.ExecuteWithJSON(command)


Is this safe? We're directly passing query args (vrf) to the command. Do we need to do some additional sanitization here to prevent RCE? I think making sure it's only allowed characters would go a long way.

Same applies to all other cases.

Done. However I am not sure what values can be used for VRF/VNI, so for now I've just restricted those to:

regexp.MustCompile("^[a-zA-Z0-9_]")

Should I add something to it? Is dash - valid character for this, for example? Or maybe underscore _ should be removed?

I believe, all the other parameters are sanitized in switch/if statements.

dash and underscore should both be valid parameters here. VNI is a 24-bit number.

OK, changed VRF regexp to
"^[a-zA-Z0-9-_.]+$"

And added validation function for VNI:

das-schiff-network-operator/pkg/monitoring/endpoint.go

Line 266 in 0ba752b

func validateVNI(vni string) error {

pkg/monitoring/endpoint.go

Separated passRequest Co-authored-by: Jakob Schrettenbrunner <dev@schrej.net>

…rate docker images and contianers in pod. Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

…together Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

schrej

lgtm, please wait for feedback on that validation comment from @chdxD1

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

p-strusiewiczsurmacki-mobica added 2 commits February 28, 2024 17:31

Added monitoring endpoint

a17a509

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Fixed linter issues

3b873c0

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

p-strusiewiczsurmacki-mobica changed the title ~~Added monitoring endpoint~~ [WIP] Added monitoring endpoint Feb 28, 2024

chdxD1 requested changes Mar 5, 2024

View reviewed changes

pkg/monitoring/endpoint.go Outdated Show resolved Hide resolved

pkg/monitoring/endpoint.go Outdated Show resolved Hide resolved

pkg/monitoring/endpoint.go Show resolved Hide resolved

pkg/monitoring/endpoint.go Outdated Show resolved Hide resolved

p-strusiewiczsurmacki-mobica added 6 commits March 6, 2024 17:37

Fixed issues from CR and added k8s client

561170b

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Added initial global endpoint

2c1b70e

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Added global endpoint

f9e1d11

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Added asynchronous GET calls

38920ff

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Fixed linter issues

aafc408

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Made label selector more specific

0a6fcf6

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

chdxD1 requested changes Mar 12, 2024

View reviewed changes

pkg/monitoring/endpoint.go Outdated Show resolved Hide resolved

pkg/monitoring/endpoint.go Outdated Show resolved Hide resolved

p-strusiewiczsurmacki-mobica added 9 commits March 12, 2024 14:34

Added basic unit tests

e0d5249

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Removed redundant const

0e99394

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Fixed linter issues

4d4ade2

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

ShowBGP - protocol ip will be accepted as ipv4

b1ba4dd

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Fixed json generation

dfb59cf

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Service/endpoint based discovery used instead of pod based discovery

869560e

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Fixed typo

47e7e9b

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Updated unit tests

f686f93

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Fixed linter issues

58b5509

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

p-strusiewiczsurmacki-mobica marked this pull request as ready for review March 13, 2024 11:56

p-strusiewiczsurmacki-mobica requested review from MaxRink, Cellebyte and schrej as code owners March 13, 2024 11:56

p-strusiewiczsurmacki-mobica changed the title ~~[WIP] Added monitoring endpoint~~ Added monitoring endpoint Mar 13, 2024

p-strusiewiczsurmacki-mobica added 5 commits March 13, 2024 16:15

Reworked request passing and added more unit tests

fdc0e00

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Removed redundant line

c5080b1

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Fixed URL building

b499702

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Removed redundant code

595daa4

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Fixed linter issues

6861d81

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

p-strusiewiczsurmacki-mobica mentioned this pull request Mar 14, 2024

Extended Visibility for Host Routing #96

Open

p-strusiewiczsurmacki-mobica added 3 commits March 15, 2024 11:26

Reworked pod discovery

dfe0051

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Status service and namespace will be now configured using env variables

cb9be8c

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Fixed linter issues

9aefc32

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

p-strusiewiczsurmacki-mobica requested a review from chdxD1 March 25, 2024 11:24

chdxD1 reviewed Apr 4, 2024

View reviewed changes

config/manager/service.yaml Outdated Show resolved Hide resolved

config/manager/service.yaml Outdated Show resolved Hide resolved

config/rbac/role.yaml Show resolved Hide resolved

config/rbac/role.yaml Show resolved Hide resolved

pkg/monitoring/endpoint.go Show resolved Hide resolved

CR related changes

2ec4a6a

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

schrej requested a review from chdxD1 April 17, 2024 12:47

schrej requested changes Apr 17, 2024

View reviewed changes

p-strusiewiczsurmacki-mobica and others added 6 commits April 18, 2024 15:19

Update pkg/monitoring/endpoint.go

4ca3c42

Separated passRequest Co-authored-by: Jakob Schrettenbrunner <dev@schrej.net>

Separate HHTTP servers for frr-exporter and monitoring endpoint. Sepa…

3c402b2

…rate docker images and contianers in pod. Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Ranamed PassRequest function to QueryAll

d5f5df6

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Separated passRequest go routine as suggested in the CR

0744b4c

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Sanitized inputs

77d7182

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Fixed logging and other minor issues

0448608

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

p-strusiewiczsurmacki-mobica requested a review from schrej April 18, 2024 15:14

Joined monitoring endpoint HTTP server and frr collector HTTP server …

71cb862

…together Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

p-strusiewiczsurmacki-mobica force-pushed the extended-routing-visability branch from 773bb8c to 71cb862 Compare April 19, 2024 17:22

schrej approved these changes Apr 22, 2024

View reviewed changes

p-strusiewiczsurmacki-mobica added 2 commits April 30, 2024 12:47

Fixed validation

0ba752b

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Fixed linter issue

1827b80

Signed-off-by: Patryk Strusiewicz-Surmacki <patryk-pawel.strusiewicz-surmacki@external.telekom.de>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added monitoring endpoint #100

Added monitoring endpoint #100

p-strusiewiczsurmacki-mobica commented Feb 28, 2024 •

edited

schrej Apr 17, 2024

p-strusiewiczsurmacki-mobica Apr 18, 2024 •

edited

chdxD1 Apr 25, 2024

p-strusiewiczsurmacki-mobica Apr 30, 2024

schrej left a comment

Added monitoring endpoint #100

Are you sure you want to change the base?

Added monitoring endpoint #100

Conversation

p-strusiewiczsurmacki-mobica commented Feb 28, 2024 • edited

schrej Apr 17, 2024

Choose a reason for hiding this comment

p-strusiewiczsurmacki-mobica Apr 18, 2024 • edited

Choose a reason for hiding this comment

chdxD1 Apr 25, 2024

Choose a reason for hiding this comment

p-strusiewiczsurmacki-mobica Apr 30, 2024

Choose a reason for hiding this comment

schrej left a comment

Choose a reason for hiding this comment

p-strusiewiczsurmacki-mobica commented Feb 28, 2024 •

edited

p-strusiewiczsurmacki-mobica Apr 18, 2024 •

edited