Merge branch 'master' of github.com:MISP/misp-taxonomies

Conflicts:
	osint/machinetag.json

MANIFEST.json

@@ -67,12 +67,12 @@
     },
     {
       "description": "Market operators and public administrations that must comply to some notifications requirements under EU NIS directive.",
-      "name": "eu-critical-sectors",
+      "name": "eu-marketop-and-publicadmin",
       "version": 2
     },
     {
       "description": "EUROPOL type of events taxonomy.",
-      "name": "europol-events",
+      "name": "europol-event",
       "version": 1
     },
     {
@@ -127,7 +127,7 @@
     },
     {
       "description": "Open Threat Taxonomy v1.1 base on James Tarala of SANS ref. - http://www.auditscripts.com/resources/open_threat_taxonomy_v1.1a.pdf",
-      "name": "open-threat",
+      "name": "open_threat",
       "version": 1
     },
     {
@@ -137,7 +137,7 @@
     },
     {
       "description": "The Permissible Actions Protocol - or short: PAP - was designed to indicate how the received information can be used.",
-      "name": "pap",
+      "name": "PAP",
       "version": 1
     },
     {

estimative-language/machinetag.json

@@ -20,7 +20,7 @@
         },
         {
           "value": "very-unlikely",
-          "expanded": "Very unlikely - highly improbale - 05-20%"
+          "expanded": "Very unlikely - highly improbable - 05-20%"
         },
         {
           "value": "unlikely",

osint/machinetag.json

@@ -29,6 +29,10 @@
         {
           "expanded": "Block or Filter List",
           "value": "block-or-filter-list"
+        },
+        {
+          "expanded": "Expansion",
+          "value": "expansion"
         }
       ],
       "predicate": "source-type"
@@ -98,7 +102,7 @@
   ],
   "namespace": "osint",
   "description": "Open Source Intelligence - Classification (MISP taxonomies)",
-  "version": 2,
+  "version": 3,
   "predicates": [
     {
       "value": "source-type",

rt_event_status/machinetag.json

@@ -0,0 +1,42 @@
+{
+  "namespace": "rt_event_status",
+  "description": "Status of events used in Request Tracker.",
+  "version": "1.0",
+  "predicates": [
+    {
+      "value": "event-status",
+      "expanded": "Event Status"
+    }
+  ],
+  "values": [
+    {
+      "predicate": "event-status",
+      "entry": [
+        {
+          "value": "new",
+          "expanded": "New"
+        },
+        {
+          "value": "open",
+          "expanded": "Open"
+        },
+        {
+          "value": "stalled",
+          "expanded": "Stalled"
+        },
+        {
+          "value": "rejected",
+          "expanded": "rejected"
+        },
+        {
+          "value": "resolved",
+          "expanded": "Resolved"
+        },
+        {
+          "value": "deleted",
+          "expanded": "Deleted"
+        }
+      ]
+    }
+  ]
+}