feat: add new discord fields

This adds the functionality to configure the discord message content, username and avatar_url.
archway-network · Jan 30, 2025 · 8b0c29e · 8b0c29e
1 parent c2af71c
commit 8b0c29e
Show file tree

Hide file tree

Showing 16 changed files with 236 additions and 0 deletions.
diff --git a/Documentation/api-reference/api.md b/Documentation/api-reference/api.md
@@ -21827,6 +21827,40 @@ HTTPConfig
 <p>HTTP client configuration.</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>content</code><br/>
+<em>
+string
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>The template of the content&rsquo;s body.</p>
+</td>
+</tr>
+<tr>
+<td>
+<code>username</code><br/>
+<em>
+string
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+</td>
+</tr>
+<tr>
+<td>
+<code>avatarURL</code><br/>
+<em>
+string
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+</td>
+</tr>
 </tbody>
 </table>
 <h3 id="monitoring.coreos.com/v1alpha1.DockerSDConfig">DockerSDConfig
@@ -31681,6 +31715,40 @@ HTTPConfig
 <p>HTTP client configuration.</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>content</code><br/>
+<em>
+string
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+<p>The template of the content&rsquo;s body.</p>
+</td>
+</tr>
+<tr>
+<td>
+<code>username</code><br/>
+<em>
+string
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+</td>
+</tr>
+<tr>
+<td>
+<code>avatarURL</code><br/>
+<em>
+string
+</em>
+</td>
+<td>
+<em>(Optional)</em>
+</td>
+</tr>
 </tbody>
 </table>
 <h3 id="monitoring.coreos.com/v1beta1.EmailConfig">EmailConfig

diff --git a/bundle.yaml b/bundle.yaml
diff --git a/example/prometheus-operator-crd-full/monitoring.coreos.com_alertmanagerconfigs.yaml b/example/prometheus-operator-crd-full/monitoring.coreos.com_alertmanagerconfigs.yaml
diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagerconfigs.yaml
diff --git a/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json b/jsonnet/prometheus-operator/alertmanagerconfigs-crd.json
@@ -262,6 +262,13 @@
                                 "type": "object",
                                 "x-kubernetes-map-type": "atomic"
                               },
+                              "avatarURL": {
+                                "type": "string"
+                              },
+                              "content": {
+                                "description": "The template of the content's body.",
+                                "type": "string"
+                              },
                               "httpConfig": {
                                 "description": "HTTP client configuration.",
                                 "properties": {
@@ -910,6 +917,9 @@
                               "title": {
                                 "description": "The template of the message's title.",
                                 "type": "string"
+                              },
+                              "username": {
+                                "type": "string"
                               }
                             },
                             "required": [

diff --git a/jsonnet/prometheus-operator/alertmanagerconfigs-v1beta1-crd.libsonnet b/jsonnet/prometheus-operator/alertmanagerconfigs-v1beta1-crd.libsonnet
@@ -134,6 +134,13 @@
                             type: 'object',
                             'x-kubernetes-map-type': 'atomic',
                           },
+                          avatarURL: {
+                            type: 'string',
+                          },
+                          content: {
+                            description: "The template of the content's body.",
+                            type: 'string',
+                          },
                           httpConfig: {
                             description: 'HTTP client configuration.',
                             properties: {
@@ -780,6 +787,9 @@
                             description: "The template of the message's title.",
                             type: 'string',
                           },
+                          username: {
+                            type: 'string',
+                          },
                         },
                         required: [
                           'apiURL',

diff --git a/pkg/alertmanager/amcfg.go b/pkg/alertmanager/amcfg.go
@@ -760,6 +760,18 @@ func (cb *configBuilder) convertDiscordConfig(ctx context.Context, in monitoring
 		out.Message = *in.Message
 	}
 
+	if in.Content != nil && *in.Content != "" {
+		out.Content = *in.Content
+	}
+
+	if in.Username != nil && *in.Username != "" {
+		out.Username = *in.Username
+	}
+
+	if in.AvatarURL != nil && *in.AvatarURL != "" {
+		out.AvatarURL = *in.AvatarURL
+	}
+
 	url, err := cb.getValidURLFromSecret(ctx, crKey.Namespace, in.APIURL)
 	if err != nil {
 		return nil, err

diff --git a/pkg/alertmanager/types.go b/pkg/alertmanager/types.go
@@ -367,6 +367,9 @@ type discordConfig struct {
 	WebhookURL    string            `yaml:"webhook_url,omitempty"`
 	Title         string            `yaml:"title,omitempty"`
 	Message       string            `yaml:"message,omitempty"`
+	Content       string            `yaml:"content,omitempty"`
+	Username      string            `yaml:"username,omitempty"`
+	AvatarURL     string            `yaml:"avatar_url,omitempty"`
 }
 
 type webexConfig struct {

diff --git a/pkg/apis/monitoring/v1alpha1/alertmanager_config_types.go b/pkg/apis/monitoring/v1alpha1/alertmanager_config_types.go
@@ -299,6 +299,13 @@ type DiscordConfig struct {
 	// HTTP client configuration.
 	// +optional
 	HTTPConfig *HTTPConfig `json:"httpConfig,omitempty"`
+	// The template of the content's body.
+	// +optional
+	Content *string `json:"content,omitempty"`
+	// +optional
+	Username *string `json:"username,omitempty"`
+	// +optional
+	AvatarURL *string `json:"avatarURL,omitempty"`
 }
 
 // SlackConfig configures notifications via Slack.

diff --git a/pkg/apis/monitoring/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/monitoring/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/monitoring/v1beta1/alertmanager_config_types.go b/pkg/apis/monitoring/v1beta1/alertmanager_config_types.go
@@ -295,6 +295,14 @@ type DiscordConfig struct {
 	// HTTP client configuration.
 	// +optional
 	HTTPConfig *HTTPConfig `json:"httpConfig,omitempty"`
+
+	// The template of the content's body.
+	// +optional
+	Content *string `json:"content,omitempty"`
+	// +optional
+	Username *string `json:"username,omitempty"`
+	// +optional
+	AvatarURL *string `json:"avatarURL,omitempty"`
 }
 
 // SlackConfig configures notifications via Slack.

diff --git a/pkg/apis/monitoring/v1beta1/conversion_from.go b/pkg/apis/monitoring/v1beta1/conversion_from.go
@@ -267,6 +267,9 @@ func convertDiscordConfigFrom(in v1alpha1.DiscordConfig) DiscordConfig {
 		Title:        in.Title,
 		Message:      in.Message,
 		SendResolved: in.SendResolved,
+		Content:      in.Content,
+		Username:     in.Username,
+		AvatarURL:    in.AvatarURL,
 	}
 }
 

diff --git a/pkg/apis/monitoring/v1beta1/conversion_to.go b/pkg/apis/monitoring/v1beta1/conversion_to.go
@@ -263,6 +263,9 @@ func convertDiscordConfigTo(in DiscordConfig) v1alpha1.DiscordConfig {
 		Title:        in.Title,
 		Message:      in.Message,
 		SendResolved: in.SendResolved,
+		Content:      in.Content,
+		Username:     in.Username,
+		AvatarURL:    in.AvatarURL,
 	}
 }
 

diff --git a/pkg/apis/monitoring/v1beta1/zz_generated.deepcopy.go b/pkg/apis/monitoring/v1beta1/zz_generated.deepcopy.go
diff --git a/pkg/client/applyconfiguration/monitoring/v1alpha1/discordconfig.go b/pkg/client/applyconfiguration/monitoring/v1alpha1/discordconfig.go