doc: move graphite and prometheus do sub-sections of stats

Neither graphire nor Prometheus are useful without stats, and any data
they export needs explanation from stats module so it does not make
sense to separate them.

diff --git a/doc/config-logging-monitoring.rst b/doc/config-logging-monitoring.rst
index 4e8dc55c80da7bc62b6fbf4f2f6a24e6e25b579d..fed233d8b1b005acdc3c7c874d46ab1a1e3ba99c 100644 (file)
--- a/doc/config-logging-monitoring.rst
+++ b/doc/config-logging-monitoring.rst
@@ -34,8 +34,6 @@ If none of these options fits your deployment or if you have special needs you c
 
    modules-nsid
    modules-stats
-   modules-graphite
-   modules-http-prometheus
    modules-dnstap
    modules-watchdog
    modules-bogus_log

diff --git a/doc/modules-graphite.rst b/doc/modules-graphite.rst
deleted file mode 120000 (symlink)
index 29d7c2a..0000000
--- a/doc/modules-graphite.rst
+++ /dev/null
@@ -1 +0,0 @@
-../modules/graphite/README.rst
\ No newline at end of file

diff --git a/doc/modules-http-prometheus.rst b/doc/modules-http-prometheus.rst
deleted file mode 120000 (symlink)
index 5f9ac97..0000000
--- a/doc/modules-http-prometheus.rst
+++ /dev/null
@@ -1 +0,0 @@
-../modules/http/prometheus.rst
\ No newline at end of file

diff --git a/modules/graphite/README.rst b/modules/graphite/README.rst
index 82cf682a82d811177090f8fa1cc76bada39d1516..c0e61143457a123f8291230fce9bacf645b127fb 100644 (file)
--- a/modules/graphite/README.rst
+++ b/modules/graphite/README.rst
@@ -1,7 +1,7 @@
 .. _mod-graphite:
 
 Graphite/InfluxDB/Metronome
-===========================
+---------------------------
 
 The ``graphite`` sends statistics over the Graphite_ protocol to either Graphite_, Metronome_, InfluxDB_ or any compatible storage. This allows powerful visualization over metrics collected by Knot Resolver.
 
@@ -36,7 +36,7 @@ The module supports sending data to multiple servers at once.
        }
 
 Dependencies
-------------
+^^^^^^^^^^^^
 
 * `lua cqueues <https://25thandclement.com/~william/projects/cqueues.html>`_ package.
 

diff --git a/modules/http/prometheus.rst b/modules/http/prometheus.rst
index 8549de19776085bebc3d4f4a1d838613d953f818..12ddd61a65ad5b49bf40f6313e3f20700c331105 100644 (file)
--- a/modules/http/prometheus.rst
+++ b/modules/http/prometheus.rst
@@ -1,7 +1,7 @@
 .. _mod-http-prometheus:
 
 Prometheus metrics endpoint
-===========================
+---------------------------
 
 The `HTTP module <mod-http>`_ exposes ``/metrics`` endpoint that serves metrics
 from :ref:`mod-stats` in Prometheus_ text format.

diff --git a/modules/stats/README.rst b/modules/stats/README.rst
index 0294325168f31f412c67a915fcf8ad47111eef6f..3a805750d056b7c9a36bb76911ba15237a6dbae5 100644 (file)
--- a/modules/stats/README.rst
+++ b/modules/stats/README.rst
@@ -196,4 +196,5 @@ and include subrequests. The list maximum size is 5000 entries, make diffs if yo
 
 Clear the list of most frequent iterative queries.
 
-
+.. include:: ../modules/graphite/README.rst
+.. include:: ../modules/http/prometheus.rst