Merge pull request #307 from guilhemmarchand/testing

Version 1.2.42
guilhemmarchand · Apr 12, 2021 · 2067cc4 · 2067cc4
2 parents 1ba0729 + 0d79102
commit 2067cc4
Show file tree

Hide file tree

Showing 9 changed files with 692 additions and 17 deletions.
diff --git a/docs/img/alert_actions/auto_ack5.png b/docs/img/alert_actions/auto_ack5.png
diff --git a/docs/img/alert_actions/free_style4.png b/docs/img/alert_actions/free_style4.png
diff --git a/docs/img/alert_actions/smart_status3.png b/docs/img/alert_actions/smart_status3.png
diff --git a/docs/img/ootb_alerts3.png b/docs/img/ootb_alerts3.png
diff --git a/docs/releasenotes.rst b/docs/releasenotes.rst
@@ -1,6 +1,24 @@
 Release notes
 #############
 
+Version 1.2.42
+==============
+
+**CAUTION:**
+
+This is a new main release branch, TrackMe 1.2.x requires the deployment of the following dependencies:
+
+- Semicircle Donut Chart Viz, Splunk Base: https://splunkbase.splunk.com/app/4378
+- Splunk Machine Learning Toolkit, Splunk Base: https://splunkbase.splunk.com/app/2890
+- Splunk Timeline - Custom Visualization, Splunk Base: https://splunkbase.splunk.com/app/3120
+- Splunk SA CIM - Splunk Common Information Model, Splunk Base: https://splunkbase.splunk.com/app/1621
+
+TrackMe requires a summary index (defaults to trackme_summary) and a metric index (defaults to trackme_metrics):
+https://trackme.readthedocs.io/en/latest/configuration.html
+
+- Feature - Issue #306 - Alert actions - UI enhancements
+- Fix - Issue #305 - Custom alerts - created alerts should set alert.digest_mode
+
 Version 1.2.41
 ==============
 

diff --git a/docs/userguide.rst b/docs/userguide.rst
@@ -1809,7 +1809,7 @@ Alerts tracking main screen
 .. image:: img/ootb_alerts3.png
    :alt: ootb_alerts3.png
    :align: center
-   :width: 800px
+   :width: 1200px
 
 Alerts tracking: out of the box alerts
 --------------------------------------
@@ -1900,6 +1900,13 @@ Alert action: TrackMe auto acknowledge
    :align: center
    :width: 1200px
 
+*The result from the Ack endpoint call can be accessed within the UI in the alert actions screen of the alert that generated the call:*
+
+.. image:: img/alert_actions/auto_ack5.png
+   :alt: auto_ack5.png
+   :align: center
+   :width: 1200px
+
 Alert action: Trackme Smart Status
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -1929,6 +1936,13 @@ Alert action: Trackme Smart Status
    :align: center
    :width: 1200px
 
+*The result from the Smart Status endpoint call can be accessed within the UI in the alert actions screen of the alert that generated the call:*
+
+.. image:: img/alert_actions/smart_status3.png
+   :alt: smart_status3.png
+   :align: center
+   :width: 1200px
+
 Alert action: TrackMe free style rest call
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -1965,9 +1979,16 @@ Alert action: TrackMe free style rest call
 *When the alert triggers:*
 
 .. image:: img/alert_actions/free_style3.png
-   :alt: smart_status3.png
+   :alt: free_style3.png
    :align: center
-   :width: 600px
+   :width: 1200px
+
+*The result from the Smart Status endpoint call can be accessed within the UI in the alert actions screen of the alert that generated the call:*
+
+.. image:: img/alert_actions/free_style4.png
+   :alt: free_style4.png
+   :align: center
+   :width: 1200px
 
 Alerts acknowledgment within the UI
 -----------------------------------

diff --git a/trackme/app.manifest b/trackme/app.manifest
@@ -5,7 +5,7 @@
     "id": {
       "group": null,
       "name": "trackme",
-      "version": "1.2.41"
+      "version": "1.2.42"
     },
     "author": [
       {

diff --git a/trackme/default/app.conf b/trackme/default/app.conf
@@ -16,4 +16,4 @@ label = TrackMe
 [launcher]
 author = Guilhem Marchand
 description = Data tracking system for Splunk
-version = 1.2.41
+version = 1.2.42
diff --git a/trackme/default/data/ui/html/TrackMe.html b/trackme/default/data/ui/html/TrackMe.html