Merge remote-tracking branch 'remotes/origin/dev' into issue/6810

salt/elasticsearch/templates/so/so-case-template.json.jinja

@@ -244,6 +244,26 @@
               "message": {
                 "type": "text"
               },
+              "scan":{
+                "type":"object",
+                "dynamic": true,
+                "properties":{
+                  "exiftool":{
+                    "type":"text"
+                   },
+                   "pe":{
+                     "properties":{
+                       "sections":{
+                         "properties":{
+                           "entropy":{
+                             "type": "float"
+                           }
+                         }
+                       }
+                     }
+                   }
+                }
+              },
               "tags": {
                 "type": "keyword",
                 "ignore_above": 1024

salt/elasticsearch/templates/so/so-common-template.json.jinja

@@ -734,7 +734,18 @@
 	  "properties":{
             "exiftool":{
               "type":"text"
-             }
+             },
+	     "pe":{
+	       "properties":{
+	         "sections":{
+		   "properties":{
+		     "entropy":{
+		       "type": "float"
+		     }
+		   }
+		 }
+	       }
+	     }
           }
         },
         "server":{

salt/soc/files/soc/cases.queries.json

@@ -1,5 +1,7 @@
 [
   { "name": "Open Cases", "query": "NOT case.status:closed AND NOT case.category:template" },
   { "name": "Closed Cases", "query": "case.status:closed AND NOT case.category:template" },
+  { "name": "My Open Cases", "query": "NOT case.status:closed AND NOT case.category:template AND case.assigneeId:{myId}" },
+  { "name": "My Closed Cases", "query": "case.status:closed AND NOT case.category:template AND case.assigneeId:{myId}" },  
   { "name": "Templates", "query": "case.category:template" }
 ]