Merge 8ea7456812d6f8b53d11c2aa26f6a2645b83322f into 79bab15541c800da05baff491de5bd2891173919

free up more disk space
free up disk space
2026-05-22 14:04:28 +00:00 · 2025-11-25 00:21:24 +01:00 · 2025-11-24 23:04:23 +01:00 · 2025-11-24 20:29:33 +01:00 · 2025-11-24 19:33:30 +01:00 · 2025-11-24 19:31:46 +01:00
5 changed files with 338 additions and 3 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -19,9 +19,8 @@ jobs:
      - name: Available platforms
        run: echo ${{ steps.buildx.outputs.platforms }}
      - name: Install Podman
-        run: sudo apt update && sudo apt install -y podman
-      - name: Free up some disk space
-        run: sudo apt-get remove -y '^aspnetcore-.*' && sudo apt-get remove -y '^dotnet-.*' --fix-missing && sudo apt-get remove -y 'php.*' --fix-missing && sudo apt-get remove -y '^mongodb-.*' --fix-missing && sudo apt-get remove -y '^mysql-.*' --fix-missing && sudo apt-get remove -y google-cloud-sdk --fix-missing && sudo apt-get autoremove -y && sudo apt-get clean && sudo rm -rf /usr/share/dotnet && sudo rm -rf /usr/local/lib/android
+        run: sudo apt update && sudo apt install -y podman 
+ 
  build:
    runs-on: ubuntu-24.04
    needs: setup
@ -34,10 +33,49 @@ jobs:
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Free up disk space
+        run: |
+          # Remove Java (JDKs)
+          sudo rm -rf /usr/lib/jvm
+
+          # Remove .NET SDKs
+          sudo rm -rf /usr/share/dotnet
+
+          # Remove Swift toolchain
+          sudo rm -rf /usr/share/swift
+
+          # Remove Haskell (GHC)
+          sudo rm -rf /usr/local/.ghcup
+
+          # Remove Julia
+          sudo rm -rf /usr/local/julia*
+
+          # Remove Android SDKs
+          sudo rm -rf /usr/local/lib/android
+
+          # Remove Chromium
+          sudo rm -rf /usr/local/share/chromium
+
+          # Remove Microsoft/Edge and Google Chrome builds
+          sudo rm -rf /opt/microsoft /opt/google
+
+          # Remove Azure CLI
+          sudo rm -rf /opt/az
+
+          # Remove PowerShell
+          sudo rm -rf /usr/local/share/powershell
+
+          # Remove CodeQL and other toolcaches
+          sudo rm -rf /opt/hostedtoolcache
+
+          docker system prune -af || true
+          docker builder prune -af || true
+          df -h
      - name: Build
        env:
          VERSION: ${{ github.run_number }}
        run: |
+          df -h
          echo "Start CI build"
          docker run --privileged --rm tonistiigi/binfmt --install all
          podman manifest create build
--- a/.github/workflows/release-dev-version.yml
+++ b/.github/workflows/release-dev-version.yml
@ -32,6 +32,45 @@ jobs:
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Free up disk space
+        run: |
+          # Remove Java (JDKs)
+          sudo rm -rf /usr/lib/jvm
+
+          # Remove .NET SDKs
+          sudo rm -rf /usr/share/dotnet
+
+          # Remove Swift toolchain
+          sudo rm -rf /usr/share/swift
+
+          # Remove Haskell (GHC)
+          sudo rm -rf /usr/local/.ghcup
+
+          # Remove Julia
+          sudo rm -rf /usr/local/julia*
+
+          # Remove Android SDKs
+          sudo rm -rf /usr/local/lib/android
+
+          # Remove Chromium
+          sudo rm -rf /usr/local/share/chromium
+
+          # Remove Microsoft/Edge and Google Chrome builds
+          sudo rm -rf /opt/microsoft /opt/google
+
+          # Remove Azure CLI
+          sudo rm -rf /opt/az
+
+          # Remove PowerShell
+          sudo rm -rf /usr/local/share/powershell
+
+          # Remove CodeQL and other toolcaches
+          sudo rm -rf /opt/hostedtoolcache
+
+          docker system prune -af || true
+          docker builder prune -af || true
+          df -h
+
      - name: Release
        env:
          VERSION: ${{ github.event.inputs.version }}
