splunk · szymonjas · Aug 26, 2025 · Sep 4, 2024 · Apr 9, 2025 · Apr 9, 2025
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -2,6 +2,6 @@ version: 2
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
-    target-branch: "master"
+    target-branch: "develop"
     schedule:
       interval: "weekly"
diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
@@ -0,0 +1,6 @@
+name: Fossa OSS Scan
+on: [push]
+jobs:
+  fossa-scan:
+    uses: splunk/oss-scanning-public/.github/workflows/oss-scan.yml@main
+    secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,20 +6,21 @@ on:
 jobs:
   publish:
     name: Deploy Release to PyPI
-    runs-on: ubuntu-latest
+    # Last version with Python 3.7 binaries available
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout source
-        uses: actions/checkout@v3
+        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@9322b3ca74000aeb2c01eb777b646334015ddd72
         with:
           python-version: 3.7
       - name: Install dependencies
         run: pip install twine
       - name: Build package
         run: python setup.py sdist
       - name: Publish package to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.8.10
+        uses: pypa/gh-action-pypi-publish@d417ba7e7683fa9104c42abe611c1f2c93c0727d
         with:
           user: __token__
           password: ${{ secrets.pypi_password }}
@@ -29,14 +30,14 @@ jobs:
         run: |
           rm -rf ./docs/_build
           tox -e docs
-      - name : Docs Upload
-        uses: actions/upload-artifact@v3
+      - name: Docs Upload
+        uses: actions/upload-artifact@de65e23aa2b7e23d713bb51fbfcb6d502f8667d8
         with:
           name: python_sdk_docs
           path: docs/_build/html
       # Test upload
       # - name: Publish package to TestPyPI
-      #   uses: pypa/gh-action-pypi-publish@master
+      #   uses: pypa/gh-action-pypi-publish@d417ba7e7683fa9104c42abe611c1f2c93c0727d
       #   with:
       #     user: __token__
       #     password: ${{ secrets.test_pypi_password }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,40 +1,35 @@
 name: Python CI
-
-on:
-  [ push, pull_request, workflow_dispatch ]
+on: [push, workflow_dispatch]
 
 jobs:
   build:
-
     runs-on: ${{ matrix.os }}
     strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-        python: [ 3.7, 3.9, 3.13]
-        splunk-version:
-          - "8.1"
-          - "8.2"
-          - "latest"
       fail-fast: false
-
+      matrix:
+        os: [ubuntu-latest]
+        python-version: [3.9]
+        splunk-version: [9.4, latest]
+        include:
+          # Oldest possible configuration
+          # Last Ubuntu version with Python 3.7 binaries available
+          - os: ubuntu-22.04
+            python-version: 3.7
+            splunk-version: 9.1
+          # Latest possible configuration
+          - os: ubuntu-latest
+            python-version: 3.13
+            splunk-version: latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
-
+        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493
       - name: Run docker compose
-        run: SPLUNK_VERSION=${{matrix.splunk-version}} docker compose up -d
-
+        run: SPLUNK_VERSION=${{ matrix.splunk-version }} docker compose up -d
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@9322b3ca74000aeb2c01eb777b646334015ddd72
         with:
-          python-version: ${{ matrix.python }}
-
+          python-version: ${{ matrix.python-version }}
       - name: Install tox
         run: pip install tox
-
       - name: Test Execution
         run: tox -e py
-  fossa-scan:
-    uses: splunk/oss-scanning-public/.github/workflows/oss-scan.yml@main
-    secrets: inherit
diff --git a/.gitignore b/.gitignore
@@ -11,18 +11,14 @@ __stdout__
 docs/_build
 build/
 proxypid
-proxy.log
 MANIFEST
 coverage_report
-test.log
-tests/searchcommands_data/log/
-tests/searchcommands_data/output/
 Test Results*.html
-tests/searchcommands/data/app/app.log
+*.log
 splunk_sdk.egg-info/
 dist/
-tests/searchcommands/apps/app_with_logging_configuration/*.log
 *.observed
 venv/
+.venv/
 .tox
 test-reports/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Splunk Enterprise SDK for Python Changelog
 
+## Version 2.1.1
+
+### Changes
+* [#623](https://github.com/splunk/splunk-sdk-python/pull/623/) Additional logging in custom search commands
+* [#622](https://github.com/splunk/splunk-sdk-python/pull/622/) Check if developer added custom map method in reporting command
+* Code reformatting and linting, improvements to github acitons
+
 ## Version 2.1.0
 
 ### Changes

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 # The Splunk Enterprise Software Development Kit for Python
 
-#### Version 2.1.0
+#### Version 2.1.1
 
 The Splunk Enterprise Software Development Kit (SDK) for Python contains library code designed to enable developers to build applications using the Splunk platform.
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,29 +1,30 @@
-version: '3.6'
-
 services:
     splunk:
         image: "splunk/splunk:${SPLUNK_VERSION}"
         container_name: splunk
         environment:
             - SPLUNK_START_ARGS=--accept-license
+            - SPLUNK_GENERAL_TERMS=--accept-sgt-current-at-splunk-com
             - SPLUNK_HEC_TOKEN=11111111-1111-1111-1111-1111111111113
             - SPLUNK_PASSWORD=changed!
             - SPLUNK_APPS_URL=https://github.com/splunk/sdk-app-collection/releases/download/v1.1.0/sdkappcollection.tgz
         ports:
-            - 8000:8000
-            - 8088:8088
-            - 8089:8089
+            - "8000:8000"
+            - "8088:8088"
+            - "8089:8089"
         healthcheck:
             test: ['CMD', 'curl', '-f', 'http://localhost:8000']
             interval: 5s
             timeout: 5s
             retries: 20
         volumes:
-            - "./tests/searchcommands/test_apps/eventing_app:/opt/splunk/etc/apps/eventing_app"
-            - "./tests/searchcommands/test_apps/generating_app:/opt/splunk/etc/apps/generating_app"
-            - "./tests/searchcommands/test_apps/reporting_app:/opt/splunk/etc/apps/reporting_app"
-            - "./tests/searchcommands/test_apps/streaming_app:/opt/splunk/etc/apps/streaming_app"
+            - "./tests/system/test_apps/eventing_app:/opt/splunk/etc/apps/eventing_app"
+            - "./tests/system/test_apps/generating_app:/opt/splunk/etc/apps/generating_app"
+            - "./tests/system/test_apps/reporting_app:/opt/splunk/etc/apps/reporting_app"
+            - "./tests/system/test_apps/streaming_app:/opt/splunk/etc/apps/streaming_app"
+            - "./tests/system/test_apps/modularinput_app:/opt/splunk/etc/apps/modularinput_app"
             - "./splunklib:/opt/splunk/etc/apps/eventing_app/lib/splunklib"
             - "./splunklib:/opt/splunk/etc/apps/generating_app/lib/splunklib"
             - "./splunklib:/opt/splunk/etc/apps/reporting_app/lib/splunklib"
             - "./splunklib:/opt/splunk/etc/apps/streaming_app/lib/splunklib"
+            - "./splunklib:/opt/splunk/etc/apps/modularinput_app/lib/splunklib"