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.

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

Add Ingress Annotation List to Telemetry #5516

Merged
merged 10 commits into from
May 14, 2024

Conversation

AlexFenlon
Copy link
Contributor

@AlexFenlon AlexFenlon commented May 8, 2024

Proposed changes

This adds a list of configured and filtered ingress annotations whether it is a mergeable or standard ingress, it collects the list of unique annotations and displays them in the telemetry log below.

Annotations that will show in telemetry are any annotation that has the following:

	"nginx.org",
	"nginx.com",
	"f5.com",
	"ingress.kubernetes.io/ssl-redirect",

Resolves: #4884

This log is from a mergeable ingress where the nginx.org/mergeable-ingress-type annotation is in both master and minions and proxy-set-headers only in one minion:

I0509 11:36:25.458992       1 collector.go:143] Telemetry data collected: {Data:{ProjectName:NIC ProjectVersion:3.6.0-SNAPSHOT ProjectArchitecture:amd64 ClusterID:707783d6-be8b-4ce0-ad22-3545281b9bb9 ClusterVersion:v1.28.3 ClusterPlatform:other InstallationID:22bd83da-822e-4cf9-8ff6-a6dc08256782 ClusterNodeCount:1} NICResourceCounts:{VirtualServers:1 VirtualServerRoutes:0 TransportServers:0 Replicas:1 Secrets:5 Services:3 Ingresses:3 IngressClasses:1 AccessControlPolicies:0 RateLimitPolicies:2 JWTAuthPolicies:1 BasicAuthPolicies:1 IngressMTLSPolicies:1 EgressMTLSPolicies:0 OIDCPolicies:0 WAFPolicies:0 GlobalConfiguration:false IngressAnnotation:[nginx.org/proxy-set-headers nginx.org/mergeable-ingress-type]}}

Checklist

Before creating a PR, run through this checklist and mark each as complete.

  • I have read the CONTRIBUTING doc
  • I have added tests that prove my fix is effective or that my feature works
  • I have checked that all unit tests pass after adding my changes
  • I have updated necessary documentation
  • I have rebased my branch onto main
  • I will ensure my PR is targeting the main branch and pulling from my branch from my own fork

@AlexFenlon AlexFenlon requested a review from a team as a code owner May 8, 2024 13:09
@github-actions github-actions bot added enhancement Pull requests for new features/feature enhancements go Pull requests that update Go code labels May 8, 2024
@AlexFenlon AlexFenlon requested a review from a team as a code owner May 8, 2024 13:10
@github-actions github-actions bot added the documentation Pull requests/issues for documentation label May 8, 2024
Copy link
Contributor

@ADubhlaoich ADubhlaoich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM docs-wise but not approving since the PR is primarily code based.

@AlexFenlon AlexFenlon merged commit d946cab into main May 14, 2024
78 checks passed
@AlexFenlon AlexFenlon deleted the feat/telemetry-ingress-annotation-count branch May 14, 2024 09:37
ssrahul96 pushed a commit to ssrahul96/kubernetes-ingress that referenced this pull request Jun 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Pull requests/issues for documentation enhancement Pull requests for new features/feature enhancements go Pull requests that update Go code
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

List of configured Ingress Annotations
5 participants