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

Collector/Analyzer - Subnet Available #1004

Merged
merged 31 commits into from
Mar 10, 2023
Merged

Collector/Analyzer - Subnet Available #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
b5ad2bb
boilerplate code for the subnet available collector and analyzer, still
Feb 2, 2023
077846b
remove netlink dependency
Feb 2, 2023
8530b20
working parsing of /proc/net/route to obtain ipv4 routes (without the
Feb 4, 2023
2f1d980
WIP on subnet available collector/analyzer including an example YAML
Feb 5, 2023
04106d2
fix api defs for subnet available collector
Feb 5, 2023
82f07ff
WIP on subnet available collector logic, tests don't pass yet
Feb 14, 2023
a1d4b19
more WIP on subnet available collector, tests don't pass yet still
Feb 14, 2023
be1591c
WIP on subnet available analyzer, not quite there yet (will likely wait
Feb 14, 2023
aeaac58
validate the cidr size for the subnet available collector
Feb 14, 2023
5e23811
WIP on subnet available collector, more logic added but it's not 100%
Feb 15, 2023
4c8fcac
more WIP on subnet available collector, dealing with IP address parsing
Feb 15, 2023
3b43f59
fixed the isASubnetAvailableInCIDR function, pretty sure it was buggy
Feb 17, 2023
4976784
subnet available collector and analyzer all working as expected
Feb 17, 2023
be64f55
remove debug output
Feb 17, 2023
d09fa32
Merge branch 'main' into cpuid-984
Feb 17, 2023
bb2026a
remove the unnecessary return, apparently its unreachable code... I
Feb 17, 2023
a3286cc
fix spacing in example
Feb 17, 2023
cde6172
subnet available collector: fix status JSON field name
Feb 17, 2023
9f06b4d
subnet available collector: include output of `make generate`
Feb 22, 2023
4529eea
move the example subnet available collector/analyzer spec, ref https:…
Feb 22, 2023
cee70d6
rename the subnet available collector/analyzer example spec, fix indents
Feb 22, 2023
d461aa9
allow picking a subnet from a /0 (all ipv4 space), ref https://github…
Feb 22, 2023
12a334d
subnet available collector/analyzer: make schemas
Feb 22, 2023
8d1c668
Merge branch 'main' into cpuid-984
Feb 22, 2023
0981e72
subnetavailable collector: have to remove this test, it can't be run …
Mar 7, 2023
4808507
Merge branch 'main' into cpuid-984
Mar 7, 2023
82394a2
Merge branch 'main' into cpuid-984
Mar 9, 2023
dc4ea46
subnetAvailable collector: change to klog
Mar 9, 2023
fcfab32
subnetAvailable collector: push the routes list even further down the
Mar 9, 2023
61e489f
subnetAvailable collector: oops remove debug param
Mar 9, 2023
3fc02f9
oops... :)
Mar 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions config/crds/troubleshoot.sh_analyzers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2056,6 +2056,55 @@ spec:
required:
- outcomes
type: object
subnetAvailable:
properties:
annotations:
additionalProperties:
type: string
type: object
checkName:
type: string
collectorName:
type: string
exclude:
type: BoolString
outcomes:
items:
properties:
fail:
properties:
message:
type: string
uri:
type: string
when:
type: string
type: object
pass:
properties:
message:
type: string
uri:
type: string
when:
type: string
type: object
warn:
properties:
message:
type: string
uri:
type: string
when:
type: string
type: object
type: object
type: array
strict:
type: BoolString
required:
- outcomes
type: object
systemPackages:
properties:
annotations:
Expand Down
63 changes: 63 additions & 0 deletions config/crds/troubleshoot.sh_hostcollectors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,55 @@ spec:
required:
- outcomes
type: object
subnetAvailable:
properties:
annotations:
additionalProperties:
type: string
type: object
checkName:
type: string
collectorName:
type: string
exclude:
type: BoolString
outcomes:
items:
properties:
fail:
properties:
message:
type: string
uri:
type: string
when:
type: string
type: object
pass:
properties:
message:
type: string
uri:
type: string
when:
type: string
type: object
warn:
properties:
message:
type: string
uri:
type: string
when:
type: string
type: object
type: object
type: array
strict:
type: BoolString
required:
- outcomes
type: object
systemPackages:
properties:
annotations:
Expand Down Expand Up @@ -1176,6 +1225,20 @@ spec:
- args
- command
type: object
subnetAvailable:
properties:
CIDRRangeAlloc:
type: string
collectorName:
type: string
desiredCIDR:
type: integer
exclude:
type: BoolString
required:
- CIDRRangeAlloc
- desiredCIDR
type: object
systemPackages:
properties:
amzn:
Expand Down
77 changes: 77 additions & 0 deletions config/crds/troubleshoot.sh_hostpreflights.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,55 @@ spec:
required:
- outcomes
type: object
subnetAvailable:
properties:
annotations:
additionalProperties:
type: string
type: object
checkName:
type: string
collectorName:
type: string
exclude:
type: BoolString
outcomes:
items:
properties:
fail:
properties:
message:
type: string
uri:
type: string
when:
type: string
type: object
pass:
properties:
message:
type: string
uri:
type: string
when:
type: string
type: object
warn:
properties:
message:
type: string
uri:
type: string
when:
type: string
type: object
type: object
type: array
strict:
type: BoolString
required:
- outcomes
type: object
systemPackages:
properties:
annotations:
Expand Down Expand Up @@ -1176,6 +1225,20 @@ spec:
- args
- command
type: object
subnetAvailable:
properties:
CIDRRangeAlloc:
type: string
collectorName:
type: string
desiredCIDR:
type: integer
exclude:
type: BoolString
required:
- CIDRRangeAlloc
- desiredCIDR
type: object
systemPackages:
properties:
amzn:
Expand Down Expand Up @@ -1548,6 +1611,20 @@ spec:
exclude:
type: BoolString
type: object
subnetAvailable:
properties:
CIDRRangeAlloc:
type: string
collectorName:
type: string
desiredCIDR:
type: integer
exclude:
type: BoolString
required:
- CIDRRangeAlloc
- desiredCIDR
type: object
systemPackages:
properties:
collectorName:
Expand Down
14 changes: 14 additions & 0 deletions config/crds/troubleshoot.sh_preflights.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10153,6 +10153,20 @@ spec:
exclude:
type: BoolString
type: object
subnetAvailable:
properties:
CIDRRangeAlloc:
type: string
collectorName:
type: string
desiredCIDR:
type: integer
exclude:
type: BoolString
required:
- CIDRRangeAlloc
- desiredCIDR
type: object
systemPackages:
properties:
collectorName:
Expand Down
14 changes: 14 additions & 0 deletions config/crds/troubleshoot.sh_remotecollectors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,20 @@ spec:
exclude:
type: BoolString
type: object
subnetAvailable:
properties:
CIDRRangeAlloc:
type: string
collectorName:
type: string
desiredCIDR:
type: integer
exclude:
type: BoolString
required:
- CIDRRangeAlloc
- desiredCIDR
type: object
systemPackages:
properties:
collectorName:
Expand Down
63 changes: 63 additions & 0 deletions config/crds/troubleshoot.sh_supportbundles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10565,6 +10565,55 @@ spec:
required:
- outcomes
type: object
subnetAvailable:
properties:
annotations:
additionalProperties:
type: string
type: object
checkName:
type: string
collectorName:
type: string
exclude:
type: BoolString
outcomes:
items:
properties:
fail:
properties:
message:
type: string
uri:
type: string
when:
type: string
type: object
pass:
properties:
message:
type: string
uri:
type: string
when:
type: string
type: object
warn:
properties:
message:
type: string
uri:
type: string
when:
type: string
type: object
type: object
type: array
strict:
type: BoolString
required:
- outcomes
type: object
systemPackages:
properties:
annotations:
Expand Down Expand Up @@ -11108,6 +11157,20 @@ spec:
- args
- command
type: object
subnetAvailable:
properties:
CIDRRangeAlloc:
type: string
collectorName:
type: string
desiredCIDR:
type: integer
exclude:
type: BoolString
required:
- CIDRRangeAlloc
- desiredCIDR
type: object
systemPackages:
properties:
amzn:
Expand Down
19 changes: 19 additions & 0 deletions examples/preflight/host/subnet-available.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
apiVersion: troubleshoot.sh/v1beta2
kind: HostPreflight
metadata:
name: subnet-available
spec:
collectors:
# would output yes/no depending if there is a /22 available in 10.0.0.0/8
- subnetAvailable:
CIDRRangeAlloc: "10.0.0.0/8"
desiredCIDR: 22
analyzers:
- subnetAvailable:
outcomes:
- fail:
when: "no-subnet-available"
message: failed to find available subnet
- pass:
when: "a-subnet-is-available"
message: available /22 subnet found
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ require (

require (
cloud.google.com/go/compute/metadata v0.2.3 // indirect
github.com/apparentlymart/go-cidr v1.1.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,8 @@ github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:C
github.com/andybalholm/brotli v1.0.1 h1:KqhlKozYbRtJvsPrrEeXcO+N2l6NYT5A2QAFmSULpEc=
github.com/andybalholm/brotli v1.0.1/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/apparentlymart/go-cidr v1.1.0 h1:2mAhrMoF+nhXqxTzSZMUzDHkLjmIHC+Zzn4tdgBZjnU=
github.com/apparentlymart/go-cidr v1.1.0/go.mod h1:EBcsNrHc3zQeuaeCeCtQruQm+n9/YjEn/vI25Lg7Gwc=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
Expand Down
2 changes: 2 additions & 0 deletions pkg/analyze/host_analyzer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ func GetHostAnalyzer(analyzer *troubleshootv1beta2.HostAnalyze) (HostAnalyzer, b
return &AnalyzeHostTCPConnect{analyzer.TCPConnect}, true
case analyzer.IPV4Interfaces != nil:
return &AnalyzeHostIPV4Interfaces{analyzer.IPV4Interfaces}, true
case analyzer.SubnetAvailable != nil:
return &AnalyzeHostSubnetAvailable{analyzer.SubnetAvailable}, true
case analyzer.FilesystemPerformance != nil:
return &AnalyzeHostFilesystemPerformance{analyzer.FilesystemPerformance}, true
case analyzer.Certificate != nil:
Expand Down
Loading