add k8s events logging to alloy #263
Conversation
|
I still need to find a way to enable the operator to switch between alloy or grafana-agent for k8s events logging based on which logging agent is deployed. |
|
Still need to handle the usage of a new |
|
You're missing the toggle as well |
Oh indeed ! My bad |
|
Created a separate PR for events-logger toggle : #270 |
|
I think I can't go further in terms of splitting this PR into smaller ones as now all files are intertwined between each other. |
| @@ -44,6 +44,11 @@ func (r *Reconciler) ReconcileCreate(ctx context.Context, lc loggedcluster.Inter | |||
| return ctrl.Result{}, errors.WithStack(err) | |||
| } | |||
|
|
|||
| // If the observability-bundle version is too old, we don't need to do anything. | |||
There was a problem hiding this comment.
What we do here is too disabled both grafana agent and alloy-event apps, not not do anything because we still need to toggle promtail right ?
There was a problem hiding this comment.
Oh ok my bad. Since 0.9.0 is such an old version of the observability-bundle I wasn't even sure that promtail was already managed by the logging-operator.
There was a problem hiding this comment.
I updated the handling of this specific case. WDYT about it ?
pkg/resource/events-logger-config/alloy/events-logger-config.alloy.yaml.template
Show resolved
Hide resolved
| ScrapedNamespaces string | ||
| }{ | ||
| ClusterID: lc.GetClusterName(), | ||
| Installation: lc.GetInstallationName(), | ||
| InsecureSkipVerify: fmt.Sprintf("%t", lc.IsInsecureCA()), | ||
| SecretName: fmt.Sprintf("%s-%s", lc.GetClusterName(), common.GrafanaAgentExtraSecretName()), | ||
| ScrapedNamespaces: common.FormatScrapedNamespaces(lc, defaultWorkloadClusterNamespaces), | ||
| SecretName: eventsloggersecret.GetEventsLoggerSecretName(lc), |
There was a problem hiding this comment.
Secret name should bé différent for grafana agent
There was a problem hiding this comment.
We already have kube-system hardcoded in the grafana-agent template so I can indeed remove the SecretNamespace field.
As for the SecretName one we still need to keep it defined as it is right now as the name will depend on the WC's right ?
There was a problem hiding this comment.
Yes but i'm reviewing on m'y phone so I might have lost context 😅
pkg/resource/events-logger-config/grafana-agent/test/events-logger-config.grafanaagent.MC.yaml
Outdated
Show resolved
Hide resolved
pkg/resource/events-logger-config/grafana-agent/events-logger-config.grafanaagent.yaml.template
Outdated
Show resolved
Hide resolved
|
@QuantumEnigmaa do not forget to test the grafana agent case |
|
Follow-up PR : #277 |
* add tests for alloy-events in events-logger-config * changelog * create alloy-events tests golden files
* add k8s events logging to alloy * changelog * create the events-logger resource : either alloy or grafana-agent * handle secret for authentication * fix alloy config property name * fix build errors * rename k8s-events-config package to events-logger-config * Apply suggestions from code review Co-authored-by: Quentin Bisson <quentin@giantswarm.io> * fix error log * return correct configmap name depending on the events logger * return correct secret name depending on the events logger * add scrapedNamespaces to alloy config create related function in common * add tls config for alloy * fix formating in grafana-agent template * hardcode controller.type and controller.replicas in alloyEvents template * remove unused observabilityBundleVersion parameters and variable in events-logger-config * remove grafanaAgentSecretName and eventsLoggerSecretName from security checking * rename variables in events-logger-config's reconciler to a neutral name * make several functions private * hardcode several fields in grafana-agent config template * rename comments and logs in agents-toggle's reconciler * enable events logger in main.go * fix formating in events-logger templates * remove unused field in alloy generateAlloyConfig * fix alloy-events secret name * Apply suggestions from code review Co-authored-by: Quentin Bisson <quentin@giantswarm.io> * update test files * handle specific case of observability-bundle version < 0.9.0 * remove secret namespace field * remove extra line in alloy and grafana-agent config * fix variable name in reconcileDelete method from event-logger-config reconciler * fix UTs for grafana-agent template * disable crds creation in alloy-events template * fixed grafana-agent tests in events-logger-config * fix enabling of events logger depending on observability-bundle version * minor fixes * add tests for alloy-events in events-logger-config (#277) * add tests for alloy-events in events-logger-config * changelog * create alloy-events tests golden files --------- Co-authored-by: Quentin Bisson <quentin@giantswarm.io>
What this PR does / why we need it
Towards giantswarm/roadmap#3750
Checklist