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 sigv4 install script, fix bug #334

Merged
merged 1 commit into from
Jan 19, 2021
Merged

Conversation

rfratto
Copy link
Member

@rfratto rfratto commented Jan 19, 2021

PR Description

Adds a sigv4-specific install script.

Also fixes bug where the deployment scrape config was included with host filtering enabled, where the inverse should've been true. (cc @hjet, this fixes the duplicate default/kubernetes job)

Which issue(s) this PR fixes

Notes to the Reviewer

PR Checklist

  • CHANGELOG updated
  • Documentation added
  • Tests updated

Also fixes bug where the deployment scrape config was included with host
filtering enabled, where the inverse should've been true.
Comment on lines +73 to +75
$._config.kubernetes_scrape_configs
else
$._config.kubernetes_scrape_configs,
$._config.kubernetes_scrape_configs + $._config.deployment_scrape_configs,
Copy link
Member Author

Choose a reason for hiding this comment

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

This was the bug. When host filtering is enabled, it shouldn't include the deployment scrape configs.

@@ -0,0 +1,357 @@
apiVersion: v1
Copy link
Member Author

Choose a reason for hiding this comment

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

This file is generated, don't need to review it directly

@@ -176,29 +176,6 @@ data:
tls_config:
ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
insecure_skip_verify: false
- bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
Copy link
Member Author

Choose a reason for hiding this comment

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

This file is generated, don't need to review it directly

CHANGELOG.md Show resolved Hide resolved
@rfratto rfratto merged commit 2f459bb into grafana:master Jan 19, 2021
@rfratto rfratto deleted the sigv4-install branch January 19, 2021 15:52
@mattdurham mattdurham mentioned this pull request Sep 7, 2021
3 tasks
mattdurham pushed a commit that referenced this pull request Nov 11, 2021
Also fixes bug where the deployment scrape config was included with host
filtering enabled, where the inverse should've been true.
@github-actions github-actions bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Apr 21, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants