From a25738e49030ae77a105ea244843a7ab0b83aee6 Mon Sep 17 00:00:00 2001
From: Avan Thakkar <athakkar@redhat.com>
Date: Thu, 10 Feb 2022 14:53:15 +0530
Subject: [PATCH] mgr/cephadm: fix loki grpc port and liniting errors

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
---
 src/pybind/mgr/cephadm/services/monitoring.py    |  6 +++---
 .../services/grafana/ceph-dashboard.yml.j2       |  7 +++----
 .../services/grafana/loki-datasource.yml.j2      | 16 ----------------
 .../mgr/cephadm/templates/services/loki.yml.j2   |  2 +-
 src/pybind/mgr/orchestrator/_interface.py        |  4 ++--
 5 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 src/pybind/mgr/cephadm/templates/services/grafana/loki-datasource.yml.j2

diff --git a/src/pybind/mgr/cephadm/services/monitoring.py b/src/pybind/mgr/cephadm/services/monitoring.py
index 908ef596033..7f57cbac2de 100644
--- a/src/pybind/mgr/cephadm/services/monitoring.py
+++ b/src/pybind/mgr/cephadm/services/monitoring.py
@@ -36,13 +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))    
+            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, 'loki_hosts': loki_services})
+            'services/grafana/ceph-dashboard.yml.j2', {'hosts': prom_services, 'loki_host': loki_services[0]})
 
         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 95c3ca28cc4..663a712c509 100644
--- 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,10 +4,9 @@ deleteDatasources:
   - name: 'Dashboard{{ loop.index }}'
     orgId: 1
 {% endfor %}
-{% for loki_host in loki_hosts %}
-  - name: 'Loki{{ loop.index }}'
+
+  - name: 'Loki'
     orgId: 1
-{% endfor %}
 
 datasources:
 {% for host in hosts %}
@@ -25,7 +24,7 @@ datasources:
     type: 'loki'
     access: 'proxy'
     orgId: 1
-    url: '{{ loki_hosts[0] }}'
+    url: '{{ loki_host }}'
     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
deleted file mode 100644
index 7f8623d946a..00000000000
--- a/src/pybind/mgr/cephadm/templates/services/grafana/loki-datasource.yml.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-# {{ 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
diff --git a/src/pybind/mgr/cephadm/templates/services/loki.yml.j2 b/src/pybind/mgr/cephadm/templates/services/loki.yml.j2
index c6ce531c205..ce29445f05d 100644
--- a/src/pybind/mgr/cephadm/templates/services/loki.yml.j2
+++ b/src/pybind/mgr/cephadm/templates/services/loki.yml.j2
@@ -2,7 +2,7 @@ auth_enabled: false
 
 server:
   http_listen_port: 3100
-  grpc_listen_port: 0
+  grpc_listen_port: 8080
 
 common:
   path_prefix: /tmp/loki
diff --git a/src/pybind/mgr/orchestrator/_interface.py b/src/pybind/mgr/orchestrator/_interface.py
index b62ef9019fa..e95d2579130 100644
--- a/src/pybind/mgr/orchestrator/_interface.py
+++ b/src/pybind/mgr/orchestrator/_interface.py
@@ -641,11 +641,11 @@ class Orchestrator(object):
     def apply_node_exporter(self, spec: ServiceSpec) -> OrchResult[str]:
         """Update existing a Node-Exporter daemon(s)"""
         raise NotImplementedError()
-    
+
     def apply_loki(self, spec: ServiceSpec) -> OrchResult[str]:
         """Update existing a Loki daemon(s)"""
         raise NotImplementedError()
-    
+
     def apply_promtail(self, spec: ServiceSpec) -> OrchResult[str]:
         """Update existing a Promtail daemon(s)"""
         raise NotImplementedError()
-- 
2.39.5