Browse Source

promqltest: adjust eval times and range selector

In order to fix new tests for changes added in
https://github.com/prometheus/prometheus/pull/13904.

Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
pull/14806/head
Jan Fajerski 3 months ago
parent
commit
956245b25b
  1. 38
      promql/promqltest/testdata/name_label_dropping.test
  2. 4
      promql/promqltest/testdata/native_histograms.test

38
promql/promqltest/testdata/name_label_dropping.test vendored

@ -4,81 +4,81 @@ load 5m
another_metric{env="1"} 60 120 180 another_metric{env="1"} 60 120 180
# Does not drop __name__ for vector selector # Does not drop __name__ for vector selector
eval instant at 15m metric{env="1"} eval instant at 10m metric{env="1"}
metric{env="1"} 120 metric{env="1"} 120
# Drops __name__ for unary operators # Drops __name__ for unary operators
eval instant at 15m -metric eval instant at 10m -metric
{env="1"} -120 {env="1"} -120
# Drops __name__ for binary operators # Drops __name__ for binary operators
eval instant at 15m metric + another_metric eval instant at 10m metric + another_metric
{env="1"} 300 {env="1"} 300
# Does not drop __name__ for binary comparison operators # Does not drop __name__ for binary comparison operators
eval instant at 15m metric <= another_metric eval instant at 10m metric <= another_metric
metric{env="1"} 120 metric{env="1"} 120
# Drops __name__ for binary comparison operators with "bool" modifier # Drops __name__ for binary comparison operators with "bool" modifier
eval instant at 15m metric <= bool another_metric eval instant at 10m metric <= bool another_metric
{env="1"} 1 {env="1"} 1
# Drops __name__ for vector-scalar operations # Drops __name__ for vector-scalar operations
eval instant at 15m metric * 2 eval instant at 10m metric * 2
{env="1"} 240 {env="1"} 240
# Drops __name__ for instant-vector functions # Drops __name__ for instant-vector functions
eval instant at 15m clamp(metric, 0, 100) eval instant at 10m clamp(metric, 0, 100)
{env="1"} 100 {env="1"} 100
# Drops __name__ for range-vector functions # Drops __name__ for range-vector functions
eval instant at 15m rate(metric{env="1"}[10m]) eval instant at 10m rate(metric{env="1"}[10m])
{env="1"} 0.2 {env="1"} 0.2
# Does not drop __name__ for last_over_time function # Does not drop __name__ for last_over_time function
eval instant at 15m last_over_time(metric{env="1"}[10m]) eval instant at 10m last_over_time(metric{env="1"}[10m])
metric{env="1"} 120 metric{env="1"} 120
# Drops name for other _over_time functions # Drops name for other _over_time functions
eval instant at 15m max_over_time(metric{env="1"}[10m]) eval instant at 10m max_over_time(metric{env="1"}[10m])
{env="1"} 120 {env="1"} 120
# Allows relabeling (to-be-dropped) __name__ via label_replace # Allows relabeling (to-be-dropped) __name__ via label_replace
eval instant at 15m label_replace(rate({env="1"}[10m]), "my_name", "rate_$1", "__name__", "(.+)") eval instant at 10m label_replace(rate({env="1"}[10m]), "my_name", "rate_$1", "__name__", "(.+)")
{my_name="rate_metric", env="1"} 0.2 {my_name="rate_metric", env="1"} 0.2
{my_name="rate_another_metric", env="1"} 0.2 {my_name="rate_another_metric", env="1"} 0.2
# Allows preserving __name__ via label_replace # Allows preserving __name__ via label_replace
eval instant at 15m label_replace(rate({env="1"}[10m]), "__name__", "rate_$1", "__name__", "(.+)") eval instant at 10m label_replace(rate({env="1"}[10m]), "__name__", "rate_$1", "__name__", "(.+)")
rate_metric{env="1"} 0.2 rate_metric{env="1"} 0.2
rate_another_metric{env="1"} 0.2 rate_another_metric{env="1"} 0.2
# Allows relabeling (to-be-dropped) __name__ via label_join # Allows relabeling (to-be-dropped) __name__ via label_join
eval instant at 15m label_join(rate({env="1"}[10m]), "my_name", "_", "__name__") eval instant at 10m label_join(rate({env="1"}[10m]), "my_name", "_", "__name__")
{my_name="metric", env="1"} 0.2 {my_name="metric", env="1"} 0.2
{my_name="another_metric", env="1"} 0.2 {my_name="another_metric", env="1"} 0.2
# Allows preserving __name__ via label_join # Allows preserving __name__ via label_join
eval instant at 15m label_join(rate({env="1"}[10m]), "__name__", "_", "__name__", "env") eval instant at 10m label_join(rate({env="1"}[10m]), "__name__", "_", "__name__", "env")
metric_1{env="1"} 0.2 metric_1{env="1"} 0.2
another_metric_1{env="1"} 0.2 another_metric_1{env="1"} 0.2
# Does not drop metric names fro aggregation operators # Does not drop metric names fro aggregation operators
eval instant at 15m sum by (__name__, env) (metric{env="1"}) eval instant at 10m sum by (__name__, env) (metric{env="1"})
metric{env="1"} 120 metric{env="1"} 120
# Aggregation operators by __name__ lead to duplicate labelset errors (aggregation is partitioned by not yet removed __name__ label) # Aggregation operators by __name__ lead to duplicate labelset errors (aggregation is partitioned by not yet removed __name__ label)
# This is an accidental side effect of delayed __name__ label dropping # This is an accidental side effect of delayed __name__ label dropping
eval_fail instant at 15m sum by (__name__) (rate({env="1"}[10m])) eval_fail instant at 10m sum by (__name__) (rate({env="1"}[10m]))
# Aggregation operators aggregate metrics with same labelset and to-be-dropped names # Aggregation operators aggregate metrics with same labelset and to-be-dropped names
# This is an accidental side effect of delayed __name__ label dropping # This is an accidental side effect of delayed __name__ label dropping
eval instant at 15m sum(rate({env="1"}[10m])) by (env) eval instant at 10m sum(rate({env="1"}[10m])) by (env)
{env="1"} 0.4 {env="1"} 0.4
# Aggregationk operators propagate __name__ label dropping information # Aggregationk operators propagate __name__ label dropping information
eval instant at 15m topk(10, sum by (__name__, env) (metric{env="1"})) eval instant at 10m topk(10, sum by (__name__, env) (metric{env="1"}))
metric{env="1"} 120 metric{env="1"} 120
eval instant at 15m topk(10, sum by (__name__, env) (rate(metric{env="1"}[10m]))) eval instant at 10m topk(10, sum by (__name__, env) (rate(metric{env="1"}[10m])))
{env="1"} 0.2 {env="1"} 0.2

