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

Bump observatorium to latest #223

Merged
merged 4 commits into from
May 31, 2022
Merged

Bump observatorium to latest #223

merged 4 commits into from
May 31, 2022

Conversation

pavolloffay
Copy link
Member

@pavolloffay pavolloffay commented May 30, 2022

Signed-off-by: Pavol Loffay [email protected]

jb update https://github.com/observatorium/observatorium/configuration@main

Copy link
Contributor

@periklis periklis left a comment

Choose a reason for hiding this comment

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

LGTM, leave the approval to @rhobs/team-monitoring to have a look on the template changes.

@@ -3,227 +3,628 @@ kind: Template
metadata:
name: observatorium
objects:
- apiVersion: apps/v1
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 scary, do we know what happened here?

Copy link
Contributor

Choose a reason for hiding this comment

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

It does not feel like reorder, there are just more lines, plus the change is hardly reviewable 🤔 Wonder if there is a way to improve this so we can have more certainty of this?

Copy link
Member Author

Choose a reason for hiding this comment

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

I wanted to ask you the same question as I am just starting with jsonent.

The intent here is to bump obs/obs jsonnet (namely the tracing one). If there is a way to just bump a single jsonnet I would prefer that, but I didn't find the solution for that.

Signed-off-by: Pavol Loffay <[email protected]>
Signed-off-by: Pavol Loffay <[email protected]>
@bwplotka
Copy link
Contributor

Majority problems comes from this change:
image

Ref: observatorium/observatorium#479

I fixed the problem - we changed the key so prefix filtering had to be adjusted. cc @douglascamata @pavolloffay

I confirmed (after debugging sort of elements) that now the file is exactly the same:

image

@bwplotka
Copy link
Contributor

I cannot provide sort function given linter bug: #227

Comment on lines -13 to +15
!std.startsWith(name, 'thanos-') &&
!std.startsWith(name, 'loki-') &&
!std.startsWith(name, 'tracing-')
!std.startsWith(name, 'observatorium/thanos-') &&
!std.startsWith(name, 'observatorium/loki-') &&
!std.startsWith(name, 'observatorium/tracing-')
Copy link
Member

Choose a reason for hiding this comment

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

@bwplotka you have eagle eyes. Great catch! 🏅

@douglascamata
Copy link
Member

Amazing. Thanks a lot for the investigation and solution, @bwplotka. I didn't imagine the original PR to Observatorium could have such side effects 😬

@bwplotka bwplotka merged commit 04f3b7b into rhobs:main May 31, 2022
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.

4 participants