Merge pull request #44751 from rhcs-dashboard/introduce-logging-containers

mgr/cephadm: introduce centralized logging in Dashboard using Loki and Promtail

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: rkachach <NOT@FOUND>
Reviewed-by: sunilangadi2 <NOT@FOUND>
Reviewed-by: umangachapagain <NOT@FOUND>

diff --cc src/cephadm/cephadm
Simple merge

diff --cc src/pybind/mgr/cephadm/module.py
Simple merge

diff --cc src/pybind/mgr/cephadm/tests/test_services.py
Simple merge

diff --cc src/pybind/mgr/orchestrator/_interface.py
Simple merge

diff --cc src/pybind/mgr/orchestrator/module.py
Simple merge

diff --cc src/python-common/ceph/deployment/service_spec.py
index 11c05f0600997d75f3339b5606497b422087d299,baeb7e7ff1cf586869a92374790f40cdcae23673..e7b6885ab1e5a7d6a204752d05eb7e91d706701b
--- 1/src/python-common/ceph/deployment/service_spec.py
--- 2/src/python-common/ceph/deployment/service_spec.py
+++ b/src/python-common/ceph/deployment/service_spec.py
@@@ -1067,9 -1055,9 +1069,10 @@@ class MonitoringSpec(ServiceSpec)
                   unmanaged: bool = False,
                   preview_only: bool = False,
                   port: Optional[int] = None,
 +                 extra_container_args: Optional[List[str]] = None,
                   ):
-         assert service_type in ['grafana', 'node-exporter', 'prometheus', 'alertmanager']
+         assert service_type in ['grafana', 'node-exporter', 'prometheus', 'alertmanager',
+                                 'loki', 'promtail']
  
          super(MonitoringSpec, self).__init__(
              service_type, service_id,