From aec11478194571fdf4d9667a48ff2e23a6135d19 Mon Sep 17 00:00:00 2001
From: Michael Hamm <michael.hamm@smile.public.lu>
Date: Tue, 6 Nov 2018 09:57:32 +0100
Subject: [PATCH 1/4] RTIR Event Classification

---
 rtir_event_classification/machinetag.json | 42 +++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 rtir_event_classification/machinetag.json

diff --git a/rtir_event_classification/machinetag.json b/rtir_event_classification/machinetag.json
new file mode 100644
index 0000000..f4dd131
--- /dev/null
+++ b/rtir_event_classification/machinetag.json
@@ -0,0 +1,42 @@
+{
+  "namespace": "rtir_event_classification",
+  "description": "Classify an RT/IR event",
+  "version": 1,
+  "predicates": [
+    {
+      "value": "event-class",
+      "expanded": "Event Classification"
+    }
+  ],
+  "values": [
+    {
+      "predicate": "event-class",
+      "entry": [
+        {
+          "value": "incident_reports",
+          "expanded": "Incident Reports"
+        },
+        {
+          "value": "incidents",
+          "expanded": "Incidents"
+        },
+        {
+          "value": "investigations",
+          "expanded": "Investigations"
+        },
+        {
+          "value": "countermeasures",
+          "expanded": "Countermeasures"
+        },
+        {
+          "value": "general",
+          "expanded": "General"
+        },
+        {
+          "value": "exercises",
+          "expanded": "Exercises"
+        }
+      ]
+    }
+  ]
+}

From 2be3f5929680856644628d131884241e09f3e126 Mon Sep 17 00:00:00 2001
From: Michael Hamm <michael.hamm@smile.public.lu>
Date: Tue, 6 Nov 2018 10:11:22 +0100
Subject: [PATCH 2/4] Fix Mainifest

---
 MANIFEST.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/MANIFEST.json b/MANIFEST.json
index 3396bd4..71ca947 100644
--- a/MANIFEST.json
+++ b/MANIFEST.json
@@ -394,6 +394,11 @@
       "version": 1,
       "name": "gsma-network-technology",
       "description": "Taxonomy used by GSMA for their information sharing program with telco describing the types of infrastructure. WiP"
+    },
+    {
+      "version": 1,
+      "name": "rtir_event_classification",
+      "description": "RTIR Event Classification."
     }
   ],
   "path": "machinetag.json",

From 096470664b7e5645102d1ee2eaf00d40d1868a6c Mon Sep 17 00:00:00 2001
From: Michael Hamm <michael.hamm@smile.public.lu>
Date: Tue, 6 Nov 2018 10:15:45 +0100
Subject: [PATCH 3/4] Move RTIR Event Classification to Generic Event
 Classification

---
 MANIFEST.json                                                 | 4 ++--
 .../machinetag.json                                           | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename {rtir_event_classification => event_classification}/machinetag.json (100%)

diff --git a/MANIFEST.json b/MANIFEST.json
index 71ca947..c3923b0 100644
--- a/MANIFEST.json
+++ b/MANIFEST.json
@@ -397,8 +397,8 @@
     },
     {
       "version": 1,
-      "name": "rtir_event_classification",
-      "description": "RTIR Event Classification."
+      "name": "event_classification",
+      "description": "Event Classification."
     }
   ],
   "path": "machinetag.json",
diff --git a/rtir_event_classification/machinetag.json b/event_classification/machinetag.json
similarity index 100%
rename from rtir_event_classification/machinetag.json
rename to event_classification/machinetag.json

From f2693dfc9f0c80a052d845b89a71a074fd693241 Mon Sep 17 00:00:00 2001
From: Michael Hamm <michael.hamm@smile.public.lu>
Date: Tue, 6 Nov 2018 10:17:54 +0100
Subject: [PATCH 4/4] Change from plural to singular

---
 event_classification/machinetag.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/event_classification/machinetag.json b/event_classification/machinetag.json
index f4dd131..5943251 100644
--- a/event_classification/machinetag.json
+++ b/event_classification/machinetag.json
@@ -1,6 +1,6 @@
 {
-  "namespace": "rtir_event_classification",
-  "description": "Classify an RT/IR event",
+  "namespace": "event_classification",
+  "description": "Classification of RT/IR and other kind of events",
   "version": 1,
   "predicates": [
     {
@@ -13,28 +13,28 @@
       "predicate": "event-class",
       "entry": [
         {
-          "value": "incident_reports",
-          "expanded": "Incident Reports"
+          "value": "incident_report",
+          "expanded": "Incident Report"
         },
         {
-          "value": "incidents",
-          "expanded": "Incidents"
+          "value": "incident",
+          "expanded": "Incident"
         },
         {
-          "value": "investigations",
-          "expanded": "Investigations"
+          "value": "investigation",
+          "expanded": "Investigation"
         },
         {
-          "value": "countermeasures",
-          "expanded": "Countermeasures"
+          "value": "countermeasure",
+          "expanded": "Countermeasure"
         },
         {
           "value": "general",
           "expanded": "General"
         },
         {
-          "value": "exercises",
-          "expanded": "Exercises"
+          "value": "exercise",
+          "expanded": "Exercise"
         }
       ]
     }