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

ksonnet: Remove invalid hostname from default promtail configuration #3254

Merged
merged 1 commit into from
Jan 29, 2021

Conversation

hairyhenderson
Copy link
Member

What this PR does / why we need it:

We're seeing traffic attempting to hit this host (and failing), and I'm guessing it's coming from misconfigured promtail instances that are using this config. Simply changing this won't help instances that already have this configuration, but in case they're updated at a future date they'll at least fail with a semi-recognizable error.

There may be a better way to declare that the value is required, but I am a jsonnet novice 😅.

Special notes for your reviewer:

Checklist

  • Documentation added
  • Tests updated

Signed-off-by: Dave Henderson dave.henderson@grafana.com

@CLAassistant
Copy link

CLAassistant commented Jan 28, 2021

CLA assistant check
All committers have signed the CLA.

@@ -10,7 +10,7 @@
username:: '',
password:: '',
scheme:: 'https',
hostname:: 'logs-us-west1.grafana.net',
hostname:: 'set valid hostname here',
Copy link
Contributor

Choose a reason for hiding this comment

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

This is what you are looking for. It could be a breaking change though for people updating their lib and promtails suddenly stopping to work.

Suggested change
hostname:: 'set valid hostname here',
hostname:: error 'must define a valid hostname',

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks @sandeepsukhani - that looks perfect!

Copy link
Member Author

Choose a reason for hiding this comment

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

It could be a breaking change though for people updating their lib and promtails suddenly stopping to work.

@sandeepsukhani If people are using this default setting, all they're getting is 404s, so it's not working for them anyway 😉

@owen-d
Copy link
Member

owen-d commented Jan 29, 2021

You'll need to sign the CLA, but this looks great. Thanks

@hairyhenderson
Copy link
Member Author

@owen-d is the CLA required for Grafana Labs employees?

Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
@hairyhenderson hairyhenderson force-pushed the remove-incorrect-host-from-default-config branch from 89e54c8 to a0f2e4d Compare January 29, 2021 13:35
@hairyhenderson
Copy link
Member Author

I've signed the CLA anyway - the bot seems to have been a bit confused so I had to kick it 🤷‍♂️

Copy link
Collaborator

@slim-bean slim-bean left a comment

Choose a reason for hiding this comment

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

LGTM!

@slim-bean slim-bean merged commit 4d9dc8a into master Jan 29, 2021
@slim-bean slim-bean deleted the remove-incorrect-host-from-default-config branch January 29, 2021 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants