-
Notifications
You must be signed in to change notification settings - Fork 16.5k
[stable/prometheus-operator] Major sync of rules, alerts and dashboards from upstream #18375
Conversation
|
Hi @den-is. Thanks for your PR. I'm waiting for a helm member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
/ok-to-test |
|
preparing fix for networking dashboards in this chart. |
|
The tests will keep failing until one of these can be done: |
|
@den-is At least some of the rules in this PR are invalid. I just tried installing this into an existing cluster with the validating webhooks enabled, which prevented the rules from being applied |
|
@vsliouniaev In addition, I'm reverting coreos/kube-prometheus release from 0.2 to 0.1 - that was false upgrade breaking compatibility with k8s <1.14 |
|
hopefully garbage cleanup after previous false-upgrade helps situation a little bit more for those who run k8s v<1.14 .. other than that I can't see other issue. I had once question to community: |
|
It looks like the issue is being caused by the use of the |
|
Unfortunately I don't have enough experience with admission webhooks in k8s in general. After reading docs for "couple minutes" I still can't understand how abstract-for-k8s string value with Not to hold this PR, any contribution help will be highly appreciated. |
|
@vsliouniaev should we just wait until this one prometheus-operator/prometheus-operator#2779 goes to the next prometheus-operator release? it should also cover |
|
@hatemosphere Yes, this should be quite easy to solve. I've opened this issue: prometheus-operator/prometheus-operator#2837 |
|
@den-is |
|
Going to try get another PR in to fix more test flakes #18430 |
|
Would like to hear any ideas if how it is possible to automate migration/fix of string from upstream which already contains backticks Current manual workflow in 17340c2 :
Proposal: Probably it is possible to have list of such exceptional strings or rule names. Catch them during iteration. and just completely replace them with hardcoded stored values for the given key rather than just running them through: def escape(s):
return s.replace("{{", "{{`{{").replace("}}", "}}`}}")Because, Imo it is almost impossible to correctly determine where to insert:
PS: Just kinda don't want to create mega monster parser :D |
|
@den-is What if you change the sync process around? You'd still have to do some substitutions for job name and namespace but that may be a simpler undertaking because you can treat the content as a string |
|
that's better to happen in individual PR |
|
Feel free to do that separately or all together. It seems like the current merge process is blocked cos we need to get another operator release out anyway |
I have tested your changes against 0.34.0 and they work, but there is a caveat: You cannot do it simultaneously with applying rules because Helm applies the changes to the cluster all at once and the validation is still occurring with the old image. For this reason. the 0.34.0 change will be made on version 7.x.x of the chart and the new rules will be marked as 8.0.0. That way we can signal to users that they must jump through some hoops by upgrading to the latest 7.x.x version, then go to 8, rather than going straight to 8. |
|
Updated images are merged |
|
@den-is |
|
@zanhsieh you don't say. |
|
@den-is Could you please add a section to the |
|
/lgtm (but needs a DCO fix) |
author Denis Iskandarov <d.iskandarov@gmail.com> 1572070164 +0400 committer Denis Iskandarov <d.iskandarov@gmail.com> 1572862763 +0400 parent 88dbc36 author Denis Iskandarov <d.iskandarov@gmail.com> 1572070164 +0400 committer Denis Iskandarov <d.iskandarov@gmail.com> 1572862723 +0400 parent 88dbc36 author Denis Iskandarov <d.iskandarov@gmail.com> 1572070164 +0400 committer Denis Iskandarov <d.iskandarov@gmail.com> 1572861866 +0400 added pip requirements.txt to make setup more clear Signed-off-by: Denis Iskandarov <d.iskandarov@gmail.com>
Signed-off-by: Denis Iskandarov <d.iskandarov@gmail.com>
Signed-off-by: Denis Iskandarov <d.iskandarov@gmail.com>
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: den-is, vsliouniaev The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/retest all |
|
Hi, Is it possible to add the missing label for this PR to be merged ? |
|
I asked in #charts on the Kubernetes slack about that. I'm afraid I'm only a collaborator and don't have rights to do that myself |
|
@den-is since this seems not to be quick, mind just closing this PR and reopening a new one? I don't get why the bot isn't adding the label |
|
Going to close that that PR and create duplicate which hopefully will work as intended. |
|
Fresh duplicate PR here #18560 |
What this PR does / why we need it:
Which issue this PR fixes
Special notes for your reviewer:
Fixed by 17340c2
Disabled alert c45b273 , because of Golang issue Proposal: Allow backticks in raw strings (by doubling them) golang/go#18221 proposal: Go 2: allow raw strings containing backticks golang/go#24475I have removed upper limit for kubernetes version because i'm using k8s v1.16.2 for development and test of this PR. Deploy looked good, rules and dashboards looked good. 15e6118
By default, Upstream has "wrong" datasource selected in Networking dashboards; "prometheus" instead of "Prometheus", and not using variable. I've pushed fix only for this chart, not upstream.
Checklist
[stable/mychartname])