Bi update (intelowlproject#2326)

* added bi document

* update bi interface

* update bi interface

* fix bi serializer

* update certego-saas version

Author: cristinaascari

api_app/serializers/__init__.py

@@ -1,18 +1,16 @@
 from django.conf import settings
-from django.utils.timezone import now
 from rest_framework import serializers as rfs
 from rest_framework.exceptions import ValidationError
 from rest_framework.fields import Field
-from rest_framework.serializers import ModelSerializer
 
 from api_app.interfaces import OwnershipAbstractModel
 from certego_saas.apps.organization.organization import Organization
+from certego_saas.ext.upload.elastic import BISerializer
 
 
-class AbstractBIInterface(ModelSerializer):
+class AbstractBIInterface(BISerializer):
     application = rfs.CharField(read_only=True, default="IntelOwl")
     environment = rfs.SerializerMethodField(method_name="get_environment")
-    timestamp: Field
     username: Field
     name: Field
     class_instance = rfs.SerializerMethodField(
@@ -23,10 +21,7 @@ class AbstractBIInterface(ModelSerializer):
     end_time: Field
 
     class Meta:
-        fields = [
-            "application",
-            "environment",
-            "timestamp",
+        fields = BISerializer.Meta.fields + [
             "username",
             "name",
             "class_instance",
@@ -48,12 +43,8 @@ def get_environment(instance):
             return "test"
 
     @staticmethod
-    def to_elastic_dict(data):
-        return {
-            "_source": data,
-            "_index": settings.ELASTICSEARCH_BI_INDEX + "-" + now().strftime("%Y.%m"),
-            "_op_type": "index",
-        }
+    def get_index():
+        return settings.ELASTICSEARCH_BI_INDEX
 
 
 class ModelWithOwnershipSerializer(rfs.ModelSerializer):

api_app/serializers/job.py

@@ -1079,7 +1079,7 @@ class Meta:
 
     def to_representation(self, instance: Job):
         data = super().to_representation(instance)
-        return self.to_elastic_dict(data)
+        return self.to_elastic_dict(data, self.get_index())
 
     @staticmethod
     def get_playbook(instance: Job):

api_app/serializers/report.py

@@ -32,7 +32,7 @@ class Meta:
 
     def to_representation(self, instance: AbstractReport):
         data = super().to_representation(instance)
-        return self.to_elastic_dict(data)
+        return self.to_elastic_dict(data, self.get_index())
 
     def get_class_instance(self, instance: AbstractReport):
         return super().get_class_instance(instance).split("report")[0]

requirements/certego-requirements.txt

@@ -1,4 +1,4 @@
-certego-saas==0.7.7
+certego-saas==0.7.10
 # While developing for certego-saas, comment the previous line.
 # Then, add a line like the one below to your forked repo and your most recent commit
 # In this way you can test your changes directly in IntelOwl with the complete application