Unify all the copied files under the alerting package

grafana · Jul 15, 2022 · 03b6ab0 · 03b6ab0
1 parent b63f072
commit 03b6ab0
Show file tree

Hide file tree

Showing 18 changed files with 17 additions and 720 deletions.
diff --git a/alerting/alertmanager.go b/alerting/alertmanager.go
diff --git a/alerting/alertmanager_config.go b/alerting/alertmanager_config.go
@@ -1,4 +1,4 @@
-package notifier
+package alerting
 
 import (
 	"context"

diff --git a/alerting/alerts.go b/alerting/alerts.go
@@ -1,4 +1,4 @@
-package notifier
+package alerting
 
 import (
 	"fmt"

diff --git a/alerting/available_channels.go b/alerting/available_channels.go
@@ -1,4 +1,4 @@
-package notifier
+package alerting
 
 import (
 	"github.com/grafana/grafana/pkg/services/alerting"

diff --git a/alerting/config.go b/alerting/config.go
@@ -1,4 +1,4 @@
-package notifier
+package alerting
 
 import (
 	"encoding/json"

diff --git a/alerting/config_test.go b/alerting/config_test.go
@@ -1,4 +1,4 @@
-package notifier
+package alerting
 
 import (
 	"errors"

diff --git a/alerting/crypto.go b/alerting/crypto.go
@@ -1,4 +1,4 @@
-package notifier
+package alerting
 
 import (
 	"context"

diff --git a/alerting/file_store.go b/alerting/file_store.go
@@ -1,4 +1,4 @@
-package notifier
+package alerting
 
 import (
 	"context"

diff --git a/alerting/file_store_test.go b/alerting/file_store_test.go
@@ -1,4 +1,4 @@
-package notifier
+package alerting
 
 import (
 	"context"

diff --git a/alerting/grafana_alertmanager.go b/alerting/grafana_alertmanager.go
@@ -145,6 +145,7 @@ type GrafanaAlertmanagerConfig struct {
 
 func NewGrafanaAlertmanager(ctx context.Context, orgID int64, cfg *setting.Cfg, store AlertingStore, config *GrafanaAlertmanagerConfig,
 	peer ClusterPeer, decryptFn channels.GetDecryptedValueFn, ns notifications.Service, m *metrics.Alertmanager) (*GrafanaAlertmanager, error) {
+
 	am := &GrafanaAlertmanager{
 		Settings:            cfg,
 		stopc:               make(chan struct{}),

diff --git a/alerting/alertmanager_test.go → alerting/grafana_alertmanager_test.go b/alerting/alertmanager_test.go → alerting/grafana_alertmanager_test.go
@@ -1,4 +1,4 @@
-package notifier
+package alerting
 
 import (
 	"context"

diff --git a/alerting/multiorg_alertmanager.go b/alerting/multiorg_alertmanager.go
@@ -1,4 +1,4 @@
-package notifier
+package alerting
 
 import (
 	"context"

diff --git a/alerting/multiorg_alertmanager_test.go b/alerting/multiorg_alertmanager_test.go
@@ -1,4 +1,4 @@
-package notifier
+package alerting
 
 import (
 	"bytes"

diff --git a/alerting/receivers.go b/alerting/receivers.go
@@ -1,4 +1,4 @@
-package notifier
+package alerting
 
 import (
 	"context"

diff --git a/alerting/receivers_test.go b/alerting/receivers_test.go
@@ -1,4 +1,4 @@
-package notifier
+package alerting
 
 import (
 	"context"

diff --git a/alerting/silences.go b/alerting/silences.go
@@ -1,4 +1,4 @@
-package notifier
+package alerting
 
 import (
 	"errors"

diff --git a/alerting/status.go b/alerting/status.go
@@ -1,4 +1,4 @@
-package notifier
+package alerting
 
 import (
 	apimodels "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"

diff --git a/alerting/testing.go b/alerting/testing.go
@@ -1,4 +1,4 @@
-package notifier
+package alerting
 
 import (
 	"context"