Skip to content
This repository was archived by the owner on Jun 21, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
coverage:
range: "60...80"
status:
patch:
default:
threshold: 1
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ after_success:
- bash <(curl -s https://codecov.io/bash) -X fix

notifications:
email: false
slack:
on_success: change
on_failure: always
Expand Down
3 changes: 3 additions & 0 deletions services/prometheus/prometheus.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ func (svc *Service) marshalConfig(ctx context.Context) ([]byte, error) {
ScrapeTimeout: model.Duration(10 * time.Second),
EvaluationInterval: model.Duration(time.Minute),
},
RuleFiles: []string{
"/etc/prometheus.d/*.rules.yml",
},
ScrapeConfigs: []*config.ScrapeConfig{
scrapeConfigForPrometheus(),
scrapeConfigForGrafana(),
Expand Down
2 changes: 2 additions & 0 deletions testdata/prometheus/prometheus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ global:
scrape_interval: 1m
scrape_timeout: 10s
evaluation_interval: 1m
rule_files:
- /etc/prometheus.d/*.rules.yml
scrape_configs:
- job_name: prometheus
scrape_interval: 1s
Expand Down