From 7334e8e8b23b2c0c4052684aea70a01e7432e8d7 Mon Sep 17 00:00:00 2001 From: Gareth Anderson Date: Thu, 5 Dec 2024 13:08:53 +1100 Subject: [PATCH 1/3] Update splunkversioncontrol_utility.py As per https://github.com/gjanders/SplunkVersionControl/issues/28 --- bin/splunkversioncontrol_utility.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/splunkversioncontrol_utility.py b/bin/splunkversioncontrol_utility.py index e0a74d4..549c627 100644 --- a/bin/splunkversioncontrol_utility.py +++ b/bin/splunkversioncontrol_utility.py @@ -35,7 +35,8 @@ def runOSProcess(command, logger, timeout=60, shell=True): finally: timer.cancel() - if not timer.isAlive(): + # As per https://github.com/gjanders/SplunkVersionControl/issues/28 + if not getattr(timer, "isAlive", getattr(timer, "is_alive"))(): # Compatibility with >py3.8 res = False logger.warn("OS process timed out after %s seconds, for command %s" % (timeout, command)) proc.terminate() From db810c8e09234f8f1940946bd6f517f826f9fcbc Mon Sep 17 00:00:00 2001 From: Gareth Anderson Date: Thu, 5 Dec 2024 13:09:36 +1100 Subject: [PATCH 2/3] Update app.conf Update version --- default/app.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default/app.conf b/default/app.conf index cdb6b6a..536653d 100644 --- a/default/app.conf +++ b/default/app.conf @@ -12,7 +12,7 @@ label = SplunkVersionControl [launcher] author = Gareth Anderson description = Version Control software for Splunk instances (backup/restore from git) -version = 1.2.11 +version = 1.2.12 [package] id = SplunkVersionControl From 0c7a5e58b9fd442e3c5dfb895ccb6cc813a06727 Mon Sep 17 00:00:00 2001 From: Gareth Anderson Date: Thu, 5 Dec 2024 13:10:45 +1100 Subject: [PATCH 3/3] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 957cb9d..2359310 100644 --- a/README.md +++ b/README.md @@ -326,6 +326,9 @@ As of October 2022, there are still no signs of version control within the Splun - [Search Head Backup](https://splunkbase.splunk.com/app/6438) - backup to an index, works in Splunk Cloud ## Release Notes +### 1.2.12 +- Update as per github issue #28, python code update to splunkversioncontrol_utility.py for Splunk 9.3 compatability contributed by ParksBra + ### 1.2.11 Library updates: - Updated Splunk python SDK to 2.0.1