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

Service Monitors and Compactor Service #68

Merged
merged 5 commits into from Nov 23, 2020

Conversation

ts-mini
Copy link
Contributor

@ts-mini ts-mini commented Oct 28, 2020

Seeing as this is included by default in the Loki chart - I figure this might not be too opinionated of an addition.

I updated the docs as well

edit: I discovered a alertmanager clustering bug (in the replicas code) that I also fixed

Copy link
Contributor

@khaines khaines left a comment

Choose a reason for hiding this comment

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

Adding the option for the Prom Operator resources is handy. Can you please rebase your branch against the latest from master?

@ts-mini ts-mini force-pushed the servicemonitors branch 3 times, most recently from 36f0d5e to 8409990 Compare November 9, 2020 19:10
Signed-off-by: Tyler Horvath <tyler.horvath@gmail.com>
Signed-off-by: Tyler Horvath <tyler.horvath@gmail.com>
Signed-off-by: Tyler Horvath <tyler.horvath@gmail.com>
Signed-off-by: Tyler Horvath <tyler.horvath@gmail.com>
@@ -85,6 +85,8 @@ spec:
{{- toYaml .Values.alertmanager.tolerations | nindent 8 }}
terminationGracePeriodSeconds: {{ .Values.alertmanager.terminationGracePeriodSeconds }}
volumes:
- emptyDir: {}
Copy link
Contributor

Choose a reason for hiding this comment

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

I would recommend avoiding specifying non-cortex path mounts here. I get the intention, but it prevents others from customizing /tmp in this setup. There are overridable settings for volumes and mounts, which allow for this.

Copy link
Contributor

Choose a reason for hiding this comment

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

@ts-mini - Sorry, should have flagged this earlier, but I think this last item needs correction prior to merge

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sounds good I'll get to this asap

Copy link
Contributor Author

Choose a reason for hiding this comment

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

if I remember correctly, it's cause the code inside of cortex writes to tmp no matter what, and it's not customizable, so if you use the default psp the file system is ro, making it fail when it validates configs. I think I should be able to make it customizable, and adjust to tmp in our setup

Copy link
Contributor

@khaines khaines Nov 16, 2020

Choose a reason for hiding this comment

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

Yes, that might be fair that cortex uses /tmp in some cases (I'll have to go look where again), but in the PR you've fixed that solution to be an emptyDir. If others are already mapping /tmp to other volume types, this will potentially break their setup.

Also correcting any path mounts should be in its own PR, given the title of this one is adding service monitors. Both valid issues, but it makes it much easier to review, provide feedback and merge when PRs are focused on a single scope.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Honestly I look back at this change and idk what I was thinking. 1) sorry for conflating prs, 2) I totally glossed over the 'extraVolume' and 'extraVolumeMount' options. I am just going to use those going forward - and while I think we could solve this ro-filesystem issue within the chart - the real "problem" imho is this section. I might just attempt to make this change on the cortex side so one could specify the 'tmpDIr' path as a config param.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thank you for being open to the feedback and adjusting the changes :) LGTM now for merging

Signed-off-by: Tyler Horvath <tyler.horvath@gmail.com>
Copy link
Contributor

@khaines khaines left a comment

Choose a reason for hiding this comment

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

LGTM

@khaines khaines merged commit adabf3e into cortexproject:master Nov 23, 2020
Skaronator pushed a commit to Skaronator/cortex-helm-chart that referenced this pull request Apr 28, 2021
* updating alertmanager and servicemonitors

Signed-off-by: Tyler Horvath <tyler.horvath@gmail.com>

* adding clusterDomain back

Signed-off-by: Tyler Horvath <tyler.horvath@gmail.com>

* adding - back

Signed-off-by: Tyler Horvath <tyler.horvath@gmail.com>

* adding scope to clusterDomain

Signed-off-by: Tyler Horvath <tyler.horvath@gmail.com>

* revert the tmp filesystem changes in this pr

Signed-off-by: Tyler Horvath <tyler.horvath@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants