small bugfixes

pkg/alerting/backend/api.go

@@ -2,9 +2,10 @@ package backend
 
 import (
 	"fmt"
+	"time"
+
 	corev1 "github.com/rancher/opni/pkg/apis/core/v1"
 	alertingv1alpha "github.com/rancher/opni/plugins/alerting/pkg/apis/common"
-	"time"
 )
 
 // PostableAlert : corresponds to the data AlertManager API
@@ -82,7 +83,7 @@ func (p *PostableSilence) WithCondition(conditionId string) {
 	if p.Matchers == nil {
 		p.Matchers = make([]Matcher, 0)
 	}
-	p.Matchers = append(p.Matchers, Matcher{Name: conditionId})
+	p.Matchers = append(p.Matchers, Matcher{Name: "conditionId", Value: conditionId})
 }
 
 func (p *PostableSilence) WithDuration(dur time.Duration) {

pkg/alerting/backend/backend.go

@@ -110,6 +110,8 @@ func WithLogger(logger *zap.SugaredLogger) AlertManagerApiOption {
 func WithPostSilenceBody(conditionId string, duration time.Duration, silenceId *string) AlertManagerApiOption {
 	return func(o *AlertManagerApiOptions) {
 		p := &PostableSilence{}
+		p.CreatedBy = "opni admin"
+		p.Comment = "silence created by opni admin"
 		p.WithCondition(conditionId)
 		p.WithDuration(duration)
 		if err := p.Must(); err != nil {
@@ -204,6 +206,7 @@ func (a *AlertManagerAPI) doRequest() error {
 		)
 		return err
 	}
+	defer resp.Body.Close()
 	if err := a.expectClosure(resp); err != nil {
 		lg.Error(
 			zap.Error(err),
@@ -306,7 +309,7 @@ func NewAlertManagerPostSilenceClient(endpoint string, ctx context.Context, opts
 	return (&AlertManagerAPI{
 		AlertManagerApiOptions: options,
 		Endpoint:               endpoint,
-		Route:                  "/silence",
+		Route:                  "/silences",
 		Verb:                   POST,
 		ctx:                    ctx,
 	}).WithAPIV2()
@@ -318,7 +321,7 @@ func NewAlertManagerGetSilenceClient(endpoint string, ctx context.Context, opts
 	return (&AlertManagerAPI{
 		AlertManagerApiOptions: options,
 		Endpoint:               endpoint,
-		Route:                  "/silence",
+		Route:                  "/silences",
 		Verb:                   GET,
 		ctx:                    ctx,
 	}).WithAPIV2()
@@ -333,7 +336,7 @@ func NewAlertManagerDeleteSilenceClient(endpoint, silenceId string, ctx context.
 	return (&AlertManagerAPI{
 		AlertManagerApiOptions: options,
 		Endpoint:               endpoint,
-		Route:                  fmt.Sprintf("/silence/%s", silenceId),
+		Route:                  fmt.Sprintf("/silences/%s", silenceId),
 		Verb:                   DELETE,
 		ctx:                    ctx,
 	}).WithAPIV2()

plugins/alerting/pkg/alerting/api.go

@@ -40,6 +40,7 @@ func (p *Plugin) TriggerAlerts(ctx context.Context, req *alertingv1alpha.Trigger
 			ctx,
 			backend.WithLogger(lg),
 			backend.WithExpectClosure(backend.NewExpectStatusOk()),
+			backend.WithPostAlertBody(req.ConditionId.Id, req.Annotations),
 		)
 		err = apiNode.DoRequest()
 		if err != nil {

plugins/alerting/pkg/alerting/api_conditions.go

@@ -4,12 +4,13 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/rancher/opni/plugins/alerting/pkg/apis/common"
-	"io/ioutil"
+	"io"
 	"math/rand"
 	"net/http"
 	"time"
 
+	"github.com/rancher/opni/plugins/alerting/pkg/apis/common"
+
 	"github.com/prometheus/alertmanager/api/v2/models"
 	"github.com/rancher/opni/pkg/alerting/backend"
 	"github.com/tidwall/gjson"
@@ -186,7 +187,8 @@ func (p *Plugin) AlertConditionStatus(ctx context.Context, ref *corev1.Reference
 	if err != nil {
 		return nil, err
 	}
-	var result gjson.Result
+	//FIXME : doesn't update because it's not a pointer
+	var resultBytes []byte
 	apiNode := backend.NewAlertManagerGetAlertsClient(
 		availableEndpoint,
 		ctx,
@@ -195,19 +197,20 @@ func (p *Plugin) AlertConditionStatus(ctx context.Context, ref *corev1.Reference
 			if resp.StatusCode != http.StatusOK {
 				return fmt.Errorf("unexpected status code %d", resp.StatusCode)
 			}
-			b, err := ioutil.ReadAll(resp.Body)
+			b, err := io.ReadAll(resp.Body)
 			if err != nil {
 				lg.Errorf("failed to read body : %s", err)
 				return err
 			}
-			result = gjson.Get(string(b), "")
+			resultBytes = b
 			return nil
 		}),
 	)
 	err = apiNode.DoRequest()
 	if err != nil {
 		return nil, err
 	}
+	result := gjson.Get(string(resultBytes), "")
 	if !result.Exists() {
 		return defaultState, nil
 	}