Skip to content

Commit 1e39f02

Browse files
committed
Remove command-line options for Alertmanager cluster params
Don't expect any of these will need to be configured. Signed-off-by: Bryan Boreham <[email protected]>
1 parent ddbe694 commit 1e39f02

File tree

1 file changed

+7
-22
lines changed

1 file changed

+7
-22
lines changed

pkg/alertmanager/multitenant.go

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,6 @@ type MultitenantAlertmanagerConfig struct {
113113
clusterAdvertiseAddr string
114114
peers flagext.StringSlice
115115
peerTimeout time.Duration
116-
gossipInterval time.Duration
117-
pushPullInterval time.Duration
118-
tcpTimeout time.Duration
119-
probeTimeout time.Duration
120-
probeInterval time.Duration
121-
reconnectInterval time.Duration
122-
peerReconnectTimeout time.Duration
123116

124117
FallbackConfigFile string
125118
AutoWebhookRoot string
@@ -144,14 +137,6 @@ func (cfg *MultitenantAlertmanagerConfig) RegisterFlags(f *flag.FlagSet) {
144137
flag.StringVar(&cfg.clusterAdvertiseAddr, "cluster.advertise-address", "", "Explicit address to advertise in cluster.")
145138
flag.Var(&cfg.peers, "cluster.peer", "Initial peers (may be repeated).")
146139
flag.DurationVar(&cfg.peerTimeout, "cluster.peer-timeout", time.Second*15, "Time to wait between peers to send notifications.")
147-
flag.DurationVar(&cfg.gossipInterval, "cluster.gossip-interval", cluster.DefaultGossipInterval, "Interval between sending gossip messages. By lowering this value (more frequent) gossip messages are propagated across the cluster more quickly at the expense of increased bandwidth.")
148-
flag.DurationVar(&cfg.pushPullInterval, "cluster.pushpull-interval", cluster.DefaultPushPullInterval, "Interval for gossip state syncs. Setting this interval lower (more frequent) will increase convergence speeds across larger clusters at the expense of increased bandwidth usage.")
149-
flag.DurationVar(&cfg.tcpTimeout, "cluster.tcp-timeout", cluster.DefaultTcpTimeout, "Timeout for establishing a stream connection with a remote node for a full state sync, and for stream read and write operations.")
150-
flag.DurationVar(&cfg.probeTimeout, "cluster.probe-timeout", cluster.DefaultProbeTimeout, "Timeout to wait for an ack from a probed node before assuming it is unhealthy. This should be set to 99-percentile of RTT (round-trip time) on your network.")
151-
flag.DurationVar(&cfg.probeInterval, "cluster.probe-interval", cluster.DefaultProbeInterval, "Interval between random node probes. Setting this lower (more frequent) will cause the cluster to detect failed nodes more quickly at the expense of increased bandwidth usage.")
152-
flag.DurationVar(&cfg.reconnectInterval, "cluster.reconnect-interval", cluster.DefaultReconnectInterval, "Interval between attempting to reconnect to lost peers.")
153-
flag.DurationVar(&cfg.peerReconnectTimeout, "cluster.reconnect-timeout", cluster.DefaultReconnectTimeout, "Length of time to attempt to reconnect to a lost peer.")
154-
155140
}
156141

157142
// A MultitenantAlertmanager manages Alertmanager instances for multiple
@@ -214,21 +199,21 @@ func NewMultitenantAlertmanager(cfg *MultitenantAlertmanagerConfig, cfgCfg confi
214199
cfg.clusterAdvertiseAddr,
215200
cfg.peers,
216201
true,
217-
cfg.pushPullInterval,
218-
cfg.gossipInterval,
219-
cfg.tcpTimeout,
220-
cfg.probeTimeout,
221-
cfg.probeInterval,
202+
cluster.DefaultPushPullInterval,
203+
cluster.DefaultGossipInterval,
204+
cluster.DefaultTcpTimeout,
205+
cluster.DefaultProbeTimeout,
206+
cluster.DefaultProbeInterval,
222207
)
223208
if err != nil {
224209
level.Error(util.Logger).Log("msg", "unable to initialize gossip mesh", "err", err)
225210
os.Exit(1)
226211
}
227-
err = peer.Join(cfg.reconnectInterval, cfg.peerReconnectTimeout)
212+
err = peer.Join(cluster.DefaultReconnectInterval, cluster.DefaultReconnectTimeout)
228213
if err != nil {
229214
level.Warn(util.Logger).Log("msg", "unable to join gossip mesh", "err", err)
230215
}
231-
go peer.Settle(context.Background(), cfg.gossipInterval*10)
216+
go peer.Settle(context.Background(), cluster.DefaultGossipInterval)
232217
}
233218

234219
am := &MultitenantAlertmanager{

0 commit comments

Comments
 (0)