diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml index f7f2fcf7dd..bbb08ff0b4 100755 --- a/stable/prometheus/Chart.yaml +++ b/stable/prometheus/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: prometheus -version: 9.5.1 +version: 9.5.2 appVersion: 2.13.1 description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ diff --git a/stable/prometheus/README.md b/stable/prometheus/README.md index fe75718720..402649d644 100644 --- a/stable/prometheus/README.md +++ b/stable/prometheus/README.md @@ -325,8 +325,10 @@ Parameter | Description | Default `serviceAccounts.server.name` | name of the server service account to use or create | `{{ prometheus.server.fullname }}` `server.terminationGracePeriodSeconds` | Prometheus server Pod termination grace period | `300` `server.retention` | (optional) Prometheus data retention | `"15d"` -`serverFiles.alerts` | Prometheus server alerts configuration | `{}` -`serverFiles.rules` | Prometheus server rules configuration | `{}` +`serverFiles.alerts` | (Deprecated) Prometheus server alerts configuration | `{}` +`serverFiles.rules` | (Deprecated) Prometheus server rules configuration | `{}` +`serverFiles.alerting_rules.yml` | Prometheus server alerts configuration | `{}` +`serverFiles.recording_rules.yml` | Prometheus server rules configuration | `{}` `serverFiles.prometheus.yml` | Prometheus server scrape configuration | example configuration `extraScrapeConfigs` | Prometheus server additional scrape configuration | "" `alertRelabelConfigs` | Prometheus server [alert relabeling configs](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs) for H/A prometheus | "" diff --git a/stable/prometheus/values.yaml b/stable/prometheus/values.yaml index 31b9946400..a310d151e0 100644 --- a/stable/prometheus/values.yaml +++ b/stable/prometheus/values.yaml @@ -1062,7 +1062,7 @@ serverFiles: ## Alerts configuration ## Ref: https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/ - alerts: {} + alerting_rules.yml: {} # groups: # - name: Instances # rules: @@ -1074,11 +1074,20 @@ serverFiles: # annotations: # description: '{{ $labels.instance }} of job {{ $labels.job }} has been down for more than 5 minutes.' # summary: 'Instance {{ $labels.instance }} down' + ## DEPRECATED DEFAULT VALUE, unless explicitly naming your files, please use alerting_rules.yml + alerts: {} + ## Records configuration + ## Ref: https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/ + recording_rules.yml: {} + ## DEPRECATED DEFAULT VALUE, unless explicitly naming your files, please use recording_rules.yml rules: {} prometheus.yml: rule_files: + - /etc/config/recording_rules.yml + - /etc/config/alerting_rules.yml + ## Below two files are DEPRECATED will be removed from this default values file - /etc/config/rules - /etc/config/alerts