From 4c7bf51ba558b78828bb51333d467d0690de19fc Mon Sep 17 00:00:00 2001 From: Michael Marod Date: Wed, 25 Feb 2026 18:54:53 -0800 Subject: [PATCH 1/2] Revert "Fix app_tel_for_sok app.conf install stanza header (#1724)" This reverts commit 7fa8698921a131ac7f120d8afb57a5e82d55f60c. --- .../workflows/arm-AL2023-build-test-push-workflow-AL2023.yml | 1 - .github/workflows/arm-Ubuntu-build-test-push-workflow.yml | 1 - .github/workflows/build-test-push-workflow.yml | 1 - .github/workflows/distroless-build-test-push-workflow.yml | 1 - .github/workflows/prodsec-workflow.yml | 1 - pkg/splunk/enterprise/names.go | 4 ++-- 6 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml b/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml index 4369ac1eb..0a6ac60e9 100644 --- a/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml +++ b/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml @@ -49,7 +49,6 @@ jobs: - name: Run Unit Tests run: make test - name: Run Code Coverage - if: ${{ secrets.COVERALLS_TOKEN != '' }} run: goveralls -coverprofile=coverage.out -service=circle-ci -repotoken ${{ secrets.COVERALLS_TOKEN }} - name: Upload Coverage artifacts uses: actions/upload-artifact@v4.4.0 diff --git a/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml b/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml index b27ac0edb..8922bf89b 100644 --- a/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml +++ b/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml @@ -49,7 +49,6 @@ jobs: - name: Run Unit Tests run: make test - name: Run Code Coverage - if: ${{ secrets.COVERALLS_TOKEN != '' }} run: goveralls -coverprofile=coverage.out -service=circle-ci -repotoken ${{ secrets.COVERALLS_TOKEN }} - name: Upload Coverage artifacts uses: actions/upload-artifact@v4.4.0 diff --git a/.github/workflows/build-test-push-workflow.yml b/.github/workflows/build-test-push-workflow.yml index 8cf8aeab6..6eb9cd142 100644 --- a/.github/workflows/build-test-push-workflow.yml +++ b/.github/workflows/build-test-push-workflow.yml @@ -61,7 +61,6 @@ jobs: run: | make test - name: Run Code Coverage - if: ${{ secrets.COVERALLS_TOKEN != '' }} run: goveralls -shallow -coverprofile=coverage.out -service=circle-ci -repotoken ${{ secrets.COVERALLS_TOKEN }} - name: Upload Coverage artifacts uses: actions/upload-artifact@v4.4.0 diff --git a/.github/workflows/distroless-build-test-push-workflow.yml b/.github/workflows/distroless-build-test-push-workflow.yml index 0912a341d..bc0b6b0ed 100644 --- a/.github/workflows/distroless-build-test-push-workflow.yml +++ b/.github/workflows/distroless-build-test-push-workflow.yml @@ -55,7 +55,6 @@ jobs: - name: Run Unit Tests run: make test - name: Run Code Coverage - if: ${{ secrets.COVERALLS_TOKEN != '' }} run: goveralls -shallow -coverprofile=coverage.out -service=circle-ci -repotoken ${{ secrets.COVERALLS_TOKEN }} - name: Upload Coverage artifacts uses: actions/upload-artifact@v4.4.0 diff --git a/.github/workflows/prodsec-workflow.yml b/.github/workflows/prodsec-workflow.yml index 777075246..64fe43b9a 100644 --- a/.github/workflows/prodsec-workflow.yml +++ b/.github/workflows/prodsec-workflow.yml @@ -39,7 +39,6 @@ jobs: id: dotenv uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359 - name: Run FOSSA Test - if: ${{ secrets.FOSSA_API_TOKEN != '' }} uses: fossas/fossa-action@main with: api-key: ${{secrets.FOSSA_API_TOKEN}} \ No newline at end of file diff --git a/pkg/splunk/enterprise/names.go b/pkg/splunk/enterprise/names.go index e49782f59..623f361f8 100644 --- a/pkg/splunk/enterprise/names.go +++ b/pkg/splunk/enterprise/names.go @@ -201,10 +201,10 @@ access = read : [ * ], write : [ admin ] ` // Command to create telemetry app on non SHC scenarios - createTelAppNonShcString = "mkdir -p /opt/splunk/etc/apps/app_tel_for_sok/default/; mkdir -p /opt/splunk/etc/apps/app_tel_for_sok/metadata/; printf '%%s' \"%s\" > /opt/splunk/etc/apps/app_tel_for_sok/default/app.conf; printf '%%s' \"%s\" > /opt/splunk/etc/apps/app_tel_for_sok/metadata/default.meta" + createTelAppNonShcString = "mkdir -p /opt/splunk/etc/apps/app_tel_for_sok/default/; mkdir -p /opt/splunk/etc/apps/app_tel_for_sok/metadata/; echo -e \"%s\" > /opt/splunk/etc/apps/app_tel_for_sok/default/app.conf; echo -e \"%s\" > /opt/splunk/etc/apps/app_tel_for_sok/metadata/default.meta" // Command to create telemetry app on SHC scenarios - createTelAppShcString = "mkdir -p %s/app_tel_for_sok/default/; mkdir -p %s/app_tel_for_sok/metadata/; printf '%%s' \"%s\" > %s/app_tel_for_sok/default/app.conf; printf '%%s' \"%s\" > %s/app_tel_for_sok/metadata/default.meta" + createTelAppShcString = "mkdir -p %s/app_tel_for_sok/default/; mkdir -p %s/app_tel_for_sok/metadata/; echo -e \"%s\" > %s/app_tel_for_sok/default/app.conf; echo -e \"%s\" > %s/app_tel_for_sok/metadata/default.meta" // Command to reload app configuration telAppReloadString = "curl -k -u admin:`cat /mnt/splunk-secrets/password` https://localhost:8089/services/apps/local/_reload" From 4879080eda4bcc2d205c64e3f5dabe21b09ef6e4 Mon Sep 17 00:00:00 2001 From: vivekr-splunk <94569031+vivekr-splunk@users.noreply.github.com> Date: Thu, 26 Feb 2026 13:09:00 -0800 Subject: [PATCH 2/2] Recreate telemetry app install stanza fix from #1724 (#1729) Co-authored-by: Michael Marod --- pkg/splunk/enterprise/names.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/splunk/enterprise/names.go b/pkg/splunk/enterprise/names.go index 623f361f8..e49782f59 100644 --- a/pkg/splunk/enterprise/names.go +++ b/pkg/splunk/enterprise/names.go @@ -201,10 +201,10 @@ access = read : [ * ], write : [ admin ] ` // Command to create telemetry app on non SHC scenarios - createTelAppNonShcString = "mkdir -p /opt/splunk/etc/apps/app_tel_for_sok/default/; mkdir -p /opt/splunk/etc/apps/app_tel_for_sok/metadata/; echo -e \"%s\" > /opt/splunk/etc/apps/app_tel_for_sok/default/app.conf; echo -e \"%s\" > /opt/splunk/etc/apps/app_tel_for_sok/metadata/default.meta" + createTelAppNonShcString = "mkdir -p /opt/splunk/etc/apps/app_tel_for_sok/default/; mkdir -p /opt/splunk/etc/apps/app_tel_for_sok/metadata/; printf '%%s' \"%s\" > /opt/splunk/etc/apps/app_tel_for_sok/default/app.conf; printf '%%s' \"%s\" > /opt/splunk/etc/apps/app_tel_for_sok/metadata/default.meta" // Command to create telemetry app on SHC scenarios - createTelAppShcString = "mkdir -p %s/app_tel_for_sok/default/; mkdir -p %s/app_tel_for_sok/metadata/; echo -e \"%s\" > %s/app_tel_for_sok/default/app.conf; echo -e \"%s\" > %s/app_tel_for_sok/metadata/default.meta" + createTelAppShcString = "mkdir -p %s/app_tel_for_sok/default/; mkdir -p %s/app_tel_for_sok/metadata/; printf '%%s' \"%s\" > %s/app_tel_for_sok/default/app.conf; printf '%%s' \"%s\" > %s/app_tel_for_sok/metadata/default.meta" // Command to reload app configuration telAppReloadString = "curl -k -u admin:`cat /mnt/splunk-secrets/password` https://localhost:8089/services/apps/local/_reload"