Improve server file names to reflect official docs (#19472)

Signed-off-by: Naseem <naseemkullah@gmail.com>
This commit is contained in:
Naseem
2019-12-09 20:45:28 -08:00
committed by Kubernetes Prow Robot
parent 5206a66993
commit 2f46f4fa4f
3 changed files with 15 additions and 4 deletions
+1 -1
View File
@@ -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/
+4 -2
View File
@@ -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 | ""
+10 -1
View File
@@ -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