Bring in new commits from master #57
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Instead of hardcoding each name of each configmap of the rules that are generated, instead use a glob on the configmap name. This means we can have 0 or more instances of rules existing, and won't make the ThanosRuler StatefulSet object force a restart when a large number of rules are created.
When a PrometheusRule object is created the Thanos Ruler statefulset object is touched for update. The previous behaviour updated the statefulset regardless if it actually needed an update. This update creates a 'diff' check to see whether or not the statefulset needs to be updated, basically the same way that it is defined in the prometheus/operator. We also force a hash key to be generated on the first go.
update thanos to v0.11.0
…ule-cmd-generation Fix constant Thanos Ruler Statefulset generation
This allows TLS config using the 'query.config' CLI arg to thanos ruler.
…er-to-querier pkg/thanos: add queryConfig to ThanosRuler spec
Now it is more clear that `port` is name of port from the service, while targetPort is the name of port from the target pod.
The 'thanos rule' command allows multiple alertmanagers.url args to be specified, so this changes the ThanosRuler custom resource spec to match.
Clarify that Endpoint.targetPort is pod port
…e-alertmanager-urls pkg/thanos: allow multiple alertmanager urls to be specified
* pkg/thanos: add grpc-server-tls config * pkg/prometheus: add grpc-server-tls config to thanos sidecar * update generated files for thanos grpc tls config
openshift-ci-robot
added
the
approved
openshift-ci-robot
added
the
size/L
lilic
force-pushed
the
update-prom-operator
branch
from
03efed1
to
fcb7381
Compare
|
/hold |
openshift-ci-robot
added
the
do-not-merge/hold
|
/hold cancel |
openshift-ci-robot
removed
the
do-not-merge/hold
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: lilic, pgier The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/retest Please review the full test history for this PR and help us cut down flakes. |
|
/hold |
openshift-ci-robot
added
the
do-not-merge/hold
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
cc @pgier