Skip to content

Pass extraSourceSelector to record first aggregation

Bob Van Landuyt requested to merge bvl/reinstate-experimental-rules-staging into master

Pass extraSourceSelector to record first aggregation

This allows passing a extraSourceSelector when recording an aggregation set from source. We need this if we want to separate the recordings by environment or by cluster in the future.

Reinstate experimental rules with extraSourceSelector

Instead of passing in a modified aggregation set, we pass in the selectorHash separately.

The aggregationSet.selector is otherwise used as a way to select metrics from the aggregationSet: for example, the aggregations that we used to record in Prometheus have a selector monitor!="global": this allows Thanos to avoid metrics that are recorded in Thanos already.

Passing in the selector separately will allow us to separate these even more if we need to.

This also re-enables the experimental rules that were previously disabled.

This is an alternative of !6466 (closed) with a fix for the global recording per service.

For gitlab-com/gl-infra/scalability#2483

Do not merge this until gitlab-com/gl-infra/scalability#2540 (closed) is resolved.

Edited by Bob Van Landuyt

Merge request reports