Update Cygnus

- Tutorials use 1.18.3 which supports the NGSI v2 interface - `legacy` has been removed where possible.

Author: jason-fox

context-provider/routes/index.js

@@ -153,6 +153,25 @@ router.get('/app/monitor', function(req, res) {
   res.render('monitor', { title: 'Event Monitor' });
 });
 
+// Display the app monitor page
+router.get('/device/history', function(req, res) {
+  const data = NGSI_VERSION === 'ngsi-v2' ? NGSI_V2_STORES : NGSI_LD_STORES;
+  const stores = [];
+
+  if (process.env.CRATE_DB_SERVICE_URL || process.env.STH_COMET_SERVICE_URL) {
+    data.forEach(element => {
+      stores.push({
+        name: element.name,
+        href: element.href.replace('app/store/', 'history/')
+      });
+    });
+  }
+  res.render('history-index', {
+    title: 'Short-Term History',
+    stores
+  });
+});
+
 // Viewing Store information is secured by Keyrock PDP.
 // LEVEL 1: AUTHENTICATION ONLY - Users must be logged in to view the store page.
 router.get('/app/store/:storeId', Security.authenticate, Store.displayStore);

context-provider/views/history-index.pug

@@ -0,0 +1,15 @@
+extends layout
+
+block content
+  h1= title
+
+  - if (stores.length)
+    div
+      h3 Device History for each Store
+
+      ul
+        each store in stores
+          a(href=`${store.href}`)  #{store.name}
+          |  
+  - else
+    p.red No Device History available

context-provider/views/index.pug

@@ -44,6 +44,8 @@ block content
     a(href="app/monitor") App Monitor
     |  
     a(href="device/monitor") Device Monitor
+    |  
+    a(href="device/history") Short-Term History
 
   div
     h3 Store Details

docs/historic-context-nifi.md

@@ -32,7 +32,7 @@ A summary of the differences can be seen below:
 
 | Draco                                                                           | Cygnus                                                                           |
 | ------------------------------------------------------------------------------- | -------------------------------------------------------------------------------- |
-| Offers an NGSI v2 interface for notifications                                   | Offers an NGSI v1 interface for notifications                                    |
+| Offers an NGSI v2 interface for notifications                                   | Offers an NGSI v2 interface for notifications                                    |
 | configurable subscription endpoint, but defaults to `/v2/notify`                | subscription endpoint listens on `/notify`                                       |
 | listens on a single port                                                        | listens on separate ports for each input                                         |
 | Configured by a graphical interface                                             | Configured via config files                                                      |

docs/short-term-history.md

@@ -1,5 +1,6 @@
 [![FIWARE Core Context Management](https://nexus.lab.fiware.org/repository/raw/public/badges/chapters/core.svg)](https://github.com/FIWARE/catalogue/blob/master/core/README.md)
 [![NGSI v1](https://img.shields.io/badge/NGSI-v1-ff69b4.svg)](http://forge.fiware.org/docman/view.php/7/3213/FI-WARE_NGSI_RESTful_binding_v1.0.zip)
+[![NGSI v2](https://img.shields.io/badge/NGSI-v2-blue.svg)](https://fiware-ges.github.io/orion/api/v2/stable/)
 
 **Description:** This tutorial is an introduction to [FIWARE STH-Comet](https://fiware-sth-comet.readthedocs.io/) - a
 generic enabler which is used to retrieve trend data from a MongoDB database. The tutorial activates the IoT sensors
@@ -1083,9 +1084,7 @@ This is done by making a POST request to the `/v2/subscription` endpoint of the
 -   The `fiware-service` and `fiware-servicepath` headers are used to filter the subscription to only listen to
     measurements from the attached IoT Sensors
 -   The `idPattern` in the request body ensures that **Cygnus** will be informed of all **Motion Sensor** data changes.
--   The notification `url` must match the configured `CYGNUS_API_PORT`
--   The `attrsFormat=legacy` is required since **Cygnus** currently only accepts notifications in the older NGSI v1
-    format.
+-   The notification `url` must match the configured `CYGNUS_MONGO_SERVICE_PORT`
 
 #### 14 Request:
 
@@ -1111,12 +1110,11 @@ curl -iX POST \
   },
   "notification": {
     "http": {
-      "url": "http://cygnus:5050/notify"
+      "url": "http://cygnus:5051/notify"
     },
     "attrs": [
       "count"
-    ],
-    "attrsFormat": "legacy"
+    ]
   }
 }'
 ```
@@ -1132,9 +1130,7 @@ the `throttling` attribute in the request body.
 -   The `fiware-service` and `fiware-servicepath` headers are used to filter the subscription to only listen to
     measurements from the attached IoT Sensors
 -   The `idPattern` in the request body ensures that **Cygnus** will be informed of all **Smart Lamp** data changes only
--   The notification `url` must match the configured `CYGNUS_API_PORT`
--   The `attrsFormat=legacy` is required since **Cygnus** currently only accepts notifications in the older NGSI v1
-    format.
+-   The notification `url` must match the configured `CYGNUS_MONGO_SERVICE_PORT`
 -   The `throttling` value defines the rate that changes are sampled.
 
 #### 15 Request:
@@ -1161,12 +1157,11 @@ curl -iX POST \
   },
   "notification": {
     "http": {
-      "url": "http://cygnus:5050/notify"
+      "url": "http://cygnus:5051/notify"
     },
     "attrs": [
       "luminosity"
-    ],
-    "attrsFormat": "legacy"
+    ]
   },
   "throttling": 5
 }'