Merge "Fix formatting in DAEXIM chapter"

[docs.git] / docs / getting-started-guide / karaf_features.rst

diff --git a/docs/getting-started-guide/karaf_features.rst b/docs/getting-started-guide/karaf_features.rst
index 4786114b97752cb4312c94bdff448db8f3eae450..51b09f55422904791bd91db13cb54db88d96a0a7 100644 (file)
--- a/docs/getting-started-guide/karaf_features.rst
+++ b/docs/getting-started-guide/karaf_features.rst
@@ -326,6 +326,7 @@ Functionality of TDSR includes:
 
 * Data Query Service - For external data-driven applications to query data from
   TSDR through REST APIs
+* ElasticSearch - Use external elastic search engine with TSDR integrated support.
 * NBI integration with Grafana - Allows visualization of data collected in TSDR
   using Grafana
 * Data Aggregation Service - Periodically aggregates raw data into larger time granularities
@@ -337,9 +338,10 @@ Functionality of TDSR includes:
 * Cassandra data store - Cassandra implementation of TSDR SPIs
 * NetFlow data collector - Collect NetFlow data from network elements
 * NetFlowV9 - version 9 Netflow collector
-* SNMP Data Collector - Integrates with SNMP plugin to bring SNMP data into TSDR
 * sFlowCollector - Collects sFlow data from network elements
+* SNMP Data Collector - Integrates with SNMP plugin to bring SNMP data into TSDR
 * Syslog data collector - Collects syslog data from network elements
+* Web Activity data collector - Collects ODL RESTCONF queries made to TSDR
 
 TSDR has multiple features to enable the functionality above. To begin,
 select one of these data stores:
@@ -352,10 +354,15 @@ Then select any “collectors” you want to use:
 
 * odl-tsdr-openflow-statistics-collector
 * odl-tsdr-netflow-statistics-collector
-* odl-tsdr-controller-metrics-collector
 * odl-tsdr-sflow-statistics-collector
+* odl-tsdr-controller-metrics-collector
 * odl-tsdr-snmp-data-collector
 * odl-tsdr-syslog-collector
+* odl-tsdr-restconf-collector
+
+Enable ElasticSearch support:
+
+* odl-tsdr-elasticsearch
 
 See these TSDR_Directions_ for more information.
 
@@ -372,29 +379,6 @@ for multiple platforms and device types, enabling USC and OpenDaylight to
 centralize the coordination of encryption across a wide array of endpoint and
 device types.
 
-VPN Service
-===========
-Implements the infrastructure services required to support L3 VPN service. It
-initially leverages open source routing applications as pluggable components.
-L3 services include:
-
-* The L3 VPN Manager
-* MP-BGP Routing Stack
-* MPLS Label Manager
-* NextHop Manager
-* FIB Service & Openstack Neutron Service
-
-The VPN Service offers:
-
-* An API for L3 VPN Services
-* Integration with open source routing suites, including Quagga & Ryu
-* OpenStack Integration with BGPVPN_Blueprint_ for end-to-end integration
-* OpenStack Neutron integration
-* VPN Service upstreamed as part of SDN-distributed routing and the VPN (SDNVPN)
-  project of Open Platform for NFV project (OPNFV) (available in Brahmaputra
-  release)
-* Network Overlay solution necessary for a Datacenter/Cloud environment
-
 Virtual Tenant Network (VTN)
 ============================
 Provides multi-tenant virtual network on an SDN controller, allowing you to