Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Making possible to add rules via docker secret #57

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Making possible to add rules via docker secret #57

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0fd886b
Making possible to add rules via docker secret
Jul 27, 2018
603b408
Update prometheus to newer version in dockerfile
dorsany Aug 22, 2018
d8c16d8
Merge pull request #60 from dorsanyvision/patch-1
vfarcic Aug 23, 2018
47fa564
k8s
Aug 24, 2018
8facb85
Decreased memory
Sep 4, 2018
85a6ab3
RFC: Convert to newer dockerflow images
thomasjpfan Sep 8, 2018
df5932f
Resources
Sep 10, 2018
59c8d44
Merge branch 'master' of https://github.com/docker-flow/docker-flow-m…
Sep 10, 2018
e995fb4
fix issue 65 by accepting a list of LISTENER_ADDRESS separated by comma
puffin May 2, 2019
97dcb7d
Merge pull request #70 from puffin/issue-65
vfarcic May 4, 2019
de6a936
Tillerless
May 20, 2019
85767eb
Merge branch 'master' of https://github.com/albertogviana/docker-flow…
Jul 2, 2019
62a3155
Upgrade Prometheus to v2.1.0
Jul 2, 2019
3dba86d
Simplifying the way to run tests
Jul 2, 2019
dd8eb47
Ignoring *.out files
Jul 2, 2019
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
5 changes: 3 additions & 2 deletions prometheus/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,12 @@ func WriteConfig(configPath string, scrapes map[string]Scrape,
c.InsertScrapesFromDir(configsDir)
}

c.RuleFiles = []string{"/run/secrets/*.rules"}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How do you feel about using: https://godoc.org/github.com/spf13/afero#Glob to explicitly scan for all the rules, adding these rules to prometheus.yml and logging the rules here?

Copy link
Author

@albertogviana albertogviana Aug 28, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @thomasjpfan,

I am using secrets because since the beginning I am injecting the scrapes via secret, so this was my first approach.

I believe I don't need to use https://godoc.org/github.com/spf13/afero#Glob because Prometheus already implemented it.

Yes @vfarcic , I can provide some documentation and release notes.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@albertogviana Yes. Please add the docs and release notes.

@thomasjpfan Do you think we can merge this after the docs and RNs are done by @albertogviana ?

if len(alerts) > 0 {
logPrintf("Writing to alert.rules")
afero.WriteFile(FS, alertRulesPath, []byte(GetAlertConfig(alerts)), 0644)
c.RuleFiles = []string{"alert.rules"}
// c.RuleFiles = []string{"alert.rules"}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commented line can be removed.

c.RuleFiles = append(c.RuleFiles, "alert.rules")
}

alertmanagerURLs := os.Getenv("ARG_ALERTMANAGER_URL")
Expand Down Expand Up @@ -66,7 +68,6 @@ func WriteConfig(configPath string, scrapes map[string]Scrape,
logPrintf("Writing to prometheus.yml")
configYAML, _ := yaml.Marshal(c)
afero.WriteFile(FS, configPath, configYAML, 0644)

}

// InsertEnv inserts envKey/envValue into config
Expand Down
2 changes: 1 addition & 1 deletion prometheus/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@ func (s *ConfigTestSuite) Test_WriteConfig_WriteAlerts() {
}

c := &Config{}
c.RuleFiles = []string{"alert.rules"}
c.RuleFiles = []string{"/run/secrets/*.rules", "alert.rules"}
cYAML, _ := yaml.Marshal(c)
expectedAlerts := GetAlertConfig(alerts)

Expand Down
10 changes: 10 additions & 0 deletions server/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@ alerting:
- targets:
- alert-manager:9093
scheme: http
rule_files:
- /run/secrets/*.rules
`
fsOrig := prometheus.FS
defer func() { prometheus.FS = fsOrig }()
Expand Down Expand Up @@ -952,6 +954,7 @@ alerting:
- alert-manager:9093
scheme: http
rule_files:
- /run/secrets/*.rules
- alert.rules
scrape_configs:
- job_name: my-service
Expand Down Expand Up @@ -995,6 +998,7 @@ alerting:
- alert-manager:9093
scheme: http
rule_files:
- /run/secrets/*.rules
- alert.rules
scrape_configs:
- job_name: my-service
Expand Down Expand Up @@ -1271,6 +1275,8 @@ alerting:
- targets:
- alert-manager:9093
scheme: http
rule_files:
- /run/secrets/*.rules
scrape_configs:
- job_name: my-service
metrics_path: /metrics
Expand Down Expand Up @@ -1301,6 +1307,8 @@ alerting:
- targets:
- alert-manager:9093
scheme: http
rule_files:
- /run/secrets/*.rules
`
addr = "/v1/docker-flow-monitor?serviceName=my-service"
req, _ = http.NewRequest("DELETE", addr, nil)
Expand Down Expand Up @@ -1450,6 +1458,8 @@ alerting:
- targets:
- alert-manager:9093
scheme: http
rule_files:
- /run/secrets/*.rules
`

actualConfig, _ := afero.ReadFile(prometheus.FS, "/etc/prometheus/prometheus.yml")
Expand Down