From 7b80919b3675bc17e715f3c00f6555d210c64d15 Mon Sep 17 00:00:00 2001 From: pasquier-s Date: Sat, 3 Mar 2018 11:07:47 +0100 Subject: [PATCH] Remove unused code (#1272) --- notify/impl.go | 5 ----- notify/notify.go | 3 +-- notify/notify_test.go | 10 ---------- provider/mem/mem_test.go | 12 ------------ 4 files changed, 1 insertion(+), 29 deletions(-) diff --git a/notify/impl.go b/notify/impl.go index f3a31f92..24666c63 100644 --- a/notify/impl.go +++ b/notify/impl.go @@ -1151,11 +1151,6 @@ type victorOpsMessage struct { MonitoringTool string `json:"monitoring_tool"` } -type victorOpsErrorResponse struct { - Result string `json:"result"` - Message string `json:"message"` -} - // Notify implements the Notifier interface. func (n *VictorOps) Notify(ctx context.Context, as ...*types.Alert) (bool, error) { victorOpsAllowedEvents := map[string]bool{ diff --git a/notify/notify.go b/notify/notify.go index 34dd6051..716afd86 100644 --- a/notify/notify.go +++ b/notify/notify.go @@ -340,8 +340,7 @@ func (n *GossipSettleStage) Exec(ctx context.Context, l log.Logger, alerts ...*t // InhibitStage filters alerts through an inhibition muter. type InhibitStage struct { - muter types.Muter - marker types.Marker + muter types.Muter } // NewInhibitStage return a new InhibitStage. diff --git a/notify/notify_test.go b/notify/notify_test.go index 11171fd7..09b2f4ca 100644 --- a/notify/notify_test.go +++ b/notify/notify_test.go @@ -21,8 +21,6 @@ import ( "time" "github.com/go-kit/kit/log" - "github.com/golang/protobuf/ptypes" - "github.com/golang/protobuf/ptypes/timestamp" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" "golang.org/x/net/context" @@ -75,14 +73,6 @@ func (l *testNflog) Snapshot(w io.Writer) (int, error) { return 0, nil } -func mustTimestampProto(ts time.Time) *timestamp.Timestamp { - tspb, err := ptypes.TimestampProto(ts) - if err != nil { - panic(err) - } - return tspb -} - func alertHashSet(hashes ...uint64) map[uint64]struct{} { res := map[uint64]struct{}{} diff --git a/provider/mem/mem_test.go b/provider/mem/mem_test.go index 8a4634f1..c79ad770 100644 --- a/provider/mem/mem_test.go +++ b/provider/mem/mem_test.go @@ -285,15 +285,3 @@ func alertsEqual(a1, a2 *types.Alert) bool { } return a1.Timeout == a2.Timeout } - -func alertListEqual(a1, a2 []*types.Alert) bool { - if len(a1) != len(a2) { - return false - } - for i, a := range a1 { - if !alertsEqual(a, a2[i]) { - return false - } - } - return true -}