--- a/.github/workflows/release-productive-version.yml
+++ b/.github/workflows/release-productive-version.yml
@ -32,6 +32,45 @@ jobs:
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Free up disk space
+        run: |
+          # Remove Java (JDKs)
+          sudo rm -rf /usr/lib/jvm
+
+          # Remove .NET SDKs
+          sudo rm -rf /usr/share/dotnet
+
+          # Remove Swift toolchain
+          sudo rm -rf /usr/share/swift
+
+          # Remove Haskell (GHC)
+          sudo rm -rf /usr/local/.ghcup
+
+          # Remove Julia
+          sudo rm -rf /usr/local/julia*
+
+          # Remove Android SDKs
+          sudo rm -rf /usr/local/lib/android
+
+          # Remove Chromium
+          sudo rm -rf /usr/local/share/chromium
+
+          # Remove Microsoft/Edge and Google Chrome builds
+          sudo rm -rf /opt/microsoft /opt/google
+
+          # Remove Azure CLI
+          sudo rm -rf /opt/az
+
+          # Remove PowerShell
+          sudo rm -rf /usr/local/share/powershell
+
+          # Remove CodeQL and other toolcaches
+          sudo rm -rf /opt/hostedtoolcache
+
+          docker system prune -af || true
+          docker builder prune -af || true
+          df -h
+
      - name: Release
        env:
          VERSION: ${{ github.event.inputs.version }}
