Skip to content

Commit

Permalink
Merge branch 'master' into improvement/redis-retryonerror
Browse files Browse the repository at this point in the history
  • Loading branch information
troll-os committed Jun 20, 2024
2 parents a0efd3a + 92cdff5 commit 5caf501
Show file tree
Hide file tree
Showing 82 changed files with 1,126 additions and 456 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ jobs:
steps:
- checkout
- kubernetes/install-kubectl
- run: kubectl --server=https://api.staging.eu-west.filigran.io --token=$K8S_TOKEN -n customer-testing rollout restart deployment
- run: kubectl --server=https://api.staging.eu-west.filigran.io --token=$K8S_TOKEN -n customer-testing rollout restart deployment -l app=opencti

notify_rolling:
docker:
Expand Down Expand Up @@ -693,4 +693,4 @@ workflows:
tags:
only: /[0-9]+(\.[0-9]+)+(\.[0-9]+)*/
branches:
ignore: /.*/
ignore: /.*/
2 changes: 1 addition & 1 deletion .github/workflows/test-feature-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ jobs:
type=ref,event=pr
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
- run: if [ "${{ inputs.upgrade_from_58 }}" == "true" ]; then ID=35; else ID=26; fi; echo "AWX_TPL_ID=$ID" >> "$GITHUB_ENV"
- run: if [ "${{ inputs.upgrade_from_58 }}" == "true" ]; then ID=21; else ID=20; fi; echo "AWX_TPL_ID=$ID" >> "$GITHUB_ENV"
- name: deploy via awx
uses: certara/github-action-ansible-tower-awx@master
with:
Expand Down
1 change: 1 addition & 0 deletions opencti-platform/opencti-front/lang/back/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"Incident type": "Art des Vorfalls",
"Include header": "Kopfzeile einschließen",
"Include in carousel": "In Karussell einschließen",
"Include inferences": "Schlussfolgerungen einbeziehen",
"Included IDs": "Enthaltene IDs",
"Index date": "Index Datum",
"Indicator decay manager": "Indikator Abklingmanager",
Expand Down
1 change: 1 addition & 0 deletions opencti-platform/opencti-front/lang/back/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"Incident type": "Incident type",
"Include header": "Include header",
"Include in carousel": "Include in carousel",
"Include inferences": "Include inferences",
"Included IDs": "Included IDs",
"Index date": "Index date",
"Indicator decay manager": "Indicator decay manager",
Expand Down
1 change: 1 addition & 0 deletions opencti-platform/opencti-front/lang/back/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"Incident type": "Tipo de incidente",
"Include header": "Incluir cabecera",
"Include in carousel": "Incluir en carrusel",
"Include inferences": "Incluir inferencias",
"Included IDs": "IDs incluidos",
"Index date": "Fecha índice",
"Indicator decay manager": "Indicador gestor de decaimiento",
Expand Down
1 change: 1 addition & 0 deletions opencti-platform/opencti-front/lang/back/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"Incident type": "Type d'incident",
"Include header": "Inclure l'en-tête",
"Include in carousel": "Inclure dans le carrousel",
"Include inferences": "Inclure les inférences",
"Included IDs": "ID inclus",
"Index date": "Date d'indexation",
"Indicator decay manager": "Gestionnaire de la décroissance de l'indicateur",
Expand Down
1 change: 1 addition & 0 deletions opencti-platform/opencti-front/lang/back/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"Incident type": "重大度",
"Include header": "ヘッダを含む",
"Include in carousel": "カルーセルの順番",
"Include inferences": "推論を含む",
"Included IDs": "含まれるID",
"Index date": "添付ファイル",
"Indicator decay manager": "インジケーター・ディケイ・マネージャー",
Expand Down
1 change: 1 addition & 0 deletions opencti-platform/opencti-front/lang/back/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"Incident type": "事件类型",
"Include header": "包含标题",
"Include in carousel": "包含在传送带中",
"Include inferences": "包括推论",
"Included IDs": "包含的 ID",
"Index date": "索引日期",
"Indicator decay manager": "指标衰减管理器",
Expand Down
36 changes: 36 additions & 0 deletions opencti-platform/opencti-front/lang/front/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,18 @@
"Abstract": "Zusammenfassung",
"Accent color": "Akzentfarbe",
"Accept": "Akzeptieren Sie",
"Access administration": "Zugriff auf die Verwaltung",
"Access already granted": "Zugriff bereits gewährt",
"Access connectors": "Zugriff auf Konnektoren",
"Access CSV feeds directly in your browser": "Zugriff auf CSV-Feeds direkt in Ihrem Browser",
"Access Dashboards and investigations": "Zugriff auf Dashboards und Untersuchungen",
"Access dashboards and investigations": "Zugriff auf Dashboards und Untersuchungen",
"Access data sharing": "Zugang zur gemeinsamen Nutzung von Daten",
"Access ingestion": "Zugang zur Aufnahme",
"Access knowledge": "Zugriff auf Wissen",
"Access right": "Zugriffsrecht",
"Access stream directly in your browser": "Zugang zum Stream direkt in Ihrem Browser",
"Access to collaborative creation": "Zugriff auf kollaborative Erstellung",
"Access to the scenario": "Zugang zum Szenario",
"Accessible for": "Erreichbar für",
"accidental": "Versehentlich/Fehler",
Expand Down Expand Up @@ -165,6 +173,7 @@
"Artifacts": "Artefakte",
"As it happens": "Wie es geschieht",
"Ask AI": "Fragen Sie AI",
"Ask for knowledge enrichment": "Wissenserweiterung anfordern",
"Assignee(s)": "Zessionar(en)",
"Assignees": "Beauftragte",
"Associated file": "Zugehörige Datei",
Expand Down Expand Up @@ -240,6 +249,8 @@
"By default we accept iso date (YYYY-MM-DD), but you can specify your own date format in ISO notation (for instance DD.MM.YYYY)": "Standardmäßig wird das ISO-Datum (JJJJ-MM-TT) akzeptiert, aber Sie können Ihr eigenes Datumsformat in ISO-Notation angeben (z. B. TT.MM.JJJJ)",
"By default, all files will be used to generate the response.": "Standardmäßig werden alle Dateien zur Erzeugung der Antwort verwendet.",
"By enabling the OpenCTI Enterprise Edition, you (and your organization) agrees to the OpenCTI Enterprise Edition (EE) supplemental license terms and conditions of usage:": "Mit der Aktivierung der OpenCTI Enterprise Edition erklären Sie (und Ihre Organisation) sich mit den zusätzlichen Lizenz- und Nutzungsbedingungen der OpenCTI Enterprise Edition (EE) einverstanden:",
"Bypass all capabilities": "Alle Fähigkeiten umgehen",
"Bypass enforced reference": "Umgehung der erzwungenen Referenz",
"CA certificate (base64)": "CA-Zertifikat (base64)",
"Campaign": "Kampagne",
"Campaigns": "Kampagnen",
Expand Down Expand Up @@ -327,6 +338,7 @@
"Connector": "Anschluss",
"Connectors": "Konnektoren",
"Connectors & workers": "Konnektoren & Arbeiter",
"Connectors API usage: register, ping, export push ...": "Nutzung der Connectors-API: registrieren, ping, export push ...",
"consent message": "zustimmungsnachricht",
"Constituent": "Wähler",
"Contact information": "Kontaktinformationen",
Expand Down Expand Up @@ -386,6 +398,9 @@
"Create": "Erstellen",
"create": "Erstellungsereignisse",
"CREATE": "CREATE",
"Create / Update Dashboards and investigations": "Dashboards und Untersuchungen erstellen/aktualisieren",
"Create / Update dashboards and investigations": "Dashboards und Untersuchungen erstellen/aktualisieren",
"Create / Update knowledge": "Wissen erstellen/aktualisieren",
"Create a campaign": "Eine Kampagne erstellen",
"Create a case template": "Eine Fallvorlage erstellen",
"Create a channel": "Erstellen eines Kanals",
Expand Down Expand Up @@ -578,6 +593,9 @@
"Definition": "Definition",
"Delete": "Löschen",
"delete": "Löschungsereignisse",
"Delete Dashboards and investigations": "Dashboards und Untersuchungen löschen",
"Delete dashboards and investigations": "Dashboards und Untersuchungen löschen",
"Delete knowledge": "Wissen löschen",
"Delete mapping": "Mapping löschen",
"Delete permanently": "Dauerhaft löschen",
"Delete public dashboard": "Öffentliches Dashboard löschen",
Expand Down Expand Up @@ -757,6 +775,7 @@
"Do you want to remove this opinion?": "Möchten Sie diese Stellungnahme entfernen?",
"Do you want to remove this report?": "Möchten Sie diesen Bericht löschen?",
"Do you want to remove this status?": "Möchten Sie diesen Status entfernen?",
"Do you want to reset the state and purge messages queue of this connector? ": "Möchten Sie den Status zurücksetzen und die Nachrichtenwarteschlange dieses Connectors löschen?",
"Do you want to reset the state of this connector?": "Möchten Sie den Status dieses Verbinders zurücksetzen?",
"Do you want to start this CSV ingester?": "Möchten Sie diesen CSV-Importer starten?",
"Do you want to start this playbook?": "Möchten Sie dieses Spielbuch starten?",
Expand All @@ -782,6 +801,7 @@
"Download as STIX report": "Als STIX-Bericht herunterladen",
"Download as SVG": "Herunterladen als SVG",
"Download in pdf": "Herunterladen im pdf-Format",
"Download knowledge export": "Wissensexport herunterladen",
"Download this file": "Herunterladen dieser Datei",
"Download this support package": "Laden Sie dieses Support-Paket herunter",
"Due Date": "Fälligkeitsdatum",
Expand Down Expand Up @@ -1114,6 +1134,7 @@
"Generate": "Erzeugen",
"Generate a simulation scenario": "Erzeugen eines Simulationsszenarios",
"Generate an export": "Erzeugen Sie einen Export",
"Generate knowledge export": "Wissensexport generieren",
"Generate report document": "Berichtsdokument generieren",
"Generate Support Package": "Erzeugen von Support Package",
"Generated Support Package": "Erstelltes Support Package",
Expand Down Expand Up @@ -1210,6 +1231,7 @@
"Import dashboard": "Dashboard importieren",
"Import data": "Daten importieren",
"Import from date (empty = all Csv possible items)": "Import von Datum (leer = alle möglichen Csv-Elemente)",
"Import knowledge": "Wissen importieren",
"Import successfully asked": "Import erfolgreich abgefragt",
"Import type": "Art des Imports",
"Important notice: your action is required!": "Wichtiger Hinweis: Ihr Handeln ist erforderlich!",
Expand All @@ -1235,6 +1257,7 @@
"Incidents": "Vorfälle",
"Include files not related to any knowledge (data import)": "Dateien einschließen, die sich nicht auf einen Wissensstand beziehen (Datenimport)",
"Include headers in the feed": "Kopfzeilen in den Feed einbeziehen",
"Include inferences": "Schlussfolgerungen einbeziehen",
"Include knowledge": "Wissen einbeziehen",
"independent": "unabhängig",
"Indexed files": "Indizierte Dateien",
Expand Down Expand Up @@ -1469,6 +1492,16 @@
"Manage access restriction": "Zugriffsbeschränkung verwalten",
"Manage an entity": "Verwalten einer Entität",
"Manage an observable": "Verwalten eines Observablen",
"Manage authorized members": "Autorisierte Mitglieder verwalten",
"Manage connector state": "Konnektorstatus verwalten",
"Manage credentials": "Zugangsdaten verwalten",
"Manage CSV mappers": "CSV-Mapper verwalten",
"Manage data sharing": "Verwalten der gemeinsamen Datennutzung",
"Manage ingestion": "Ingestion verwalten",
"Manage labels & Attributes": "Labels und Attribute verwalten",
"Manage marking definitions": "Markierungsdefinitionen verwalten",
"Manage Public Dashboards": "Öffentliche Dashboards verwalten",
"Manage public dashboards": "Öffentliche Dashboards verwalten",
"Mandatory": "Obligatorisch",
"Mandatory attributes": "Obligatorische Attribute",
"Manual": "Handbuch",
Expand Down Expand Up @@ -1666,6 +1699,7 @@
"Number of history entries": "Anzahl der Historieneinträge",
"Number of injects by attack pattern": "Anzahl der Injektionen nach Angriffsmuster",
"Number of lowercase chars must be greater or equals to": "Anzahl der Kleinbuchstaben muss größer oder gleich sein",
"Number of messages: ": "Anzahl der Nachrichten:",
"Number of node(s)": "Anzahl der Knoten(s)",
"Number of operations": "Anzahl der Operationen",
"Number of paragraphs": "Anzahl der Absätze",
Expand Down Expand Up @@ -2089,6 +2123,7 @@
"Response type": "Antworttyp",
"Restore": "Wiederherstellen",
"Restore the state of the graphic before the last expansion": "Wiederherstellung des Zustands der Grafik vor der letzten Erweiterung",
"Restrict organization access": "Zugriff auf Organisation einschränken",
"Restrict to specific entity types": "Beschränkung auf bestimmte Entitätstypen",
"Restricted": "Eingeschränkt",
"Result": "Ergebnis",
Expand Down Expand Up @@ -2638,6 +2673,7 @@
"Update without references": "Update ohne Referenzen",
"Updated on": "Aktualisiert am",
"Upload date": "Datum des Uploads",
"Upload knowledge files": "Wissensdateien hochladen",
"Uploaded files": "Hochgeladene Dateien",
"Uploaded PDF files": "Hochgeladene PDF-Dateien",
"Uploading image": "Bild hochladen",
Expand Down
36 changes: 36 additions & 0 deletions opencti-platform/opencti-front/lang/front/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,18 @@
"Abstract": "Abstract",
"Accent color": "Accent color",
"Accept": "Accept",
"Access administration": "Access administration",
"Access already granted": "Access already granted",
"Access connectors": "Access connectors",
"Access CSV feeds directly in your browser": "Access CSV feeds directly in your browser",
"Access Dashboards and investigations": "Access dashboards and investigations",
"Access dashboards and investigations": "Access dashboards and investigations",
"Access data sharing": "Access data sharing",
"Access ingestion": "Access ingestion",
"Access knowledge": "Access knowledge",
"Access right": "Access right",
"Access stream directly in your browser": "Access stream directly in your browser",
"Access to collaborative creation": "Access to collaborative creation",
"Access to the scenario": "Access to the scenario",
"Accessible for": "Accessible for",
"accidental": "Accidental/Mistake",
Expand Down Expand Up @@ -165,6 +173,7 @@
"Artifacts": "Artifacts",
"As it happens": "As it happens",
"Ask AI": "Ask AI",
"Ask for knowledge enrichment": "Ask for knowledge enrichment",
"Assignee(s)": "Assignee(s)",
"Assignees": "Assignees",
"Associated file": "Associated file",
Expand Down Expand Up @@ -240,6 +249,8 @@
"By default we accept iso date (YYYY-MM-DD), but you can specify your own date format in ISO notation (for instance DD.MM.YYYY)": "By default we accept iso date (YYYY-MM-DD), but you can specify your own date format in ISO notation (for instance DD.MM.YYYY)",
"By default, all files will be used to generate the response.": "By default, all files will be used to generate the response.",
"By enabling the OpenCTI Enterprise Edition, you (and your organization) agrees to the OpenCTI Enterprise Edition (EE) supplemental license terms and conditions of usage:": "By enabling the OpenCTI Enterprise Edition, you (and your organization) agrees to the OpenCTI Enterprise Edition (EE) supplemental license terms and conditions of usage:",
"Bypass all capabilities": "Bypass all capabilities",
"Bypass enforced reference": "Bypass enforced reference",
"CA certificate (base64)": "CA certificate (base64)",
"Campaign": "Campaign",
"Campaigns": "Campaigns",
Expand Down Expand Up @@ -327,6 +338,7 @@
"Connector": "Connector",
"Connectors": "Connectors",
"Connectors & workers": "Connectors & workers",
"Connectors API usage: register, ping, export push ...": "Connectors API usage: register, ping, export push ...",
"consent message": "consent message",
"Constituent": "Constituent",
"Contact information": "Contact information",
Expand Down Expand Up @@ -386,6 +398,9 @@
"CREATE": "CREATE",
"Create": "Create",
"create": "create",
"Create / Update Dashboards and investigations": "Create / Update dashboards and investigations",
"Create / Update dashboards and investigations": "Create / Update dashboards and investigations",
"Create / Update knowledge": "Create / Update knowledge",
"Create a campaign": "Create a campaign",
"Create a case template": "Create a case template",
"Create a channel": "Create a channel",
Expand Down Expand Up @@ -578,6 +593,9 @@
"Definition": "Definition",
"Delete": "Delete",
"delete": "delete",
"Delete Dashboards and investigations": "Delete dashboards and investigations",
"Delete dashboards and investigations": "Delete dashboards and investigations",
"Delete knowledge": "Delete knowledge",
"Delete mapping": "Delete mapping",
"Delete permanently": "Delete permanently",
"Delete public dashboard": "Delete public dashboard",
Expand Down Expand Up @@ -757,6 +775,7 @@
"Do you want to remove this opinion?": "Do you want to remove this opinion?",
"Do you want to remove this report?": "Do you want to remove this report?",
"Do you want to remove this status?": "Do you want to remove this status?",
"Do you want to reset the state and purge messages queue of this connector? ": "Do you want to reset the state and purge messages queue of this connector? ",
"Do you want to reset the state of this connector?": "Do you want to reset the state of this connector?",
"Do you want to start this CSV ingester?": "Do you want to start this CSV ingester?",
"Do you want to start this playbook?": "Do you want to start this playbook?",
Expand All @@ -782,6 +801,7 @@
"Download as STIX report": "Download as STIX report",
"Download as SVG": "Download as SVG",
"Download in pdf": "Download in pdf",
"Download knowledge export": "Download knowledge export",
"Download this file": "Download this file",
"Download this support package": "Download this support package",
"Due Date": "Due Date",
Expand Down Expand Up @@ -1114,6 +1134,7 @@
"Generate": "Generate",
"Generate a simulation scenario": "Generate a simulation scenario",
"Generate an export": "Generate an export",
"Generate knowledge export": "Generate knowledge export",
"Generate report document": "Generate report document",
"Generate Support Package": "Generate Support Package",
"Generated Support Package": "Generated Support Package",
Expand Down Expand Up @@ -1210,6 +1231,7 @@
"Import dashboard": "Import dashboard",
"Import data": "Import data",
"Import from date (empty = all Csv possible items)": "Import from date (empty = all Csv possible items)",
"Import knowledge": "Import knowledge",
"Import successfully asked": "Import successfully asked",
"Import type": "Import type",
"Important notice: your action is required!": "Important notice: your action is required!",
Expand All @@ -1235,6 +1257,7 @@
"Incidents": "Incidents",
"Include files not related to any knowledge (data import)": "Include files not related to any knowledge (data import)",
"Include headers in the feed": "Include headers in the feed",
"Include inferences": "Include inferences",
"Include knowledge": "Include knowledge",
"independent": "independent",
"Indexed files": "Indexed files",
Expand Down Expand Up @@ -1469,6 +1492,16 @@
"Manage access restriction": "Manage access restriction",
"Manage an entity": "Manage an entity",
"Manage an observable": "Manage an observable",
"Manage authorized members": "Manage authorized members",
"Manage connector state": "Manage connector state",
"Manage credentials": "Manage credentials",
"Manage CSV mappers": "Manage CSV mappers",
"Manage data sharing": "Manage data sharing",
"Manage ingestion": "Manage ingestion",
"Manage labels & Attributes": "Manage labels & Attributes",
"Manage marking definitions": "Manage marking definitions",
"Manage Public Dashboards": "Manage public dashboards",
"Manage public dashboards": "Manage public dashboards",
"Mandatory": "Mandatory",
"Mandatory attributes": "Mandatory attributes",
"Manual": "Manual",
Expand Down Expand Up @@ -1666,6 +1699,7 @@
"Number of history entries": "Number of history entries",
"Number of injects by attack pattern": "Number of injects by attack pattern",
"Number of lowercase chars must be greater or equals to": "Number of lowercase chars must be greater or equals to",
"Number of messages: ": "Number of messages: ",
"Number of node(s)": "Number of node(s)",
"Number of operations": "Number of operations",
"Number of paragraphs": "Number of paragraphs",
Expand Down Expand Up @@ -2089,6 +2123,7 @@
"Response type": "Response type",
"Restore": "Restore",
"Restore the state of the graphic before the last expansion": "Restore the state of the graphic before the last expansion",
"Restrict organization access": "Restrict organization access",
"Restrict to specific entity types": "Restrict to specific entity types",
"Restricted": "Restricted",
"Result": "Result",
Expand Down Expand Up @@ -2638,6 +2673,7 @@
"Update without references": "Update without references",
"Updated on": "Updated on",
"Upload date": "Upload date",
"Upload knowledge files": "Upload knowledge files",
"Uploaded files": "Uploaded files",
"Uploaded PDF files": "Uploaded PDF files",
"Uploading image": "Uploading image",
Expand Down
Loading

0 comments on commit 5caf501

Please sign in to comment.