Description: Change default paths to match Debian packaging
Forwarded: not-needed
Author: Martina Ferrari <tina@debian.org>
Last-Update: 2019-10-29
---
README.md | 2 +-
cli/root.go | 8 ++++----
cli/silence_add.go | 5 ++++-
cmd/alertmanager/main.go | 4 ++--
4 files changed, 11 insertions(+), 8 deletions(-)
--- a/cmd/alertmanager/main.go
+++ b/cmd/alertmanager/main.go
@@ -186,8 +186,8 @@ func run() int {
}
var (
- configFile = kingpin.Flag("config.file", "Alertmanager configuration file name.").Default("alertmanager.yml").String()
- dataDir = kingpin.Flag("storage.path", "Base path for data storage.").Default("data/").String()
+ configFile = kingpin.Flag("config.file", "Alertmanager configuration file name.").Default("/etc/prometheus/alertmanager.yml").String()
+ dataDir = kingpin.Flag("storage.path", "Base path for data storage.").Default("/var/lib/prometheus/alertmanager/").String()
retention = kingpin.Flag("data.retention", "How long to keep data for.").Default("120h").Duration()
alertGCInterval = kingpin.Flag("alerts.gc-interval", "Interval between alert GC.").Default("30m").Duration()
--- a/cli/root.go
+++ b/cli/root.go
@@ -42,7 +42,7 @@ var (
tlsInsecureSkipVerify bool
versionCheck bool
- configFiles = []string{os.ExpandEnv("$HOME/.config/amtool/config.yml"), "/etc/amtool/config.yml"}
+ configFiles = []string{os.ExpandEnv("$HOME/.config/prometheus/amtool.yml"), "/etc/prometheus/amtool.yml"}
legacyFlags = map[string]string{"comment_required": "require-comment"}
)
@@ -124,7 +124,7 @@ func Execute() {
format.InitFormatFlags(app)
app.Flag("verbose", "Verbose running information").Short('v').BoolVar(&verbose)
- app.Flag("alertmanager.url", "Alertmanager to talk to").URLVar(&alertmanagerURL)
+ app.Flag("alertmanager.url", "Alertmanager to talk to").Default("http://localhost:9093/").URLVar(&alertmanagerURL)
app.Flag("output", "Output formatter (simple, extended, json)").Short('o').Default("simple").EnumVar(&output, "simple", "extended", "json")
app.Flag("timeout", "Timeout for the executed command").Default("30s").DurationVar(&timeout)
app.Flag("tls.insecure.skip.verify", "Skip TLS certificate verification").BoolVar(&tlsInsecureSkipVerify)
@@ -162,8 +162,8 @@ const (
Config File:
The alertmanager tool will read a config file in YAML format from one of two
-default config locations: $HOME/.config/amtool/config.yml or
-/etc/amtool/config.yml
+default config locations: $HOME/.config/prometheus/amtool.yml or
+/etc/prometheus/amtool.yml
All flags can be given in the config file, but the following are the suited for
static configuration:
--- a/README.md
+++ b/README.md
@@ -307,7 +307,7 @@ amtool template render --template.glob='
### Configuration
-`amtool` allows a configuration file to specify some options for convenience. The default configuration file paths are `$HOME/.config/amtool/config.yml` or `/etc/amtool/config.yml`
+`amtool` allows a configuration file to specify some options for convenience. The default configuration file paths are `$HOME/.config/prometheus/amtool/config.yml` or `/etc/prometheus/amtool/config.yml`
An example configuration file might look like the following:
--- a/cli/silence_add.go
+++ b/cli/silence_add.go
@@ -75,7 +75,7 @@ func configureSilenceAddCmd(cc *kingpin.
c = &silenceAddCmd{}
addCmd = cc.Command("add", silenceAddHelp)
)
- addCmd.Flag("author", "Username for CreatedBy field").Short('a').Default(username()).StringVar(&c.author)
+ addCmd.Flag("author", "Username for CreatedBy field").Short('a').StringVar(&c.author)
addCmd.Flag("require-comment", "Require comment to be set").Hidden().Default("true").BoolVar(&c.requireComment)
addCmd.Flag("duration", "Duration of silence").Short('d').Default("1h").StringVar(&c.duration)
addCmd.Flag("start", "Set when the silence should start. RFC3339 format 2006-01-02T15:04:05-07:00").StringVar(&c.start)
@@ -108,6 +108,9 @@ func (c *silenceAddCmd) add(ctx context.
return fmt.Errorf("no matchers specified")
}
+ if c.author == "" {
+ c.author = username()
+ }
var endsAt time.Time
if c.end != "" {
endsAt, err = time.Parse(time.RFC3339, c.end)