From 6a970c03a47649b9c0eab7bfd2f09400f54d7ab7 Mon Sep 17 00:00:00 2001 From: iglocska Date: Fri, 12 Nov 2021 08:31:54 +0100 Subject: [PATCH 1/4] new: submarine object template added --- objects/submarine/definition.json | 144 ++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 objects/submarine/definition.json diff --git a/objects/submarine/definition.json b/objects/submarine/definition.json new file mode 100644 index 0000000..3f59578 --- /dev/null +++ b/objects/submarine/definition.json @@ -0,0 +1,144 @@ +{ + "attributes": { + "class": { + "description": "Submarine class", + "misp-attribute": "text", + "ui-priority": 0 + }, + "builders": { + "description": "The organisation building this class of submarines", + "misp-attribute": "text", + "multiple": true, + "ui-priority": 0 + }, + "in_service_from": { + "description": "The year the submarine entered service", + "misp-attribute": "counter", + "ui-priority": 0 + }, + "in_service_until": { + "description": "The year the submarine left service", + "misp-attribute": "counter", + "ui-priority": 0 + }, + "planned": { + "description": "The number of submarines of this class planned to be built", + "misp-attribute": "counter", + "ui-priority": 1 + }, + "completed": { + "description": "The number of submarines of this class built", + "misp-attribute": "counter", + "ui-priority": 1 + }, + "cancelled": { + "description": "The number of submarines of this class cancelled", + "misp-attribute": "counter", + "ui-priority": 1 + }, + "active": { + "description": "The number of submarines of this class in active service", + "misp-attribute": "counter", + "ui-priority": 1 + }, + "retired": { + "description": "The number of submarines of this class that has been retired", + "misp-attribute": "counter", + "ui-priority": 1 + }, + "operator": { + "description": "The countries operating such vessels (can be multiple)", + "misp-attribute": "text", + "multiple": true, + "ui-priority": 0 + }, + "predecessor": { + "description": "Predecessor class", + "misp-attribute": "text", + "ui-priority": 0 + }, + "successor": { + "description": "Successor class", + "misp-attribute": "text", + "ui-priority": 0 + }, + "type": { + "description": "Submarine type", + "disable_correlation": true, + "misp-attribute": "text", + "sane_default": [ + "Ballistic missile submarine" + ], + "ui-priority": 0 + }, + + "displacement": { + "description": "Displacement in tonns", + "misp-attribute": "counter", + "recommended": true, + "ui-priority": 0 + }, + "length": { + "description": "The length measurement of the submarine in meters", + "misp-attribute": "float", + "recommended": false, + "ui-priority": 0 + }, + "beam": { + "description": "The beam measurement of the submarine in meters", + "misp-attribute": "float", + "recommended": false, + "ui-priority": 0 + }, + "draught": { + "description": "The draught measurement of the submarine in meters", + "misp-attribute": "float", + "recommended": false, + "ui-priority": 0 + }, + "propulsion": { + "description": "The propulsion of the submarine, add multiple if applicabe", + "misp-attribute": "text", + "recommended": false, + "multiple": true, + "ui-priority": 0 + }, + "speed_surfaced": { + "description": "Surfaced top speed in knots", + "misp-attribute": "float", + "ui-priority": 1 + }, + "speed_submerged": { + "description": "Surfaced top speed in knots", + "misp-attribute": "float", + "ui-priority": 1 + }, + "endurance": { + "description": "Expected submerged endurance in days", + "misp-attribute": "counter", + "ui-priority": 1 + }, + "complement": { + "description": "Crew size", + "misp-attribute": "counter", + "recommended": false, + "ui-priority": 0 + }, + "armament": { + "description": "Armaments carried by the submarine", + "misp-attribute": "sha512/256", + "recommended": false, + "multiple": true, + "ui-priority": 0 + } + }, + "description": "Submarine description", + "meta-category": "naval", + "name": "submarine", + "required": [ + "class", + "type" + ], + "uuid": "c8e0c039-0ada-486a-b446-2686709e1e28", + "version": 1 +} From dba92cbd5345cfc3894a282bd06f4dfbbed0d0d5 Mon Sep 17 00:00:00 2001 From: iglocska Date: Fri, 12 Nov 2021 08:33:24 +0100 Subject: [PATCH 2/4] chg: jq all the things --- objects/submarine/definition.json | 179 +++++++++++++++--------------- 1 file changed, 89 insertions(+), 90 deletions(-) diff --git a/objects/submarine/definition.json b/objects/submarine/definition.json index 3f59578..db326dd 100644 --- a/objects/submarine/definition.json +++ b/objects/submarine/definition.json @@ -1,8 +1,21 @@ { "attributes": { - "class": { - "description": "Submarine class", - "misp-attribute": "text", + "active": { + "description": "The number of submarines of this class in active service", + "misp-attribute": "counter", + "ui-priority": 1 + }, + "armament": { + "description": "Armaments carried by the submarine", + "misp-attribute": "sha512/256", + "multiple": true, + "recommended": false, + "ui-priority": 0 + }, + "beam": { + "description": "The beam measurement of the submarine in meters", + "misp-attribute": "float", + "recommended": false, "ui-priority": 0 }, "builders": { @@ -11,6 +24,44 @@ "multiple": true, "ui-priority": 0 }, + "cancelled": { + "description": "The number of submarines of this class cancelled", + "misp-attribute": "counter", + "ui-priority": 1 + }, + "class": { + "description": "Submarine class", + "misp-attribute": "text", + "ui-priority": 0 + }, + "complement": { + "description": "Crew size", + "misp-attribute": "counter", + "recommended": false, + "ui-priority": 0 + }, + "completed": { + "description": "The number of submarines of this class built", + "misp-attribute": "counter", + "ui-priority": 1 + }, + "displacement": { + "description": "Displacement in tonns", + "misp-attribute": "counter", + "recommended": true, + "ui-priority": 0 + }, + "draught": { + "description": "The draught measurement of the submarine in meters", + "misp-attribute": "float", + "recommended": false, + "ui-priority": 0 + }, + "endurance": { + "description": "Expected submerged endurance in days", + "misp-attribute": "counter", + "ui-priority": 1 + }, "in_service_from": { "description": "The year the submarine entered service", "misp-attribute": "counter", @@ -21,30 +72,11 @@ "misp-attribute": "counter", "ui-priority": 0 }, - "planned": { - "description": "The number of submarines of this class planned to be built", - "misp-attribute": "counter", - "ui-priority": 1 - }, - "completed": { - "description": "The number of submarines of this class built", - "misp-attribute": "counter", - "ui-priority": 1 - }, - "cancelled": { - "description": "The number of submarines of this class cancelled", - "misp-attribute": "counter", - "ui-priority": 1 - }, - "active": { - "description": "The number of submarines of this class in active service", - "misp-attribute": "counter", - "ui-priority": 1 - }, - "retired": { - "description": "The number of submarines of this class that has been retired", - "misp-attribute": "counter", - "ui-priority": 1 + "length": { + "description": "The length measurement of the submarine in meters", + "misp-attribute": "float", + "recommended": false, + "ui-priority": 0 }, "operator": { "description": "The countries operating such vessels (can be multiple)", @@ -52,11 +84,38 @@ "multiple": true, "ui-priority": 0 }, + "planned": { + "description": "The number of submarines of this class planned to be built", + "misp-attribute": "counter", + "ui-priority": 1 + }, "predecessor": { "description": "Predecessor class", "misp-attribute": "text", "ui-priority": 0 }, + "propulsion": { + "description": "The propulsion of the submarine, add multiple if applicabe", + "misp-attribute": "text", + "multiple": true, + "recommended": false, + "ui-priority": 0 + }, + "retired": { + "description": "The number of submarines of this class that has been retired", + "misp-attribute": "counter", + "ui-priority": 1 + }, + "speed_submerged": { + "description": "Surfaced top speed in knots", + "misp-attribute": "float", + "ui-priority": 1 + }, + "speed_surfaced": { + "description": "Surfaced top speed in knots", + "misp-attribute": "float", + "ui-priority": 1 + }, "successor": { "description": "Successor class", "misp-attribute": "text", @@ -70,75 +129,15 @@ "Ballistic missile submarine" ], "ui-priority": 0 - }, - - "displacement": { - "description": "Displacement in tonns", - "misp-attribute": "counter", - "recommended": true, - "ui-priority": 0 - }, - "length": { - "description": "The length measurement of the submarine in meters", - "misp-attribute": "float", - "recommended": false, - "ui-priority": 0 - }, - "beam": { - "description": "The beam measurement of the submarine in meters", - "misp-attribute": "float", - "recommended": false, - "ui-priority": 0 - }, - "draught": { - "description": "The draught measurement of the submarine in meters", - "misp-attribute": "float", - "recommended": false, - "ui-priority": 0 - }, - "propulsion": { - "description": "The propulsion of the submarine, add multiple if applicabe", - "misp-attribute": "text", - "recommended": false, - "multiple": true, - "ui-priority": 0 - }, - "speed_surfaced": { - "description": "Surfaced top speed in knots", - "misp-attribute": "float", - "ui-priority": 1 - }, - "speed_submerged": { - "description": "Surfaced top speed in knots", - "misp-attribute": "float", - "ui-priority": 1 - }, - "endurance": { - "description": "Expected submerged endurance in days", - "misp-attribute": "counter", - "ui-priority": 1 - }, - "complement": { - "description": "Crew size", - "misp-attribute": "counter", - "recommended": false, - "ui-priority": 0 - }, - "armament": { - "description": "Armaments carried by the submarine", - "misp-attribute": "sha512/256", - "recommended": false, - "multiple": true, - "ui-priority": 0 } }, "description": "Submarine description", "meta-category": "naval", "name": "submarine", "required": [ - "class", - "type" + "class", + "type" ], "uuid": "c8e0c039-0ada-486a-b446-2686709e1e28", "version": 1 -} +} \ No newline at end of file From 66c037177efe0c463c311b7c593d5f20ad9015a9 Mon Sep 17 00:00:00 2001 From: iglocska Date: Fri, 12 Nov 2021 08:36:00 +0100 Subject: [PATCH 3/4] fix: [naval] meta category fixed --- objects/submarine/definition.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/objects/submarine/definition.json b/objects/submarine/definition.json index db326dd..d432598 100644 --- a/objects/submarine/definition.json +++ b/objects/submarine/definition.json @@ -132,7 +132,7 @@ } }, "description": "Submarine description", - "meta-category": "naval", + "meta-category": "misc", "name": "submarine", "required": [ "class", @@ -140,4 +140,4 @@ ], "uuid": "c8e0c039-0ada-486a-b446-2686709e1e28", "version": 1 -} \ No newline at end of file +} From 3ed8f7ae6e159582199c82f2ada165e30cc7a64a Mon Sep 17 00:00:00 2001 From: iglocska Date: Fri, 12 Nov 2021 08:39:35 +0100 Subject: [PATCH 4/4] chg: [submarine] fixes and list of types added --- objects/submarine/definition.json | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/objects/submarine/definition.json b/objects/submarine/definition.json index d432598..2e27303 100644 --- a/objects/submarine/definition.json +++ b/objects/submarine/definition.json @@ -7,7 +7,7 @@ }, "armament": { "description": "Armaments carried by the submarine", - "misp-attribute": "sha512/256", + "misp-attribute": "text", "multiple": true, "recommended": false, "ui-priority": 0 @@ -126,7 +126,13 @@ "disable_correlation": true, "misp-attribute": "text", "sane_default": [ - "Ballistic missile submarine" + "Ballistic missile submarine", + "Cruise missile submarine", + "Nuclear-powered attack submarine", + "Non-nuclear attack submarine with air-independent propulsion", + "Diesel-electric attack submarine", + "Midget submarine", + "Special mission submarine" ], "ui-priority": 0 } @@ -140,4 +146,4 @@ ], "uuid": "c8e0c039-0ada-486a-b446-2686709e1e28", "version": 1 -} +} \ No newline at end of file