Merge branch 'issue_3145' of https://github.com/SolidProgramming/firewall-orchestrator into issue_2973

Author: SolidProgramming

documentation/revision-history-develop.md

@@ -260,3 +260,7 @@ bugfix release:
 
 # 8.7.1 - 05.03.2025 DEVELOP
 - ldap writepath for groups
+
+# 8.7.2 - 20.03.2025 DEVELOP
+- new config values
+- external request: attempt counter

inventory/group_vars/all.yml

@@ -1,5 +1,5 @@
 ### general settings
-product_version: "8.7.1"
+product_version: "8.7.2"
 ansible_user: "{{ lookup('env', 'USER') }}"
 ansible_become_method: sudo
 ansible_python_interpreter: /usr/bin/python3

roles/api/files/replace_metadata.json

@@ -5190,6 +5190,7 @@
                   "permission": {
                     "check": {},
                     "columns": [
+                      "attempts",
                       "create_date",
                       "ext_query_variables",
                       "ext_request_content",
@@ -5238,22 +5239,23 @@
                   "role": "auditor",
                   "permission": {
                     "columns": [
-                      "id",
-                      "ticket_id",
-                      "locked",
+                      "attempts",
+                      "create_date",
                       "ext_query_variables",
                       "ext_request_content",
                       "ext_request_state",
                       "ext_request_type",
                       "ext_ticket_id",
                       "ext_ticket_system",
+                      "finish_date",
+                      "id",
                       "last_creation_response",
                       "last_processing_response",
+                      "locked",
                       "owner_id",
                       "task_number",
-                      "wait_cycles",
-                      "create_date",
-                      "finish_date"
+                      "ticket_id",
+                      "wait_cycles"
                     ],
                     "filter": {}
                   },
@@ -5274,6 +5276,7 @@
                       "ext_ticket_system",
                       "last_creation_response",
                       "last_processing_response",
+                      "attempts",
                       "owner_id",
                       "task_number",
                       "wait_cycles",
@@ -5288,22 +5291,23 @@
                   "role": "modeller",
                   "permission": {
                     "columns": [
-                      "id",
-                      "ticket_id",
-                      "locked",
+                      "attempts",
+                      "create_date",
                       "ext_query_variables",
                       "ext_request_content",
                       "ext_request_state",
                       "ext_request_type",
                       "ext_ticket_id",
                       "ext_ticket_system",
+                      "finish_date",
+                      "id",
                       "last_creation_response",
                       "last_processing_response",
+                      "locked",
                       "owner_id",
                       "task_number",
-                      "wait_cycles",
-                      "create_date",
-                      "finish_date"
+                      "ticket_id",
+                      "wait_cycles"
                     ],
                     "filter": {}
                   },
@@ -5315,22 +5319,23 @@
                   "role": "middleware-server",
                   "permission": {
                     "columns": [
-                      "id",
-                      "ticket_id",
-                      "locked",
+                      "attempts",
+                      "create_date",
                       "ext_query_variables",
                       "ext_request_content",
                       "ext_request_state",
                       "ext_request_type",
                       "ext_ticket_id",
                       "ext_ticket_system",
+                      "finish_date",
+                      "id",
                       "last_creation_response",
                       "last_processing_response",
+                      "locked",
                       "owner_id",
                       "task_number",
-                      "wait_cycles",
-                      "create_date",
-                      "finish_date"
+                      "ticket_id",
+                      "wait_cycles"
                     ],
                     "filter": {},
                     "check": null

roles/database/files/sql/creation/fworch-create-tables.sql

@@ -1113,6 +1113,7 @@ create table ext_request
 	create_date Timestamp default now(),
 	finish_date Timestamp,
 	wait_cycles int default 0,
+	attempts int default 0,
 	locked boolean default false
 );
 

roles/database/files/sql/creation/fworch-fill-stm.sql

@@ -127,6 +127,10 @@ insert into config (config_key, config_value, config_user) VALUES ('autoReplaceA
 insert into config (config_key, config_value, config_user) VALUES ('ownerLdapId', '1', 0);
 insert into config (config_key, config_value, config_user) VALUES ('ownerLdapGroupNames', 'ModellerGroup_@@ExternalAppId@@', 0);
 insert into config (config_key, config_value, config_user) VALUES ('manageOwnerLdapGroups', 'true', 0);
+insert into config (config_key, config_value, config_user) VALUES ('modModelledMarker', 'FWOC', 0);
+insert into config (config_key, config_value, config_user) VALUES ('modModelledMarkerLocation', 'rulename', 0);
+insert into config (config_key, config_value, config_user) VALUES ('ruleRecognitionOption', '{"nwRegardIp":true,"nwRegardName":false,"nwRegardGroupName":false,"nwResolveGroup":false,"svcRegardPortAndProt":true,"svcRegardName":false,"svcRegardGroupName":false,"svcResolveGroup":true}', 0);
+insert into config (config_key, config_value, config_user) VALUES ('availableReportTypes', '[1,2,3,4,5,6,7,8,9,10,21,22]', 0);
 
 INSERT INTO "report_format" ("report_format_name") VALUES ('json');
 INSERT INTO "report_format" ("report_format_name") VALUES ('pdf');