1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
From: Martina Ferrari <tina@debian.org>
Date: Tue, 12 Jul 2016 03:23:14 +0000
Subject: Debian defaults
Forwarded: not-needed
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(-)
diff --git a/README.md b/README.md
index b2b1616..2043205 100644
@@ -307,7 +307,7 @@ amtool template render --template.glob='/foo/bar/*.tmpl' --template.text='{{ tem
### 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:
diff --git a/cli/root.go b/cli/root.go
index cad3996..5e16330 100644
@@ -45,7 +45,7 @@ var (
versionCheck bool
featureFlags string
- 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"}
)
@@ -151,7 +151,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("http.config.file", "HTTP client configuration file for amtool to connect to Alertmanager.").PlaceHolder("<filename>").ExistingFileVar(&httpConfigFile)
@@ -192,8 +192,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:
diff --git a/cli/silence_add.go b/cli/silence_add.go
index e23d1fc..b153b2b 100644
@@ -78,7 +78,7 @@ func configureSilenceAddCmd(cc *kingpin.CmdClause) {
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)
@@ -124,6 +124,9 @@ func (c *silenceAddCmd) add(ctx context.Context, _ *kingpin.ParseContext) error
startsAt = time.Now().UTC()
}
+ if c.author == "" {
+ c.author = username()
+ }
var endsAt time.Time
if c.end != "" {
endsAt, err = time.Parse(time.RFC3339, c.end)
diff --git a/cmd/alertmanager/main.go b/cmd/alertmanager/main.go
index 872ad1d..a44a1ae 100644
@@ -143,8 +143,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()
maintenanceInterval = kingpin.Flag("data.maintenance-interval", "Interval between garbage collection and snapshotting to disk of the silences and the notification logs.").Default("15m").Duration()
maxSilences = kingpin.Flag("silences.max-silences", "Maximum number of silences, including expired silences. If negative or zero, no limit is set.").Default("0").Int()
|
