Rename all occurrences of noma -> icinga-notifications

Author: yhabteab

cmd/noma-daemon/main.go renamed to cmd/icinga-notifications-daemon/main.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"github.com/icinga/icinga-notifications/internal/config"
+	"github.com/icinga/icinga-notifications/internal/listener"
 	"github.com/icinga/icingadb/pkg/logging"
 	"github.com/icinga/icingadb/pkg/utils"
-	"github.com/icinga/noma/internal/config"
-	"github.com/icinga/noma/internal/listener"
 	"go.uber.org/zap"
 	"os"
 	"time"
@@ -31,7 +31,7 @@ func main() {
 	}
 
 	logs, err := logging.NewLogging(
-		"noma",
+		"icinga-notifications",
 		conf.Logging.Level,
 		conf.Logging.Output,
 		conf.Logging.Options,

config.example.yml

@@ -13,9 +13,9 @@ database:
   host: /run/postgresql
   #host: localhost
   #port: 5432
-  user: noma
-  database: noma
-  #password: noma
+  user: icinga_notifications
+  database: icinga_notifications
+  #password: icinga_notifications
 
 logging:
   # Default logging level. Can be set to 'fatal', 'error', 'warn', 'info' or 'debug'.

go.mod

@@ -1,4 +1,4 @@
-module github.com/icinga/noma
+module github.com/icinga/icinga-notifications
 
 go 1.20
 

icinga2.conf

@@ -1,15 +1,15 @@
-if (!globals.contains("NomaProcessEventUrl")) {
-	const NomaProcessEventUrl = "http://localhost:5680/process-event"
+if (!globals.contains("IcingaNotificationsProcessEventUrl")) {
+	const IcingaNotificationsProcessEventUrl = "http://localhost:5680/process-event"
 }
-if (!globals.contains("NomaIcingaWebUrl")) {
-	const NomaIcingaWebUrl = "http://localhost/icingaweb2"
+if (!globals.contains("IcingaNotificationsIcingaWebUrl")) {
+	const IcingaNotificationsIcingaWebUrl = "http://localhost/icingaweb2"
 }
-if (!globals.contains("NomaEventSourceId")) {
+if (!globals.contains("IcingaNotificationsEventSourceId")) {
 	// INSERT INTO source (id, type, name) VALUES (1, 'icinga2', 'Icinga 2')
-	const NomaEventSourceId = 1
+	const IcingaNotificationsEventSourceId = 1
 }
 
-object User "noma" {
+object User "icinga-notifications" {
 	# Workaround, types filter here must exclude Problem, otherwise no Acknowledgement notifications are sent.
 	# https://github.com/Icinga/icinga2/issues/9739
 	types = [ Acknowledgement ]
@@ -31,7 +31,7 @@ var baseBody = {
 	"--show-error" = { set_if = true }
 	"url" = {
 		skip_key = true
-		value = NomaProcessEventUrl
+		value = IcingaNotificationsProcessEventUrl
 	}
 }
 
@@ -73,7 +73,7 @@ var hostExtraTags = {{
 	return tags
 }}
 
-object NotificationCommand "noma-host-notification" use(hostBody, hostExtraTags) {
+object NotificationCommand "icinga-notifications-host" use(hostBody, hostExtraTags) {
 	command = [ /* full command line generated from arguments */ ]
 
 	arguments = hostBody
@@ -83,9 +83,9 @@ object NotificationCommand "noma-host-notification" use(hostBody, hostExtraTags)
 		event_author = "$notification.author$"
 		event_message = "$notification.comment$"
 		event_object_name = "$host.display_name$"
-		event_action_url = NomaIcingaWebUrl + "/icingadb/host?name=$host.name$"
+		event_action_url = IcingaNotificationsIcingaWebUrl + "/icingadb/host?name=$host.name$"
 		event_extra_tags = hostExtraTags
-		event_source_id = NomaEventSourceId
+		event_source_id = IcingaNotificationsEventSourceId
 	}
 
 	vars.event_type = {{
@@ -105,7 +105,7 @@ object NotificationCommand "noma-host-notification" use(hostBody, hostExtraTags)
 	}}
 }
 
-object EventCommand "noma-host-events-forwarder" use(hostBody, hostExtraTags) {
+object EventCommand "icinga-notifications-host-events" use(hostBody, hostExtraTags) {
 	command = [ /* full command line generated from arguments */ ]
 
 	arguments = hostBody
@@ -115,9 +115,9 @@ object EventCommand "noma-host-events-forwarder" use(hostBody, hostExtraTags) {
 		event_author = ""
 		event_message = "$host.output$"
 		event_object_name = "$host.display_name$"
-		event_action_url = NomaIcingaWebUrl + "/icingadb/host?name=$host.name$"
+		event_action_url = IcingaNotificationsIcingaWebUrl + "/icingadb/host?name=$host.name$"
 		event_extra_tags = hostExtraTags
-		event_source_id = NomaEventSourceId
+		event_source_id = IcingaNotificationsEventSourceId
 	}
 
 	vars.event_severity = {{
@@ -129,16 +129,16 @@ object EventCommand "noma-host-events-forwarder" use(hostBody, hostExtraTags) {
 	}}
 }
 
-template Host "generic-noma-host" default {
-	event_command = "noma-host-events-forwarder"
+template Host "generic-icinga-notifications-host" default {
+	event_command = "icinga-notifications-host-events"
 }
 
-apply Notification "noma-notifier" to Host {
-	command = "noma-host-notification"
+apply Notification "icinga-notifications-forwarder" to Host {
+	command = "icinga-notifications-host"
 
 	types = [ Acknowledgement ]
 
-	users = [ "noma" ]
+	users = [ "icinga-notifications" ]
 
 	assign where true
 }
@@ -186,7 +186,7 @@ var serviceExtraTags = {{
 	return tags
 }}
 
-object NotificationCommand "noma-service-notification" use(serviceBody, serviceExtraTags) {
+object NotificationCommand "icinga-notifications-service" use(serviceBody, serviceExtraTags) {
 	command = [ /* full command line generated from arguments */ ]
 
 	arguments = serviceBody
@@ -197,9 +197,9 @@ object NotificationCommand "noma-service-notification" use(serviceBody, serviceE
 		event_author = "$notification.author$"
 		event_message = "$notification.comment$"
 		event_object_name = "$host.display_name$: $service.display_name$"
-		event_action_url = NomaIcingaWebUrl + "/icingadb/service?name=$service.name$&host.name=$service.host.name$"
+		event_action_url = IcingaNotificationsIcingaWebUrl + "/icingadb/service?name=$service.name$&host.name=$service.host.name$"
 		event_extra_tags = serviceExtraTags
-		event_source_id = NomaEventSourceId
+		event_source_id = IcingaNotificationsEventSourceId
 	}
 
 	vars.event_type = {{
@@ -228,7 +228,7 @@ object NotificationCommand "noma-service-notification" use(serviceBody, serviceE
 	}}
 }
 
-object EventCommand "noma-service-events-forwarder" use(serviceBody, serviceExtraTags) {
+object EventCommand "icinga-notifications-service-events" use(serviceBody, serviceExtraTags) {
 	command = [ /* full command line generated from arguments */ ]
 
 	arguments = serviceBody
@@ -239,9 +239,9 @@ object EventCommand "noma-service-events-forwarder" use(serviceBody, serviceExtr
 		event_author = ""
 		event_message = "$service.output$"
 		event_object_name = "$host.display_name$: $service.display_name$"
-		event_action_url = NomaIcingaWebUrl + "/icingadb/service?name=$service.name$&host.name=$service.host.name$"
+		event_action_url = IcingaNotificationsIcingaWebUrl + "/icingadb/service?name=$service.name$&host.name=$service.host.name$"
 		event_extra_tags = serviceExtraTags
-		event_source_id = NomaEventSourceId
+		event_source_id = IcingaNotificationsEventSourceId
 	}
 
 	vars.event_severity = {{
@@ -262,16 +262,16 @@ object EventCommand "noma-service-events-forwarder" use(serviceBody, serviceExtr
 	}}
 }
 
-template Service "generic-noma-service" default {
-	event_command = "noma-service-events-forwarder"
+template Service "generic-icinga-notifications-service" default {
+	event_command = "icinga-notifications-service-events"
 }
 
-apply Notification "noma-notifier" to Service {
-	command = "noma-service-notification"
+apply Notification "icinga-notifications-forwarder" to Service {
+	command = "icinga-notifications-service"
 
 	types = [ Acknowledgement ]
 
-	users = [ "noma" ]
+	users = [ "icinga-notifications" ]
 
 	assign where true
 }

internal/channel/channel.go

@@ -2,9 +2,9 @@ package channel
 
 import (
 	"fmt"
-	"github.com/icinga/noma/internal/event"
-	"github.com/icinga/noma/internal/incident"
-	"github.com/icinga/noma/internal/recipient"
+	"github.com/icinga/icinga-notifications/internal/event"
+	"github.com/icinga/icinga-notifications/internal/incident"
+	"github.com/icinga/icinga-notifications/internal/recipient"
 )
 
 type Channel struct {

internal/channel/email.go

@@ -4,9 +4,9 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/icinga/noma/internal/event"
-	"github.com/icinga/noma/internal/incident"
-	"github.com/icinga/noma/internal/recipient"
+	"github.com/icinga/icinga-notifications/internal/event"
+	"github.com/icinga/icinga-notifications/internal/incident"
+	"github.com/icinga/icinga-notifications/internal/recipient"
 	"log"
 	"net"
 	"net/smtp"

internal/channel/rocketchat.go

@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/icinga/noma/internal/event"
-	"github.com/icinga/noma/internal/incident"
-	"github.com/icinga/noma/internal/recipient"
+	"github.com/icinga/icinga-notifications/internal/event"
+	"github.com/icinga/icinga-notifications/internal/incident"
+	"github.com/icinga/icinga-notifications/internal/recipient"
 	"log"
 	"net/http"
 	"time"

internal/channel/utils.go

@@ -2,8 +2,8 @@ package channel
 
 import (
 	"fmt"
-	"github.com/icinga/noma/internal/event"
-	"github.com/icinga/noma/internal/incident"
+	"github.com/icinga/icinga-notifications/internal/event"
+	"github.com/icinga/icinga-notifications/internal/incident"
 	"io"
 	"strings"
 )
@@ -20,9 +20,9 @@ func FormatMessage(writer io.Writer, incident *incident.Incident, event *event.E
 	_, _ = writer.Write([]byte(event.URL + "\n\n"))
 	incidentUrl := icingaweb2Url
 	if strings.HasSuffix(incidentUrl, "/") {
-		incidentUrl = fmt.Sprintf("Incident: %snoma/incident?id=%d\n", icingaweb2Url, incident.ID())
+		incidentUrl = fmt.Sprintf("Incident: %snotifications/incident?id=%d\n", icingaweb2Url, incident.ID())
 	} else {
-		incidentUrl = fmt.Sprintf("Incident: %s/noma/incident?id=%d\n", icingaweb2Url, incident.ID())
+		incidentUrl = fmt.Sprintf("Incident: %s/notifications/incident?id=%d\n", icingaweb2Url, incident.ID())
 	}
 
 	_, _ = writer.Write([]byte(incidentUrl))

internal/config/channel.go

@@ -2,7 +2,7 @@ package config
 
 import (
 	"context"
-	"github.com/icinga/noma/internal/channel"
+	"github.com/icinga/icinga-notifications/internal/channel"
 	"github.com/jmoiron/sqlx"
 	"go.uber.org/zap"
 )

internal/config/contact.go

@@ -2,7 +2,7 @@ package config
 
 import (
 	"context"
-	"github.com/icinga/noma/internal/recipient"
+	"github.com/icinga/icinga-notifications/internal/recipient"
 	"github.com/jmoiron/sqlx"
 	"go.uber.org/zap"
 )