mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-25 05:34:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Rename notification to notifier

Browse source
This commit is contained in:
Fabian Reinartz 2016-03-01 12:37:22 +01:00
parent 42a64a7d0b
commit bfa8aaa017
5 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cmd/prometheus/config.go
View file

@ -26,7 +26,7 @@ import (
"github.com/asaskevich/govalidator" "github.com/asaskevich/govalidator"
"github.com/prometheus/common/log" "github.com/prometheus/common/log"
"github.com/prometheus/prometheus/notification" "github.com/prometheus/prometheus/notifier"
"github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/storage/local" "github.com/prometheus/prometheus/storage/local"
"github.com/prometheus/prometheus/storage/local/index" "github.com/prometheus/prometheus/storage/local/index"
@ -42,11 +42,11 @@ var cfg = struct {
printVersion bool printVersion bool
configFile string configFile string
storage local.MemorySeriesStorageOptions storage local.MemorySeriesStorageOptions
notification notification.HandlerOptions notifier notifier.Options
queryEngine promql.EngineOptions queryEngine promql.EngineOptions
web web.Options web web.Options
remote remote.Options remote remote.Options
prometheusURL string prometheusURL string
influxdbURL string influxdbURL string
@ -203,15 +203,15 @@ func init() {
// Alertmanager. // Alertmanager.
cfg.fs.StringVar( cfg.fs.StringVar(
&cfg.notification.AlertmanagerURL, "alertmanager.url", "", &cfg.notifier.AlertmanagerURL, "alertmanager.url", "",
"The URL of the alert manager to send notifications to.", "The URL of the alert manager to send notifications to.",
) )
cfg.fs.IntVar( cfg.fs.IntVar(
&cfg.notification.QueueCapacity, "alertmanager.notification-queue-capacity", 10000, &cfg.notifier.QueueCapacity, "alertmanager.notification-queue-capacity", 10000,
"The capacity of the queue for pending alert manager notifications.", "The capacity of the queue for pending alert manager notifications.",
) )
cfg.fs.DurationVar( cfg.fs.DurationVar(
&cfg.notification.Timeout, "alertmanager.timeout", 10*time.Second, &cfg.notifier.Timeout, "alertmanager.timeout", 10*time.Second,
"Alert manager HTTP API timeout.", "Alert manager HTTP API timeout.",
) )

26
cmd/prometheus/main.go
View file

@ -31,7 +31,7 @@ import (
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/notification" "github.com/prometheus/prometheus/notifier"
"github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/retrieval" "github.com/prometheus/prometheus/retrieval"
"github.com/prometheus/prometheus/rules" "github.com/prometheus/prometheus/rules"
@ -84,16 +84,16 @@ func Main() int {
} }
var ( var (
notificationHandler = notification.New(&cfg.notification) notifier = notifier.New(&cfg.notifier)
targetManager = retrieval.NewTargetManager(sampleAppender) targetManager = retrieval.NewTargetManager(sampleAppender)
queryEngine = promql.NewEngine(memStorage, &cfg.queryEngine) queryEngine = promql.NewEngine(memStorage, &cfg.queryEngine)
) )
ruleManager := rules.NewManager(&rules.ManagerOptions{ ruleManager := rules.NewManager(&rules.ManagerOptions{
SampleAppender: sampleAppender, SampleAppender: sampleAppender,
NotificationHandler: notificationHandler, Notifier: notifier,
QueryEngine: queryEngine, QueryEngine: queryEngine,
ExternalURL: cfg.web.ExternalURL, ExternalURL: cfg.web.ExternalURL,
}) })
flags := map[string]string{} flags := map[string]string{}
@ -110,7 +110,7 @@ func Main() int {
webHandler := web.New(memStorage, queryEngine, ruleManager, status, &cfg.web) webHandler := web.New(memStorage, queryEngine, ruleManager, status, &cfg.web)
reloadables = append(reloadables, status, targetManager, ruleManager, webHandler, notificationHandler) reloadables = append(reloadables, status, targetManager, ruleManager, webHandler, notifier)
if !reloadConfig(cfg.configFile, reloadables...) { if !reloadConfig(cfg.configFile, reloadables...) {
return 1 return 1
@ -153,14 +153,14 @@ func Main() int {
} }
// The storage has to be fully initialized before registering. // The storage has to be fully initialized before registering.
prometheus.MustRegister(memStorage) prometheus.MustRegister(memStorage)
prometheus.MustRegister(notificationHandler) prometheus.MustRegister(notifier)
prometheus.MustRegister(configSuccess) prometheus.MustRegister(configSuccess)
prometheus.MustRegister(configSuccessTime) prometheus.MustRegister(configSuccessTime)
// The notification handler is a dependency of the rule manager. It has to be // The notifieris a dependency of the rule manager. It has to be
// started before and torn down afterwards. // started before and torn down afterwards.
go notificationHandler.Run() go notifier.Run()
defer notificationHandler.Stop() defer notifier.Stop()
go ruleManager.Run() go ruleManager.Run()
defer ruleManager.Stop() defer ruleManager.Stop()

36
notification/notification.go → notifier/notifier.go
View file

@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package notification package notifier
import ( import (
"bytes" "bytes"
@ -44,9 +44,9 @@ const (
// Handler is responsible for dispatching alert notifications to an // Handler is responsible for dispatching alert notifications to an
// alert manager service. // alert manager service.
type Handler struct { type Notifier struct {
queue model.Alerts queue model.Alerts
opts *HandlerOptions opts *Options
more chan struct{} more chan struct{}
mtx sync.RWMutex mtx sync.RWMutex
@ -62,18 +62,18 @@ type Handler struct {
} }
// HandlerOptions are the configurable parameters of a Handler. // HandlerOptions are the configurable parameters of a Handler.
type HandlerOptions struct { type Options struct {
AlertmanagerURL string AlertmanagerURL string
QueueCapacity int QueueCapacity int
Timeout time.Duration Timeout time.Duration
ExternalLabels model.LabelSet ExternalLabels model.LabelSet
} }
// New constructs a new Handler. // New constructs a neww Notifier.
func New(o *HandlerOptions) *Handler { func New(o *Options) *Notifier {
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
return &Handler{ return &Notifier{
queue: make(model.Alerts, 0, o.QueueCapacity), queue: make(model.Alerts, 0, o.QueueCapacity),
ctx: ctx, ctx: ctx,
cancel: cancel, cancel: cancel,
@ -124,7 +124,7 @@ func New(o *HandlerOptions) *Handler {
// ApplyConfig updates the status state as the new config requires. // ApplyConfig updates the status state as the new config requires.
// Returns true on success. // Returns true on success.
func (n *Handler) ApplyConfig(conf *config.Config) bool { func (n *Notifier) ApplyConfig(conf *config.Config) bool {
n.mtx.Lock() n.mtx.Lock()
defer n.mtx.Unlock() defer n.mtx.Unlock()
@ -134,14 +134,14 @@ func (n *Handler) ApplyConfig(conf *config.Config) bool {
const maxBatchSize = 64 const maxBatchSize = 64
func (n *Handler) queueLen() int { func (n *Notifier) queueLen() int {
n.mtx.RLock() n.mtx.RLock()
defer n.mtx.RUnlock() defer n.mtx.RUnlock()
return len(n.queue) return len(n.queue)
} }
func (n *Handler) nextBatch() []*model.Alert { func (n *Notifier) nextBatch() []*model.Alert {
n.mtx.Lock() n.mtx.Lock()
defer n.mtx.Unlock() defer n.mtx.Unlock()
@ -159,7 +159,7 @@ func (n *Handler) nextBatch() []*model.Alert {
} }
// Run dispatches notifications continuously. // Run dispatches notifications continuously.
func (n *Handler) Run() { func (n *Notifier) Run() {
// Just warn once in the beginning to prevent noisy logs. // Just warn once in the beginning to prevent noisy logs.
if n.opts.AlertmanagerURL == "" { if n.opts.AlertmanagerURL == "" {
log.Warnf("No AlertManager configured, not dispatching any alerts") log.Warnf("No AlertManager configured, not dispatching any alerts")
@ -202,7 +202,7 @@ func (n *Handler) Run() {
// Send queues the given notification requests for processing. // Send queues the given notification requests for processing.
// Panics if called on a handler that is not running. // Panics if called on a handler that is not running.
func (n *Handler) Send(alerts ...*model.Alert) { func (n *Notifier) Send(alerts ...*model.Alert) {
n.mtx.Lock() n.mtx.Lock()
defer n.mtx.Unlock() defer n.mtx.Unlock()
@ -230,7 +230,7 @@ func (n *Handler) Send(alerts ...*model.Alert) {
} }
// setMore signals that the alert queue has items. // setMore signals that the alert queue has items.
func (n *Handler) setMore() { func (n *Notifier) setMore() {
// If we cannot send on the channel, it means the signal already exists // If we cannot send on the channel, it means the signal already exists
// and has not been consumed yet. // and has not been consumed yet.
select { select {
@ -239,11 +239,11 @@ func (n *Handler) setMore() {
} }
} }
func (n *Handler) postURL() string { func (n *Notifier) postURL() string {
return strings.TrimRight(n.opts.AlertmanagerURL, "/") + alertPushEndpoint return strings.TrimRight(n.opts.AlertmanagerURL, "/") + alertPushEndpoint
} }
func (n *Handler) send(alerts ...*model.Alert) error { func (n *Notifier) send(alerts ...*model.Alert) error {
// Attach external labels before sending alerts. // Attach external labels before sending alerts.
for _, a := range alerts { for _, a := range alerts {
for ln, lv := range n.opts.ExternalLabels { for ln, lv := range n.opts.ExternalLabels {
@ -272,14 +272,14 @@ func (n *Handler) send(alerts ...*model.Alert) error {
} }
// Stop shuts down the notification handler. // Stop shuts down the notification handler.
func (n *Handler) Stop() { func (n *Notifier) Stop() {
log.Info("Stopping notification handler...") log.Info("Stopping notification handler...")
n.cancel() n.cancel()
} }
// Describe implements prometheus.Collector. // Describe implements prometheus.Collector.
func (n *Handler) Describe(ch chan<- *prometheus.Desc) { func (n *Notifier) Describe(ch chan<- *prometheus.Desc) {
ch <- n.latency.Desc() ch <- n.latency.Desc()
ch <- n.errors.Desc() ch <- n.errors.Desc()
ch <- n.sent.Desc() ch <- n.sent.Desc()
@ -289,7 +289,7 @@ func (n *Handler) Describe(ch chan<- *prometheus.Desc) {
} }
// Collect implements prometheus.Collector. // Collect implements prometheus.Collector.
func (n *Handler) Collect(ch chan<- prometheus.Metric) { func (n *Notifier) Collect(ch chan<- prometheus.Metric) {
n.queueLength.Set(float64(n.queueLen())) n.queueLength.Set(float64(n.queueLen()))
ch <- n.latency ch <- n.latency

12
notification/notification_test.go → notifier/notifier_test.go
View file

@ -11,7 +11,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
package notification package notifier
import ( import (
"encoding/json" "encoding/json"
@ -50,8 +50,8 @@ func TestHandlerPostURL(t *testing.T) {
out: "http://localhost:9093/prefix/api/v1/alerts", out: "http://localhost:9093/prefix/api/v1/alerts",
}, },
} }
h := &Handler{ h := &Notifier{
opts: &HandlerOptions{}, opts: &Options{},
} }
for _, c := range cases { for _, c := range cases {
@ -63,7 +63,7 @@ func TestHandlerPostURL(t *testing.T) {
} }
func TestHandlerNextBatch(t *testing.T) { func TestHandlerNextBatch(t *testing.T) {
h := New(&HandlerOptions{}) h := New(&Options{})
for i := range make([]struct{}, 2*maxBatchSize+1) { for i := range make([]struct{}, 2*maxBatchSize+1) {
h.queue = append(h.queue, &model.Alert{ h.queue = append(h.queue, &model.Alert{
@ -146,7 +146,7 @@ func TestHandlerSend(t *testing.T) {
defer server.Close() defer server.Close()
h := New(&HandlerOptions{ h := New(&Options{
AlertmanagerURL: server.URL, AlertmanagerURL: server.URL,
Timeout: time.Minute, Timeout: time.Minute,
ExternalLabels: model.LabelSet{"a": "b"}, ExternalLabels: model.LabelSet{"a": "b"},
@ -202,7 +202,7 @@ func TestHandlerFull(t *testing.T) {
} }
})) }))
h := New(&HandlerOptions{ h := New(&Options{
AlertmanagerURL: server.URL, AlertmanagerURL: server.URL,
Timeout: time.Second, Timeout: time.Second,
QueueCapacity: 3 * maxBatchSize, QueueCapacity: 3 * maxBatchSize,

12
rules/manager.go
View file

@ -28,7 +28,7 @@ import (
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
"github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/config"
"github.com/prometheus/prometheus/notification" "github.com/prometheus/prometheus/notifier"
"github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql"
"github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/storage"
"github.com/prometheus/prometheus/template" "github.com/prometheus/prometheus/template"
@ -343,7 +343,7 @@ func (g *Group) sendAlerts(rule *AlertingRule, timestamp model.Time) error {
} }
if len(alerts) > 0 { if len(alerts) > 0 {
g.opts.NotificationHandler.Send(alerts...) g.opts.Notifier.Send(alerts...)
} }
return nil return nil
@ -359,10 +359,10 @@ type Manager struct {
// ManagerOptions bundles options for the Manager. // ManagerOptions bundles options for the Manager.
type ManagerOptions struct { type ManagerOptions struct {
ExternalURL *url.URL ExternalURL *url.URL
QueryEngine *promql.Engine QueryEngine *promql.Engine
NotificationHandler *notification.Handler Notifier *notifier.Notifier
SampleAppender storage.SampleAppender SampleAppender storage.SampleAppender
} }
// NewManager returns an implementation of Manager, ready to be started // NewManager returns an implementation of Manager, ready to be started