Skip to content

Commit bc14b6e

Browse files
tpurschketpurschke
authored
Merge branch 'develop' into issue_2973
2 parents 31f6afb + da928b6 commit bc14b6e

File tree

61 files changed

+2116
-914
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+2116
-914
lines changed

‎documentation/revision-history-develop.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,3 +264,6 @@ bugfix release:
264264
# 8.7.2 - 20.03.2025 DEVELOP
265265
- new config values
266266
- external request: attempt counter
267+
268+
# 8.8.2 - 07.05.2025 DEVELOP
269+
- displayed state via variance analysis

‎inventory/group_vars/all.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### general settings
2-
product_version: "8.8.1"
2+
product_version: "8.8.2"
33
ansible_user: "{{ lookup('env', 'USER') }}"
44
ansible_become_method: sudo
55
ansible_python_interpreter: /usr/bin/python3

‎roles/api/files/replace_metadata.json‎

Lines changed: 216 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,6 +1106,30 @@
11061106
},
11071107
"comment": ""
11081108
},
1109+
{
1110+
"role": "middleware-server",
1111+
"permission": {
1112+
"columns": [
1113+
"ticket_id",
1114+
"common_service",
1115+
"is_interface",
1116+
"is_published",
1117+
"is_requested",
1118+
"conn_prop",
1119+
"creator",
1120+
"extra_params",
1121+
"name",
1122+
"app_id",
1123+
"id",
1124+
"proposed_app_id",
1125+
"used_interface_id",
1126+
"reason",
1127+
"creation_date"
1128+
],
1129+
"filter": {}
1130+
},
1131+
"comment": ""
1132+
},
11091133
{
11101134
"role": "modeller",
11111135
"permission": {
@@ -1144,6 +1168,17 @@
11441168
},
11451169
"comment": ""
11461170
},
1171+
{
1172+
"role": "middleware-server",
1173+
"permission": {
1174+
"columns": [
1175+
"conn_prop"
1176+
],
1177+
"filter": {},
1178+
"check": {}
1179+
},
1180+
"comment": ""
1181+
},
11471182
{
11481183
"role": "modeller",
11491184
"permission": {
@@ -1445,6 +1480,18 @@
14451480
},
14461481
"comment": ""
14471482
},
1483+
{
1484+
"role": "middleware-server",
1485+
"permission": {
1486+
"columns": [
1487+
"nwgroup_id",
1488+
"connection_field",
1489+
"connection_id"
1490+
],
1491+
"filter": {}
1492+
},
1493+
"comment": ""
1494+
},
14481495
{
14491496
"role": "modeller",
14501497
"permission": {
@@ -1514,6 +1561,18 @@
15141561
},
15151562
"comment": ""
15161563
},
1564+
{
1565+
"role": "middleware-server",
1566+
"permission": {
1567+
"columns": [
1568+
"nwobject_id",
1569+
"connection_field",
1570+
"connection_id"
1571+
],
1572+
"filter": {}
1573+
},
1574+
"comment": ""
1575+
},
15171576
{
15181577
"role": "modeller",
15191578
"permission": {
@@ -1865,6 +1924,22 @@
18651924
},
18661925
"comment": ""
18671926
},
1927+
{
1928+
"role": "middleware-server",
1929+
"permission": {
1930+
"columns": [
1931+
"is_global",
1932+
"name",
1933+
"app_id",
1934+
"id",
1935+
"port",
1936+
"port_end",
1937+
"proto_id"
1938+
],
1939+
"filter": {}
1940+
},
1941+
"comment": ""
1942+
},
18681943
{
18691944
"role": "modeller",
18701945
"permission": {
@@ -1963,6 +2038,17 @@
19632038
},
19642039
"comment": ""
19652040
},
2041+
{
2042+
"role": "middleware-server",
2043+
"permission": {
2044+
"columns": [
2045+
"connection_id",
2046+
"service_id"
2047+
],
2048+
"filter": {}
2049+
},
2050+
"comment": ""
2051+
},
19662052
{
19672053
"role": "modeller",
19682054
"permission": {
@@ -2063,6 +2149,22 @@
20632149
},
20642150
"comment": ""
20652151
},
2152+
{
2153+
"role": "middleware-server",
2154+
"permission": {
2155+
"columns": [
2156+
"is_global",
2157+
"comment",
2158+
"creator",
2159+
"name",
2160+
"app_id",
2161+
"id",
2162+
"creation_date"
2163+
],
2164+
"filter": {}
2165+
},
2166+
"comment": ""
2167+
},
20662168
{
20672169
"role": "modeller",
20682170
"permission": {
@@ -2161,6 +2263,17 @@
21612263
},
21622264
"comment": ""
21632265
},
2266+
{
2267+
"role": "middleware-server",
2268+
"permission": {
2269+
"columns": [
2270+
"connection_id",
2271+
"service_group_id"
2272+
],
2273+
"filter": {}
2274+
},
2275+
"comment": ""
2276+
},
21642277
{
21652278
"role": "modeller",
21662279
"permission": {
@@ -2227,6 +2340,17 @@
22272340
},
22282341
"comment": ""
22292342
},
2343+
{
2344+
"role": "middleware-server",
2345+
"permission": {
2346+
"columns": [
2347+
"service_group_id",
2348+
"service_id"
2349+
],
2350+
"filter": {}
2351+
},
2352+
"comment": ""
2353+
},
22302354
{
22312355
"role": "modeller",
22322356
"permission": {
@@ -6317,7 +6441,8 @@
63176441
"stop_time",
63186442
"successful_import"
63196443
],
6320-
"filter": {}
6444+
"filter": {},
6445+
"allow_aggregations": true
63216446
}
63226447
},
63236448
{
@@ -8584,7 +8709,8 @@
85848709
"ssh_hostname",
85858710
"ssh_port"
85868711
],
8587-
"filter": {}
8712+
"filter": {},
8713+
"allow_aggregations": true
85888714
}
85898715
},
85908716
{
@@ -9361,6 +9487,21 @@
93619487
"filter": {}
93629488
}
93639489
},
9490+
{
9491+
"role": "middleware-server",
9492+
"permission": {
9493+
"columns": [
9494+
"import_created",
9495+
"import_last_seen",
9496+
"objgrp_id",
9497+
"objgrp_member_id",
9498+
"active",
9499+
"negated"
9500+
],
9501+
"filter": {}
9502+
},
9503+
"comment": ""
9504+
},
93649505
{
93659506
"role": "modeller",
93669507
"permission": {
@@ -9483,6 +9624,21 @@
94839624
"filter": {}
94849625
}
94859626
},
9627+
{
9628+
"role": "middleware-server",
9629+
"permission": {
9630+
"columns": [
9631+
"import_created",
9632+
"import_last_seen",
9633+
"objgrp_flat_id",
9634+
"objgrp_flat_member_id",
9635+
"active",
9636+
"negated"
9637+
],
9638+
"filter": {}
9639+
},
9640+
"comment": ""
9641+
},
94869642
{
94879643
"role": "modeller",
94889644
"permission": {
@@ -16977,6 +17133,21 @@
1697717133
"filter": {}
1697817134
}
1697917135
},
17136+
{
17137+
"role": "middleware-server",
17138+
"permission": {
17139+
"columns": [
17140+
"import_created",
17141+
"import_last_seen",
17142+
"svcgrp_id",
17143+
"svcgrp_member_id",
17144+
"active",
17145+
"negated"
17146+
],
17147+
"filter": {}
17148+
},
17149+
"comment": ""
17150+
},
1698017151
{
1698117152
"role": "modeller",
1698217153
"permission": {
@@ -17099,6 +17270,21 @@
1709917270
"filter": {}
1710017271
}
1710117272
},
17273+
{
17274+
"role": "middleware-server",
17275+
"permission": {
17276+
"columns": [
17277+
"active",
17278+
"negated",
17279+
"import_created",
17280+
"import_last_seen",
17281+
"svcgrp_flat_id",
17282+
"svcgrp_flat_member_id"
17283+
],
17284+
"filter": {}
17285+
},
17286+
"comment": ""
17287+
},
1710217288
{
1710317289
"role": "modeller",
1710417290
"permission": {
@@ -19333,6 +19519,20 @@
1933319519
"allow_aggregations": true
1933419520
}
1933519521
},
19522+
{
19523+
"role": "middleware-server",
19524+
"permission": {
19525+
"columns": [
19526+
"import_created",
19527+
"import_last_seen",
19528+
"usergrp_id",
19529+
"usergrp_member_id",
19530+
"active"
19531+
],
19532+
"filter": {}
19533+
},
19534+
"comment": ""
19535+
},
1933619536
{
1933719537
"role": "modeller",
1933819538
"permission": {
@@ -19491,6 +19691,20 @@
1949119691
"filter": {}
1949219692
}
1949319693
},
19694+
{
19695+
"role": "middleware-server",
19696+
"permission": {
19697+
"columns": [
19698+
"import_created",
19699+
"import_last_seen",
19700+
"usergrp_flat_id",
19701+
"usergrp_flat_member_id",
19702+
"active"
19703+
],
19704+
"filter": {}
19705+
},
19706+
"comment": ""
19707+
},
1949419708
{
1949519709
"role": "modeller",
1949619710
"permission": {

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,13 @@ insert into config (config_key, config_value, config_user) VALUES ('ownerLdapGro
129129
insert into config (config_key, config_value, config_user) VALUES ('manageOwnerLdapGroups', 'true', 0);
130130
insert into config (config_key, config_value, config_user) VALUES ('modModelledMarker', 'FWOC', 0);
131131
insert into config (config_key, config_value, config_user) VALUES ('modModelledMarkerLocation', 'rulename', 0);
132-
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);
132+
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,"svcSplitPortRanges":false}', 0);
133133
insert into config (config_key, config_value, config_user) VALUES ('availableReportTypes', '[1,2,3,4,5,6,7,8,9,10,21,22]', 0);
134+
insert into config (config_key, config_value, config_user) VALUES ('varianceAnalysisSleepTime', '0', 0);
135+
insert into config (config_key, config_value, config_user) VALUES ('varianceAnalysisStartAt', '00:00:00', 0);
136+
insert into config (config_key, config_value, config_user) VALUES ('varianceAnalysisSync', 'false', 0);
137+
insert into config (config_key, config_value, config_user) VALUES ('varianceAnalysisRefresh', 'false', 0);
138+
insert into config (config_key, config_value, config_user) VALUES ('resolveNetworkAreas', 'False', 0);
134139

135140
INSERT INTO "report_format" ("report_format_name") VALUES ('json');
136141
INSERT INTO "report_format" ("report_format_name") VALUES ('pdf');

0 commit comments

Comments
 (0)