-
Notifications
You must be signed in to change notification settings - Fork 411
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
[bugfix] add sigv4_auth_enabled to grafana config #609
Conversation
Signed-off-by: Paul Czarkowski <username.taken@gmail.com>
Signed-off-by: Paul Czarkowski <username.taken@gmail.com>
Signed-off-by: Paul Czarkowski <username.taken@gmail.com>
Please run |
So this PR does allot more then description and subject says. // Fields for AWS Prometheus data sources
SigV4Auth bool `json:"sigV4Auth,omitempty"`
SigV4AuthType string `json:"sigV4AuthType,omitempty"`
SigV4ExternalId string `json:"sigV4ExternalId,omitempty"`
SigV4AssumeRoleArn string `json:"sigV4AssumeRoleArn,omitempty"`
SigV4Region string `json:"sigV4Region,omitempty"`
SigV4Profile string `json:"sigV4Profile,omitempty"` I did a very quick google and couldn't find SigV4AuthType config in grafana. |
@NissesSenap SigV4AuthType is straight from the Grafana docs - https://grafana.com/docs/grafana/latest/administration/provisioning/ |
@NissesSenap I've updated the PR description to provide details why I think the GrafanaDataSource commits also belong to this bugfix. |
@paulczar are you not missing sigV4AccessKey | string | Elasticsearch and Prometheus | SigV4 access key. Required when using keys auth provider
sigV4SecretKey | string | Elasticsearch and Prometheus | SigV4 secret key. Required when using keys auth provider I guess it should be stored in: https://github.com/grafana-operator/grafana-operator/blob/ac5c63a5866d95984cdf0b800e330daf9efa22cb/api/integreatly/v1alpha1/grafanadatasource_types.go#L189 Also create a example datasource file on how to use sigV4 and store it under: deploy/examples/datasources/ |
Signed-off-by: Paul Czarkowski <username.taken@gmail.com>
@NissesSenap good catch! I missed them in another section and they weren't needed because I was using STS/pod-identity. Added them in, and added the example datasource. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@NissesSenap I think this is good, if you're happy with your re-review go ahead and approve ;)
Thanks @paulczar ! Nice work
Thanks @HubertStefanski ! I'm already using these changes on some openshift clusters where I have federated cluster and user workload metrics to AWS Prometheus and cluster logging forwarded to CloudWatch with Grafana in the cluster providing dashboards and logs :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Signed-off-by: Paul Czarkowski username.taken@gmail.com
Description
grafana config was missing the sigv4_auth_enabled setting, so setting it in the operand did nothing.
Subsequently there are no updates to the GrafanaDataSource to actually use it, so without those, even with it enabled, its still effectively a no-op.
These fields allow grafana to use AWS sigv4 auth which is needed amongst other things to use the AWS managed prometheus service.
Relevant issues/tickets
#608
Type of change
Checklist