Merge pull request #58 from guilhemmarchand/version_111

Version 1.1.1
guilhemmarchand · Dec 29, 2019 · 12fb1ab · 12fb1ab
2 parents 74a0236 + d95ef07
commit 12fb1ab
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/docs/releasenotes.rst b/docs/releasenotes.rst
@@ -1,6 +1,12 @@
 Release notes
 #############
 
+Version 1.1.1
+=============
+
+- fix: Long term trackers should use latest time in the future too
+- fix: New trackme_data_host_rule_filter macro does not show up properly in manage UI
+
 Version 1.1.0
 ==============
 

diff --git a/trackme/default/app.conf b/trackme/default/app.conf
@@ -16,4 +16,4 @@ label = TrackMe
 [launcher]
 author = Guilhem Marchand
 description = Easy data tracking system for Splunk admins
-version = 1.1.0
+version = 1.1.1
diff --git a/trackme/default/data/ui/html/TrackMe_manage.html b/trackme/default/data/ui/html/TrackMe_manage.html
@@ -981,7 +981,7 @@ <h2 style="padding: 12px 55px 7px 12px;">trackme_data_host_rule_filter</h2><h2 c
 
         var searchGetMacro_trackme_data_host_rule_filter = new PostProcessManager({
             "tokenDependencies": {},
-            "search": "where title=\"trackme_data_host_rule_filter\" | table definition",
+            "search": "where title=\"trackme_data_host_rule_filter(1)\" | table definition",
             "managerid": "searchGetMacrosDefinitions",
             "id": "searchGetMacro_trackme_data_host_rule_filter"
         }, {
@@ -1361,7 +1361,7 @@ <h2 style="padding: 12px 55px 7px 12px;">trackme_data_host_rule_filter</h2><h2 c
         elementTable_trackme_data_host_rule_filter.on("click", function(e) {
             if (e.field !== undefined) {
                 e.preventDefault();
-                var url = TokenUtils.replaceTokenNames("/en-GB/manager/trackme/admin/macros/trackme_data_host_rule_filter?action=edit", _.extend(submittedTokenModel.toJSON(), e.data), TokenUtils.getEscaper('url'), TokenUtils.getFilters(mvc.Components));
+                var url = TokenUtils.replaceTokenNames("/en-GB/manager/trackme/admin/macros/trackme_data_host_rule_filter(1)?action=edit", _.extend(submittedTokenModel.toJSON(), e.data), TokenUtils.getEscaper('url'), TokenUtils.getFilters(mvc.Components));
                 utils.redirect(url, false, "_blank");
             }
         });

diff --git a/trackme/default/savedsearches.conf b/trackme/default/savedsearches.conf
@@ -58,7 +58,7 @@ search  = | savedsearch "TrackMe - Data sources abstract root tracker"
 cron_schedule = 1 * * * *
 description = This scheduled report tracks and updates the data source availability KVstore based lookup
 dispatch.earliest_time = -7d
-dispatch.latest_time = now
+dispatch.latest_time = +4h
 enableSched = 1
 request.ui_dispatch_app = trackme
 request.ui_dispatch_view = trackme
@@ -184,7 +184,7 @@ search  = | savedsearch "TrackMe - Data hosts abstract root tracker"
 cron_schedule = 1 * * * *
 description = This scheduled report tracks and updates the data source availability KVstore based lookup
 dispatch.earliest_time = -7d
-dispatch.latest_time = now
+dispatch.latest_time = +4h
 enableSched = 1
 request.ui_dispatch_app = trackme
 request.ui_dispatch_view = trackme

diff --git a/trackme_110.tgz → trackme_111.tgz b/trackme_110.tgz → trackme_111.tgz