update structure / added information enterprise (Graylog2#942)

rhoughton · Sep 17, 2020 · a9a42a6 · a9a42a6
1 parent efda52c
commit a9a42a6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/index.rst b/index.rst
@@ -34,10 +34,8 @@ NOTE: There are multiple options for reading this documentation. See link to the
    pages/users_and_roles
    pages/plugins
    pages/content_packs
-   pages/external_dashboards
    pages/marketplace
    pages/faq
-   pages/gelf
    pages/ideas_explained
    pages/changelog
 
@@ -57,3 +55,4 @@ NOTE: There are multiple options for reading this documentation. See link to the
    :caption: Graylog Content
 
    pages/integrations
+   pages/gelf
diff --git a/pages/enterprise/intro.rst b/pages/enterprise/intro.rst
@@ -29,14 +29,22 @@ When the Graylog enterprise plugins and Graylog enterprise integrations plugin i
 
 		* Cluster-wide scheduler - Open Source runs alerts on a single node only, Enterprise runs them on all Graylog nodes, increasing capacity.
 
-		* :ref:`Script Notification<alert_notification_script>` - ability to run a custom native program in response to a generated alert, useful for the integration of third-party systems.
+		* :ref:`Script Notification<alert_notification_script>` (Integrations) - ability to run a custom native program in response to a generated alert, useful for the integration of third-party systems.
 
     - :ref:`MongoDB Lookup Table<lookuptable_mongodb>`
         * This allows settings values from pipelines, e.g. to maintain a list of suspicious IP addresses to be used in Dynamic Lists
 
-    - :ref:`Forwarding<forwarder>`
+    - :ref:`Forwarding<forwarder>` (Integrations)
         * Cluster-to-cluster forwarder output - requires two fully functioning Graylog clusters. The forwarder adds the ability to forward specific data streams to remote locations with journaling support incase of outages.
 
+    - :ref:`Output Framework<output_framework>` (Integrations)
+        * plugable solution to forward events from Graylog to any other system. Including  advanced options to manipulate the events before hand over, formatted as syslog message, json or any way. 
+
+    - Inputs (Integrations)
+        * :ref:`Okta Events Input <okta_input>` - get Okta events into Graylog
+
+        * :ref:`O365 Events Input <o365_input>` - get O365 events into Graylog 
+
 
 
 

diff --git a/pages/external_dashboards.rst b/pages/external_dashboards.rst
@@ -1,10 +1,16 @@
+:orphan:
+
 *******************
 External dashboards
 *******************
 
 There are other frontends that are connecting to the Graylog REST API and display data or information in a
 special way.
 
+.. warning:: As of time of writing this, we have now known external dashbard that is working. This is the reason this page is removed from the documentation.
+
+
+
 CLI stream dashboard
 ====================