From c9c0b2216fb5a01d93a7fd9efeb8c32bcc9164f6 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Thu, 7 Oct 2021 22:29:05 +0200
Subject: [PATCH] L2SS-434: Fixed PromQL link, added more info for
tango-grafana exporter
---
docs/source/interfaces/monitoring.rst | 3 ++-
docs/source/interfaces/overview.rst | 32 ++++++++++++++-------------
2 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/docs/source/interfaces/monitoring.rst b/docs/source/interfaces/monitoring.rst
index 0f479a429..7d8a85fdf 100644
--- a/docs/source/interfaces/monitoring.rst
+++ b/docs/source/interfaces/monitoring.rst
@@ -31,7 +31,8 @@ Prometheus
- Every several seconds, Prometheus scrapes our `TANGO-Grafana Exporter <https://git.astron.nl/lofar2.0/ska-tango-grafana-exporter>`_ (our fork of https://gitlab.com/ska-telescope/TANGO-grafana.git), collecting all values of all the device attributes (except the large ones, for performance reasons).
- Prometheus can be queried directly on http://localhost:9090,
-- The query language is `PromQL <https://prometheus.io/docs/prometheus/latest/querying/basics/>`, which is also used in Grafana to query Prometheus,
+- The TANGO-Grafana Exporter can be queried directly on http://localhost:8000,
+- The query language is `PromQL <https://prometheus.io/docs/prometheus/latest/querying/basics/>`_, which is also used in Grafana to query Prometheus,
Prometheus stores attributes in the following format::
diff --git a/docs/source/interfaces/overview.rst b/docs/source/interfaces/overview.rst
index 4adc12a80..a00ab5710 100644
--- a/docs/source/interfaces/overview.rst
+++ b/docs/source/interfaces/overview.rst
@@ -15,21 +15,23 @@ The station provides the following interfaces accessible through your browser (a
Futhermore, there are some low-level interfaces:
-+---------------------------+--------------+-----------------------+-------------------+
-|Interface |Subsystem |URL |Default credentials|
-+===========================+==============+=======================+===================+
-| :ref:`pytango-section` |Tango |tango://localhost:10000| |
-+---------------------------+--------------+-----------------------+-------------------+
-| :ref:`prometheus-section` |Prometheus |http://localhost:9090 | |
-+---------------------------+--------------+-----------------------+-------------------+
-| :ref:`rest-api` |tango-rest |http://localhost:8080 |tango-cs/tango |
-+---------------------------+--------------+-----------------------+-------------------+
-| :ref:`tangodb` |MariaDB |http://localhost:3306 |tango/tango |
-+---------------------------+--------------+-----------------------+-------------------+
-|Archive Database |MariaDB |http://localhost:3307 |tango/tango |
-+---------------------------+--------------+-----------------------+-------------------+
-|Log Database |ElasticSearch |http://localhost:9200 | |
-+---------------------------+--------------+-----------------------+-------------------+
++---------------------------+------------------+-----------------------+-------------------+
+|Interface |Subsystem |URL |Default credentials|
++===========================+==================+=======================+===================+
+| :ref:`pytango-section` |Tango |tango://localhost:10000| |
++---------------------------+------------------+-----------------------+-------------------+
+| :ref:`prometheus-section` |Prometheus |http://localhost:9090 | |
++---------------------------+------------------+-----------------------+-------------------+
+| TANGO-Grafana Exporter |Python HTTPServer |http://localhost:8000 | |
++---------------------------+------------------+-----------------------+-------------------+
+| :ref:`rest-api` |tango-rest |http://localhost:8080 |tango-cs/tango |
++---------------------------+------------------+-----------------------+-------------------+
+| :ref:`tangodb` |MariaDB |http://localhost:3306 |tango/tango |
++---------------------------+------------------+-----------------------+-------------------+
+|Archive Database |MariaDB |http://localhost:3307 |tango/tango |
++---------------------------+------------------+-----------------------+-------------------+
+|Log Database |ElasticSearch |http://localhost:9200 | |
++---------------------------+------------------+-----------------------+-------------------+
.. toctree::
:hidden:
--
GitLab