--- a/src/api/graylogapi.go
+++ b/src/api/graylogapi.go
@ -0,0 +1,211 @@
+package api
+
+import (
+	"encoding/json"
+	"errors"
+	"strconv"
+	"strings"
+	"fmt"
+
+	_ "runtime/debug"
+	_ "github.com/yassinebenaid/godump"
+
+	"github.com/gin-gonic/gin"
+	log "github.com/sirupsen/logrus"
+
+	"github.com/bbernhard/signal-cli-rest-api/client"
+)
+
+type AlertManagerNotification struct {
+	Receiver          string      `json:"receiver"`
+	Status            string      `json:"status"`
+	Alerts            []Alert     `json:"alerts"`
+	GroupLabels       Labels      `json:"groupLabels"`
+	CommonLabels      Labels      `json:"commonLabels"`
+	CommonAnnotations Annotations `json:"commonAnnotations"`
+	ExternalURL       string      `json:"externalURL"`
+	Version           string      `json:"version"`
+	GroupKey          string      `json:"groupKey"`
+	TruncatedAlerts   int64       `json:"truncatedAlerts"`
+	OrgID             int64       `json:"orgId"`
+	Title             string      `json:"title"`
+	State             string      `json:"state"`
+	Message           string      `json:"message"`
+}
+
+type Alert struct {
+	Status       string      `json:"status"`
+	Labels       Labels      `json:"labels"`
+	Annotations  Annotations `json:"annotations"`
+	StartsAt     string      `json:"startsAt"`
+	EndsAt       string      `json:"endsAt"`
+	GeneratorURL string      `json:"generatorURL"`
+	Fingerprint  string      `json:"fingerprint"`
+	SilenceURL   string      `json:"silenceURL"`
+	DashboardURL string      `json:"dashboardURL"`
+	PanelURL     string      `json:"panelURL"`
+	Values       interface{} `json:"values"`
+	ValueString  string      `json:"valueString"`
+}
+
+type Annotations struct {
+	Summary string `json:"summary"`
+}
+
+type Labels struct {
+	Alertname string `json:"alertname"`
+	Instance  string `json:"instance"`
+}
+
+type GrafanaMessage struct {
+	Number           string   `json:"number"`
+	Recipients       string   `json:"recipients"`
+	Message          string   `json:"message"`
+}
+
+type GraylogNotification struct {
+	EventDefinitionID          string        `json:"event_definition_id"`
+	EventDefinitionType        string        `json:"event_definition_type"`
+	EventDefinitionTitle       string        `json:"event_definition_title"`
+	EventDefinitionDescription string        `json:"event_definition_description"`
+	JobDefinitionID            string        `json:"job_definition_id"`
+	JobTriggerID               string        `json:"job_trigger_id"`
+	Event                      GraylogEvent  `json:"event"`
+	Backlog                    []interface{} `json:"backlog"`
+}
+
+type GraylogEvent struct {
+	ID                  string        `json:"id"`
+	EventDefinitionType string        `json:"event_definition_type"`
+	EventDefinitionID   string        `json:"event_definition_id"`
+	OriginContext       string        `json:"origin_context"`
+	Timestamp           string        `json:"timestamp"`
+	TimestampProcessing string        `json:"timestamp_processing"`
+	TimerangeStart      interface{}   `json:"timerange_start"`
+	TimerangeEnd        interface{}   `json:"timerange_end"`
+	Streams             []string      `json:"streams"`
+	SourceStreams       []interface{} `json:"source_streams"`
+	Message             string        `json:"message"`
+	Source              string        `json:"source"`
+	KeyTuple            []string      `json:"key_tuple"`
+	Key                 string        `json:"key"`
+	Priority            int64         `json:"priority"`
+	Alert               bool          `json:"alert"`
+	Fields              Fields        `json:"fields"`
+}
+
+type Fields struct {
+	Recipients string `json:"recipients"`
+	FromNumber string `json:"fromnumber"`
+	Message    string `json:"message"`
+}
+
+// @Summary Send a signal message.
+// @Tags Messages
+// @Description Send a signal message. Set the text_mode to 'styled' in case you want to add formatting to your text message. Styling Options: *italic text*, **bold text**, ~strikethrough text~.
+// @Accept  json
+// @Produce  json
+// @Success 201 {object} SendMessageResponse
+// @Failure 400 {object} SendMessageError
+// @Param data body SendMessageV2 true "Input Data"
+// @Router /v2/send [post]
+func (a *Api) SendAlertManagerV2(c *gin.Context) {
+	var req AlertManagerNotification
+	var msg GrafanaMessage
+	base64Attachments := []string{}
+
+	err := c.BindJSON(&req)
+	if err != nil {
+		c.JSON(400, gin.H{"error": "Couldn't process request - invalid request"})
+		log.Error(err.Error())
+		return
+	}
+
+	//fmt.Printf(">>>%s\n",[]byte(req.Message))
+
+	// Unmarshal or Decode the JSON to the interface.
+	json.Unmarshal([]byte(req.Message), &msg)
+
+//	timestamp, err := a.signalClient.SendV1(msg.Number, msg.Message, msg.Recipients, base64Attachments, msg.IsGroup)
+//	if err != nil {
+//		c.JSON(400, Error{Msg: err.Error()})
+//		return
+//	}
+//	c.JSON(201, SendMessageResponse{Timestamp: strconv.FormatInt(timestamp.Timestamp, 10)})
+
+        data, err := a.signalClient.SendV2(msg.Number, msg.Message, strings.Split(msg.Recipients,","), base64Attachments, "", nil, nil, nil, nil, nil, nil, nil, nil)
+
+        if err != nil {
+                switch err.(type) {
+                case *client.RateLimitErrorType:
+                        if rateLimitError, ok := err.(*client.RateLimitErrorType); ok {
+                                extendedError := errors.New(err.Error() + ". Use the attached challenge tokens to lift the rate limit restrictions via the '/v1/accounts/{number}/rate-limit-challenge' endpoint.")
+                                c.JSON(429, SendMessageError{Msg: extendedError.Error(), ChallengeTokens: rateLimitError.ChallengeTokens, Account: msg.Number})
+                                return
+                        } else {
+                                c.JSON(400, Error{Msg: err.Error()})
+                                return
+                        }
+                default:
+                        c.JSON(400, Error{Msg: err.Error()})
+                        return
+                }
+                c.JSON(400, Error{Msg: err.Error()})
+                return
+        }
+
+        c.JSON(201, SendMessageResponse{Timestamp: strconv.FormatInt((*data)[0].Timestamp, 10)})
+
+}
+
+// @Summary Send a signal message.
+// @Tags Messages
+// @Description Send a signal message. Set the text_mode to 'styled' in case you want to add formatting to your text message. Styling Options: *italic text*, **bold text**, ~strikethrough text~.
+// @Accept  json
+// @Produce  json
+// @Success 201 {object} SendMessageResponse
+// @Failure 400 {object} SendMessageError
+// @Param data body SendMessageV2 true "Input Data"
+// @Router /v2/send [post]
+func (a *Api) SendGraylogNotificationV2(c *gin.Context) {
+        var req GraylogNotification
+        base64Attachments := []string{}
+       // jsonData,err2 := io.ReadAll(c.Request.Body)
+	//if err2 != nil {
+	//	log.Error(err2.Error())
+	//}
+	//fmt.Printf("<<<%s\n",jsonData)
+
+        err := c.BindJSON(&req)
+        if err != nil {
+                c.JSON(400, gin.H{"error": "Couldn't process request - invalid requestttttt"})
+                log.Error(err.Error())
+		fmt.Printf("<<<%s\n",c.Request.Body)
+                return
+        }
+
+	data, err := a.signalClient.SendV2(req.Event.Fields.FromNumber, req.Event.Fields.Message, strings.Split(req.Event.Fields.Recipients,","), base64Attachments, "", nil, nil, nil, nil, nil, nil, nil, nil)
+
+        if err != nil {
+                switch err.(type) {
+                case *client.RateLimitErrorType:
+                        if rateLimitError, ok := err.(*client.RateLimitErrorType); ok {
+                                extendedError := errors.New(err.Error() + ". Use the attached challenge tokens to lift the rate limit restrictions via the '/v1/accounts/{number}/rate-limit-challenge' endpoint.")
+                                c.JSON(429, SendMessageError{Msg: extendedError.Error(), ChallengeTokens: rateLimitError.ChallengeTokens, Account: req.Event.Fields.FromNumber})
+                                return
+                        } else {
+                                c.JSON(400, Error{Msg: err.Error()})
+                                return
+                        }
+                default:
+                        c.JSON(400, Error{Msg: err.Error()})
+                        return
+                }
+                c.JSON(400, Error{Msg: err.Error()})
+                return
+        }
+
+        c.JSON(201, SendMessageResponse{Timestamp: strconv.FormatInt((*data)[0].Timestamp, 10)})
+}
+
+
--- a/src/main.go
+++ b/src/main.go
@ -356,6 +356,14 @@ func main() {
 		{
 			sendV2.POST("", api.SendV2)
 		}
+		sendalertmanagerV2 := v2.Group("/sendalertmanager")
+		{
+			sendalertmanagerV2.POST("", api.SendAlertManagerV2)
+		}
+		sendgraylognotificationV2 := v2.Group("/sendgraylognotification")
+		{
+			sendgraylognotificationV2.POST("", api.SendGraylogNotificationV2)
+		}
 	}

 	protocol := "http"
