diff --git a/CHANGELOG.md b/CHANGELOG.md index 72da005e..de8c43f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ ## Changelog
+ OROCHI 2.0.2 [WIP] + + * Paginate analysis results in tree +
+ +
OROCHI 2.0.1 [2024/01/18] * Add tree visualization for other plugin diff --git a/compose/local/dask/daskworkerinit.py b/compose/local/dask/daskworkerinit.py index 596e3c82..7652f70f 100644 --- a/compose/local/dask/daskworkerinit.py +++ b/compose/local/dask/daskworkerinit.py @@ -1,8 +1,12 @@ +import logging import os import sys import django +logger = logging.getLogger("distributed.utils_perf") +logger.setLevel(logging.ERROR) + os.environ["DATABASE_URL"] = "postgres://{}:{}@{}:{}/{}".format( os.environ["POSTGRES_USER"], os.environ["POSTGRES_PASSWORD"], diff --git a/orochi/website/views.py b/orochi/website/views.py index eff6a810..f53fd10e 100644 --- a/orochi/website/views.py +++ b/orochi/website/views.py @@ -618,18 +618,31 @@ def analysis(request): elif res.result == RESULT_STATUS_SUCCESS: try: index = f"{res.dump.index}_{res.plugin.name.lower()}" + + # GET COLUMNS FROM ELASTIC mappings = es_client.indices.get_mapping(index=index) columns = [ x for x in mappings[index]["mappings"]["properties"] if x not in SYSTEM_COLUMNS ] + + # IF PLUGIN HAS REPORT SHOW REPORT COLUMN if ( res.plugin.vt_check or res.plugin.regipy_check or res.plugin.clamav_check ): columns += ["reports"] + + # TIMELINER HAS SOME CUSTOM RENDERED COLUMS + if res.plugin.name.lower() == "timeliner.timeliner": + columns += ["Date", "Type", "row_color"] + columns = [ + x for x in columns if x not in COLOR_TIMELINER.keys() + ] + + # DEFAULT COLUMN ADDED columns += ["hashes", "color", "actions"] except elasticsearch.NotFoundError: continue diff --git a/version.py b/version.py index 159d48b8..0309ae29 100644 --- a/version.py +++ b/version.py @@ -1 +1 @@ -__version__ = "2.0.1" +__version__ = "2.0.2"