Merge pull request #363 from guilhemmarchand/testing

Version 1.2.53
guilhemmarchand · Aug 17, 2021 · 65ffe07 · 65ffe07
2 parents 8ca9d0f + 501670e
commit 65ffe07
Show file tree

Hide file tree

Showing 23 changed files with 49 additions and 39 deletions.
diff --git a/docs/releasenotes.rst b/docs/releasenotes.rst
@@ -1,6 +1,17 @@
 Release notes
 #############
 
+Version 1.2.53
+==============
+
+.. warning:: **Splunk 8.x and Python3 support only**
+
+    - Starting from this release, only Splunk 8.x and Python3 are supported
+    - Some functions such as builtin alert actions are not compatible any longer with Python2 and Splunk 7.x
+    - For the latest version available for Splunk 7.x, see the release 1.2.51
+
+- Fix - Issue #362 - Windows based deployment reports ERROR JSON reply had no "payload" value in rest calls
+
 Version 1.2.52
 ==============
 

diff --git a/globalConfig.json b/globalConfig.json
@@ -142,11 +142,10 @@
         }
     ],
     "meta": {
-        "apiVersion": "3.2.0",
         "name": "trackme",
         "restRoot": "trackme",
-        "version": "1.2.52",
+        "version": "1.2.53",
         "displayName": "TrackMe",
-        "schemaVersion": "0.0.2"
+        "schemaVersion": "0.0.3"
     }
 }