4
promql/promqltest/testdata/native_histograms.test vendored

@ -995,8 +995,8 @@ clear
load 1m load 1m
histogram_sum_over_time {{schema:0 count:25 sum:1234.5 z_bucket:4 z_bucket_w:0.001 buckets:[1 2 0 1 1] n_buckets:[2 4 0 0 1 9]}} {{schema:0 count:41 sum:2345.6 z_bucket:5 z_bucket_w:0.001 buckets:[1 3 1 2 1 1 1] n_buckets:[0 1 4 2 7 0 0 0 0 5 5 2]}} {{schema:0 count:41 sum:1111.1 z_bucket:5 z_bucket_w:0.001 buckets:[1 3 1 2 1 1 1] n_buckets:[0 1 4 2 7 0 0 0 0 5 5 2]}} {{schema:1 count:0}} histogram_sum_over_time {{schema:0 count:25 sum:1234.5 z_bucket:4 z_bucket_w:0.001 buckets:[1 2 0 1 1] n_buckets:[2 4 0 0 1 9]}} {{schema:0 count:41 sum:2345.6 z_bucket:5 z_bucket_w:0.001 buckets:[1 3 1 2 1 1 1] n_buckets:[0 1 4 2 7 0 0 0 0 5 5 2]}} {{schema:0 count:41 sum:1111.1 z_bucket:5 z_bucket_w:0.001 buckets:[1 3 1 2 1 1 1] n_buckets:[0 1 4 2 7 0 0 0 0 5 5 2]}} {{schema:1 count:0}}
eval instant at 3m sum_over_time(histogram_sum_over_time[3m:1m]) eval instant at 3m sum_over_time(histogram_sum_over_time[4m:1m])
{} {{schema:0 count:107 sum:4691.2 z_bucket:14 z_bucket_w:0.001 buckets:[3 8 2 5 3 2 2] n_buckets:[2 6 8 4 15 9 0 0 0 10 10 4]}} {} {{schema:0 count:107 sum:4691.2 z_bucket:14 z_bucket_w:0.001 buckets:[3 8 2 5 3 2 2] n_buckets:[2 6 8 4 15 9 0 0 0 10 10 4]}}
eval instant at 3m avg_over_time(histogram_sum_over_time[3m:1m]) eval instant at 3m avg_over_time(histogram_sum_over_time[4m:1m])
{} {{schema:0 count:26.75 sum:1172.8 z_bucket:3.5 z_bucket_w:0.001 buckets:[0.75 2 0.5 1.25 0.75 0.5 0.5] n_buckets:[0.5 1.5 2 1 3.75 2.25 0 0 0 2.5 2.5 1]}} {} {{schema:0 count:26.75 sum:1172.8 z_bucket:3.5 z_bucket_w:0.001 buckets:[0.75 2 0.5 1.25 0.75 0.5 0.5] n_buckets:[0.5 1.5 2 1 3.75 2.25 0 0 0 2.5 2.5 1]}}

Loading…
Cancel
Save