assemblyline 4.7.2.dev16__tar.gz → 4.7.2.dev18__tar.gz

{assemblyline-4.7.2.dev16/assemblyline.egg-info → assemblyline-4.7.2.dev18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline
-Version: 4.7.2.dev16
+Version: 4.7.2.dev18
 Summary: Assemblyline 4 - Automated malware analysis framework
 Home-page: https://github.com/CybercentreCanada/assemblyline-base
 Author: CCCS Assemblyline development team

assemblyline-4.7.2.dev18/assemblyline/VERSION

@@ -0,0 +1 @@
+4.7.2.dev18

{assemblyline-4.7.2.dev16 → assemblyline-4.7.2.dev18}/assemblyline/datastore/helper.py

@@ -1227,7 +1227,7 @@ class AssemblylineDatastore(object):
         fileinfo = {
             k: v for k, v in fileinfo.items()
             if k not in
-            ['classification', 'expiry_ts', 'seen', 'archive_ts', 'labels', 'label_categories', 'comments']}
+            ['classification', 'expiry_ts', 'seen', 'archive_ts', 'labels', 'label_categories', 'comments', 'from_json']}
 
         # Reset archive_ts field
         fileinfo['archive_ts'] = None

{assemblyline-4.7.2.dev16 → assemblyline-4.7.2.dev18}/assemblyline/odm/models/config.py

@@ -1182,6 +1182,10 @@ class Services(odm.Model):
         "At `1`, a service's full CPU request will be reserved for them.<br>"
         "At `0` (only for very small appliances/dev boxes), the service's CPU will be limited "
         "but no CPU will be reserved allowing for more flexible scheduling of containers.")
+    cpu_slack: float = odm.Float(
+        description="How far above the specified cpu for a service to raise the limits?<br>"
+        "At `0` a service is limited to its cpu specification.<br>"
+        "At `0.5` a service will be allowed to use up to 50% above its specification.")
     safelist = odm.Compound(ServiceSafelist)
     registries = odm.Optional(odm.List(odm.Compound(ServiceRegistry)),
                               description="Global set of registries for services")
@@ -1197,6 +1201,7 @@ DEFAULT_SERVICES = {
     "preferred_update_channel": "stable",
     "allow_insecure_registry": False,
     "cpu_reservation": 0.25,
+    "cpu_slack": 0.0,
     "safelist": {
         "enabled": True,
         "hash_types": ['sha1', 'sha256'],

{assemblyline-4.7.2.dev16 → assemblyline-4.7.2.dev18}/assemblyline/run/cli.py

@@ -913,7 +913,7 @@ class ALCommandLineInterface(cmd.Cmd):  # pylint:disable=R0904
             restore_old_archive  Restaure all documents from the old archiving method into the hot index
 
         Parameters:
-            <safe>       Does not validate the model [optional]
+            <safe>       Does not validate the model. This can incur possible dataloss if used so we recommend creating a backup. [optional]
             <cleanup>    After restoring the data, remove old indices (restore_old_archive only) [optional]
             <index>      index to do the operation on [optional]
 

{assemblyline-4.7.2.dev16 → assemblyline-4.7.2.dev18/assemblyline.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assemblyline
-Version: 4.7.2.dev16
+Version: 4.7.2.dev18
 Summary: Assemblyline 4 - Automated malware analysis framework
 Home-page: https://github.com/CybercentreCanada/assemblyline-base
 Author: CCCS Assemblyline development team

assemblyline-4.7.2.dev16/assemblyline/VERSION

@@ -1 +0,0 @@
-4.7.2.dev16