diff --git a/package/app.manifest b/package/app.manifest
@@ -5,7 +5,7 @@
     "id": {
       "group": null,
       "name": "trackme",
-      "version": "1.2.52"
+      "version": "1.2.53"
     },
     "author": [
       {

diff --git a/package/bin/trackme.py b/package/bin/trackme.py
@@ -19,7 +19,7 @@
 sys.path.append(os.path.join(splunkhome, 'etc', 'apps', 'trackme', 'lib'))
 
 from splunklib.searchcommands import dispatch, GeneratingCommand, Configuration, Option, validators
-import rest_handler
+import trackme_rest_handler
 import splunklib.client as client
 
 

diff --git a/package/bin/trackme_rest_handler_ack.py b/package/bin/trackme_rest_handler_ack.py
@@ -10,10 +10,10 @@
 splunkhome = os.environ['SPLUNK_HOME']
 sys.path.append(os.path.join(splunkhome, 'etc', 'apps', 'trackme', 'lib'))
 
-import rest_handler
+import trackme_rest_handler
 import splunklib.client as client
 
-class TrackMeHandlerAck_v1(rest_handler.RESTHandler):
+class TrackMeHandlerAck_v1(trackme_rest_handler.RESTHandler):
     def __init__(self, command_line, command_arg):
         super(TrackMeHandlerAck_v1, self).__init__(command_line, command_arg, logger)
 

diff --git a/package/bin/trackme_rest_handler_allowlist.py b/package/bin/trackme_rest_handler_allowlist.py
@@ -10,10 +10,10 @@
 splunkhome = os.environ['SPLUNK_HOME']
 sys.path.append(os.path.join(splunkhome, 'etc', 'apps', 'trackme', 'lib'))
 
-import rest_handler
+import trackme_rest_handler
 import splunklib.client as client
 
-class TrackMeHandlerAllowList_v1(rest_handler.RESTHandler):
+class TrackMeHandlerAllowList_v1(trackme_rest_handler.RESTHandler):
     def __init__(self, command_line, command_arg):
         super(TrackMeHandlerAllowList_v1, self).__init__(command_line, command_arg, logger)
 

diff --git a/package/bin/trackme_rest_handler_backup_and_restore.py b/package/bin/trackme_rest_handler_backup_and_restore.py
@@ -15,15 +15,15 @@
 splunkhome = os.environ['SPLUNK_HOME']
 sys.path.append(os.path.join(splunkhome, 'etc', 'apps', 'trackme', 'lib'))
 
-import rest_handler
+import trackme_rest_handler
 import splunklib.client as client
 
 #
 # Splunk Cloud certification notes: these functions create and manage archive files for the application in the following directory $SPLUNK/etc/apps/trackme/backup
 # There are no options to perform any kind of file manipulations out of this application directory
 #
 
-class TrackMeHandlerBackupAndRestore_v1(rest_handler.RESTHandler):
+class TrackMeHandlerBackupAndRestore_v1(trackme_rest_handler.RESTHandler):
     def __init__(self, command_line, command_arg):
         super(TrackMeHandlerBackupAndRestore_v1, self).__init__(command_line, command_arg, logger)
 

diff --git a/package/bin/trackme_rest_handler_blocklist.py b/package/bin/trackme_rest_handler_blocklist.py
@@ -10,10 +10,10 @@
 splunkhome = os.environ['SPLUNK_HOME']
 sys.path.append(os.path.join(splunkhome, 'etc', 'apps', 'trackme', 'lib'))
 
-import rest_handler
+import trackme_rest_handler
 import splunklib.client as client
 
-class TrackMeHandlerBlockList_v1(rest_handler.RESTHandler):
+class TrackMeHandlerBlockList_v1(trackme_rest_handler.RESTHandler):
     def __init__(self, command_line, command_arg):
         super(TrackMeHandlerBlockList_v1, self).__init__(command_line, command_arg, logger)
 

diff --git a/package/bin/trackme_rest_handler_data_hosts.py b/package/bin/trackme_rest_handler_data_hosts.py
@@ -10,11 +10,11 @@
 splunkhome = os.environ['SPLUNK_HOME']
 sys.path.append(os.path.join(splunkhome, 'etc', 'apps', 'trackme', 'lib'))
 
-import rest_handler
+import trackme_rest_handler
 import splunklib.client as client
 
 
-class TrackMeHandlerDataHosts_v1(rest_handler.RESTHandler):
+class TrackMeHandlerDataHosts_v1(trackme_rest_handler.RESTHandler):
     def __init__(self, command_line, command_arg):
         super(TrackMeHandlerDataHosts_v1, self).__init__(command_line, command_arg, logger)
 

diff --git a/package/bin/trackme_rest_handler_data_sampling.py b/package/bin/trackme_rest_handler_data_sampling.py
@@ -10,10 +10,10 @@
 splunkhome = os.environ['SPLUNK_HOME']
 sys.path.append(os.path.join(splunkhome, 'etc', 'apps', 'trackme', 'lib'))
 
-import rest_handler
+import trackme_rest_handler
 import splunklib.client as client
 
-class TrackMeHandlerDataSampling_v1(rest_handler.RESTHandler):
+class TrackMeHandlerDataSampling_v1(trackme_rest_handler.RESTHandler):
     def __init__(self, command_line, command_arg):
         super(TrackMeHandlerDataSampling_v1, self).__init__(command_line, command_arg, logger)
 

diff --git a/package/bin/trackme_rest_handler_data_sources.py b/package/bin/trackme_rest_handler_data_sources.py
@@ -10,11 +10,11 @@
 splunkhome = os.environ['SPLUNK_HOME']
 sys.path.append(os.path.join(splunkhome, 'etc', 'apps', 'trackme', 'lib'))
 
-import rest_handler
+import trackme_rest_handler
 import splunklib.client as client
 
 
-class TrackMeHandlerDataSources_v1(rest_handler.RESTHandler):
+class TrackMeHandlerDataSources_v1(trackme_rest_handler.RESTHandler):
     def __init__(self, command_line, command_arg):
         super(TrackMeHandlerDataSources_v1, self).__init__(command_line, command_arg, logger)
 

diff --git a/package/bin/trackme_rest_handler_elastic_sources.py b/package/bin/trackme_rest_handler_elastic_sources.py
@@ -10,11 +10,11 @@
 splunkhome = os.environ['SPLUNK_HOME']
 sys.path.append(os.path.join(splunkhome, 'etc', 'apps', 'trackme', 'lib'))
 
-import rest_handler
+import trackme_rest_handler
 import splunklib.client as client
 
 
-class TrackMeHandlerElasticSources_v1(rest_handler.RESTHandler):
+class TrackMeHandlerElasticSources_v1(trackme_rest_handler.RESTHandler):
     def __init__(self, command_line, command_arg):
         super(TrackMeHandlerElasticSources_v1, self).__init__(command_line, command_arg, logger)
 

diff --git a/package/bin/trackme_rest_handler_identity_cards.py b/package/bin/trackme_rest_handler_identity_cards.py
@@ -10,10 +10,10 @@
 splunkhome = os.environ['SPLUNK_HOME']
 sys.path.append(os.path.join(splunkhome, 'etc', 'apps', 'trackme', 'lib'))
 
-import rest_handler
+import trackme_rest_handler
 import splunklib.client as client
 
-class TrackMeHandlerIdentityCards_v1(rest_handler.RESTHandler):
+class TrackMeHandlerIdentityCards_v1(trackme_rest_handler.RESTHandler):
     def __init__(self, command_line, command_arg):
         super(TrackMeHandlerIdentityCards_v1, self).__init__(command_line, command_arg, logger)
 

diff --git a/package/bin/trackme_rest_handler_lagging_classes.py b/package/bin/trackme_rest_handler_lagging_classes.py
@@ -10,10 +10,10 @@
 splunkhome = os.environ['SPLUNK_HOME']
 sys.path.append(os.path.join(splunkhome, 'etc', 'apps', 'trackme', 'lib'))
 
-import rest_handler
+import trackme_rest_handler
 import splunklib.client as client
 
-class TrackMeHandlerLaggingClasses_v1(rest_handler.RESTHandler):
+class TrackMeHandlerLaggingClasses_v1(trackme_rest_handler.RESTHandler):
     def __init__(self, command_line, command_arg):
         super(TrackMeHandlerLaggingClasses_v1, self).__init__(command_line, command_arg, logger)
 

diff --git a/package/bin/trackme_rest_handler_lagging_classes_metrics.py b/package/bin/trackme_rest_handler_lagging_classes_metrics.py
@@ -10,10 +10,10 @@
 splunkhome = os.environ['SPLUNK_HOME']
 sys.path.append(os.path.join(splunkhome, 'etc', 'apps', 'trackme', 'lib'))
 
-import rest_handler
+import trackme_rest_handler
 import splunklib.client as client
 
-class TrackMeHandlerLaggingClassesMetrics_v1(rest_handler.RESTHandler):
+class TrackMeHandlerLaggingClassesMetrics_v1(trackme_rest_handler.RESTHandler):
     def __init__(self, command_line, command_arg):
         super(TrackMeHandlerLaggingClassesMetrics_v1, self).__init__(command_line, command_arg, logger)
 

diff --git a/package/bin/trackme_rest_handler_logical_groups.py b/package/bin/trackme_rest_handler_logical_groups.py
@@ -10,10 +10,10 @@
 splunkhome = os.environ['SPLUNK_HOME']
 sys.path.append(os.path.join(splunkhome, 'etc', 'apps', 'trackme', 'lib'))
 
-import rest_handler
+import trackme_rest_handler
 import splunklib.client as client
 
-class TrackMeHandlerLogicalGroups_v1(rest_handler.RESTHandler):
+class TrackMeHandlerLogicalGroups_v1(trackme_rest_handler.RESTHandler):
     def __init__(self, command_line, command_arg):
         super(TrackMeHandlerLogicalGroups_v1, self).__init__(command_line, command_arg, logger)
 

diff --git a/package/bin/trackme_rest_handler_maintenance.py b/package/bin/trackme_rest_handler_maintenance.py
@@ -10,10 +10,10 @@
 splunkhome = os.environ['SPLUNK_HOME']
 sys.path.append(os.path.join(splunkhome, 'etc', 'apps', 'trackme', 'lib'))
 
-import rest_handler
+import trackme_rest_handler
 import splunklib.client as client
 
-class TrackMeHandlerMaintenance_v1(rest_handler.RESTHandler):
+class TrackMeHandlerMaintenance_v1(trackme_rest_handler.RESTHandler):
     def __init__(self, command_line, command_arg):
         super(TrackMeHandlerMaintenance_v1, self).__init__(command_line, command_arg, logger)
 

diff --git a/package/bin/trackme_rest_handler_metric_hosts.py b/package/bin/trackme_rest_handler_metric_hosts.py
@@ -10,11 +10,11 @@
 splunkhome = os.environ['SPLUNK_HOME']
 sys.path.append(os.path.join(splunkhome, 'etc', 'apps', 'trackme', 'lib'))
 
-import rest_handler
+import trackme_rest_handler
 import splunklib.client as client
 
 
-class TrackMeHandlerMetricHosts_v1(rest_handler.RESTHandler):
+class TrackMeHandlerMetricHosts_v1(trackme_rest_handler.RESTHandler):
     def __init__(self, command_line, command_arg):
         super(TrackMeHandlerMetricHosts_v1, self).__init__(command_line, command_arg, logger)
 

diff --git a/package/bin/trackme_rest_handler_smart_status.py b/package/bin/trackme_rest_handler_smart_status.py
@@ -13,11 +13,11 @@
 splunkhome = os.environ['SPLUNK_HOME']
 sys.path.append(os.path.join(splunkhome, 'etc', 'apps', 'trackme', 'lib'))
 
-import rest_handler
+import trackme_rest_handler
 import splunklib.client as client
 import splunklib.results as results
 
-class TrackMeHandlerSmartStatus_v1(rest_handler.RESTHandler):
+class TrackMeHandlerSmartStatus_v1(trackme_rest_handler.RESTHandler):
     def __init__(self, command_line, command_arg):
         super(TrackMeHandlerSmartStatus_v1, self).__init__(command_line, command_arg, logger)
 

diff --git a/package/bin/trackme_rest_handler_tag_policies.py b/package/bin/trackme_rest_handler_tag_policies.py
@@ -10,10 +10,10 @@
 splunkhome = os.environ['SPLUNK_HOME']
 sys.path.append(os.path.join(splunkhome, 'etc', 'apps', 'trackme', 'lib'))
 
-import rest_handler
+import trackme_rest_handler
 import splunklib.client as client
 
-class TrackMeHandlerTagPolicies_v1(rest_handler.RESTHandler):
+class TrackMeHandlerTagPolicies_v1(trackme_rest_handler.RESTHandler):
     def __init__(self, command_line, command_arg):
         super(TrackMeHandlerTagPolicies_v1, self).__init__(command_line, command_arg, logger)
 

diff --git a/package/default/app.conf b/package/default/app.conf
@@ -16,7 +16,7 @@ label = TrackMe
 [launcher]
 author = Guilhem Marchand
 description = Data tracking system for Splunk
-version = 1.2.52
+version = 1.2.53
 
 [triggers]
 reload.trackme_settings = simple
diff --git a/package/lib/rest_handler.py → package/lib/trackme_rest_handler.py b/package/lib/rest_handler.py → package/lib/trackme_rest_handler.py
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-version = 1.2.52
+version = 1.2.53