mgr/dashboard: add grps port to loki

Signed-off-by: Aashish Sharma <aasharma@redhat.com>
Co-authored-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit f0fa000edc8af2896f66a5a95ec3e5f06cedf8e4)

diff --git a/src/pybind/mgr/cephadm/services/monitoring.py b/src/pybind/mgr/cephadm/services/monitoring.py
index ed165b9f1be0f8e02e58443952e79f7fc161b4fb..0e1da36e76134f4496e762d3f92e0634790b99ec 100644 (file)
--- a/src/pybind/mgr/cephadm/services/monitoring.py
+++ b/src/pybind/mgr/cephadm/services/monitoring.py
@@ -397,6 +397,7 @@ class NodeExporterService(CephadmService):
 
 class LokiService(CephadmService):
     TYPE = 'loki'
+    DEFAULT_SERVICE_PORT = 3100
 
     def prepare_create(self, daemon_spec: CephadmDaemonDeploySpec) -> CephadmDaemonDeploySpec:
         assert self.TYPE == daemon_spec.daemon_type
@@ -421,6 +422,7 @@ class LokiService(CephadmService):
 
 class PromtailService(CephadmService):
     TYPE = 'promtail'
+    DEFAULT_SERVICE_PORT = 9080
 
     def prepare_create(self, daemon_spec: CephadmDaemonDeploySpec) -> CephadmDaemonDeploySpec:
         assert self.TYPE == daemon_spec.daemon_type

diff --git a/src/pybind/mgr/cephadm/templates/services/loki.yml.j2 b/src/pybind/mgr/cephadm/templates/services/loki.yml.j2
index d1849cb74602d559b2d7e63d5a0631a3ea9a63f5..c6ce531c205fe3fe5f1871748bf854e458ecd1c8 100644 (file)
--- a/src/pybind/mgr/cephadm/templates/services/loki.yml.j2
+++ b/src/pybind/mgr/cephadm/templates/services/loki.yml.j2
@@ -2,6 +2,7 @@ auth_enabled: false
 
 server:
   http_listen_port: 3100
+  grpc_listen_port: 0
 
 common:
   path_prefix: /tmp/loki