Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/technical addon/v1.4.0 #5872

Merged
merged 2 commits into from
Feb 6, 2025
+4 −4
Merged

Release/technical addon/v1.4.0 #5872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ae10fc
Updates TA to splunk-otel-collector v and marks TA as v1.4.0
hughesjj Feb 6, 2025
d1a6699
update test to 118
hughesjj Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packaging/technical-addon/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Used for building
SOURCE_DIR?=$(dir $(abspath $(lastword $(MAKEFILE_LIST))))
BUILD_DIR?=$(realpath .)/build
OTEL_COLLECTOR_VERSION?=0.111.0
OTEL_COLLECTOR_VERSION?=0.118.0
SPLUNK_OTELCOL_DOWNLOAD_BASE?=https://github.com/signalfx/splunk-otel-collector/releases/download
PLATFORM?=linux
ARCH?=amd64
Expand Down
4 changes: 2 additions & 2 deletions packaging/technical-addon/Splunk_TA_otel/default/app.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ label = Splunk Add-on for OpenTelemetry Agent
[launcher]
author = Splunk, Inc.
description = Splunk Add-on for OpenTelemetry is used to easily deploy OpenTelemetry Agent alongside Splunk Universal Forwarder to collect traces and metrics
version = 1.3.3
version = 1.4.0

[package]
id = Splunk_TA_otel

[id]
name = Splunk_TA_otel
version = 1.3.3
version = 1.4.0
2 changes: 1 addition & 1 deletion packaging/technical-addon/packaging-scripts/cicd-tests/happypath-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ fi
# For release, ensure version is as expected. TODO move this to another test and compare against tag
actual_version="$(grep "Version" "$TEST_FOLDER/splunk/otel.log" | head -1 | awk -F 'Version": "' '{print $2}' | awk -F '", "' '{print $1}')"
echo "actual version: $actual_version"
[[ "$actual_version" != "v0.111.0" ]] && echo "Test failed -- invalid version" && exit 1
[[ "$actual_version" != "v0.118.0" ]] && echo "Test failed -- invalid version" && exit 1

# clean up orca container
splunk_orca --cloud ${ORCA_CLOUD} destroy "${deployment_id}"
Expand Down