upstream/icingadb
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb.git synced 2026-02-19 02:28:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

notifications: Send relative Icinga Web 2 URLs

Browse source 
There is no need to let each Icinga Notifications source know the root
URL of Icinga Web 2. Since the latest IGL and IN change, partly URLs
relative to Icinga Web 2 are supported.
This commit is contained in:
Alvar Penning 2025-09-29 17:05:28 +02:00
parent b6e9b61b15
commit 37212a2b64
No known key found for this signature in database
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config.example.yml
View file

@ -151,6 +151,3 @@ redis:
#
# # Password for the defined user.
# password: insecureinsecure
#
# # URL to the Icinga Web 2 to craft event URLs.
# icingaweb2-base-url: http://localhost/icingaweb2

19
pkg/notifications/notifications.go
View file

@ -10,6 +10,7 @@ import (
"github.com/icinga/icinga-go-library/redis"
"github.com/icinga/icinga-go-library/types"
"github.com/icinga/icinga-go-library/utils"
"github.com/icinga/icingadb/internal"
"github.com/icinga/icingadb/pkg/common"
"github.com/icinga/icingadb/pkg/icingadb/history"
v1history "github.com/icinga/icingadb/pkg/icingadb/v1/history"
@ -54,13 +55,13 @@ func NewNotificationsClient(
db: db,
logger: logger,
rules: &source.RulesInfo{Version: source.EmptyRulesVersion},
rules: &source.RulesInfo{},
redisClient: rc,
ctx: ctx,
}
notificationsClient, err := source.NewClient(client.Config, "Icinga DB")
notificationsClient, err := source.NewClient(client.Config, fmt.Sprintf("Icinga DB %s", internal.Version.Version))
if err != nil {
logger.Fatalw("Cannot create Icinga Notifications client", zap.Error(err))
}
@ -84,8 +85,8 @@ func NewNotificationsClient(
// > select * from host where id = :host_id and environment_id = :environment_id and name like 'prefix_%'
//
// The :host_id and :environment_id parameters will be bound to the entity's ID and EnvironmentId fields, respectively.
func (client *Client) evaluateRulesForObject(ctx context.Context, entity database.Entity) ([]int64, error) {
outRuleIds := make([]int64, 0, len(client.rules.Rules))
func (client *Client) evaluateRulesForObject(ctx context.Context, entity database.Entity) ([]string, error) {
outRuleIds := make([]string, 0, len(client.rules.Rules))
for rule := range client.rules.Iter() {
if rule.ObjectFilterExpr == "" {
@ -98,7 +99,7 @@ func (client *Client) evaluateRulesForObject(ctx context.Context, entity databas
// So, we need to unescape it before passing it to the database.
query, err := url.QueryUnescape(rule.ObjectFilterExpr)
if err != nil {
return false, errors.Wrapf(err, "cannot unescape rule %d object filter expression %q", rule.Id, rule.ObjectFilterExpr)
return false, errors.Wrapf(err, "cannot unescape rule %q object filter expression %q", rule.Id, rule.ObjectFilterExpr)
}
rows, err := client.db.NamedQueryContext(ctx, client.db.Rebind(query), entity)
if err != nil {
@ -112,7 +113,7 @@ func (client *Client) evaluateRulesForObject(ctx context.Context, entity databas
return true, nil
}()
if err != nil {
return nil, errors.Wrapf(err, "cannot fetch rule %d from %q", rule.Id, rule.ObjectFilterExpr)
return nil, errors.Wrapf(err, "cannot fetch rule %q from %q", rule.Id, rule.ObjectFilterExpr)
} else if !evaluates {
continue
}
@ -130,14 +131,14 @@ func (client *Client) evaluateRulesForObject(ctx context.Context, entity databas
func (client *Client) buildCommonEvent(rlr *redisLookupResult) (*event.Event, error) {
var (
objectName string
objectUrl *url.URL
objectUrl url.URL
objectTags map[string]string
)
if rlr.ServiceName != "" {
objectName = rlr.HostName + "!" + rlr.ServiceName
objectUrl = client.notificationsClient.JoinIcingaWeb2Path("/icingadb/service")
objectUrl.Path = "/icingadb/service"
objectUrl.RawQuery = "name=" + utils.RawUrlEncode(rlr.ServiceName) + "&host.name=" + utils.RawUrlEncode(rlr.HostName)
objectTags = map[string]string{
@ -147,7 +148,7 @@ func (client *Client) buildCommonEvent(rlr *redisLookupResult) (*event.Event, er
} else {
objectName = rlr.HostName
objectUrl = client.notificationsClient.JoinIcingaWeb2Path("/icingadb/host")
objectUrl.Path = "/icingadb/host"
objectUrl.RawQuery = "name=" + utils.RawUrlEncode(rlr.HostName)
objectTags = map[string]string{