Author	SHA1	Message	Date
Hugo	263a1d31fa	Merge 8ea7456812d6f8b53d11c2aa26f6a2645b83322f into 79bab15541c800da05baff491de5bd2891173919	2025-11-25 00:21:24 +01:00
Bernhard B	79bab15541	free up more disk space	2025-11-24 23:04:23 +01:00
Bernhard B	cbfc6b9e94	free up disk space	2025-11-24 20:29:33 +01:00
Bernhard B	6325cb2fe4	fixed syntax error in YAML file	2025-11-24 19:33:30 +01:00
Bernhard B	d42f6d04c5	fixed syntax error in YAML file	2025-11-24 19:31:46 +01:00
Bernhard B	48ebe4f98c	fixed syntax in YAML file	2025-11-24 19:30:13 +01:00
Bernhard B	990a300ca7	free up disk space in CI	2025-11-24 19:27:47 +01:00
Bernhard B	e0f4517f00	debugging: print out disk space	2025-11-24 19:21:30 +01:00
Bernhard B	8713741e94	free up more disk space	2025-11-24 18:10:12 +01:00
Hugo	8ea7456812	Add files via upload added 2 API registrations : /api/v2/sendalertmanager /api/v2/sendgraylognotification	2024-12-24 08:45:50 +01:00
Hugo	95c14a5f2b	Add files via upload Additional functions to process calls from Graylog or Grafana. Grafana uses the AlertManager structure, so all tools using this structure can use this.	2024-12-24 08:43:15 +01:00