-
Notifications
You must be signed in to change notification settings - Fork 502
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace the metering.rules.stateful.yaml symlink with its content (#8286
) In PR 8237, the monitoring related helm chart was refactored and the deprecated ``` ChartApplier // Deprecated: Use ApplyFromEmbeddedFS for new code! Apply(ctx context.Context, chartPath, namespace, name string, opts ...ApplyOption) error ``` function is no longer used to render the helm chart. The new, `ApplyFromEmbeddedFS` function is used instead, which uses the `//go:embed` embedded file system. The previously used deprecated method called `os.Open` at the end to read the files that were written to the gardenlet's container's file system. With that approach, symbolic links were resolved regularly. There is a caveat though: `go:embed` does not support symbolic links. https://pkg.go.dev/embed This led to the regression that the `metering.rules.stateful.yaml` file was silently missing when the chart was applied and hence the aggregate prometheus did not get these recording rule definitions. This PR "resolves" the symbolic link with its content to mitigate this issue. The other symbolic links (see `find . -type l`) are not related to monitoring and probably not used inside embedded file systems, so there are probably no other similar issues. Co-authored-by: Istvan Zoltan Ballok <istvan.zoltan.ballok@sap.com>
- Loading branch information
1 parent
c552eeb
commit a40a220
Showing
1 changed file
with
326 additions
and
1 deletion.
There are no files selected for viewing
1 change: 0 additions & 1 deletion
1
...onent/monitoring/charts/bootstrap/aggregate-prometheus-rules/metering.rules.stateful.yaml
This file was deleted.
Oops, something went wrong.
326 changes: 326 additions & 0 deletions
326
...onent/monitoring/charts/bootstrap/aggregate-prometheus-rules/metering.rules.stateful.yaml
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,326 @@ | ||
groups: | ||
- name: metering.rules.stateful | ||
rules: | ||
|
||
# - _year_month2 | ||
|
||
- record: _year_month2 | ||
expr: |2 | ||
count_values without () ( | ||
"year", | ||
year(timestamp(count_values without () ("month", month(timestamp(vector(0)))))) | ||
) | ||
* | ||
0 | ||
# - metering :memory_usage_seconds | ||
# - metering :disk_usage_seconds | ||
# - metering :memory_usage_seconds :this_month | ||
# - metering :disk_usage_seconds :this_month | ||
|
||
|
||
- record: metering:memory_usage_seconds | ||
expr: |2 | ||
(metering:working_set_memory:sum_by_namespace > bool 0) * 60 | ||
+ | ||
(last_over_time(metering:memory_usage_seconds[10m]) or metering:working_set_memory:sum_by_namespace * 0) | ||
- record: metering:disk_usage_seconds | ||
expr: |2 | ||
(metering:persistent_volume_claims:sum_by_namespace > bool 0) * 60 | ||
+ | ||
( | ||
last_over_time(metering:disk_usage_seconds[10m]) | ||
or | ||
metering:persistent_volume_claims:sum_by_namespace * 0 | ||
) | ||
- record: metering:memory_usage_seconds:this_month | ||
expr: |2 | ||
metering:memory_usage_seconds | ||
or | ||
last_over_time(metering:memory_usage_seconds:this_month[10m]) | ||
+ on (year, month) group_left () | ||
_year_month2 | ||
- record: metering:disk_usage_seconds:this_month | ||
expr: |2 | ||
metering:disk_usage_seconds | ||
or | ||
last_over_time(metering:disk_usage_seconds:this_month[10m]) | ||
+ on (year, month) group_left () | ||
_year_month2 | ||
# - metering :persistent_volume_claims :sum_by_namespace :sum_over_time | ||
# - metering :persistent_volume_claims :sum_by_namespace :avg_over_time | ||
# - metering :persistent_volume_claims :sum_by_namespace :avg_over_time :this_month | ||
|
||
- record: metering:persistent_volume_claims:sum_by_namespace:sum_over_time | ||
expr: |2 | ||
metering:persistent_volume_claims:sum_by_namespace | ||
+ | ||
( | ||
last_over_time(metering:persistent_volume_claims:sum_by_namespace:sum_over_time[10m]) | ||
or | ||
metering:persistent_volume_claims:sum_by_namespace * 0 | ||
) | ||
- record: metering:persistent_volume_claims:sum_by_namespace:avg_over_time | ||
expr: |2 | ||
metering:persistent_volume_claims:sum_by_namespace:sum_over_time * 60 | ||
/ | ||
(metering:disk_usage_seconds != 0) | ||
or | ||
metering:persistent_volume_claims:sum_by_namespace:sum_over_time | ||
- record: metering:persistent_volume_claims:sum_by_namespace:avg_over_time:this_month | ||
expr: |2 | ||
metering:persistent_volume_claims:sum_by_namespace:avg_over_time | ||
or | ||
last_over_time(metering:persistent_volume_claims:sum_by_namespace:avg_over_time:this_month[10m]) | ||
+ on (year, month) group_left () | ||
_year_month2 | ||
# Generated with metering.rules.stateful.sh | ||
|
||
# - metering :cpu_usage :sum_by_namespace :sum_over_time | ||
# - metering :cpu_usage :sum_by_namespace :avg_over_time | ||
# - metering :cpu_usage :sum_by_namespace :avg_over_time :this_month | ||
# - metering :cpu_requests :sum_by_namespace :sum_over_time | ||
# - metering :cpu_requests :sum_by_namespace :avg_over_time | ||
# - metering :cpu_requests :sum_by_namespace :avg_over_time :this_month | ||
# - metering :memory_usage :sum_by_namespace :sum_over_time | ||
# - metering :memory_usage :sum_by_namespace :avg_over_time | ||
# - metering :memory_usage :sum_by_namespace :avg_over_time :this_month | ||
# - metering :working_set_memory :sum_by_namespace :sum_over_time | ||
# - metering :working_set_memory :sum_by_namespace :avg_over_time | ||
# - metering :working_set_memory :sum_by_namespace :avg_over_time :this_month | ||
# - metering :memory_requests :sum_by_namespace :sum_over_time | ||
# - metering :memory_requests :sum_by_namespace :avg_over_time | ||
# - metering :memory_requests :sum_by_namespace :avg_over_time :this_month | ||
# - metering :network_transmit :sum_by_namespace :sum_over_time | ||
# - metering :network_transmit :sum_by_namespace :avg_over_time | ||
# - metering :network_transmit :sum_by_namespace :avg_over_time :this_month | ||
# - metering :network_receive :sum_by_namespace :sum_over_time | ||
# - metering :network_receive :sum_by_namespace :avg_over_time | ||
# - metering :network_receive :sum_by_namespace :avg_over_time :this_month | ||
# - metering :persistent_volume_usage :sum_by_namespace :sum_over_time | ||
# - metering :persistent_volume_usage :sum_by_namespace :avg_over_time | ||
# - metering :persistent_volume_usage :sum_by_namespace :avg_over_time :this_month | ||
|
||
- record: metering:cpu_usage:sum_by_namespace:sum_over_time | ||
expr: |2 | ||
metering:cpu_usage:sum_by_namespace | ||
+ | ||
( | ||
last_over_time(metering:cpu_usage:sum_by_namespace:sum_over_time[10m]) | ||
or | ||
metering:cpu_usage:sum_by_namespace * 0 | ||
) | ||
- record: metering:cpu_usage:sum_by_namespace:avg_over_time | ||
expr: |2 | ||
metering:cpu_usage:sum_by_namespace:sum_over_time * 60 | ||
/ | ||
(metering:memory_usage_seconds != 0) | ||
or | ||
metering:cpu_usage:sum_by_namespace:sum_over_time | ||
- record: metering:cpu_usage:sum_by_namespace:avg_over_time:this_month | ||
expr: |2 | ||
metering:cpu_usage:sum_by_namespace:avg_over_time | ||
or | ||
last_over_time(metering:cpu_usage:sum_by_namespace:avg_over_time:this_month[10m]) | ||
+ on (year, month) group_left () | ||
_year_month2 | ||
- record: metering:cpu_requests:sum_by_namespace:sum_over_time | ||
expr: |2 | ||
metering:cpu_requests:sum_by_namespace | ||
+ | ||
( | ||
last_over_time(metering:cpu_requests:sum_by_namespace:sum_over_time[10m]) | ||
or | ||
metering:cpu_requests:sum_by_namespace * 0 | ||
) | ||
- record: metering:cpu_requests:sum_by_namespace:avg_over_time | ||
expr: |2 | ||
metering:cpu_requests:sum_by_namespace:sum_over_time * 60 | ||
/ | ||
(metering:memory_usage_seconds != 0) | ||
or | ||
metering:cpu_requests:sum_by_namespace:sum_over_time | ||
- record: metering:cpu_requests:sum_by_namespace:avg_over_time:this_month | ||
expr: |2 | ||
metering:cpu_requests:sum_by_namespace:avg_over_time | ||
or | ||
last_over_time(metering:cpu_requests:sum_by_namespace:avg_over_time:this_month[10m]) | ||
+ on (year, month) group_left () | ||
_year_month2 | ||
- record: metering:memory_usage:sum_by_namespace:sum_over_time | ||
expr: |2 | ||
metering:memory_usage:sum_by_namespace | ||
+ | ||
( | ||
last_over_time(metering:memory_usage:sum_by_namespace:sum_over_time[10m]) | ||
or | ||
metering:memory_usage:sum_by_namespace * 0 | ||
) | ||
- record: metering:memory_usage:sum_by_namespace:avg_over_time | ||
expr: |2 | ||
metering:memory_usage:sum_by_namespace:sum_over_time * 60 | ||
/ | ||
(metering:memory_usage_seconds != 0) | ||
or | ||
metering:memory_usage:sum_by_namespace:sum_over_time | ||
- record: metering:memory_usage:sum_by_namespace:avg_over_time:this_month | ||
expr: |2 | ||
metering:memory_usage:sum_by_namespace:avg_over_time | ||
or | ||
last_over_time(metering:memory_usage:sum_by_namespace:avg_over_time:this_month[10m]) | ||
+ on (year, month) group_left () | ||
_year_month2 | ||
- record: metering:working_set_memory:sum_by_namespace:sum_over_time | ||
expr: |2 | ||
metering:working_set_memory:sum_by_namespace | ||
+ | ||
( | ||
last_over_time(metering:working_set_memory:sum_by_namespace:sum_over_time[10m]) | ||
or | ||
metering:working_set_memory:sum_by_namespace * 0 | ||
) | ||
- record: metering:working_set_memory:sum_by_namespace:avg_over_time | ||
expr: |2 | ||
metering:working_set_memory:sum_by_namespace:sum_over_time * 60 | ||
/ | ||
(metering:memory_usage_seconds != 0) | ||
or | ||
metering:working_set_memory:sum_by_namespace:sum_over_time | ||
- record: metering:working_set_memory:sum_by_namespace:avg_over_time:this_month | ||
expr: |2 | ||
metering:working_set_memory:sum_by_namespace:avg_over_time | ||
or | ||
last_over_time(metering:working_set_memory:sum_by_namespace:avg_over_time:this_month[10m]) | ||
+ on (year, month) group_left () | ||
_year_month2 | ||
- record: metering:memory_requests:sum_by_namespace:sum_over_time | ||
expr: |2 | ||
metering:memory_requests:sum_by_namespace | ||
+ | ||
( | ||
last_over_time(metering:memory_requests:sum_by_namespace:sum_over_time[10m]) | ||
or | ||
metering:memory_requests:sum_by_namespace * 0 | ||
) | ||
- record: metering:memory_requests:sum_by_namespace:avg_over_time | ||
expr: |2 | ||
metering:memory_requests:sum_by_namespace:sum_over_time * 60 | ||
/ | ||
(metering:memory_usage_seconds != 0) | ||
or | ||
metering:memory_requests:sum_by_namespace:sum_over_time | ||
- record: metering:memory_requests:sum_by_namespace:avg_over_time:this_month | ||
expr: |2 | ||
metering:memory_requests:sum_by_namespace:avg_over_time | ||
or | ||
last_over_time(metering:memory_requests:sum_by_namespace:avg_over_time:this_month[10m]) | ||
+ on (year, month) group_left () | ||
_year_month2 | ||
- record: metering:network_transmit:sum_by_namespace:sum_over_time | ||
expr: |2 | ||
metering:network_transmit:sum_by_namespace | ||
+ | ||
( | ||
last_over_time(metering:network_transmit:sum_by_namespace:sum_over_time[10m]) | ||
or | ||
metering:network_transmit:sum_by_namespace * 0 | ||
) | ||
- record: metering:network_transmit:sum_by_namespace:avg_over_time | ||
expr: |2 | ||
metering:network_transmit:sum_by_namespace:sum_over_time * 60 | ||
/ | ||
(metering:memory_usage_seconds != 0) | ||
or | ||
metering:network_transmit:sum_by_namespace:sum_over_time | ||
- record: metering:network_transmit:sum_by_namespace:avg_over_time:this_month | ||
expr: |2 | ||
metering:network_transmit:sum_by_namespace:avg_over_time | ||
or | ||
last_over_time(metering:network_transmit:sum_by_namespace:avg_over_time:this_month[10m]) | ||
+ on (year, month) group_left () | ||
_year_month2 | ||
- record: metering:network_receive:sum_by_namespace:sum_over_time | ||
expr: |2 | ||
metering:network_receive:sum_by_namespace | ||
+ | ||
( | ||
last_over_time(metering:network_receive:sum_by_namespace:sum_over_time[10m]) | ||
or | ||
metering:network_receive:sum_by_namespace * 0 | ||
) | ||
- record: metering:network_receive:sum_by_namespace:avg_over_time | ||
expr: |2 | ||
metering:network_receive:sum_by_namespace:sum_over_time * 60 | ||
/ | ||
(metering:memory_usage_seconds != 0) | ||
or | ||
metering:network_receive:sum_by_namespace:sum_over_time | ||
- record: metering:network_receive:sum_by_namespace:avg_over_time:this_month | ||
expr: |2 | ||
metering:network_receive:sum_by_namespace:avg_over_time | ||
or | ||
last_over_time(metering:network_receive:sum_by_namespace:avg_over_time:this_month[10m]) | ||
+ on (year, month) group_left () | ||
_year_month2 | ||
- record: metering:persistent_volume_usage:sum_by_namespace:sum_over_time | ||
expr: |2 | ||
metering:persistent_volume_usage:sum_by_namespace | ||
+ | ||
( | ||
last_over_time(metering:persistent_volume_usage:sum_by_namespace:sum_over_time[10m]) | ||
or | ||
metering:persistent_volume_usage:sum_by_namespace * 0 | ||
) | ||
- record: metering:persistent_volume_usage:sum_by_namespace:avg_over_time | ||
expr: |2 | ||
metering:persistent_volume_usage:sum_by_namespace:sum_over_time * 60 | ||
/ | ||
(metering:memory_usage_seconds != 0) | ||
or | ||
metering:persistent_volume_usage:sum_by_namespace:sum_over_time | ||
- record: metering:persistent_volume_usage:sum_by_namespace:avg_over_time:this_month | ||
expr: |2 | ||
metering:persistent_volume_usage:sum_by_namespace:avg_over_time | ||
or | ||
last_over_time(metering:persistent_volume_usage:sum_by_namespace:avg_over_time:this_month[10m]) | ||
+ on (year, month) group_left () | ||
_year_month2 |