From af7b14299d2ae55efdd9a92f62d33d7408eabd9d Mon Sep 17 00:00:00 2001 From: Christopher Fenner Date: Mon, 20 Jan 2025 10:39:23 +0100 Subject: [PATCH 1/3] expose orchestrator to splunk --- pkg/splunk/data.go | 1 + pkg/splunk/splunk.go | 1 + 2 files changed, 2 insertions(+) diff --git a/pkg/splunk/data.go b/pkg/splunk/data.go index 740713b89a..2debc7a8bc 100644 --- a/pkg/splunk/data.go +++ b/pkg/splunk/data.go @@ -18,6 +18,7 @@ type Details struct { type MonitoringData struct { PipelineUrlHash string `json:"PipelineUrlHash,omitempty"` BuildUrlHash string `json:"BuildUrlHash,omitempty"` + Orchestrator string `json:"Orchestrator,omitempty"` StageName string `json:"StageName,omitempty"` StepName string `json:"StepName,omitempty"` ExitCode string `json:"ExitCode,omitempty"` diff --git a/pkg/splunk/splunk.go b/pkg/splunk/splunk.go index 1ce1190516..e23a8cae44 100644 --- a/pkg/splunk/splunk.go +++ b/pkg/splunk/splunk.go @@ -114,6 +114,7 @@ func (s *Splunk) prepareTelemetry(telemetryData telemetry.Data) MonitoringData { monitoringData := MonitoringData{ PipelineUrlHash: telemetryData.PipelineURLHash, BuildUrlHash: telemetryData.BuildURLHash, + Orchestrator: telemetryData.Orchestrator, StageName: telemetryData.StageName, StepName: telemetryData.BaseData.StepName, ExitCode: telemetryData.CustomData.ErrorCode, From de03aaa2191517d78fb9863d8211df674748ea70 Mon Sep 17 00:00:00 2001 From: Christopher Fenner Date: Tue, 21 Jan 2025 09:07:02 +0100 Subject: [PATCH 2/3] update test case --- pkg/splunk/splunk_test.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/splunk/splunk_test.go b/pkg/splunk/splunk_test.go index 8f7f580931..57706096fe 100644 --- a/pkg/splunk/splunk_test.go +++ b/pkg/splunk/splunk_test.go @@ -354,7 +354,9 @@ func Test_prepareTelemetry(t *testing.T) { {name: "Testing prepare telemetry information", args: args{ telemetryData: telemetry.Data{ - BaseData: telemetry.BaseData{}, + BaseData: telemetry.BaseData{ + Orchestrator: "Jenkins", + }, CustomData: telemetry.CustomData{ Duration: "1234", ErrorCode: "0", @@ -365,6 +367,7 @@ func Test_prepareTelemetry(t *testing.T) { want: MonitoringData{ PipelineUrlHash: "", BuildUrlHash: "", + Orchestrator: "Jenkins", StageName: "", StepName: "", ExitCode: "0", From 99f935c5c627b0239f9c60ddd0b116320236fb20 Mon Sep 17 00:00:00 2001 From: Christopher Fenner Date: Tue, 21 Jan 2025 09:18:20 +0100 Subject: [PATCH 3/3] fix format --- pkg/splunk/splunk_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/splunk/splunk_test.go b/pkg/splunk/splunk_test.go index 57706096fe..2cc9188d0a 100644 --- a/pkg/splunk/splunk_test.go +++ b/pkg/splunk/splunk_test.go @@ -367,7 +367,7 @@ func Test_prepareTelemetry(t *testing.T) { want: MonitoringData{ PipelineUrlHash: "", BuildUrlHash: "", - Orchestrator: "Jenkins", + Orchestrator: "Jenkins", StageName: "", StepName: "", ExitCode: "0",