mgr/dashboard: add Loki to grafana datasources

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Co-authored-by: Aashish Sharma <aasharma@redhat.com>

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 58c8f225abb4aac62f600d3c167f65ba0da798c9..47a4a6f15ca9911b1f48de9ecc07a72f593efe7e 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -453,7 +453,7 @@ class Monitoring(object):
                 '--config.file=/etc/loki/loki.yml',
             ],
             'config-json-files': [
-                'loki.yml',
+                'loki.yml'
             ],
         },
         'promtail': {

diff --git a/src/pybind/mgr/cephadm/services/monitoring.py b/src/pybind/mgr/cephadm/services/monitoring.py
index fa89dc27b4a86a36529c4fef2499c28feefa0739..59c3d94a605d246c613acff80e28d9d7b134c896 100644 (file)
--- a/src/pybind/mgr/cephadm/services/monitoring.py
+++ b/src/pybind/mgr/cephadm/services/monitoring.py
@@ -36,8 +36,13 @@ class GrafanaService(CephadmService):
             prom_services.append(build_url(scheme='http', host=addr, port=port))
 
             deps.append(dd.name())
+            
+        loki_services = []  # type: List[str]
+        for dd in self.mgr.cache.get_daemons_by_service('mgr'):
+            addr = self.mgr.inventory.get_addr(dd.hostname)
+            loki_services.append(build_url(scheme='http', host=addr, port=3100))    
         grafana_data_sources = self.mgr.template.render(
-            'services/grafana/ceph-dashboard.yml.j2', {'hosts': prom_services})
+            'services/grafana/ceph-dashboard.yml.j2', {'hosts': prom_services, 'loki_hosts': loki_services})
 
         cert = self.mgr.get_store('grafana_crt')
         pkey = self.mgr.get_store('grafana_key')

diff --git a/src/pybind/mgr/cephadm/templates/services/grafana/ceph-dashboard.yml.j2 b/src/pybind/mgr/cephadm/templates/services/grafana/ceph-dashboard.yml.j2
index 170e6f246f6df6f40b37c705c2c1541913b5ef11..95c3ca28cc433854b249b176d4302ecb78667ee5 100644 (file)
--- a/src/pybind/mgr/cephadm/templates/services/grafana/ceph-dashboard.yml.j2
+++ b/src/pybind/mgr/cephadm/templates/services/grafana/ceph-dashboard.yml.j2
@@ -4,6 +4,10 @@ deleteDatasources:
   - name: 'Dashboard{{ loop.index }}'
     orgId: 1
 {% endfor %}
+{% for loki_host in loki_hosts %}
+  - name: 'Loki{{ loop.index }}'
+    orgId: 1
+{% endfor %}
 
 datasources:
 {% for host in hosts %}
@@ -16,3 +20,12 @@ datasources:
     isDefault: {{ 'true' if loop.first else 'false' }}
     editable: false
 {% endfor %}
+
+  - name: 'Loki'
+    type: 'loki'
+    access: 'proxy'
+    orgId: 1
+    url: '{{ loki_hosts[0] }}'
+    basicAuth: false
+    isDefault: true
+    editable: false

diff --git a/src/pybind/mgr/cephadm/templates/services/grafana/loki-datasource.yml.j2 b/src/pybind/mgr/cephadm/templates/services/grafana/loki-datasource.yml.j2
new file mode 100644 (file)
index 0000000..7f8623d
--- /dev/null
+++ b/src/pybind/mgr/cephadm/templates/services/grafana/loki-datasource.yml.j2
@@ -0,0 +1,16 @@
+# {{ cephadm_managed }}
+deleteDatasources:
+{% for loki_host in loki_hosts %}
+  - name: 'Loki{{ loop.index }}'
+    orgId: 1
+{% endfor %}
+
+datasources:
+  - name: 'Loki{{ loop.index }}'
+    type: 'loki'
+    access: 'proxy'
+    orgId: 1
+    url: '{{ loki_hosts }}'
+    basicAuth: false
+    isDefault: {{ 'true' if loop.first else 'false' }}
+    editable: false